Updates (fixes)

6 files changed, 76 insertions, 234 deletions

diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml
index dca3b62f..18ea8d5d 100644
--- a/docs/installer/en/SelectAndUseISOs2.xml
+++ b/docs/installer/en/SelectAndUseISOs2.xml
@@ -1,20 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="Select-and-use-ISOs">
+<?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="Select-and-use-ISOs">
   <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
-
   <info>
     <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
-
   <section>
     <title>Introduction</title>
-
     <para>Mageia is distributed via ISO images. This page will help you to
     choose which image match your needs.</para>
-
     <para>There is two families of media:</para>
-
     <itemizedlist>
       <listitem>
         <para>Classical installer: After booting the media, it will follow a
@@ -23,7 +18,6 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
         installation, in particular to choose which Desktop Environment you
         will 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.
@@ -31,60 +25,46 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
         choices.</para>
       </listitem>
     </itemizedlist>
-
     <para>Details are given in the next sections.</para>
   </section>
-
   <section>
     <title>Media</title>
-
     <section>
       <title>Definition</title>
-
       <para>Here, a medium (plural: media) is an ISO image file that allows
       you to install and/or update Mageia and by extension any physical
       support the ISO file is copied to.</para>
-
       <para>You can find them <link ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
-
     <section>
       <title>Classical installation media</title>
-
       <section>
         <title>Common features</title>
-
         <itemizedlist>
           <listitem>
             <para>These ISOs use the traditional installer called
             drakx.</para>
           </listitem>
-
           <listitem>
             <para>They are able to make a clean install or an update from
             previous releases.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>DVD</title>
-
         <itemizedlist>
           <listitem>
-            <para>Different media for architecture 32 or 64 bits.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
-
           <listitem>
             <para>Some tools are available in the Welcome screen: Rescue
             System, Memory Test, Hardware Detection Tool.</para>
           </listitem>
-
           <listitem>
             <para>Each DVD contains many available desktop environments and
             languages.</para>
           </listitem>
-
           <listitem>
             <para>You'll be given the choice during the installation to add
             non free software.</para>
@@ -92,101 +72,79 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
         </itemizedlist>
       </section>
     </section>
-
     <section>
       <title>Live media</title>
-
       <section>
         <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>
           </listitem>
-
           <listitem>
             <para>Each ISO contains only one desktop environment (KDE, GNOME
             or Xfce).</para>
           </listitem>
-
           <listitem>
             <para>Different media for 32 or 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>
           </listitem>
-
           <listitem>
             <para>They contain non free software.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>Live DVD Plasma</title>
-
         <itemizedlist>
           <listitem>
             <para>Plasma desktop environment only.</para>
           </listitem>
-
           <listitem>
             <para>All languages are present.</para>
           </listitem>
-
           <listitem>
             <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>Live DVD GNOME</title>
-
         <itemizedlist>
           <listitem>
             <para>GNOME desktop environment only.</para>
           </listitem>
-
           <listitem>
             <para>All languages are present.</para>
           </listitem>
-
           <listitem>
             <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>Live DVD Xfce</title>
-
         <itemizedlist>
           <listitem>
             <para>Xfce desktop environment only.</para>
           </listitem>
-
           <listitem>
             <para>All languages are present.</para>
           </listitem>
-
           <listitem>
             <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
-
     <section>
       <title>Boot-only CD media</title>
-
       <section>
         <title>Common features</title>
-
         <itemizedlist>
           <listitem>
             <para>Each one is a small image that contains no more than that
@@ -196,27 +154,22 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
             hard disk, on a local drive, on a local network or on the
             Internet.</para>
           </listitem>
-
           <listitem>
             <para>These media are very light (less than 100 MB) and are
             convenient when bandwidth is too low to download a full DVD, a PC
             without a DVD drive or a PC that can't boot from a USB
             stick.</para>
           </listitem>
-
           <listitem>
             <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
-
           <listitem>
             <para>English language only.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>netinstall.iso</title>
-
         <itemizedlist>
           <listitem>
             <para>Contains only free software, for those people who refuse to
@@ -224,10 +177,8 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>netinstall-nonfree.iso</title>
-
         <itemizedlist>
           <listitem>
             <para>Contains non-free software (mostly drivers, codecs...) for
@@ -237,165 +188,114 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
       </section>
     </section>
   </section>
-
   <section>
     <title>Downloading and Checking Media</title>
-
     <section>
       <title>Downloading</title>
-
       <para>Once you have chosen your ISO file, you can download it using
       either http or BitTorrent. In both cases, a window gives you some
       information, such as the mirror in use and the possibility to change if
       the bandwidth is to low. If http is chosen, you may also see something
       like</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 this window appears:</para>
-
       <mediaobject>
         <imageobject>
           <imagedata fileref="Download.png"/>
         </imageobject>
       </mediaobject>
-
       <para>Check the radio button Save File.</para>
     </section>
-
     <section>
       <title xml:id="integrity">Checking the downloaded media
       integrity</title>
-
-      <para>Both checksums are hexadecimal numbers calculated by an algorithm
-      from the file to be downloaded. When you ask these algorithms to
-      recalculate this number from your downloaded file, either you have the
-      same number and your downloaded file is correct, or the number is
-      different and you have a failure. A failure infers that you should retry
-      the download.</para>
-
+      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the file to be downloaded. When you ask these algorithms to recalculate this number from your downloaded file, either you have the same number and your downloaded file is correct, or the number is different and you have a failure. A failure infers that you should retry the download or attempt a repair using BitTorrent.</para>
       <para>Open a console, no need to be root, and:</para>
-
       <para>- To use md5sum, type: [sam@localhost]$ <userinput>md5sum
       path/to/the/image/file.iso</userinput>.</para>
-
       <para>- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum
       path/to/the/image/file.iso</userinput>.</para>
-
       <para>and compare the obtained number on your computer (you may have to
       wait for a while) with the number given by Mageia. Example:</para>
-
       <mediaobject>
         <imageobject>
           <imagedata fileref="../Md5sum.png"/>
         </imageobject>
       </mediaobject>
-
       <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 boot-able
-    medium.</para>
-
+    <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>
     <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>
     </section>
-
     <section>
       <title>Dump the ISO to a USB stick</title>
-
       <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a
       USB stick and then use it to boot and install the system.</para>
-
       <warning>
-        <para>"dumping" an image onto a flash device destroys any previous
-        file-system on the device; any other data will be lost and the
-        partition capacity will be reduced to the image size.</para>
+        <para>"Dumping" an image onto a flash device destroys any previous file-system on the device; any other 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
       re-format the USB stick.</para>
-
       <section>
         <title>Using a graphical tool within Mageia</title>
-
         <para>You can use a graphical tool like <link ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
       </section>
-
       <section>
         <title>Using a graphical tool within Windows</title>
-
         <para>You could try:</para>
-
         <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>
       </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>
         </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>
-
             <mediaobject>
               <imageobject>
                 <imagedata fileref="../Root.png"/>
               </imageobject>
             </mediaobject>
           </listitem>
-
           <listitem>
-            <para>Plug your USB stick (do not mount it, this also means do not
-            open any application or file manager that could access or read
-            it)</para>
+            <para>Plug in your USB stick (do not mount it, this also means do not open any application or file manager that could access or read it)</para>
           </listitem>
-
           <listitem>
             <para>Enter the command <userinput>fdisk -l</userinput></para>
-
             <mediaobject>
               <imageobject>
                 <imagedata fileref="../Fdisk.png"/>
               </imageobject>
             </mediaobject>
-
             <para>Alternatively, you can get the device name with the command
             <code>dmesg</code>: at end, you see the device name starting with
             <emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this
             case:</para>
-
             <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [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
@@ -415,28 +315,22 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
           </listitem>
-
           <listitem>
             <para>Find the device name for your USB stick (by its size), for
             example <code>/dev/sdb</code> in the screenshot above, it is a 8GB
             USB stick.</para>
           </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-4-x86_64-DVD.iso of=/dev/sdb
             bs=1M</userinput></para>
           </listitem>
-
           <listitem>
             <para>Enter the command: # <userinput>sync</userinput></para>
           </listitem>
-
           <listitem>
             <para>Unplug your USB stick, it is done</para>
           </listitem>
diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml
index 680847ba..eb20c08e 100644
--- a/docs/installer/en/addUser.xml
+++ b/docs/installer/en/addUser.xml
@@ -1,26 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
+<?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">
   <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
@@ -29,84 +24,63 @@
     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>
-
     <note xml:id="givePassword">
       <para>All passwords are case sensitive, it is best to use a mixture of
       letters (upper and lower case), numbers and other characters in a
       password.</para>
     </note>
   </section>
-
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Enter a user</title>
     </info>
-
-    <para>Add a user here. A user has fewer rights than the superuser (root),
-    but enough to surf the internet, use office applications or play games and
-    anything else the average user does with his computer</para>
-
+    <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>
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icon</guibutton>: if you click on this button it will
-        change the users 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 users 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 users real name. <emphasis>The
+        <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>
       </listitem>
-
       <listitem>
         <para><guilabel>Password</guilabel>: In this text box you should type
         in the user password. There is a shield at the end of the text box
         that indicates the strength of the password. (See also <xref linkend="givePassword"/>)</para>
       </listitem>
-
       <listitem>
         <para><guilabel>Password (again)</guilabel>: Retype the user password
         into this text box and drakx will check you have the same password in
         each of the user password text boxes.</para>
       </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
       - 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>
-
     <itemizedlist>
       <listitem condition="classical">
         <para><guilabel>Enable guest account</guilabel>: Here you can enable
@@ -114,19 +88,16 @@
         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>
       </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>
       </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
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
index a4eb1a53..71f78be6 100644
--- a/docs/installer/en/diskdrake.xml
+++ b/docs/installer/en/diskdrake.xml
@@ -54,12 +54,11 @@ Lebarhon 20170902 added SC-->
     below)</para>
 
     <para><mediaobject>
-        <imageobject>
-          <imagedata fileref="dx2-diskdrake2.png"/>
+        <imageobject condition="classical">
+          <imagedata fileref="dx2-diskdrake2.png" align="center"/>
         </imageobject>
-      </mediaobject><mediaobject>
-        <imageobject>
-          <imagedata fileref="live-diskdrake2.png"/>
+      <imageobject condition="live">
+        <imagedata fileref="live-diskdrake2.png" align="center"/>
         </imageobject>
       </mediaobject></para>
   </note>
@@ -69,12 +68,12 @@ Lebarhon 20170902 added SC-->
     BIOS boot partition is present with a correct type</para>
 
     <mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-doPartitionDisks3.png"/>
+      <imageobject condition="classical">
+        <imagedata fileref="dx2-doPartitionDisks3.png" align="center"/>
       </imageobject>
 
-      <imageobject>
-        <imagedata fileref="live-doPartitionDisks3.png"/>
+      <imageobject condition="live">
+        <imagedata fileref="live-doPartitionDisks3.png" align="center"/>
       </imageobject>
     </mediaobject>
   </note>
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
index aead94ea..8bfd8903 100644
--- a/docs/installer/en/doPartitionDisks.xml
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -19,14 +19,12 @@ lebarhon 20170209 added SC-->
   and content.</para>
 
   <mediaobject>
-    <imageobject>
+    <imageobject condition="classical">
       <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
     </imageobject>
-  </mediaobject>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="live-doPartitionDisks.png"/>
+    <imageobject condition="live">
+      <imagedata fileref="live-doPartitionDisks.png" align="center"/>
     </imageobject>
   </mediaobject>
 
@@ -76,14 +74,12 @@ lebarhon 20170209 added SC-->
         partitions. See the screen-shot below.</para>
 
         <mediaobject>
-          <imageobject>
-            <imagedata fileref="dx2-doPartitionDisks2.png"/>
+          <imageobject condition="classical">
+            <imagedata fileref="dx2-doPartitionDisks2.png" align="center"/>
           </imageobject>
-        </mediaobject>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="live-doPartitionDisks2.png"/>
+        
+           <imageobject condition="live">
+            <imagedata fileref="live-doPartitionDisks2.png" align="center"/>
           </imageobject>
         </mediaobject>
       </listitem>
@@ -166,13 +162,11 @@ lebarhon 20170209 added SC-->
     filesystem type.</para>
 
     <mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-doPartitionDisks3.png"/>
+      <imageobject condition="classical">
+        <imagedata fileref="dx2-doPartitionDisks3.png" align="center"/>
       </imageobject>
-    </mediaobject>
-
-    <mediaobject>
-      <imageobject>
+    
+      <imageobject condition="live">
         <imagedata fileref="live-doPartitionDisks3.png"/>
       </imageobject>
     </mediaobject>
diff --git a/docs/installer/en/reboot.xml b/docs/installer/en/reboot.xml
index a0241fc5..ba527d96 100644
--- a/docs/installer/en/reboot.xml
+++ b/docs/installer/en/reboot.xml
@@ -1,26 +1,18 @@
-<?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="reboot">
+<?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="reboot">
   <info>
     <title xml:id="reboot-ti1">Reboot</title>
   </info>
-
-<!--Lebarhon 20170210 updated for Mageia6-->
-
-
+  <!--Lebarhon 20170210 updated for Mageia6-->
   <para>Once the bootloader has been installed, you will be prompted to halt
   your computer, remove the live CD and restart the computer, click on
   <emphasis role="bold"><guibutton>Finish</guibutton></emphasis> and act as
   asked<emphasis role="bold"> in this order!</emphasis></para>
-
   <mediaobject>
     <imageobject>
       <imagedata fileref="live-reboot2.png"/>
     </imageobject>
   </mediaobject>
-
-  <para>When you restart, you will see a succession of download progress bars.
-  These indicate that the software media are being downloaded (see Software
-  management).</para>
-
+  <para>When you restart, you will see a succession of download progress bars. These indicate that the software media lists are being downloaded (see Software management).</para>
   <mediaobject condition="live">
     <imageobject>
       <imagedata format="PNG" xml:id="reboot-im1" fileref="live-reboot.png" align="center" revision="1"/>
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
index 6c57ff2c..edfe1115 100644
--- a/docs/installer/en/setupBootloader.xml
+++ b/docs/installer/en/setupBootloader.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:ns42="http://www.w3.org/1998/Math/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:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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">
   <!---->
 
   <!--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
@@ -33,19 +33,17 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
 
       <mediaobject>
-        <imageobject>
-          <imagedata fileref="dx2-setupBootloader.png"/>
+        <imageobject condition="classical"> 
+          <imagedata fileref="dx2-setupBootloader.png" align="center"/>
         </imageobject>
-      </mediaobject>
-
-      <mediaobject>
-        <imageobject>
+     
+        <imageobject condition="live"> 
           <imagedata xml:id="setupBootloader-im1" fileref="live-setupBootloader.png"/>
         </imageobject>
       </mediaobject>
 
-      <para>Don't modify the "Boot Device" unless really knowing what you
-      do.</para>
+      <para>Don't modify the "Boot Device" unless you really know what you are
+      doing.</para>
     </section>
 
     <section>
@@ -55,28 +53,25 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       you cannot choose between with or without graphical menu</para>
 
       <mediaobject>
-        <imageobject>
-          <imagedata fileref="dx2-setupBootloader2.png"/>
+       <imageobject condition="classical"> 
+          <imagedata fileref="dx2-setupBootloader2.png" align="center"/>
         </imageobject>
-      </mediaobject>
-
-      <mediaobject>
-        <imageobject>
+      
+        <imageobject condition="live"> 
           <imagedata fileref="live-setupBootloader2.png"/>
         </imageobject>
       </mediaobject>
 
-      <para>If Mageia is the first system installed on your computer, the
+      <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 was already UEFI operating systems
-      previously installed on your computer (Windows 8 for example), the
-      Mageia installer detected the existing ESP created by Windows and adds
-      grub2-efi. Although it is possible to have several ESPs, only one is
-      advised and enough whatever the number of operating systems you
-      have.</para>
-
-      <para>Don't modify the "Boot Device" unless really knowing what you
-      do.</para>
+      bootloader (Grub2-efi). If there are already UEFI operating systems
+      installed on your computer (Windows 8 for example), the Mageia installer
+      detects the existing ESP created by Windows and adds grub2-efi. Although
+      it is possible to have several ESPs, only one is advised and enough
+      whatever the number of operating systems you have.</para>
+
+      <para>Don't modify the "Boot Device" unless you really know what you are
+      doing.</para>
     </section>
   </section>
 
@@ -102,14 +97,12 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
     <guilabel>Probe Foreign OS</guilabel></para>
 
     <mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-setupBootloader3.png"/>
+      <imageobject condition="classical"> 
+        <imagedata fileref="dx2-setupBootloader3.png" align="center"/>
       </imageobject>
-    </mediaobject>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="live-setupBootloader3.png"/>
+    
+      <imageobject condition="live"> 
+        <imagedata fileref="live-setupBootloader3.png" align="center"/>
       </imageobject>
     </mediaobject>
   </section>
@@ -125,27 +118,25 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
   </section>
 
   <section>
-    <title xml:id="setupChainLoading">Using the chain loading</title>
+    <title xml:id="setupChainLoading">Using chain loading</title>
 
-    <para>If you don't want a bootable Mageia, but chain load it from another
-    OS, click on <guibutton>Next</guibutton>, then on
+    <para>If you don't want a bootable Mageia, but to chain load it from
+    another OS, click on <guibutton>Next</guibutton>, then on
     <guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch
     ESP or MBR</guilabel>.</para>
 
     <mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-setupBootloader4.png"/>
+      <imageobject condition="classical"> 
+        <imagedata fileref="dx2-setupBootloader4.png" align="center"/>
       </imageobject>
-    </mediaobject>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="live-setupBootloader4.png"/>
+    
+      <imageobject condition="live">
+        <imagedata fileref="live-setupBootloader4.png" align="center"/>
       </imageobject>
     </mediaobject>
 
-    <para>You will get a warning that the bootloader will lack, ignore it by a
-    click on <guibutton>OK</guibutton>.</para>
+    <para>You will get a warning that the bootloader is missing, ignore it by
+    clicking <guibutton>OK</guibutton>.</para>
 
     <mediaobject>
       <imageobject>
@@ -192,10 +183,10 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
                 <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. Uncheck it be useful, for
-                example, if 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>
+                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>
@@ -214,7 +205,7 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
               <listitem>
                 <para><guilabel>Enable Local APIC</guilabel>: Here you can set
-                local APIC, which manage all external interrupts for some
+                local APIC, which manages all external interrupts for a
                 specific processor in an SMP system.</para>
               </listitem>
             </itemizedlist>
@@ -238,7 +229,8 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
         </listitem>
 
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia
+          bootloader</link></para>
         </listitem>
 
         <listitem>