Update catalog

8 files changed, 297 insertions, 402 deletions

diff --git a/docs/installer/en/DrakX.xml b/docs/installer/en/DrakX.xml
index 90770389..b39e7186 100644
--- a/docs/installer/en/DrakX.xml
+++ b/docs/installer/en/DrakX.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- Converted by db4-upgrade version 1.0 --><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en" xml:id="Quick-Startup">
+<?xml version='1.0' encoding='UTF-8'?><!-- Converted by db4-upgrade version 1.0 --><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:lang="en" version="5.0" xml:id="Quick-Startup">
   <info>
     <title>Installation with DrakX</title>
 
@@ -9,24 +9,29 @@
           choices you make while installing.</para>
         </note></para>
 
-      <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the
-      CC BY-SA 3.0 license
- <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+      <para xml:id="CC_BY-SA">The texts and screenshots in this manual are
+      available under the CC BY-SA 3.0 license <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
 
       <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+      <para>It was written by volunteers in their free time. Please contact
+      <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+      Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
 
   <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 
-<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
-<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
-<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
-<!--2013-12-08 add soundConfig.xml -->
-<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-  
+  <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+
+  <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+
+  <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+
+  <!--2013-12-08 add soundConfig.xml -->
+
+  <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+
   <!-- <xi:include href="drakx-intro.xml"/> -->
 
   <xi:include href="SelectAndUseISOs2.xml"/>
@@ -45,29 +50,29 @@
 
   <xi:include href="doPartitionDisks.xml"/>
 
- <!-- <xi:include href="resizeFATChoose.xml"/>
+  <!-- <xi:include href="resizeFATChoose.xml"/>
 
   <xi:include href="takeOverHdChoose.xml"/> -->
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
   <xi:include href="formatPartitions.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
+  <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"></xi:include>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"></xi:include>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"></xi:include>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"></xi:include>
+  <xi:include href="choosePackagesTree.xml"/>
 
   <!-- <xi:include href="setRootPassword.xml"></xi:include> -->
 
@@ -91,18 +96,19 @@
 
   <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"></xi:include>
- 
-<xi:include href="selectCountry.xml"></xi:include>
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
 
-<xi:include href="configureServices.xml"></xi:include>
+  <xi:include href="configureServices.xml"/>
 
-<xi:include href="selectMouse.xml"/>
+  <xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="soundConfig.xml"/>
 
-  <xi:include href="securityLevel.xml"></xi:include>
+  <xi:include href="securityLevel.xml"/>
 
+  <xi:include href="firewall.xml"></xi:include>
 
   <!-- <xi:include href="configureNetwork.xml"></xi:include> -->
 
@@ -110,5 +116,5 @@
 
   <xi:include href="exitInstall.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uninstall-Mageia.xml"/>
-</article>
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
index 71f78be6..7dfa23b6 100644
--- a/docs/installer/en/diskdrake.xml
+++ b/docs/installer/en/diskdrake.xml
@@ -1,23 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:id="diskdrake">
   <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-
   <info>
     <title xml:id="diskdrake-ti1">Custom disk partitioning with
     DiskDrake</title>
   </info>
-
   <mediaobject>
     <imageobject condition="classical">
       <imagedata fileref="dx2-diskdrake.png" align="center"/>
     </imageobject>
-
     <imageobject condition="live">
       <imagedata fileref="live-diskdrake.png" align="center"/>
     </imageobject>
   </mediaobject>
-
   <warning>
     <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on
     your <literal>/</literal> partition you must ensure that you have a
@@ -25,55 +21,38 @@ Lebarhon 20170902 added SC-->
     <literal>/boot</literal> partition must NOT be set, otherwise your system
     will be unbootable.</para>
   </warning>
-
   <para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s)
   here. You can remove or create partitions, change the filesystem of a
   partition or change its size and even view what is in them before you
   start.</para>
-
   <para xml:id="diskdrake-pa4" revision="1">There is a tab for every detected
   hard disk or other storage device, like an USB key. For example sda, sdb and
-  sdc if there are three of them.</para>
-
+  sdc if there are three of them. </para>
   <para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear
   all</guibutton> to wipe all partitions on the selected storage device</para>
-
   <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on
   the desired partition first. Then view it, or choose a filesystem and a
-  mount point, resize it or wipe it.</para>
-
+  mount point, resize it or wipe it. <guibutton>Toggle to expert
+  mode</guibutton> (or <guibutton>Expert mode</guibutton>) gives some more
+  tools like to add a label or to choose a partition type. </para>
   <para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted
   everything to your wishes.</para>
-
   <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton>
   when you're ready.</para>
-
   <note>
     <para>If you are installing Mageia on an UEFI system, check that an ESP
     (EFI System Partition) is present and correctly mounted on /boot/EFI (see
     below)</para>
-
-    <para><mediaobject>
-        <imageobject condition="classical">
-          <imagedata fileref="dx2-diskdrake2.png" align="center"/>
-        </imageobject>
-      <imageobject condition="live">
-        <imagedata fileref="live-diskdrake2.png" align="center"/>
-        </imageobject>
-      </mediaobject></para>
+    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png" align="center"/></imageobject><imageobject condition="live"><imagedata align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
   </note>
-
   <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a
-    BIOS boot partition is present with a correct type</para>
-
+    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot partition is present and of the correct type</para>
     <mediaobject>
       <imageobject condition="classical">
-        <imagedata fileref="dx2-doPartitionDisks3.png" align="center"/>
+        <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/>
       </imageobject>
-
       <imageobject condition="live">
-        <imagedata fileref="live-doPartitionDisks3.png" align="center"/>
+        <imagedata align="center" fileref="live-doPartitionDisks3.png"/>
       </imageobject>
     </mediaobject>
   </note>
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
index 8bfd8903..149e7082 100644
--- a/docs/installer/en/doPartitionDisks.xml
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -1,183 +1,94 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:id="doPartitionDisks">
   <!---->
-
   <!-- lebarhon 20161216 updated for Mageia 6
 
 lebarhon 20170209 added SC-->
-
   <info>
     <title xml:id="doPartitionDisks-ti1">Partitioning</title>
   </info>
-
   <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see
   the content of your hard drive(s) and see the solutions the DrakX
   partitioning wizard found for where to install
   <application>Mageia</application>.</para>
-
   <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 condition="classical">
       <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
     </imageobject>
-
     <imageobject condition="live">
       <imagedata fileref="live-doPartitionDisks.png" align="center"/>
     </imageobject>
   </mediaobject>
-
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing
-        Partitions</para>
-
-        <para xml:id="doPartitionDisks-pa5" revision="1">If this option is
+  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Use Existing
+        Partitions</para><para xml:id="doPartitionDisks-pa5" revision="1">If this option is
         available, then existing Linux compatible partitions have been found
-        and may be used for the installation.</para>
-      </listitem>
-
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
-
-        <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused
+        and may be used for the installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para><para xml:id="doPartitionDisks-pa7" revision="1">If you have unused
         space on your hard drive then this option will use it for your new
-        Mageia installation.</para>
-      </listitem>
-
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a
-        Windows Partition</para>
-
-        <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused
+        Mageia installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a
+        Windows Partition</para><para xml:id="doPartitionDisks-pa9" revision="1">If you have unused
         space on an existing Windows partition, the installer may offer to use
-        it.</para>
-
-        <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful
+        it.</para><para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful
         way of making room for your new Mageia installation, but is a risky
         operation so you should make sure you have backed up all important
-        files!</para>
-
-        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this
+        files!</para><para revision="3" xml:id="doPartitionDisks-pa11">Note that this
         involves shrinking the size of the Windows partition. The partition
         must be "clean", meaning that Windows must have closed down correctly
         the last time it was used. It must also have been defragmented,
         although this is not a guarantee that all files in the partition have
         been moved out of the area that is about to be used. It is highly
-        recommended to back up your personal files.</para>
-
-        <para>With this option, the installer displays the remaining Windows
+        recommended to back up your personal files.</para><para>With this option, the installer displays the remaining Windows
         partition in light blue and the future Mageia partition in dark blue
         with their intended sizes just under. You have the possibility to
         adapt these sizes by clicking and dragging the gap between both
-        partitions. See the screen-shot below.</para>
-
-        <mediaobject>
-          <imageobject condition="classical">
-            <imagedata fileref="dx2-doPartitionDisks2.png" align="center"/>
-          </imageobject>
-        
-           <imageobject condition="live">
-            <imagedata fileref="live-doPartitionDisks2.png" align="center"/>
-          </imageobject>
-        </mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire
-        Disk.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will use
-        the complete drive for Mageia.</para>
-
-        <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will
-        erase ALL data on the selected hard drive. Take care!</para>
-
-        <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use
+        partitions. See the screen-shot below.</para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-doPartitionDisks2.png" align="center"/></imageobject><imageobject condition="live"><imagedata fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire
+        Disk.</para><para xml:id="doPartitionDisks-pa13" revision="1">This option will use
+        the complete drive for Mageia.</para><para xml:id="doPartitionDisks-pa14" revision="1">Note! This will
+        erase ALL data on the selected hard drive. Take care!</para><para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use
         part of the disk for something else, or you already have data on the
         drive that you are not prepared to lose, then do not use this
-        option.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Custom</para>
-
-        <para xml:id="doPartitionDisks-pa17" revision="1">This gives you
+        option.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Custom disk
+        partitioning</para><para xml:id="doPartitionDisks-pa17" revision="1">This gives you
         complete control over the placing of the installation on your hard
-        drive(s).</para>
-      </listitem>
-    </itemizedlist></para>
-
-  <para><emphasis role="bold">Partitions sizing:</emphasis></para>
-
+        drive(s).</para></listitem></itemizedlist></para>
+  <para><emphasis role="bold">Partition sizing:</emphasis></para>
   <para>The installer will share the available place out according to the
   following rules:</para>
-
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available place is lower than 50 GB, only one
+  <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one
         partition is created for /, there is no separate partition for
-        /home.</para>
-      </listitem>
-
-      <listitem>
-        <para>If the total available place is over 50 GB, then three
-        partitions are created</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to / with a
-            maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 is allocated to swap with a maximum of 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to /home</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
-
+        /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three
+        partitions are created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a
+            maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
   <para>That means that from 160 GB and over of available place, the installer
   will create three partitions: 50 GB for /, 4 GB for swap and the rest for
   /home.</para>
-
   <note>
     <para>If you are using an UEFI system, the ESP (EFI System Partition) will
     be automatically detected, or created if it does not exist yet, and
-    mounted on /boot/EFI. The "Custom" option is the only one that allows to
-    check it has been correctly done</para>
+    mounted on /boot/EFI. The "Custom disk partitioning" option is the only
+    one that allows to check it has been correctly done</para>
   </note>
-
   <note>
     <para>If you are using a Legacy (as known as CSM or BIOS) system with a
     GPT disk, you need to create a Bios boot partition if not already
-    existing. It is an about 1 MiB partition with no mount point. Choose 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>
-
+    existing. It is an about 1 MiB partition with no mount point. Choose <xref linkend="diskdrake"/> to be able to create it with the Installer like any
+    other partition, just select BIOS boot partition as filesystem
+    type.</para>
     <mediaobject>
       <imageobject condition="classical">
-        <imagedata fileref="dx2-doPartitionDisks3.png" align="center"/>
+        <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/>
       </imageobject>
-    
       <imageobject condition="live">
         <imagedata fileref="live-doPartitionDisks3.png"/>
       </imageobject>
     </mediaobject>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="dx2-doPartitionDisks4.png"/>
       </imageobject>
     </mediaobject>
   </note>
-
   <warning>
     <para>Some newer drives are now using 4096 byte logical sectors, instead
     of the previous standard of 512 byte logical sectors. Due to lack of
@@ -186,11 +97,8 @@ lebarhon 20170209 added SC-->
     size over 1 MB. We suggest to pre-partition the drive, using an
     alternative partitioning tool like gparted, if you own such a device, and
     to use the following settings:</para>
-
     <para>"Align to" "MiB"</para>
-
     <para>"Free space preceding (MiB)" "2"</para>
-
     <para>Also make sure all partitions are created with an even number of
     megabytes.</para>
   </warning>
diff --git a/docs/installer/en/exitInstall.xml b/docs/installer/en/exitInstall.xml
index 7cf642d5..ff5d8d0d 100644
--- a/docs/installer/en/exitInstall.xml
+++ b/docs/installer/en/exitInstall.xml
@@ -1,30 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 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:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0">
   <info>
     <title xml:id="exitInstall-ti1">Congratulations</title>
   </info>
-
   <!-- Lebarhon 20170209 updated SC-->
-
   <mediaobject>
     <imageobject>
       <imagedata format="PNG" fileref="dx2-exitInstall.png" align="center" revision="1" xml:id="exitInstall-im1"/>
     </imageobject>
   </mediaobject>
-
   <para xml:id="exitInstall-pa1" revision="2">You have finished installing and
   configuring <application>Mageia</application> and it is now safe to remove
   the installation medium and reboot your computer.</para>
-
   <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader
   screen, you can choose between the operating systems on your computer (if
   you have more than one).</para>
-
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the
   settings for the bootloader, your Mageia install will be automatically
   selected and started.</para>
-
   <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
-
   <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have
   any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/installer/en/firewall.xml b/docs/installer/en/firewall.xml
new file mode 100644
index 00000000..d363e197
--- /dev/null
+++ b/docs/installer/en/firewall.xml
@@ -0,0 +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="firewall" version="5.0">
+  <info>
+    <title xml:id="firewall-ti1">Firewall</title>
+  </info>
+
+  <para xml:id="firewall-pa1" revision="1">This section allows to configure
+  some simple firewall rules: they determine which type of message from the
+  Internet will be accepted by the target system. This, in turn, allows the
+  corresponding services on the system to be accessible from the
+  Internet.</para>
+
+  <para>In the default setting, no button is checked - no service of the
+  system is accessibly from the network. The "<emphasis>Everything (no
+  firewall)</emphasis>" button has a particular role: it enables access to all
+  services of the machine - an option that does not make much sense in the
+  context of the installer since it would create a totally unprotected system.
+  Its veritable use is in the context of the Mageia Control Center (which uses
+  the same GUI layout) for temporarily disabling the entire set of firewall
+  rules for testing and debugging purposes.</para>
+
+  <para>All other checkbuttons are more or less self-explanatory. As an
+  example, you will check the "CUPS server" button if you want printers on
+  your machine to be accessible from the network.</para>
+
+  <para><emphasis role="bold">Advanced</emphasis></para>
+
+  <para>The set of checkbuttons only comprises the most common services. The
+  "Advanced" button allows to enable messages that correspond to a service for
+  which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
+  opens a window where you can enable a series of services by typing a list of
+  couples (blank separated)</para>
+
+  <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+
+  <simplelist>
+    <member>- <emphasis>&lt;port-number></emphasis> is the value of the
+    port assigned to the service you want to enable (e.g. 873 for the RSYNC
+    service) as defined in <emphasis>RFC-433</emphasis>;</member>
+
+    <member>- <emphasis>&lt;protocol></emphasis> is one of
+    <emphasis>TCP</emphasis> or <emphasis>UDP</emphasis> - the internet
+    protocol that is used by the service.</member>
+  </simplelist>
+
+  <para>For instance, the entry for enabling access to the RSYNC service
+  therefore is <emphasis>873/tcp</emphasis>.</para>
+
+  <para>In case a service is implemented to use both protocols, you specify 2
+  couples for the same port.</para>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index dabdb195..2b89e5d4 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.xml
@@ -1,204 +1,186 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/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="installer" version="5.0">
-  <!-- Made by marja on 2012 03 30, using barjac's text -->
-
-  <!-- NEEDS TO BE REVIEWED! -->
-
-  <!--removed para id's, corrected duplicate id's for segments, marja, 20120409 -->
-
-  <!--barjac 2012-04-11 - corrected link to Welcome screen and unmangled header - 
-      seems to be corrupted by xxe addon when saving -->
-
-  <!-- JohnR - apparent corruption is caused by the positioning of this comment block 
-       - corrected Lebarhon : I put [] where it seems having mistakes  -->
-
-  <!-- barjac 18/04/2012 Commented out para relating to peripherals, as it's apparently wrong -->
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="installer">
   <info>
-    <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+    <title xml:id="Select-and-use-ISOs-ti1">DrakX, the Mageia
+    Installer</title>
   </info>
 
   <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
   Installer is designed to help make your installation or upgrade as easy as
   possible.</para>
 
-  <!-- <para>If you have peripherals like printers or scanners, it is [best] to
-  connect them and make sure they are powered up during installation. These
-  will be automatically detected and configured.</para> -->
-
   <para>The initial menu screen has various options, however the default one
   will start the installer, which will normally be all that you will
   need.</para>
 
-  <figure xml:id="dx-welcome">
-    <info>
-      <title xml:id="installer-ti2">Installation Welcome Screen</title>
-    </info>
-
-    <para>Here are the default welcome screens when using a Mageia DVD, The
-    first one with a legacy system and the second one with an UEFI system:
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata xml:id="BId-drakx-intro-im1" revision="1" align="center" format="PNG" fileref="../dx-welcome.png"/>
-      </imageobject>
-    </mediaobject>
-  </figure>
-
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="dx-welcome2.png" align="center"/>
-    </imageobject>
-  </mediaobject>
-
-  <para>From this first screen, it is possible to set some personal
-  preferences:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The language (for the installation only, may be different that the
-      chosen language for the system) by pressing the key F2 (Legacy mode
-      only)</para>
-
-      <para/>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="dx-welcome-lang.png" align="center"/>
-        </imageobject>
-      </mediaobject>
-
-      <para>Use the arrow keys to select the language and press the key
-      Enter.</para>
-
-      <para>Here is for example, the French welcome screen when using a Live
-      DVD/CD. Note that the Live DVD/CD menu does not propose:
-      <guilabel>Rescue System</guilabel>, <guilabel>Memory test</guilabel> and
-      <guilabel>Hardware Detection Tool</guilabel>.</para>
-
-      <para/>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="dx-welcome4fr.png" align="center"/>
-        </imageobject>
-      </mediaobject>
+  <section>
+    <title>Installation Welcome Screen</title>
 
-      <para/>
-    </listitem>
+    <section>
+      <title>Using a Mageia DVD</title>
 
-    <listitem>
-      <para>Change the screen resolution by pressing the F3 key (Legacy mode
-      only).</para>
+      <para>Here are the default welcome screens when using a Mageia DVD, The
+      first one with an UEFI system and the second one with a Legacy
+      system:</para>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome5def.png" align="center"/>
+          <imagedata fileref="dx-welcome2.png"/>
         </imageobject>
       </mediaobject>
-    </listitem>
-
-    <listitem>
-      <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis> key for the legacy mode or the <emphasis role="bold">e</emphasis> key for the UEFI mode.</para>
-
-      <para>If the installation fails, then it may be necessary to try again
-      using one of the extra options. The menu called by F6 displays a new
-      line called <guilabel>Boot options</guilabel> and propose four
-      entries:</para>
-
-      <para>- Default, it doesn't alter anything in the default
-      options.</para>
-
-      <para>- Safe Settings, priority is given to the safer options to the
-      detriment of performances.</para>
 
-      <para>- No ACPI (Advanced Configuration and Power Interface), power
-      management isn't taken into account.</para>
-
-      <para>- No Local APIC (Local Advanced Programmable Interrupt
-      Controller), it is about CPU interruptions, select this option if you
-      are asked for.</para>
-
-      <para>When you select one of these entries, it modifies the default
-      options displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-      <note>
-        <para>In some Mageia releases, it may happen that the entries selected
-        with the key F6 does not appear in the <guilabel>Boot
-        Options</guilabel> line, however, they are really taken into
-        account.</para>
-      </note>
+      <para>From this screen, you can access to options by pressing the "e"
+      letter to enter the "edit mode". To come back to this screen, press
+      either the key "esc" to quit without saving or press the key "Ctrl" or
+      "F10" to quit with saving.</para>
 
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="dx-welcome6opt.png"/>
+          <imagedata fileref="dx-welcome.png"/>
         </imageobject>
       </mediaobject>
-    </listitem>
 
-    <listitem>
-      <para>Add more kernel options by pressing the key F1 (Legacy mode
-      only).</para>
-
-      <para>Pressing F1 opens a new window with more available options. Select
-      one with the arrow keys and press Enter to have more details or press
-      the Esc key to go back to the welcome screen.</para>
+      <para>From this screen, it is possible to set some personal
+      preferences:<itemizedlist>
+          <listitem>
+            <para>The language (for the installation only, may be different
+            that the chosen language for the system) by pressing the key F2
+            (Legacy mode only)</para>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="dx-welcome-lang.png"/>
+              </imageobject>
+            </mediaobject>
+
+            <para>Use the arrow keys to select the language and press the key
+            Enter.</para>
+
+            <para>Here is for example, the French welcome screen when using a
+            Live DVD/CD. Note that the Live DVD/CD menu does not propose:
+            <guilabel>Rescue System</guilabel>, <guilabel>Memory
+            test</guilabel> and <guilabel>Hardware Detection
+            Tool</guilabel>.</para>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="dx-welcome4fr.png"/>
+              </imageobject>
+            </mediaobject>
+          </listitem>
+
+          <listitem>
+            <para>Change the screen resolution by pressing the F3 key (Legacy
+            mode only).</para>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="dx-welcome5def.png"/>
+              </imageobject>
+            </mediaobject>
+          </listitem>
+
+          <listitem>
+            <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis> key for the legacy mode or the <emphasis role="bold">e</emphasis> key for the UEFI mode.</para>
+
+            <para>If the installation fails, then it may be necessary to try
+            again using one of the extra options. The menu called by F6
+            displays a new line called <guilabel>Boot options</guilabel> and
+            propose four entries:</para>
+
+            <para>- Default, it doesn't alter anything in the default
+            options.</para>
+
+            <para>- Default, it doesn't alter anything in the default
+            options.</para>
+
+            <para>- No ACPI (Advanced Configuration and Power Interface),
+            power management isn't taken into account.</para>
+
+            <para>- No Local APIC (Local Advanced Programmable Interrupt
+            Controller), it is about CPU interruptions, select this option if
+            you are asked for.</para>
+
+            <para>When you select one of these entries, it modifies the
+            default options displayed in the <guilabel>Boot Options</guilabel>
+            line.</para>
+
+            <note>
+              <para>In some Mageia releases, it may happen that the entries
+              selected with the key F6 does not appear in the <guilabel>Boot
+              Options</guilabel> line, however, they are really taken into
+              account.</para>
+            </note>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="dx-welcome6opt.png"/>
+              </imageobject>
+            </mediaobject>
+          </listitem>
+
+          <listitem>
+            <para>Add more kernel options by pressing the key F1 (Legacy mode
+            only).</para>
+
+            <para>Pressing F1 opens a new window with more available options.
+            Select one with the arrow keys and press Enter to have more
+            details or press the Esc key to go back to the welcome
+            screen.</para>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="dx-welcomeHelp1.png"/>
+              </imageobject>
+            </mediaobject>
+
+            <para>The detailed view about the option splash. Press Esc or
+            select <guilabel>Return to Boot Options</guilabel> to go back to
+            the options list. These options can by added by hand in the
+            <guilabel>Boot options</guilabel> line.</para>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="dx-welcomeHelp2.png"/>
+              </imageobject>
+            </mediaobject>
+
+            <note>
+              <para>The help is translated in the chosen language with the F2
+              key.</para>
+            </note>
+
+            <para>For more information about kernel options on legacy and UEFI
+            systems, see: <link ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
+          </listitem>
+        </itemizedlist></para>
+    </section>
 
-      <para/>
+    <section>
+      <title>Using a Wired Network</title>
 
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="dx-welcomeHelp1.png" align="center"/>
-        </imageobject>
-      </mediaobject>
+      <para>Here is the default welcome screen when using a Wired
+      Network-based Installation CD (netinstall.iso or netinstall-nonfree.iso
+      images):</para>
 
-      <para/>
+      <para>It does not allow to change the language, the available options
+      are described in the screen. For more information about using a Wired
+      Network-based Installation CD, see <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
+      Wiki</link></para>
 
-      <para>The detailed view about the option splash. Press Esc or select
-      <guilabel>Return to Boot Options</guilabel> to go back to the options
-      list. These options can by added by hand in the <guilabel>Boot
-      options</guilabel> line.</para>
+      <warning>
+        <para>The keyboard layout is the American one.</para>
+      </warning>
 
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="dx-welcomeHelp2.png"/>
+          <imagedata fileref="../dx-help.png"/>
         </imageobject>
       </mediaobject>
+    </section>
+  </section>
 
-      <para/>
-
-      <note>
-        <para>The help is translated in the chosen language with the F2
-        key.</para>
-      </note>
-    </listitem>
-  </itemizedlist>
-
-  <para>For more information about kernel options on legacy and UEFI systems,
-  see: <link ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-
-  <para>Here is the default welcome screen when using a Wired Network-based
-  Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
-
-  <para>It does not allow to change the language, the available options are
-  described in the screen. For more information about using a Wired
-  Network-based Installation CD, see <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
-  Wiki</link></para>
-
-  <warning>
-    <para>The keyboard layout is the American one.</para>
-  </warning>
-
-  <mediaobject>
-    <imageobject>
-      <imagedata revision="1" xml:id="installer-im2" align="center" format="PNG" fileref="../dx-help.png"/>
-    </imageobject>
-  </mediaobject>
-
-  <section xml:id="installationSteps">
-    <info>
-      <title xml:id="installationSteps-ti1">The installation steps</title>
-    </info>
+  <section>
+    <title>The installation steps</title>
 
     <para>The install process is divided into a number of steps, which can be
     followed on the side panel of the screen.</para>
@@ -223,16 +205,11 @@
     </note>
   </section>
 
-  <section xml:id="installationProblems">
-    <info>
-      <title xml:id="installationProblems-ti1">Installation Problems and
-      Possible Solutions</title>
-    </info>
+  <section>
+    <title>Installation Problems and Possible Solutions</title>
 
-    <section xml:id="noX">
-      <info>
-        <title xml:id="noX-ti2">No Graphical Interface</title>
-      </info>
+    <section>
+      <title>No Graphical Interface</title>
 
       <itemizedlist>
         <listitem>
@@ -243,20 +220,18 @@
         </listitem>
 
         <listitem>
-          <para revision="2">If the hardware is very old, a graphical
-          installation may not be possible. In this case it is worth trying a
-          text mode installation. To use this hit ESC at the first welcome
-          screen and confirm with ENTER. You will be presented with a black
-          screen with the word "boot:". Type "text" and hit ENTER. Now
-          continue with the installation in text mode.</para>
+          <para>If the hardware is very old, a graphical installation may not
+          be possible. In this case it is worth trying a text mode
+          installation. To use this hit ESC at the first welcome screen and
+          confirm with ENTER. You will be presented with a black screen with
+          the word "boot:". Type "text" and hit ENTER. Now continue with the
+          installation in text mode.</para>
         </listitem>
       </itemizedlist>
     </section>
 
-    <section xml:id="installFreezes">
-      <info>
-        <title xml:id="installFreezes-ti1">The Install Freezes</title>
-      </info>
+    <section>
+      <title>The Install Freezes</title>
 
       <para>If the system appeared to freeze during the installation, this may
       be a problem with hardware detection. In this case the automatic
@@ -265,10 +240,8 @@
       with other options as necessary.</para>
     </section>
 
-    <section xml:id="kernelOptions">
-      <info>
-        <title xml:id="kernelOptions-ti1">RAM problem</title>
-      </info>
+    <section>
+      <title>RAM problem</title>
 
       <para>These will rarely be needed, but in some cases the hardware may
       report the available RAM incorrectly. To specify this manually, you can
@@ -276,10 +249,8 @@
       of RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
     </section>
 
-    <section xml:id="DynamicPartitions">
-      <info>
-        <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
-      </info>
+    <section>
+      <title>Dynamic partitions</title>
 
       <para>If you converted your hard disk from "basic" format to "dynamic"
       format on Microsoft Windows, you must know that it is impossible to
@@ -287,5 +258,6 @@
       Microsoft documentation: <link ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-</section>
 
+  <section/>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/selectLanguage.xml b/docs/installer/en/selectLanguage.xml
index ee1280d1..8469812c 100644
--- a/docs/installer/en/selectLanguage.xml
+++ b/docs/installer/en/selectLanguage.xml
@@ -1,61 +1,51 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectLanguage" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:id="selectLanguage">
   <!-- Made by marja on 2012 04 01, using barjac's text -->
-
   <!-- NEEDS TO BE REVIEWED! -->
-
   <!-- SimonNZG 2012-04-03 has had a look -->
-
   <!-- removed para id's, corrected duplicate id's for segments, corrected wrong
        code in figure, marja, 20120409 -->
-
   <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
-
   <info>
     <title xml:id="selectLanguage-ti1">Please choose a language to use</title>
   </info>
-
-  <para>Select your preferred language, by first expanding the list for your
-  continent. <application>Mageia</application> will use this selection during
-  the installation and for your installed system.</para>
-
+  <para condition="classical">Select your preferred language, by first
+  expanding the list for your continent. <application>Mageia</application>
+  will use this selection during the installation and for your installed
+  system.</para>
+  <para condition="live">Select your preferred language.
+  <application>Mageia</application> will use this selection during the
+  installation and for your installed system.</para>
   <para condition="classical">If it is likely that you will require several
   languages installed on your system, for yourself or other users, then you
   should use the <guibutton>Multiple languages</guibutton> button to add them
   now. It will be difficult to add extra language support after
   installation.</para>
-
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata align="center" fileref="dx2-selectLanguage.png" format="PNG"/>
+      <imagedata format="PNG" fileref="dx2-selectLanguage.png" align="center"/>
     </imageobject>
-
     <imageobject condition="live">
       <imagedata fileref="live-language.png" format=""/>
     </imageobject>
   </mediaobject>
-
   <warning condition="classical">
     <para>Even if you choose more than one language, you must first choose one
     of them as your preferred language in the first language screen. It will
     also be marked as chosen in the multiple languages screen .</para>
   </warning>
-
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred
       language, then it is advisable to install the language of your keyboard
       as well.</para>
     </listitem>
-
     <listitem>
       <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
       <para condition="classical">This may be disabled in the "multiple
       languages" screen if you know that it is inappropriate for your
       language. Disabling UTF-8 applies to all installed languages.</para>
     </listitem>
-
     <listitem>
       <para>You can change the language of your system after installation in
       the Mageia Control Center -> System -> Manage localization for
diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml
index 0af54953..6f30d553 100644
--- a/docs/installer/en/setupBootloaderAddEntry.xml
+++ b/docs/installer/en/setupBootloaderAddEntry.xml
@@ -1,17 +1,14 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:id="setupBootloaderAddEntry">
   <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
-
   <info>
     <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu
     Entry</title>
   </info>
-
   <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
   software grub-customizer instead (Available in the Mageia
   repositories).</para>
-
   <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>