Sync the docs in XML with Calenco

35 files changed, 1017 insertions, 1005 deletions

diff --git a/docs/docs/stable/installer/en/DrakX-cover.xml b/docs/docs/stable/installer/en/DrakX-cover.xml
index f26eb588..07e95eef 100644
--- a/docs/docs/stable/installer/en/DrakX-cover.xml
+++ b/docs/docs/stable/installer/en/DrakX-cover.xml
@@ -1,4 +1,4 @@
-<?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="en" xml:id="Quick-Startup">
+<?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" xml:lang="en" version="5.0" xml:id="Quick-Startup">
   <info>
     <title>Installation with DrakX</title>
    <publisher>
@@ -126,4 +126,4 @@
   
   <xi:include href="uninstall-Mageia.xml"/>
   </article>
-</book>
+</book>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/SelectAndUseISOs2.xml b/docs/docs/stable/installer/en/SelectAndUseISOs2.xml
index 3e2a618f..bb455f62 100644
--- a/docs/docs/stable/installer/en/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/en/SelectAndUseISOs2.xml
@@ -8,21 +8,20 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
   <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>
+    choose which image best suits your needs.</para>
+    <para>There are two families of 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>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>
       </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>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>
       </listitem>
     </itemizedlist>
     <para>Details are given in the next sections.</para>
@@ -33,8 +32,8 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
       <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 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
+      support (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>
@@ -42,15 +41,14 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
         <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
@@ -73,20 +71,21 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
         <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. Can also be used to install Mageia if you
+            wish.</para>
           </listitem>
           <listitem>
             <para>Each ISO contains only one desktop environment (Plasma,
             GNOME or Xfce).</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><emphasis role="bold">Live ISOs can only be used to create
-            clean installations, they cannot be used to upgrade from previous
-            releases.</emphasis></para>
+            clean installations, they cannot be used to upgrade previously
+            installed Mageia releases.</emphasis></para>
           </listitem>
           <listitem>
             <para>They contain non free software.</para>
@@ -100,7 +99,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
             <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>
@@ -114,7 +113,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
             <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>
@@ -128,7 +127,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
             <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>
@@ -137,13 +136,13 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
       </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
+            <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
@@ -151,15 +150,15 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
           </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
+            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 or 64 bit architectures.</para>
+            <para>Different media for 32 and 64 bit architectures.</para>
           </listitem>
           <listitem>
-            <para>English language only.</para>
+            <para>First steps are English language only.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -167,7 +166,8 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
         <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 people who prefer not
+            to use non-free software.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -186,56 +186,63 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
     <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, 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>
+      <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>
       <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>
+      <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>
       <mediaobject>
         <imageobject>
           <imagedata fileref="Download.png"/>
         </imageobject>
       </mediaobject>
-      <para>Check the radio button Save File.</para>
+      <para>Select the Save File option, then, click OK.</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
+      <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 it is the case, then 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>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>
+        </listitem>
+        <listitem>
+          <para>To use sha1sum, type: <userinput>sha1sum
+          path/to/the/image/file.iso</userinput></para>
+        </listitem>
+      </itemizedlist>
+      <para> Example:</para>
       <mediaobject>
         <imageobject>
           <imagedata fileref="../Md5sum.png"/>
         </imageobject>
       </mediaobject>
-      <para/>
+      <para>and compare the result (you may have to wait for a while) with the
+      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 dumped 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 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the
-      Mageia wiki</link>.</para>
+      <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 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>
@@ -243,7 +250,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
       USB stick and then use it 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
+        file-system on the device; any existing data will be lost and the
         partition capacity will be reduced to the image size.</para>
       </warning>
       <para>To recover the original capacity, you must redo partitioning and
@@ -255,25 +262,31 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
       <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>
         <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 root (Administrator) user with the command
+            <userinput>su -</userinput> (don't forget the final '-' )</para>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="../Root.png"/>
@@ -292,11 +305,16 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
                 <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
+          </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>
+            <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 thaat 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
@@ -313,24 +331,26 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
 [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>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </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>
-          </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: <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>
+            <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>
+            </tip>
           </listitem>
           <listitem>
             <para>Enter the command: # <userinput>sync</userinput></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/en/acceptLicense.xml b/docs/docs/stable/installer/en/acceptLicense.xml
index de2ee584..b3b2508e 100644
--- a/docs/docs/stable/installer/en/acceptLicense.xml
+++ b/docs/docs/stable/installer/en/acceptLicense.xml
@@ -27,11 +27,11 @@
 
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata xml:id="acceptLicense-im1" revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+      <imagedata format="PNG" xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center" revision="4"/>
     </imageobject>
 
     <imageobject>
-      <imagedata xml:id="acceptLicense-im2" revision="5" align="center" condition="live" format="PNG" fileref="live-license.png"/>
+      <imagedata format="PNG" fileref="live-license.png" xml:id="acceptLicense-im2" revision="5" align="center" condition="live"/>
     </imageobject>
   </mediaobject>
 
@@ -47,7 +47,7 @@
     <application>Mageia</application> distribution and must be accepted before
     you can continue.</para>
 
-    <para>To accept, simply select <guilabel>Accept</guilabel> and then click
+    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click
     on <guibutton>Next</guibutton>.</para>
 
     <para>If you decide not to accept these conditions, then we thank you for
@@ -67,8 +67,8 @@
   <para>Release Notes</para>
 -->
 
-    <para>Important information are given about this release of
-    <application>Mageia</application> and are accessible clicking on the
+    <para>Important information about this release of
+    <application>Mageia</application> can be viewed by clicking on the
     <guibutton>Release Notes</guibutton> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/addUser.xml b/docs/docs/stable/installer/en/addUser.xml
index eb20c08e..bb398e43 100644
--- a/docs/docs/stable/installer/en/addUser.xml
+++ b/docs/docs/stable/installer/en/addUser.xml
@@ -1,107 +1,117 @@
-<?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:id="addUser">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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:id="addUser">
   <info>
     <title xml:id="addUser-ti1">User and Superuser Management</title>
   </info>
+
   <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+
   <mediaobject>
     <imageobject condition="classical">
       <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
     </imageobject>
+
     <imageobject>
       <imagedata format="PNG" fileref="live-user1.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 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>
+    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>
+
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive, it is best to use a mixture of
+      <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 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
+    <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>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icon</guibutton>: if you click on this button it will change the user's icon.</para>
+        <para><guibutton>Icon</guibutton>: if you click on this button it will
+        change the user's icon.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Real Name</guilabel>: Insert the user's real name into this text box.</para>
+        <para><guilabel>Real Name</guilabel>: 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><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>
       </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>
+        <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>
       </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>
+        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 you 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">
     <info>
       <title xml:id="addUserAdvanced-ti3">Advanced User Management</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">Additionally, you can disable or enable a
-    guest account.</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 <guibutton>Advanced</guibutton> option allows you to edit
+    further settings for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Enable guest account</guilabel>: Here you can enable
-        or disable a guest account. The guest account allows a guest to log
-        into and use the PC, but he has more restricted access than normal
-        users.</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><guilabel>Shell</guilabel>: 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>
       </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><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>
       </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><guilabel>Group ID</guilabel>: This lets you set the <emphasis role="bold">group ID</emphasis>. Again, if unsure, leave it
+        blank.</para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/docs/docs/stable/installer/en/add_supplemental_media.xml b/docs/docs/stable/installer/en/add_supplemental_media.xml
index c4d1194a..7cb7d9d2 100644
--- a/docs/docs/stable/installer/en/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/en/add_supplemental_media.xml
@@ -1,54 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:lang="en" 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:lang="en" xml:id="add_supplemental_media" version="5.0">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Media Selection (Configure Supplemental Installation Media)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Media Selection (Configure
+    Supplemental Installation Media)</title>
+  </info>
 
   <!-- 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 -->
 
-<mediaobject>
+  <mediaobject>
     <imageobject>
-      <imagedata align="center"  fileref="dx2-add_supplemental_media.png"
-                 format="PNG" revision="1"  xml:id="dx2-add_supplemental_media-im1"/>
+      <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 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>
+  <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.
+  The source selection determines which packages will be available during the
+  next 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 activation of 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>
+      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 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
-      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>
+  <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, 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/en/ask_mntpoint_s.xml b/docs/docs/stable/installer/en/ask_mntpoint_s.xml
index 39c064c0..f2b70920 100644
--- a/docs/docs/stable/installer/en/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/en/ask_mntpoint_s.xml
@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/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 version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Choose the mount points</title>
   </info>
 
   <!-- 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 -->
 
-<mediaobject>
-    <imageobject condition='classical'>
-      <imagedata revision="1" fileref="dx2-chooseMountpoints.png" align="center" 
-       format="PNG"  xml:id="chooseMountPoints-im1"></imagedata>
+  <mediaobject>
+    <imageobject condition="classical">
+      <imagedata format="PNG" xml:id="chooseMountPoints-im1" align="center" fileref="dx2-chooseMountpoints.png" revision="1"/>
     </imageobject>
-    <imageobject condition='live'>
-      <imagedata revision="1" fileref="live-chooseMountpoints.png" align="center" 
-       format="PNG"  xml:id="live-chooseMountPoints-im1"></imagedata>
+
+    <imageobject condition="live">
+      <imagedata format="PNG" fileref="live-chooseMountpoints.png" align="center" xml:id="live-chooseMountPoints-im1" revision="1"/>
     </imageobject>
   </mediaobject>
 
@@ -39,46 +38,40 @@
   suggestions, you can change the mount points.</para>
 
   <note>
-    <para>If you change anything, make sure you still have a
-    <literal>/</literal> (root) partition.</para>
+    <para>If you change anything, make sure you still have a <emphasis role="bold"><literal>/</literal></emphasis> (root) partition.</para>
   </note>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown as follows: "Device" ("Capacity", "Mount
-      point", "Type").</para>
+      <para>Every partition is shown to the left as: <emphasis role="bold">Device (capacity, mount point, type).</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>"Device", is made up of: "hard drive", ["hard drive
-      number"(letter)], "partition number" (for example, "sda5").</para>
+      <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 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
+      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>
     </listitem>
 
     <listitem>
-      <para>For partitions you don't need to have access to, you can leave the
+      <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 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>
   </warning>
 
   <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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/chooseDesktop.xml b/docs/docs/stable/installer/en/chooseDesktop.xml
index 50edc24d..6b5e9559 100644
--- a/docs/docs/stable/installer/en/chooseDesktop.xml
+++ b/docs/docs/stable/installer/en/chooseDesktop.xml
@@ -6,9 +6,9 @@
   <!--Lebarhon 20170209 updated SC-->
 
   <para>Depending on your selection here, you may be offered further screens
-  to fine tune your choice.</para>
+  to fine-tune your choice.</para>
 
-  <para>After the selection step(s), you will see a slide show during package
+  <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>
 
@@ -18,11 +18,12 @@
     </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>
+  <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
diff --git a/docs/docs/stable/installer/en/choosePackageGroups.xml b/docs/docs/stable/installer/en/choosePackageGroups.xml
index 65838436..2a3451bd 100644
--- a/docs/docs/stable/installer/en/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/en/choosePackageGroups.xml
@@ -11,30 +11,30 @@
     </imageobject>
   </mediaobject>
 
-  <para>Packages have been sorted into 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>
+  <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>Workstation.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Server.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Graphical Environment.</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>I<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/en/choosePackagesTree.xml b/docs/docs/stable/installer/en/choosePackagesTree.xml
index 2bcfd6cb..0314129f 100644
--- a/docs/docs/stable/installer/en/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/en/choosePackagesTree.xml
@@ -1,26 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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: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" version="5.0">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Choose Individual Packages</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Choose Individual
-      Packages</title>
-    </info>
+  <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
 
-    <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+  <mediaobject>
+    <imageobject>
+      <imagedata format="PNG" fileref="dx2-choosePackagesTree.png" align="center"/>
+    </imageobject>
+  </mediaobject>
 
-<mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-choosePackagesTree.png" align="center" format="PNG" 
-         ></imagedata>
-      </imageobject>
-    </mediaobject>
-
-    <para>Here you can add or remove any extra packages to customise 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>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>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/configureServices.xml b/docs/docs/stable/installer/en/configureServices.xml
index 236315b3..24a75c40 100644
--- a/docs/docs/stable/installer/en/configureServices.xml
+++ b/docs/docs/stable/installer/en/configureServices.xml
@@ -1,44 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/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 version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Configure your Services</title>
+  </info>
 
+  <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 
-    <info>
-      <title xml:id="configureServices-ti1">Configure your
-      Services</title>
-    </info>
+  <!-- 2013-05-05 marja - added screenshot -->
 
-    <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
-   <!-- 2013-05-05 marja - added screenshot -->
-
-
-<mediaobject>
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-configureServices.png"  align="center" format="PNG"  xml:id="configureServices-im1"></imagedata>
+      <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>
-
-    <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 xml:id="configureServices-pa2" revision="1">Click on a triangle to
+  expand a group to all the relevant services.</para>
 
-    <para revision="1" xml:id="configureServices-pa4">If you highlight
-    a service, some information about it is shown in the info box
-    below.</para>
+  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose
+  are usually good.</para>
 
-    <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-pa4" revision="1">If you highlight a
+  service, some information about it is shown in the info box below.</para>
 
+  <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/en/configureTimezoneUTC.xml b/docs/docs/stable/installer/en/configureTimezoneUTC.xml
index 7849edb8..0210abad 100644
--- a/docs/docs/stable/installer/en/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/en/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: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" xml:id="configureTimezoneUTC" version="5.0">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configure your Timezone</title>
   </info>
@@ -9,20 +9,20 @@
 
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata xml:id="configureTimezoneUTC-im1" revision="1" fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+      <imagedata format="PNG" xml:id="configureTimezoneUTC-im1" align="center" fileref="dx2-configureTimezoneUTC.png" revision="1"/>
     </imageobject>
 
     <imageobject>
-      <imagedata fileref="live-timeZone.png" condition="live" format="PNG"/>
+      <imagedata format="PNG" fileref="live-timeZone.png" condition="live"/>
     </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>
+  <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>
 
-  <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
+  <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>
diff --git a/docs/docs/stable/installer/en/configureX_card_list.xml b/docs/docs/stable/installer/en/configureX_card_list.xml
index ffc88130..8bab1ffb 100644
--- a/docs/docs/stable/installer/en/configureX_card_list.xml
+++ b/docs/docs/stable/installer/en/configureX_card_list.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/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:id="configureX_card_list">
+<?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">
   <!-- Initiated by Marja  2012-08-08 -->
 
   <!-- Further text JohnR  2012-08-29 -->
@@ -6,7 +6,9 @@
   <!-- tproof  -->
 
   <!-- lproof  -->
+
   <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+
   <info>
     <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
     your Graphic Card)</title>
@@ -14,7 +16,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata revision="1" align="center" xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png" format="PNG"/>
+      <imagedata format="PNG" xml:id="configureX_card_list-im1" align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
     </imageobject>
   </mediaobject>
 
@@ -38,21 +40,20 @@
 
   <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>
-
-  <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>
+  <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>
 
   <para>Be aware that if you select an incompatible driver you may only have
-  access to the Commandline Interface.</para>
+  access to the <emphasis role="bold">Command-line</emphasis>
+  Interface.</para>
 
   <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>
+  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 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>
+  <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
diff --git a/docs/docs/stable/installer/en/configureX_chooser.xml b/docs/docs/stable/installer/en/configureX_chooser.xml
index b223e5d2..41dc78b1 100644
--- a/docs/docs/stable/installer/en/configureX_chooser.xml
+++ b/docs/docs/stable/installer/en/configureX_chooser.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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 version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <info>
     <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor
     Configuration</title>
@@ -9,63 +8,60 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-configureX_chooser.png"  align="center" 
-       format="PNG"  xml:id="configureX_chooser-im1">
-      </imagedata>
+      <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 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
+  <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
+  <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 you can see that
-  <application>DrakX</application> didn't make a choice, or if you think the
-  choice is incorrect.</para>
+  to be correct. Choose the correct settings if none are shown, or if you
+  think the details are incorrect.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Graphic
+      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graphic
       card</guibutton></emphasis>: Choose your card from the list if
       needed.</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
+      <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 revision="1" xml:id="configureX_chooser-pa3a">Incorrect refresh rates may
-		damage your monitor</para>
+        <para xml:id="configureX_chooser-pa3a" revision="1">Incorrect refresh
+        rates may damage your monitor</para>
       </warning>
     </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 xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>:
+      The resolution and color depth of your monitor ca 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 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>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Options</guibutton></emphasis>:
+      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>:
       Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/configureX_monitor.xml b/docs/docs/stable/installer/en/configureX_monitor.xml
index bbc3587e..0884c5fd 100644
--- a/docs/docs/stable/installer/en/configureX_monitor.xml
+++ b/docs/docs/stable/installer/en/configureX_monitor.xml
@@ -1,45 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" 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">
+<?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">
   <!-- Initiated by Marga 2012-8-09 -->
 
   <!-- Further text JohnR  2012-08-30 -->
 
   <!-- tproof -->
 
-  <!-- lproof -->
+  <!---->
 
   <info>
     <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
-  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very
+  <para xml:id="configureX_monitor-pa1" revision="1">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>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 xml:id="configureX_monitor-pa1w" revision="1"><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"/>
+      <imagedata format="PNG" xml:id="configureX_monitor-im1" fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
     </imageobject>
   </mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Custom</emphasis></para>
+  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Custom</emphasis></para>
 
   <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to
   set two critical parameters, the vertical refresh rate and the horizontal
@@ -52,17 +41,16 @@
   monitor. If in doubt, choose a conservative setting and consult your monitor
   documentation.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n
+  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n
   Play</emphasis></para>
 
-  <para revision="1" xml:id="configureX_monitor-pa6">This is the default
+  <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 revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Vendor</emphasis></para>
+  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendor</emphasis></para>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not
+  <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>
@@ -78,13 +66,12 @@
       </listitem>
     </itemizedlist></para>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Generic</emphasis></para>
+  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
 
-  <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 may be wise
-  to be conservative in your selections.</para>
-</section>
+  <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
diff --git a/docs/docs/stable/installer/en/diskdrake.xml b/docs/docs/stable/installer/en/diskdrake.xml
index 7dfa23b6..a36e49df 100644
--- a/docs/docs/stable/installer/en/diskdrake.xml
+++ b/docs/docs/stable/installer/en/diskdrake.xml
@@ -1,56 +1,82 @@
-<?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:id="diskdrake">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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:id="diskdrake">
   <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
+
   <info>
     <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>
+
   <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>
+    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>
-  <para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s)
+
+  <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 what is in them before you
+  partition or change its size and even view their details 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-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>
+
+  <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>
+
   <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>
+  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>
+
+  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted
+  everything to your satisfaction.</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
+    <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>
-    <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>
+
+    <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>
+    <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>
       <imageobject condition="classical">
         <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/>
       </imageobject>
+
       <imageobject condition="live">
         <imagedata align="center" fileref="live-doPartitionDisks3.png"/>
       </imageobject>
diff --git a/docs/docs/stable/installer/en/doPartitionDisks.xml b/docs/docs/stable/installer/en/doPartitionDisks.xml
index 149e7082..46130388 100644
--- a/docs/docs/stable/installer/en/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/en/doPartitionDisks.xml
@@ -1,105 +1,197 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:id="doPartitionDisks">
+<?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:id="doPartitionDisks">
   <!---->
+
   <!-- lebarhon 20161216 updated for Mageia 6
 
 lebarhon 20170209 added SC-->
+
   <info>
     <title xml:id="doPartitionDisks-ti1">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>
+  the content of your hard drive(s) along with the DrakX partitioning
+  proposals 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>
+  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">Use Existing
-        Partitions</para><para xml:id="doPartitionDisks-pa5" revision="1">If this option is
+
+  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing
+        Partitions</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">Use Free Space</para><para xml:id="doPartitionDisks-pa7" revision="1">If you have unused
+        and may be used for the installation.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</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
+        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
+        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
+        files!</para>
+
+        <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">Erase and use Entire
-        Disk.</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
+        recommended to back up your personal 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 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>
+
+        <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">Custom disk
-        partitioning</para><para xml:id="doPartitionDisks-pa17" revision="1">This gives you
+        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>
+        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>
+
+  <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>
+
+  <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>
+
+      <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 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>
+
+  <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>
+
   <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 /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>
   </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
+    <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>
       <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>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 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
+    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>
+
+    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+
+    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> =
+    2</para>
+
+    <para>Also make sure all partitions are created using an even number of
     megabytes.</para>
   </warning>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/exitInstall.xml b/docs/docs/stable/installer/en/exitInstall.xml
index ff5d8d0d..cafa76f8 100644
--- a/docs/docs/stable/installer/en/exitInstall.xml
+++ b/docs/docs/stable/installer/en/exitInstall.xml
@@ -1,23 +1,30 @@
-<?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 version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <info>
     <title xml:id="exitInstall-ti1">Congratulations</title>
   </info>
+
   <!-- Lebarhon 20170209 updated SC-->
+
   <mediaobject>
     <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>
+  screen, you can choose between the operating systems (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>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/firewall.xml b/docs/docs/stable/installer/en/firewall.xml
index d363e197..0309fd02 100644
--- a/docs/docs/stable/installer/en/firewall.xml
+++ b/docs/docs/stable/installer/en/firewall.xml
@@ -3,32 +3,30 @@
     <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
+  <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 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
+  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 <emphasis role="bold">CUPS server</emphasis> 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 role="bold">Advanced</emphasis> option opens a window
+  where you can enable a series of services by typing a list of couples (blank
+  separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/en/formatPartitions.xml b/docs/docs/stable/installer/en/formatPartitions.xml
index 4e6f0897..5c27dc01 100644
--- a/docs/docs/stable/installer/en/formatPartitions.xml
+++ b/docs/docs/stable/installer/en/formatPartitions.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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:id="formatPartitions">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <info>
     <title xml:id="formatPartitions-ti1">Formatting</title>
   </info>
@@ -7,46 +6,41 @@
   <!-- 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 -->
-  
-  
-  
-   <mediaobject>
-    <imageobject condition='classical'>
-      <imagedata revision="1" fileref="dx2-formatPartitions.png"  
-       format="PNG" align="center"   xml:id="formatPartitions-im1">
-      </imagedata>
+
+  <mediaobject>
+    <imageobject condition="classical">
+      <imagedata format="PNG" fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1" align="center" revision="1"/>
     </imageobject>
-    <imageobject condition='live'>
-      <imagedata revision="1" fileref="live-formatPartitions.png"  
-       format="PNG" align="center"   xml:id="live-formatPartitions-im1">
-      </imagedata>
+
+    <imageobject condition="live">
+      <imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center" fileref="live-formatPartitions.png" revision="1"/>
     </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>
+  <para xml:id="formatPartitions-pa1" revision="2">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 xml:id="formatPartitions-pa2" revision="1">Usually at least the
+  partitions 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 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>
 
   <tip>
-    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you
+    <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.
-    In that screen you can choose to view what is in your partitions.</para>
+    and then on <guibutton>Custom</guibutton> 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
+  <para xml:id="formatPartitions-pa5" revision="1">When you are confident
   about the selection, click on <guibutton>Next</guibutton> to
   continue.</para>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/installUpdates.xml b/docs/docs/stable/installer/en/installUpdates.xml
index 3c96f841..69e5924a 100644
--- a/docs/docs/stable/installer/en/installUpdates.xml
+++ b/docs/docs/stable/installer/en/installUpdates.xml
@@ -1,32 +1,31 @@
-<?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">
+  <info>
+    <title xml:id="installUpdates-ti1">Updates</title>
+  </info>
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Updates</title></info>
+  <!-- Made by marja on 2012 03 30 -->
 
-<!-- Made by marja on 2012 03 30 -->
-<!-- NEEDS TO BE REVIEWED! -->
+  <!-- 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 -->
+  <!-- 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-->
 
-   <mediaobject>
+  <!-- marja, 2012-04-24 added screenshot -->
+
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-installUpdates.png"  
-        format="PNG" align="center"   xml:id="installUpdates-im1"></imagedata>
-      </imageobject>
-   </mediaobject> 
+      <imagedata format="PNG" fileref="dx2-installUpdates.png" align="center" revision="1" xml:id="installUpdates-im1"/>
+    </imageobject>
+  </mediaobject>
 
- <para revision="1" xml:id="installUpdates-pa1">Since this version of
+  <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 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
+  <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 aren't
   connected to the Internet</para>
 
-  <para revision="1" xml:id="installUpdates-pa3">Then press
+  <para xml:id="installUpdates-pa3" revision="1">Press
   <guibutton>Next</guibutton> to continue</para>
-
-</section>
-  
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/installer.xml b/docs/docs/stable/installer/en/installer.xml
index 2b89e5d4..7b4ac785 100644
--- a/docs/docs/stable/installer/en/installer.xml
+++ b/docs/docs/stable/installer/en/installer.xml
@@ -1,7 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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:id="installer">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, the Mageia
-    Installer</title>
+    <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
@@ -19,8 +25,8 @@
       <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>
+      first one is what you will see if you have a UEFI system, the second one
+      is for a Legacy system:</para>
 
       <mediaobject>
         <imageobject>
@@ -28,10 +34,12 @@
         </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>
+      <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>
@@ -39,12 +47,21 @@
         </imageobject>
       </mediaobject>
 
-      <para>From this screen, it is possible to set some personal
-      preferences:<itemizedlist>
+      <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>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>
+            <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>
@@ -52,25 +69,13 @@
               </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>
+            <para>Use the arrow keys to select the language then press
+            <emphasis role="bold">Enter</emphasis>.</para>
           </listitem>
 
           <listitem>
-            <para>Change the screen resolution by pressing the F3 key (Legacy
-            mode only).</para>
+            <para>If needed, change the screen resolution by pressing
+            <emphasis role="bold">F3</emphasis> (Legacy mode only).</para>
 
             <mediaobject>
               <imageobject>
@@ -80,25 +85,37 @@
           </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>
-
-            <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>
-
-            <para>- Default, it doesn't alter anything in the default
-            options.</para>
-
-            <para>- Default, it doesn't alter anything in the default
-            options.</para>
-
-            <para>- No ACPI (Advanced Configuration and Power Interface),
-            power management isn't taken into account.</para>
-
-            <para>- No Local APIC (Local Advanced Programmable Interrupt
-            Controller), it is about CPU interruptions, select this option if
-            you are asked for.</para>
+            <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>
@@ -106,9 +123,9 @@
 
             <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>
+              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>
@@ -119,13 +136,11 @@
           </listitem>
 
           <listitem>
-            <para>Add more kernel options by pressing the key F1 (Legacy mode
-            only).</para>
-
-            <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>
+            <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>
@@ -133,10 +148,11 @@
               </imageobject>
             </mediaobject>
 
-            <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>
+            <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>
@@ -145,63 +161,41 @@
             </mediaobject>
 
             <note>
-              <para>The help is translated in the chosen language with the F2
-              key.</para>
+              <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>
+            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>
     </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>
-
-      <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>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="../dx-help.png"/>
-        </imageobject>
-      </mediaobject>
-    </section>
   </section>
 
   <section>
     <title>The installation steps</title>
 
-    <para>The install process is divided into a number of steps, which can be
-    followed on the side panel of the screen.</para>
+    <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>Each step has one or more screens which may also have
-    <guibutton>Advanced</guibutton> buttons with extra, less commonly
+    <guibutton>Advanced</guibutton> sections with extra, less commonly
     required, options.</para>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons which give
-    further explanations about the current step.</para>
+    <para>Most screens have <guibutton>Help</guibutton> buttons for further
+    details about the particular step.</para>
 
     <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>
+      <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>
   </section>
 
@@ -222,10 +216,12 @@
         <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>
+          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>
         </listitem>
       </itemizedlist>
     </section>
@@ -243,7 +239,7 @@
     <section>
       <title>RAM problem</title>
 
-      <para>These will rarely be needed, but in some cases the hardware may
+      <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>
@@ -252,12 +248,12 @@
     <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 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+      <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
+      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/en/media_selection.xml b/docs/docs/stable/installer/en/media_selection.xml
index a4d943aa..c60ebc28 100644
--- a/docs/docs/stable/installer/en/media_selection.xml
+++ b/docs/docs/stable/installer/en/media_selection.xml
@@ -1,17 +1,19 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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="en">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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:lang="en" xml:id="media_selection" version="5.0">
   <info>
     <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
   </info>
 
   <!-- 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)-->
 
-<mediaobject>
+  <mediaobject>
     <imageobject>
-      <imagedata align="center"  fileref="dx2-media_selection.png"
-                 format="PNG" revision="1"  xml:id="media_selection-im1"/>
+      <imagedata format="PNG" xml:id="media_selection-im1" align="center" revision="1" fileref="dx2-media_selection.png"/>
     </imageobject>
   </mediaobject>
 
@@ -27,19 +29,19 @@
     </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 ATI graphics card proprietary
-      drivers, firmware for various WiFi cards, 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 ATI 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,
+      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>
diff --git a/docs/docs/stable/installer/en/minimal-install.xml b/docs/docs/stable/installer/en/minimal-install.xml
index 5e08ec07..d6696c6a 100644
--- a/docs/docs/stable/installer/en/minimal-install.xml
+++ b/docs/docs/stable/installer/en/minimal-install.xml
@@ -1,48 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" 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" version="5.0">
   <info>
     <title xml:id="minimal-install-ti1">Minimal Install</title>
   </info>
 
   <!--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/ -->
 
   <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>
+  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 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>
+  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
+  lightweight desktop environment) will also be included.</para>
+
   <para>The basic documentation is provided in the form of man and info 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 
+  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>
+      <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/en/misc-params.xml b/docs/docs/stable/installer/en/misc-params.xml
index bbc50975..9df3ff00 100644
--- a/docs/docs/stable/installer/en/misc-params.xml
+++ b/docs/docs/stable/installer/en/misc-params.xml
@@ -12,14 +12,14 @@
     </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>
+  <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>
 
   <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>
@@ -29,7 +29,8 @@
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentionned in the detailed sections below is
+          an issue.</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -43,7 +44,7 @@
       <listitem>
         <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</guilabel></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selected a
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a
         time zone for you, depending on your preferred language. You can
         change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
@@ -52,9 +53,9 @@
         <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country /
         Region</guilabel></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>
@@ -64,7 +65,7 @@
         good choices 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>
+        anything, unless you know how to configure GRUB2</para>
 
         <para xml:id="misc-params-system-pa4c" revision="2">For more
         information, see <xref linkend="setupBootloader"/></para>
@@ -83,8 +84,8 @@
         <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services</guilabel>:</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>
+        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
@@ -104,9 +105,9 @@
       <listitem>
         <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</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,
@@ -126,9 +127,10 @@
         card</guilabel>:</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
+        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>
+        driver for your card, but where none of them is the default
+        one.</para>
       </listitem>
 
       <listitem>
@@ -162,13 +164,13 @@
 
         <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
+        better to do that after reboot, using the <application>Mageia Control
         Center</application>, if you have not yet enabled the Nonfree 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 that
+          network card, do not forget to set your firewall to monitor that
           interface as well.</para>
         </warning>
       </listitem>
@@ -183,7 +185,7 @@
 
         <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>
+        enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/docs/docs/stable/installer/en/securityLevel.xml b/docs/docs/stable/installer/en/securityLevel.xml
index 471b73cd..72aae2b3 100644
--- a/docs/docs/stable/installer/en/securityLevel.xml
+++ b/docs/docs/stable/installer/en/securityLevel.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="securityLevel" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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:id="securityLevel">
+  <info>
+    <title xml:id="securityLevel-ti1">Security Level</title>
+  </info>
 
+  <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 
-    <info>
-      <title xml:id="securityLevel-ti1">Security Level</title>
-    </info>
+  <!-- 2013-05-05 marja - added screenshot -->
 
- <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
- <!-- 2013-05-05 marja - added screenshot -->
-
-<mediaobject>
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-securityLevel.png"  align="center" format="PNG"  xml:id="securityLevel-im1"></imagedata>
+      <imagedata format="PNG" xml:id="securityLevel-im1" align="center" fileref="dx2-securityLevel.png" revision="1"/>
     </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 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><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 send <emphasis>security
+  alert messages</emphasis> when it detects situations which require
+  notification to a system administrator.</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>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 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>
+  <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">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
diff --git a/docs/docs/stable/installer/en/selectCountry.xml b/docs/docs/stable/installer/en/selectCountry.xml
index a167abd0..6450e3a2 100644
--- a/docs/docs/stable/installer/en/selectCountry.xml
+++ b/docs/docs/stable/installer/en/selectCountry.xml
@@ -17,14 +17,15 @@
   use a Wireless network.</para>
 
   <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
+  list, click the <guilabel>Other Countries</guilabel> option and choose your
   country / region there.</para>
 
   <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>
+    <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>
   </note>
 
   <section xml:id="inputMethod">
@@ -37,13 +38,14 @@
     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
+    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
+      installed system via <emphasis role="bold">Configure your
+      Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
       running localedrake as root.</para>
     </note>
   </section>
diff --git a/docs/docs/stable/installer/en/selectInstallClass.xml b/docs/docs/stable/installer/en/selectInstallClass.xml
index 9c3ada3f..91befa12 100644
--- a/docs/docs/stable/installer/en/selectInstallClass.xml
+++ b/docs/docs/stable/installer/en/selectInstallClass.xml
@@ -1,12 +1,4 @@
-<?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:id="selectInstallClass">
-
+<?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:id="selectInstallClass">
   <!-- Made by marja on 2012 03 18 -->
 
   <!-- 20120405 updated JohnR -->
@@ -15,6 +7,7 @@
       "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  -->
 
   <info>
@@ -23,7 +16,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata fileref="dx2-selectInstallClass.png" align="center"  format="PNG"></imagedata>
+      <imagedata format="PNG" align="center" fileref="dx2-selectInstallClass.png"/>
     </imageobject>
   </mediaobject>
 
@@ -31,24 +24,25 @@
     <listitem>
       <para>Install</para>
 
-      <para>Use this option for a fresh <application>Mageia</application>
-      installation.</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>
     </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>
+      <para>This can be used to upgrade an existing installation of
+      <application>Mageia</application>.</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>
+      <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>
     </listitem>
   </itemizedlist>
 
@@ -57,16 +51,17 @@
     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>
+    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>
 
   <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>
+    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>
   </tip>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/selectKeyboard.xml b/docs/docs/stable/installer/en/selectKeyboard.xml
index e2420235..2913109f 100644
--- a/docs/docs/stable/installer/en/selectKeyboard.xml
+++ b/docs/docs/stable/installer/en/selectKeyboard.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" 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">
+<?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">
   <!-- Started by marja on 2012 03 31 -->
 
   <!-- NEEDS TO BE REVIEWED! -->
@@ -14,48 +7,46 @@
     <title xml:id="selectKeyboard-ti1">Keyboard</title>
   </info>
 
-  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate
+  <para xml:id="selectKeyboard-pa1" revision="1">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"
-                 />
+      <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
     </imageobject>
   </mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the
+      <para xml:id="selectKeyboard-pa2" revision="1">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>
+      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 <guibutton>More</guibutton> to get a full list,
-      and select your keyboard there.</para>
+      <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
-          anomaly and continue the installation: Your keyboard is the one you
-          chose from the full list.</para>
+          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>
     </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
+      <para xml:id="selectKeyboard-pa4" revision="1">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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/selectLanguage.xml b/docs/docs/stable/installer/en/selectLanguage.xml
index 8469812c..d8bbb8d6 100644
--- a/docs/docs/stable/installer/en/selectLanguage.xml
+++ b/docs/docs/stable/installer/en/selectLanguage.xml
@@ -1,51 +1,65 @@
-<?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:id="selectLanguage">
+<?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:id="selectLanguage">
   <!-- 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 -->
+
   <info>
     <title xml:id="selectLanguage-ti1">Please choose a language to use</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>
+
+  <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 extra language support after installation.</para>
+
   <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>
+    as your preferred language in the first language screen. It will also be
+    marked as chosen in the multiple languages screen .</para>
   </warning>
+
   <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>
     </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 languages.</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>
     </listitem>
+
     <listitem>
       <para>You can change the language of your system after installation in
       the Mageia Control Center -> System -> Manage localization for
diff --git a/docs/docs/stable/installer/en/setupBootloader.xml b/docs/docs/stable/installer/en/setupBootloader.xml
index c52a88a9..ba3fa322 100644
--- a/docs/docs/stable/installer/en/setupBootloader.xml
+++ b/docs/docs/stable/installer/en/setupBootloader.xml
@@ -1,255 +1,167 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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: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" version="5.0" xml:id="setupBootloader">
   <!---->
-
   <!--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-->
-
   <info>
     <title xml:id="setupBootloader-ti1">Bootloader main options</title>
   </info>
-
   <section>
     <title>Bootloader interface</title>
-
     <para>By default, Mageia uses exclusively:</para>
-
     <itemizedlist>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or
+        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or
         Legacy/GPT system</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi for a UEFI system.</para>
+        <para>GRUB2-efi for a UEFI system.</para>
       </listitem>
     </itemizedlist>
-
     <tip>
       <para>The Mageia graphical menus are nice :)</para>
     </tip>
-
     <section>
-      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
-
+      <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>
+      <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 an UEFI system, the user interface is slightly different as
-      you cannot choose between with or without graphical menu</para>
-
+      <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 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
+      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 "Boot Device" unless you really know what you are
-      doing.</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, according to your system, Mageia writes a new:</para>
-
+    <para>By default, and according to your system, Mageia writes one of the
+    following:</para>
     <itemizedlist>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of
+        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of
         your first hard drive or in the BIOS boot partition.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>a GRUB2-efi bootloader into the ESP</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>
-
+    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 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>
+    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
+    <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
+    <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>
-
     <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
+      <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 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 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>
+            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>
     </section>
-
     <section>
       <title>Next page</title>
-
       <itemizedlist>
         <listitem>
           <para><guilabel>Default:</guilabel> Operating system 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>
         </listitem>
-
         <listitem>
           <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia
           bootloader</link></para>
         </listitem>
-
         <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
+          <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>
+                loading</link></para></listitem></itemizedlist></para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/docs/docs/stable/installer/en/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/en/setupBootloaderAddEntry.xml
index 6f30d553..df65f61c 100644
--- a/docs/docs/stable/installer/en/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/en/setupBootloaderAddEntry.xml
@@ -1,15 +1,18 @@
-<?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: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:id="setupBootloaderAddEntry">
   <!--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-->
+
   <info>
     <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 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+    <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/en/setupSCSI.xml b/docs/docs/stable/installer/en/setupSCSI.xml
index 5b89bcc1..77fca6b8 100644
--- a/docs/docs/stable/installer/en/setupSCSI.xml
+++ b/docs/docs/stable/installer/en/setupSCSI.xml
@@ -1,41 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/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 version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <info>
     <title xml:id="setupSCSI-ti1">Setup SCSI</title>
   </info>
 
   <!-- 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. --> 
-  
+
+  <!-- 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 -->
-  
-   <mediaobject>
+
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-setupSCSI.png"  
-       format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
+      <imagedata format="PNG" fileref="dx2-setupSCSI.png" align="center" xml:id="setupSCSI-im1" revision="1"/>
     </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>
+  <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>
+  manually tell DrakX which SCSI drive(s) you have.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX should then be able
-  to configure the drive(s) correctly.</para>
-</section>
+  <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
diff --git a/docs/docs/stable/installer/en/soundConfig.xml b/docs/docs/stable/installer/en/soundConfig.xml
index a9371cc2..516d6f05 100644
--- a/docs/docs/stable/installer/en/soundConfig.xml
+++ b/docs/docs/stable/installer/en/soundConfig.xml
@@ -12,8 +12,8 @@
   </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>
+  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
@@ -21,22 +21,22 @@
   <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>
+  <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>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Advanced</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
+    <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
-    <guibutton>Let me pick any driver</guibutton>.</para>
+    <emphasis role="bold"><guibutton>Let me pick any
+    driver</guibutton></emphasis>.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/takeOverHdConfirm.xml b/docs/docs/stable/installer/en/takeOverHdConfirm.xml
index 00c520c8..53a614f5 100644
--- a/docs/docs/stable/installer/en/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/en/takeOverHdConfirm.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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:id="takeOverHdConfirm">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be
     formatted</title>
@@ -8,7 +7,7 @@
   <!-- 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 -->
@@ -16,18 +15,21 @@
   <!-- 2013-05-05 marja added screenshot -->
 
   <mediaobject>
-      <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>
+    <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 revision="1" xml:id="takeOverHdConfirm-pa1">Click on
-  <guibutton>Previous</guibutton> if you are not sure about your choice.</para>
+  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on
+  <guibutton>Previous</guibutton> if you are at all unsure about your
+  choice.</para>
 
-  <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>
-</section>
+  <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
diff --git a/docs/docs/stable/installer/en/uninstall-Mageia.xml b/docs/docs/stable/installer/en/uninstall-Mageia.xml
index e5c9b3b9..07b3c7d5 100644
--- a/docs/docs/stable/installer/en/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/en/uninstall-Mageia.xml
@@ -6,35 +6,30 @@
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
 
-  <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 possibility to uninstall. This is not true for every operating
+  system.</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>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 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>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>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>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 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>
+  <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>
\ No newline at end of file