Sync with Calenco

14 files changed, 585 insertions, 574 deletions

diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml
index 12a8c2e6..dca3b62f 100644
--- a/docs/installer/en/SelectAndUseISOs2.xml
+++ b/docs/installer/en/SelectAndUseISOs2.xml
@@ -1,5 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 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="Select-and-use-ISOs" version="5.0">
-  <!-- Made by Lebarhon 2014 03 26 -->
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" 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>
@@ -89,30 +91,6 @@
           </listitem>
         </itemizedlist>
       </section>
-
-      <section>
-        <title>DVD dual arch</title>
-
-        <itemizedlist>
-          <listitem>
-            <para>Both architectures are present on the same medium, the
-            choice is made automatically according to the detected CPU.</para>
-          </listitem>
-
-          <listitem>
-            <para>Uses Xfce desktop only.</para>
-          </listitem>
-
-          <listitem>
-            <para>Not all languages are available. (be, bg, ca, de, en, es,
-            fr, it, mk, pl, pt, ru, sv, uk) TO BE CHECKED!</para>
-          </listitem>
-
-          <listitem>
-            <para>It contains non free software.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
     </section>
 
     <section>
@@ -128,8 +106,8 @@
           </listitem>
 
           <listitem>
-            <para>Each ISO contains only one desktop environment (KDE or
-            GNOME).</para>
+            <para>Each ISO contains only one desktop environment (KDE, GNOME
+            or Xfce).</para>
           </listitem>
 
           <listitem>
@@ -149,25 +127,25 @@
       </section>
 
       <section>
-        <title>Live CD KDE</title>
+        <title>Live DVD Plasma</title>
 
         <itemizedlist>
           <listitem>
-            <para>KDE desktop environment only.</para>
+            <para>Plasma desktop environment only.</para>
           </listitem>
 
           <listitem>
-            <para>English language only.</para>
+            <para>All languages are present.</para>
           </listitem>
 
           <listitem>
-            <para>32 bit only.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
 
       <section>
-        <title>Live CD GNOME</title>
+        <title>Live DVD GNOME</title>
 
         <itemizedlist>
           <listitem>
@@ -175,24 +153,6 @@
           </listitem>
 
           <listitem>
-            <para>English language only.</para>
-          </listitem>
-
-          <listitem>
-            <para>32 bit only.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Live DVD KDE</title>
-
-        <itemizedlist>
-          <listitem>
-            <para>KDE desktop environment only.</para>
-          </listitem>
-
-          <listitem>
             <para>All languages are present.</para>
           </listitem>
 
@@ -203,11 +163,11 @@
       </section>
 
       <section>
-        <title>Live DVD GNOME</title>
+        <title>Live DVD Xfce</title>
 
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>Xfce desktop environment only.</para>
           </listitem>
 
           <listitem>
@@ -255,7 +215,7 @@
       </section>
 
       <section>
-        <title>boot.iso</title>
+        <title>netinstall.iso</title>
 
         <itemizedlist>
           <listitem>
@@ -266,7 +226,7 @@
       </section>
 
       <section>
-        <title>boot-nonfree.iso</title>
+        <title>netinstall-nonfree.iso</title>
 
         <itemizedlist>
           <listitem>
diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml
index 7676bdc2..680847ba 100644
--- a/docs/installer/en/addUser.xml
+++ b/docs/installer/en/addUser.xml
@@ -1,32 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="addUser" 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" version="5.0" xml:id="addUser">
   <info>
     <title xml:id="addUser-ti1">User and Superuser Management</title>
   </info>
 
-  <!-- Started by marja,using Led43's text, on 2012 03 27 -->
-
-  <!-- NEEDS TO BE REVIEWED! -->
-
-  <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
-
-  <!-- removed para xml:id's, finished the page using Led43's text in the wiki, but
-       changed his text about the Advanced User Managment screen (the only thing 
-       about guest account there, is the box you can tick or untick to enable or 
-       disable it, the rest is about the normal user you're adding in the previous
-       screen), marja, 20120409-->
-
-  <!-- barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-       "rbash" in the xguest warning - is that correct? -->
-
-  <!-- JohnR 2012-04-19 Language proofreading  -->
-
-  <!-- marja 2012-04-24 Added screenshot -->
-
-  <!-- marja 2013-04-26 added new note-->
+  <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata revision="1" align="center" xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png" format="PNG"/>
+      <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
     </imageobject>
 
     <imageobject>
@@ -96,20 +77,11 @@
     </itemizedlist>
 
     <note>
-      <para>Any user you add while installing Mageia, will have a world
-      readable (but write protected) home directory.</para>
-
-      <para>However, while using your new install, any user you add in
-      <emphasis>MCC - System - Manage users on system</emphasis> will have a
-      home directory that is both read and write protected.</para>
-
-      <para>If you don't want a world readable home directory for anyone, it
-      is advised to only add a temporary user now and to add the real one(s)
-      after reboot.</para>
+      <para>Any user you add while installing Mageia, will have a both read
+      and write protected home directory (umask=0027).</para>
 
-      <para>If you prefer world readable home directories, you might want to
-      add all extra needed users in the <emphasis>Configuration -
-      Summary</emphasis> step during the install. Choose <emphasis>User
+      <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
@@ -117,7 +89,7 @@
     </note>
   </section>
 
-  <section condition="classical" xml:id="addUserAdvanced">
+  <section xml:id="addUserAdvanced" condition="classical">
     <info>
       <title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
     </info>
diff --git a/docs/installer/en/chooseDesktop.xml b/docs/installer/en/chooseDesktop.xml
index 792a8a92..50edc24d 100644
--- a/docs/installer/en/chooseDesktop.xml
+++ b/docs/installer/en/chooseDesktop.xml
@@ -1,35 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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="chooseDesktop">
-
-
-    <info>
-      <title xml:id="chooseDesktop-ti1">Desktop Selection</title>
-    </info>
-
- <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-
-
-    <para>Depending on your selection here, you may be offered further screens to fine tune your choice.</para>
-
-    <para>After the selection step(s), you will see a slide show during package
-	        installation. The slide show can be disabled by pressing the
-		  <guilabel>Details</guilabel> button</para>
-
-
-
-<mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-chooseDesktop.png" align="center" format="PNG" 
-         ></imagedata>
-      </imageobject>
-    </mediaobject>
-
-    <para>Choose whether you prefer to use the <application>KDE</application>
-    or <application>Gnome</application> desktop environment. Both come with a
-    full set of useful applications and tools. Tick
-    <guilabel>Custom</guilabel> if you want to use neither or both, or if you
-    want something other than the default software choices for these desktop
-    environments. The <application>LXDE</application> desktop is lighter than
-    the previous two, sporting less eye candy and fewer packages installed by
-    default.</para>
-  </section>
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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="chooseDesktop">
+  <info>
+    <title xml:id="chooseDesktop-ti1">Desktop Selection</title>
+  </info>
+
+  <!--Lebarhon 20170209 updated SC-->
+
+  <para>Depending on your selection here, you may be offered further screens
+  to fine tune your choice.</para>
+
+  <para>After the selection step(s), you will see a slide show during package
+  installation. The slide show can be disabled by pressing the
+  <guilabel>Details</guilabel> button</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata format="PNG" fileref="dx2-chooseDesktop.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>Choose whether you prefer to use the <application>KDE</application> or
+  <application>Gnome</application> desktop environment. Both come with a full
+  set of useful applications and tools. Tick <guilabel>Custom</guilabel> if
+  you want to use neither or both, or if you want something other than the
+  default software choices for these desktop environments. The
+  <application>LXDE</application> desktop is lighter than the previous two,
+  sporting less eye candy and fewer packages installed by default.</para>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/choosePackageGroups.xml b/docs/installer/en/choosePackageGroups.xml
index 7e50d6ae..65838436 100644
--- a/docs/installer/en/choosePackageGroups.xml
+++ b/docs/installer/en/choosePackageGroups.xml
@@ -1,42 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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="choosePackageGroups">
-
-    <info>
-      <title xml:id="choosePackageGroups-ti1">Package Group Selection</title>
-    </info>
-
-    <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-
-<mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-choosePackageGroups.png" align="center" format="PNG" 
-         ></imagedata>
-      </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>
-
-    <itemizedlist>
-      <listitem>
-        <para>Workstation.</para>
-      </listitem>
-
-      <listitem>
-        <para>Server.</para>
-      </listitem>
-
-      <listitem>
-        <para>Graphical Environment.</para>
-      </listitem>
-
-      <listitem>
-        <para>Individual Package Selection: You can use this option to
-        manually add or remove packages.</para>
-      </listitem>
-    </itemizedlist>
-    <para>Read  <xref linkend="minimal-install"></xref> for instructions on
-    how to do a minimal install (without or with X &amp; IceWM).</para> 
-  </section>
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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="choosePackageGroups">
+  <info>
+    <title xml:id="choosePackageGroups-ti1">Package Group Selection</title>
+  </info>
+
+  <!--Lebarhon 20170209 Updated SC-->
+
+  <mediaobject>
+    <imageobject>
+      <imagedata format="PNG" fileref="dx2-choosePackageGroups.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>Packages have been sorted into groups, to make choosing what you need
+  on 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>
+    </listitem>
+
+    <listitem>
+      <para>Server.</para>
+    </listitem>
+
+    <listitem>
+      <para>Graphical Environment.</para>
+    </listitem>
+
+    <listitem>
+      <para>Individual Package Selection: 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
+  minimal install (without or with X &amp; IceWM).</para>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
index 0affba06..a4eb1a53 100644
--- a/docs/installer/en/diskdrake.xml
+++ b/docs/installer/en/diskdrake.xml
@@ -1,20 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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">
-  <!-- Started by marja on 2012 03 29 -->
+  <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
-  <!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-
-  <!-- JohnR added note for bug 133 re encrypted partitions -->
-
-  <!-- JohnR 2012-04-10 - tidy up module formatting -->
-
-  <!-- Marja, 2012-04-18 changed "If you wish to use encryption on
-    any of your partitions" into "If you wish to use encryption on
-      your <literal>/</literal> partition" because pterjan said this is only for root 
-      Also added some text. -->
-
-  <!--marja 20120418 moved section end tag down to where it belongs-->
-
-  <!--marja 20120418 added para 6a-->
+Lebarhon 20170902 added SC-->
 
   <info>
     <title xml:id="diskdrake-ti1">Custom disk partitioning with
@@ -22,10 +9,11 @@
   </info>
 
   <mediaobject>
-    <imageobject condition='classical'>
+    <imageobject condition="classical">
       <imagedata fileref="dx2-diskdrake.png" align="center"/>
     </imageobject>
-    <imageobject condition='live' >
+
+    <imageobject condition="live">
       <imagedata fileref="live-diskdrake.png" align="center"/>
     </imageobject>
   </mediaobject>
@@ -38,37 +26,56 @@
     will be unbootable.</para>
   </warning>
 
-  <para revision="2" xml:id="diskdrake-pa3">Adjust the layout of your disk(s)
+  <para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s)
   here. You can remove or create partitions, change the filesystem of a
   partition or change its size and even view what is in them before you
   start.</para>
 
-  <para revision="1" xml:id="diskdrake-pa4">There is a tab for every detected
+  <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 revision="1" xml:id="diskdrake-pa5">Push <guibutton>Clear
+  <para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear
   all</guibutton> to wipe all partitions on the selected storage device</para>
 
-  <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on
+  <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.</para>
 
   <para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted
   everything to your wishes.</para>
 
-  <para revision="1" xml:id="diskdrake-pa7">Click <guibutton>Done</guibutton>
+  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton>
   when you're ready.</para>
 
   <note>
     <para>If you are installing Mageia on an UEFI system, check that an ESP
     (EFI System Partition) is present and correctly mounted on /boot/EFI (see
-    above)</para>
+    below)</para>
 
     <para><mediaobject>
         <imageobject>
           <imagedata fileref="dx2-diskdrake2.png"/>
         </imageobject>
+      </mediaobject><mediaobject>
+        <imageobject>
+          <imagedata 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 with a correct type</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-doPartitionDisks3.png"/>
+      </imageobject>
+
+      <imageobject>
+        <imagedata fileref="live-doPartitionDisks3.png"/>
+      </imageobject>
+    </mediaobject>
+  </note>
 </section>
\ No newline at end of file
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
index e583d579..aead94ea 100644
--- a/docs/installer/en/doPartitionDisks.xml
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -1,24 +1,32 @@
 <?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 2015-07-03 Suggested updates for Mageia 5 -->
+  <!-- lebarhon 20161216 updated for Mageia 6
+
+lebarhon 20170209 added SC-->
 
   <info>
     <title xml:id="doPartitionDisks-ti1">Partitioning</title>
   </info>
 
-  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see
+  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see
   the content of your hard drive(s) and see the solutions the DrakX
   partitioning wizard found for where to install
   <application>Mageia</application>.</para>
 
-  <para revision="1" xml:id="doPartitionDisks-pa2">The options available from
+  <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>
 
   <mediaobject>
     <imageobject>
-      <imagedata align="center" fileref="dx2-doPartitionDisks.png"/>
+      <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="live-doPartitionDisks.png"/>
     </imageobject>
   </mediaobject>
 
@@ -27,24 +35,24 @@
         <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing
         Partitions</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa5">If this option is
+        <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 revision="1" xml:id="doPartitionDisks-pa6">Use Free Space</para>
+        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused
+        <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 revision="1" xml:id="doPartitionDisks-pa8">Use Free Space on a
+        <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a
         Windows Partition</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa9">If you have unused
+        <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>
 
@@ -53,7 +61,7 @@
         operation so you should make sure you have backed up all important
         files!</para>
 
-        <para xml:id="doPartitionDisks-pa11" revision="3">Note that this
+        <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,
@@ -72,28 +80,34 @@
             <imagedata fileref="dx2-doPartitionDisks2.png"/>
           </imageobject>
         </mediaobject>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="live-doPartitionDisks2.png"/>
+          </imageobject>
+        </mediaobject>
       </listitem>
     </itemizedlist> <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa12">Erase and use Entire
+        <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire
         Disk.</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa13">This option will use
+        <para xml:id="doPartitionDisks-pa13" revision="1">This option will use
         the complete drive for Mageia.</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa14">Note! This will
+        <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will
         erase ALL data on the selected hard drive. Take care!</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa15">If you intend to use
+        <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 revision="1" xml:id="doPartitionDisks-pa16">Custom</para>
+        <para xml:id="doPartitionDisks-pa16" revision="1">Custom</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa17">This gives you
+        <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>
@@ -143,6 +157,33 @@
     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 the
+    "Custom disk partitioning" option to be able to create it with the
+    Installer like any other partition, just select BIOS boot partition as
+    filesystem type.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-doPartitionDisks3.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <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
diff --git a/docs/installer/en/exitInstall.xml b/docs/installer/en/exitInstall.xml
index 229aba28..7cf642d5 100644
--- a/docs/installer/en/exitInstall.xml
+++ b/docs/installer/en/exitInstall.xml
@@ -1,37 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 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>
 
-  <!-- Started by marja on 2012 03 29 -->
-  <!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-  
-  <!-- marja - 2012-04-24 added screenshot and text -->
-  <!-- same day, added "s" to "sytems"-->
-  
-   <mediaobject>
+  <!-- Lebarhon 20170209 updated SC-->
+
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-exitInstall.png"  
-       format="PNG" align="center"   xml:id="exitInstall-im1">
-      </imagedata>
+      <imagedata format="PNG" fileref="dx2-exitInstall.png" align="center" revision="1" xml:id="exitInstall-im1"/>
     </imageobject>
   </mediaobject>
 
-  <para revision="2" xml:id="exitInstall-pa1">You have finished installing
-  and configuring <application>Mageia</application> and it is now safe to 
-  remove the installation medium and reboot your computer.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and
+  configuring <application>Mageia</application> and it is now safe to remove
+  the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader
+  screen, you can choose between the operating systems on your computer (if
+  you have more than one).</para>
+
+  <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the
+  settings for the bootloader, your Mageia install will be automatically
+  selected and started.</para>
 
-  <para revision="2" xml:id="exitInstall-pa2">After reboot, in the bootloader screen,
-  you can choose between the operating systems on your computer (if you have more than one).</para>
+  <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
 
-  <para revision="1" xml:id="exitInstall-pa3">If you didn't adjust the settings for
-   the bootloader, your Mageia install will be automatically selected and started. </para>
-  
-  <para revision="1" xml:id="exitInstall-pa4">Enjoy!</para>
-  
-  <para revision="1" xml:id="exitInstall-pa5">Visit www.mageia.org if you have any questions
-   or want to contribute to Mageia </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/installer/en/misc-params.xml b/docs/installer/en/misc-params.xml
index b3475c3e..bbc50975 100644
--- a/docs/installer/en/misc-params.xml
+++ b/docs/installer/en/misc-params.xml
@@ -1,45 +1,39 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="misc-params" 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="misc-params">
   <info>
     <title xml:id="misc-params-ti1">Summary of miscellaneous
     parameters</title>
   </info>
 
-  <!-- Started by marja on 2012 03 31 -->
-
-  <!-- NEEDS TO BE WRITTEN AND REVIEWED! -->
-
-  <!--marja - 2012 04 15 added some text, not much, unfortunately :( -->
-
-  <!--marja 2012-04-24 added screenshots -->
-
-  <!--JohnR 2012-04-25 Added text as requested by Psec :-)-->
-
-  <!--marja 2012-04-24 added 2 links to other help pages -->
-
-  <!--marja 2012-04-24 added some text in the drakxid-configureServices and 
-      the drakxid-miscellaneous section -->
-
-  <!--marja 2012-04-24 corrected "Magaia" in the last paragraph -->
-
-  <!--marja 2012-04-24 corrected para xml:id number in the last paragraph -->
-
-  <!-- 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. -->
-
-  <!-- 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" -->
-
-  <!--2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files-->
+  <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
 
   <mediaobject>
     <imageobject>
-      <imagedata fileref="dx2-summary.png"  revision="1" align="center" format="PNG" xml:id="summary-im1" />
+      <imagedata fileref="dx2-summaryTop.png"/>
     </imageobject>
   </mediaobject>
 
-  <para revision="1" xml:id="misc-params-pa1">DrakX made smart choices for the
+  <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>
 
+  <note>
+    <para>As a general rule, default settings are recommended and you can keep
+    them with 3 exceptions:<itemizedlist>
+        <listitem>
+          <para>there are known issues with a default setting</para>
+        </listitem>
+
+        <listitem>
+          <para>the default setting has already been tried and it fails</para>
+        </listitem>
+
+        <listitem>
+          <para>something else is said in the detailed sections below</para>
+        </listitem>
+      </itemizedlist></para>
+  </note>
+
   <section xml:id="misc-params-system">
     <info>
       <title xml:id="misc-params-system-ti2">System parameters</title>
@@ -55,38 +49,38 @@
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa3" revision="1"><guilabel>Country /
+        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country /
         Region</guilabel></para>
 
-        <para revision="1" xml:id="misc-params-system-pa3a">If you are not in
+        <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>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa4" revision="1"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
 
-        <para revision="2" xml:id="misc-params-system-pa4a">DrakX has made
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made
         good choices for the bootloader setting.</para>
 
-        <para revision="2" xml:id="misc-params-system-pa4b">Do not change
-        anything, unless you know how to configure Grub and/or Lilo</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change
+        anything, unless you know how to configure Grub2</para>
 
-        <para revision="2" xml:id="misc-params-system-pa4c">For more
+        <para xml:id="misc-params-system-pa4c" revision="2">For more
         information, see <xref linkend="setupBootloader"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa5"><guilabel>User
+        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User
         management</guilabel></para>
 
-        <para revision="2" xml:id="misc-params-system-pa5a">You can add extra
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra
         users here. They will each get their own <literal>/home</literal>
         directories.</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa6"><guilabel>Services</guilabel>:</para>
+        <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
@@ -108,45 +102,50 @@
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-hardware-pa1"><guilabel>Keyboard</guilabel>:</para>
+        <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>
+
+        <note>
+          <para>If you notice a wrong keyboard layout and want to change it,
+          keep in mind that your passwords are going to change too.</para>
+        </note>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-hardware-pa2"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
 
-        <para revision="1" xml:id="misc-params-hardware-pa2a">Here you can add
+        <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add
         or configure other pointing devices, tablets, trackballs etc.</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-hardware-pa3"><guilabel>Sound
+        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound
         card</guilabel>:</para>
 
-	<para revision="1" xml:id="misc-params-hardware-pa3a">The installer uses
-	the default driver, if there is a default one. The option to select a
-	different driver is only given when there is more than one driver for
-        your card, but none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer
+        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>
       </listitem>
 
       <listitem>
         <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical
         interface</guilabel>:</para>
 
-        <para revision="1" xml:id="misc-params-hardware-pa4a">This section
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section
         allows you to configure your graphic card(s) and displays.</para>
 
-        <para revision="1" xml:id="misc-params-hardware-pa4b">For more
+        <para xml:id="misc-params-hardware-pa4b" revision="1">For more
         information, see <xref linkend="configureX_chooser"/>.</para>
       </listitem>
     </itemizedlist>
 
     <mediaobject>
       <imageobject>
-        <imagedata xml:id="summaryBottom-im1"  revision="1" align="center" format="PNG" fileref="dx2-summaryBottom.png" />
+        <imagedata format="PNG" xml:id="summaryBottom-im1" align="center" fileref="dx2-summaryBottom.png" revision="1"/>
       </imageobject>
     </mediaobject>
   </section>
@@ -159,7 +158,7 @@
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-network-pa1"><guilabel>Network</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</guilabel>:</para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure
         your network here, but for network cards with non-free drivers it is
@@ -182,7 +181,7 @@
         This section allows you to configure your computer to utilize a proxy
         service.</para>
 
-        <para revision="1" xml:id="misc-params-network-pa4b">You may need to
+        <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>
       </listitem>
@@ -196,33 +195,34 @@
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-security-pa1" revision="1"><guilabel>Security
+        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security
         Level</guilabel>:</para>
 
-        <para revision="1" xml:id="misc-params-security-pa1a">Here you set the
+        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the
         Security level for your computer, in most cases the default setting
         (Standard) is adequate for general use.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa1b">Check the option
+        <para xml:id="misc-params-security-pa1b" revision="1">Check the option
         which best suits your usage.</para>
       </listitem>
 
       <listitem>
         <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
 
-        <para xml:id="misc-params-security-pa2a" revision="1">A firewall is
+        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is
         intended to be a barrier between your important data and the rascals
         out there on the internet who would compromise or steal it.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2b">Select the
+        <para xml:id="misc-params-security-pa2b" revision="1">Select the
         services that you wish to have access to your system. Your selections
-        will depend on what you use your computer for.</para>
+        will depend on what you use your computer for. For more information,
+        see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para revision="1" xml:id="misc-params-security-pa2c">Bear in mind
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind
           that allowing everything (no firewall) may be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/reboot.xml b/docs/installer/en/reboot.xml
index 84f9412f..a0241fc5 100644
--- a/docs/installer/en/reboot.xml
+++ b/docs/installer/en/reboot.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="reboot" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="reboot">
   <info>
     <title xml:id="reboot-ti1">Reboot</title>
   </info>
 
-  <mediaobject condition="live">
+<!--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 align="center" fileref="live-reboot.png" format="PNG"
-                 revision="1" xml:id="reboot-im1"/>
+      <imagedata fileref="live-reboot2.png"/>
     </imageobject>
   </mediaobject>
 
-  <para>Once the bootloader has been installed, you will be prompted to halt
-  your computer, remove the live CD and restart the computer. When you
-  restart, you will see a succession of download progress bars. These indicate
-  that the software media are being downloaded (see Software
+  <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>
-</section>
+
+  <mediaobject condition="live">
+    <imageobject>
+      <imagedata format="PNG" xml:id="reboot-im1" fileref="live-reboot.png" align="center" revision="1"/>
+    </imageobject>
+  </mediaobject>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/selectCountry.xml b/docs/installer/en/selectCountry.xml
index 300188c3..a167abd0 100644
--- a/docs/installer/en/selectCountry.xml
+++ b/docs/installer/en/selectCountry.xml
@@ -1,68 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="selectCountry" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0">
+  <info>
+    <title xml:id="selectCountry-ti1">Select your Country / Region</title>
+  </info>
 
+  <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
 
-
-    <info>
-      <title xml:id="selectCountry-ti1">Select your Country /
-      Region</title>
-    </info>
-
-    <!-- 2012-12-25 marja - moved this section out of misc-params -->
-   <!-- 2013-05-05 marja - added screenshot -->
-
-<mediaobject>
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-selectCountry.png"  align="center" format="PNG"  xml:id="selectCountry-im1"></imagedata>
+      <imagedata format="PNG" xml:id="selectCountry-im1" align="center" fileref="dx2-selectCountry.png" revision="1"/>
     </imageobject>
   </mediaobject>
 
+  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.
+  This is important for all kinds of settings, like the currency and wireless
+  regulatory domain. Setting the wrong country can lead to not being able to
+  use a Wireless network.</para>
 
-    <para revision="2" xml:id="selectCountry-pa1">Select your country
-    or region. This is important for all kinds of settings, like the currency
-    and wireless regulatory domain. Setting the wrong country can lead to not
-    being able to use a Wireless network.</para>
-
-    <para revision="1" xml:id="selectCountry-pa2">If your country
-    isn't in the list, click the <guilabel>Other Countries</guilabel> button
-    and choose your country / region there.</para>
-
-    <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>
-    </note>
+  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the
+  list, click the <guilabel>Other Countries</guilabel> button and choose your
+  country / region there.</para>
 
-    <section xml:id="inputMethod">
+  <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>
+  </note>
 
-      <info>
-        <title xml:id="inputMethod-ti7">Input method</title>
-      </info>
+  <section xml:id="inputMethod">
+    <info>
+      <title xml:id="inputMethod-ti7">Input method</title>
+    </info>
 
-      <para revision="1" xml:id="selectCountry-pa4">In the
-      <guilabel>Other Countries</guilabel> screen you can also select an input
-      method (at the bottom of the list). Input methods allow users to input
-      multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
-      default input method in Mageia DVDs, Africa/India and Asia/no-India
-      Live-CDs. For Asian and African locales, IBus will be set as default
-      input method so users should not need to configure it manually. Other
-      input methods(SCIM, GCIN, HIME, etc) also provide similar functions and
-      can be installed if you added HTTP/FTP media before package
-      selection.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other
+    Countries</guilabel> screen you can also select an input method (at the
+    bottom of the list). Input methods allow users to input multilingual
+    characters (Chinese, Japanese, Korean, etc). IBus is the default input
+    method, so users should not need to configure it manually. Other input
+    methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be
+    installed if you added HTTP/FTP media before package selection.</para>
 
-      <note>
-        <para revision="1" xml:id="selectCountry-pa5">If you missed
-        the input method setup during installation, you can access it after
-        you boot your installed system via "Configure your Computer" -&gt;
-        "System", or by running localedrake as root.</para>
-      </note>
-    </section>
+    <note>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input
+      method setup during installation, you can access it after you boot your
+      installed system via "Configure your Computer" -> "System", or by
+      running localedrake as root.</para>
+    </note>
   </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
index 938d2618..90a86690 100644
--- a/docs/installer/en/setupBootloader.xml
+++ b/docs/installer/en/setupBootloader.xml
@@ -1,137 +1,263 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/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-->
+  <!--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>
 
-  <mediaobject>
-    <imageobject condition="classical">
-      <imagedata xml:id="setupBootloader-im1" format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
-    </imageobject>
-    <imageobject condition="live">
-      <imagedata xml:id="setupBootloader-im1" format="PNG" align="center" revision="1" fileref="live-setupBootloader.png"/>
-    </imageobject>
-  </mediaobject>
-
   <section>
-    <title>With a Bios system</title>
+    <title>Bootloader interface</title>
 
-    <para xml:id="setupBootloader-pa1" revision="4">If you prefer different
-    bootloader settings to those chosen automatically by the installer, you
-    can change them here.</para>
+    <para>By default, Mageia uses exclusively:</para>
 
-    <para xml:id="setupBootloader-pa2" revision="4">You may already have
-    another operating system on your machine, in which case you need to decide
-    whether to add Mageia to your existing bootloader, or allow Mageia to
-    create a new one.</para>
+    <itemizedlist>
+      <listitem>
+        <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>
+      </listitem>
+    </itemizedlist>
 
     <tip>
       <para>The Mageia graphical menus are nice :</para>
     </tip>
 
-    <section xml:id="usingMageiaBootloader">
-      <info>
-        <title xml:id="usingMageiaBootloader-ti2">Using a Mageia
-        bootloader</title>
-      </info>
-
-      <para xml:id="setupBootloader-pa4" revision="3">By default, Mageia
-      writes a new GRUB (legacy) bootloader into the MBR (Master Boot Record)
-      of your first hard drive. If you already have other operating systems
-      installed, Mageia attempts to add them to your new Mageia boot
-      menu.</para>
-
-      <para revision="3">Mageia now also offers GRUB2 as an optional
-      bootloader in addition to GRUB legacy and Lilo.</para>
-
-      <warning>
-        <para xml:id="setupBootloader-pa6" revision="3">Linux systems which
-        use the GRUB2 bootloader are not currently supported by GRUB (legacy)
-        and will not be recognized if the default GRUB bootloader is
-        used.</para>
-
-        <para revision="3">The best solution here is to use the GRUB2
-        bootloader which is available at the Summary page during
-        installation.</para>
-      </warning>
-    </section>
+    <section>
+      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
 
-    <section xml:id="usingExistingBootloader">
-      <info>
-        <title xml:id="usingExistingBootloader-ti4" revision="2">Using an
-        existing bootloader</title>
-      </info>
-
-      <para xml:id="setupBootloader-pa46" revision="3">If you decide to use an
-      existing bootloader then you will need to remember to STOP at the
-      summary page during the installation and click the Bootloader
-      <guibutton>Configure</guibutton> button, which will allow you to change
-      the bootloader install location.</para>
-
-      <para xml:id="setupBootloader-pa47" revision="1">Do not select a device
-      e.g."sda", or you will overwrite your existing MBR. You must select the
-      root partition that you chose during the partitioning phase earlier,
-      e.g. sda7.</para>
-
-      <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a
-      device, sda7 is a partition on that device.</para>
-
-      <tip>
-        <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with
-        Ctrl+Alt+F2 and type <literal>df</literal> to check where your
-        <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back
-        to the installer screen.</para>
-      </tip>
-
-      <para xml:id="setupBootloader-pa49" revision="2">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>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx2-setupBootloader.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <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>
     </section>
 
-    <section xml:id="advancedOptionBootloader">
-      <info>
-        <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader
-        advanced option</title>
-      </info>
-
-      <para xml:id="setupBootloader-pa52" revision="3">If you have very
-      limited disk space for the <literal>/</literal> partition that contains
-      <literal>/tmp</literal>, click on <guibutton>Advanced</guibutton> and
-      check the box for <guilabel>Clean /tmp at each boot</guilabel>. This
-      helps to maintain some free space.</para>
+    <section>
+      <title>Grub2-efi on UEFI systems</title>
+
+      <para>With an UEFI system, the user interface is slightly different as
+      you cannot choose between with or without graphical menu</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx2-setupBootloader2.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="live-setupBootloader2.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If Mageia is the first 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>
     </section>
   </section>
 
   <section>
-    <title>With an UEFI system</title>
+    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
+
+    <para>By default, according to your system, Mageia writes a new:</para>
 
-    <para>With an UEFI system, the user interface is slightly different as you
-    cannot choose the boot loader since only Grub2-efi is available. </para>
+    <itemizedlist>
+      <listitem>
+        <para>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>
+      </listitem>
+    </itemizedlist>
+
+    <para>If you already have other operating systems installed, Mageia
+    attempts to add them to your new Mageia boot menu. If you don't want this
+    behaviour, click on <guibutton>Next</guibutton> and then uncheck the box
+    <guilabel>Probe Foreign OS</guilabel></para>
 
     <mediaobject>
-      <imageobject condition="classical">
-        <imagedata fileref="dx2-setupBootloader2.png"/>
+      <imageobject>
+        <imagedata fileref="dx2-setupBootloader3.png"/>
       </imageobject>
-      <imageobject condition="live">
-        <imagedata fileref="live-setupBootloader2.png"/>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-setupBootloader3.png"/>
       </imageobject>
     </mediaobject>
+  </section>
+
+  <section>
+    <title>Using an existing bootloader</title>
+
+    <para>The exact procedure for adding your Mageia system to an existing
+    bootloader is beyond the scope of this help, however in most cases it will
+    involve running the relevant bootloader installation program which should
+    detect and add it automatically. See the documentation for the operating
+    system in question.</para>
+  </section>
 
-    <para>If Mageia is the first 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 added 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>
+  <section>
+    <title xml:id="setupChainLoading">Using the 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
+    <guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch
+    ESP or MBR</guilabel>.</para>
 
-    <para>Don't modify the "Boot Device" unless really knowing what you
-    do.</para>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-setupBootloader4.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-setupBootloader4.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <para>You will get a warning that the bootloader will lack, ignore it by a
+    click on <guibutton>OK</guibutton>.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-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
+            password for the bootloader. This means other people can not enter
+            single user mode or change settings at the boot time.</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. 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>
+              </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 manage all external interrupts for some
+                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>P<guilabel>robe 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
+                MBR</emphasis>: see above <link linkend="setupChainLoading">Using the chain
+                loading</link></para>
+              </listitem>
+            </itemizedlist></para>
+        </listitem>
+      </itemizedlist>
+    </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml
index 0096b862..0af54953 100644
--- a/docs/installer/en/setupBootloaderAddEntry.xml
+++ b/docs/installer/en/setupBootloaderAddEntry.xml
@@ -1,74 +1,18 @@
 <?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 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>
 
-  <mediaobject>
-    <imageobject condition="classical">
-      <imagedata format="PNG" xml:id="bootloaderConfiguration-im1" fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
-    </imageobject>
-    <imageobject condition="live">
-      <imagedata format="PNG" xml:id="bootloaderConfiguration-im1" fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
-    </imageobject>
-  </mediaobject>
-
-  <section>
-    <title>With a Bios system</title>
-
-    <para>You can add an entry or modify the one you select first, by pressing
-    the relevant button in the <emphasis>Bootloader Configuration</emphasis>
-    screen and editing the screen that pops up on top of it.</para>
-
-    <note>
-      <para>If you have chosen <code>Grub 2</code> as your bootloader, you
-      cannot use this tool to edit entries at this step, press 'Next'. You
-      need to manually edit <code>/boot/grub2/custom.cfg</code> or use
-      <code>grub-customizer</code> instead.</para>
-    </note>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1" align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
-      </imageobject>
-    </mediaobject>
-
-    <para>Some things that can be done without any risk, are changing the
-    label of an entry and ticking the box to make an entry the default
-    one.</para>
-
-    <para>You can add the proper version number of an entry, or rename it
-    completely.</para>
-
-    <para>The default entry is the one the systems boots into if you don't
-    make a choice while booting up.</para>
-
-    <warning>
-      <para>Editing other things can leave you with an unbootable system.
-      Please don't just try something without knowing what you are
-      doing.</para>
-    </warning>
-  </section>
-
-  <section>
-    <title>With an UEFI system</title>
-
-    <para>In this case you are using Grub2-efi and you cannot use this tool to
-    edit entries at this step. To do that you need to manually edit
-    <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
-    instead. All you can do here, is to choose the default entry in the drop
-    down list.</para>
-
-    <para>After a click on the <guibutton>Next</guibutton> button, another
-    drop down list allows to choose the video resolution for Grub2 which is a
-    graphical boot loader.</para>
+  <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>
 
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
-      </imageobject>
-    </mediaobject>
-  </section>
+  <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>
+  </note>
 </section>
\ No newline at end of file
diff --git a/docs/installer/en/soundConfig.xml b/docs/installer/en/soundConfig.xml
index 62e92941..a9371cc2 100644
--- a/docs/installer/en/soundConfig.xml
+++ b/docs/installer/en/soundConfig.xml
@@ -1,54 +1,42 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<section xmlns="http://docbook.org/ns/docbook"
-	xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-	xmlns:ns4="http://www.w3.org/2000/svg"
-	xmlns:ns3="http://www.w3.org/1999/xhtml"
-	xmlns:ns2="http://www.w3.org/1999/xlink"
-	xmlns:ns="http://docbook.org/ns/docbook"
-	xml:id="soundConfig" version="5.0">
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0">
   <info>
     <title xml:id="soundConfig-ti1">Sound Configuration</title>
   </info>
 
-  <!-- Started by marja on 2013-12-07 -->
+  <!-- Lebarhon 20170209 updated SC-->
 
   <mediaobject>
     <imageobject>
-	    <imagedata fileref="dx2-soundConfig.png"  revision="1" format="PNG"
-		    xml:id="soundConfig-im1" />
+      <imagedata format="PNG" fileref="dx2-soundConfig.png" xml:id="soundConfig-im1" revision="1"/>
     </imageobject>
   </mediaobject>
 
-  <para>In this screen the name of the driver that the installer chose for your
-	  sound card is given, which will be the default driver if we have a 
-	  default one.
-  </para>
-  <para>The default driver should work without problems. However, if after 
-  install you do encounter problems, then run <command>draksound</command>
-  or start this tool via MCC (Mageia Control Center), by choosing the  
-  <guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound 
-  Configuration</guilabel> at the top right of the screen.
-  </para>
-  <para>Then, in the draksound or "Sound Configuration" tool screen, click on 
-  <guibutton>Advanced</guibutton> and then on 
-  <guibutton>Troubleshooting</guibutton> to find very useful advice about how 
-  to solve the problem.
-  </para>
+  <para>In this screen the name of the driver that the installer chose for
+  your sound card is given, which will be the default driver if we have a
+  default one.</para>
+
+  <para>The default driver should work without problems. However, if after
+  install you do encounter problems, then run <command>draksound</command> or
+  start this tool via MCC (Mageia Control Center), by choosing the
+  <guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
+  Configuration</guilabel> at the top right of the screen.</para>
+
+  <para>Then, in the draksound or "Sound Configuration" tool screen, click on
+  <guibutton>Advanced</guibutton> and then on
+  <guibutton>Troubleshooting</guibutton> to find very useful advice about how
+  to solve the problem.</para>
 
   <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 one.
-    </para>
-
-    <para>In that case you can select a different driver after clicking on 
-	    <guibutton>Let me pick any driver</guibutton>.
-    </para>
+    <para>Clicking <guibutton>Advanced</guibutton> in this screen, during
+    install, is useful if there is no default driver and there are several
+    drivers available, but you think the installer selected the wrong
+    one.</para>
 
+    <para>In that case you can select a different driver after clicking on
+    <guibutton>Let me pick any driver</guibutton>.</para>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/uninstall-Mageia.xml b/docs/installer/en/uninstall-Mageia.xml
index b5be8f5a..e5c9b3b9 100644
--- a/docs/installer/en/uninstall-Mageia.xml
+++ b/docs/installer/en/uninstall-Mageia.xml
@@ -1,9 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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="uninstall-Mageia">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0">
   <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
-  <!--Lebarhon 2015-07-06 Not true with UEFI -->
+  <!--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>
@@ -13,9 +14,10 @@
     the possibility to uninstall. This is not true for every operating
     system.</para>
 
-    <para>After your data backup, reboot your installation Mageia DVD and select Rescue
-    system, then, Restore Windows boot loader. At the next boot, you will only
-    have Windows with no option to choose your operating system.</para>
+    <para>After 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>To recover the space used by Mageia partitions on Windows, click on
     <code>Start -> Control Panel -> Administrative Tools -> Computer
@@ -25,8 +27,8 @@
     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.