Update catalog

3 files changed, 177 insertions, 89 deletions

diff --git a/docs/docs/stable/installer/en/bootLive.xml b/docs/docs/stable/installer/en/bootLive.xml
index 5d05fb1f..35b8a144 100644
--- a/docs/docs/stable/installer/en/bootLive.xml
+++ b/docs/docs/stable/installer/en/bootLive.xml
@@ -1,21 +1,40 @@
-<?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 version="1.0" encoding="UTF-8"?>
+<section version="5.0" 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">
   <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+
   <!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+
   <!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+
+  <!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+
+  <!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+
+  <!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+
   <info>
     <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
   </info>
+
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Booting the medium</title>
     </info>
+
     <para>You can boot directly from a Live DVD or USB. Usually, you just need
     to plug the USB device in or place the DVD in the drive and restart the
     computer.</para>
+
     <para>If the computer does not automatically boot from the USB or DVD you
     may need to reconfigure your BIOS Boot Disk priority. Alternatively, you
     might try accessing the boot device menu to select a device from which the
     computer will boot.</para>
+
     <tip>
       <para>To access the BIOS or boot menu when the computer is starting, you
       can try pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -24,143 +43,131 @@
       the boot device menu. These (fairly common) keys are just a selection of
       possible options though.</para>
     </tip>
+
     <note>
       <para>The actual screen that you will first see when booting from the
       Live media will depend on whether your computer motherboard is of the
       Legacy (BIOS) or UEFI type.</para>
     </note>
   </section>
+
   <section xml:id="biosmode">
     <info>
       <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
     </info>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="live-bootCSM.png"/>
+      </imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
     <itemizedlist>
-      <title>Main Menu</title>
+      <title>Menu</title>
+
       <listitem>
         <para><emphasis role="bold">Boot Mageia</emphasis></para>
-        <para>This option will boot the Mageia Live system from the connected DVD/USB media (expect a very slow system compared to an installed OS).</para>
-        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <para>This option will boot the Mageia Live system from the connected
+        DVD/USB media (expect a very slow system compared to an installed
+        OS).</para>
+
+        <para>Once the boot is done, you can proceed to the
+        installation.</para>
+
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ use non-free video drivers (slower
             to boot)</emphasis></para>
+
             <para>Boot the Mageia Live system using non-free video
             drivers</para>
           </listitem>
         </itemizedlist>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Install Mageia</emphasis></para>
+
         <para>This option will install Mageia to a hard disk.</para>
+
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ use non-free video drivers (slower
             to boot)</emphasis></para>
+
             <para>Install Mageia using non-free video drivers</para>
           </listitem>
         </itemizedlist>
       </listitem>
-    </itemizedlist>
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="live-bootCSM.png" align="center"/>
-      </imageobject>
-      <caption>
-        <para>First screen while booting in BIOS mode</para>
-      </caption>
-    </mediaobject>
-    <itemizedlist>
-      <title>Function Keys</title>
+
       <listitem>
-        <para><keycap>F1</keycap> <emphasis role="bold">Help</emphasis></para>
-        <para>Within any of the <keycap>F2</keycap> to <keycap>F6</keycap>
-        options, you can view relevant help by pressing
-        <keycap>F1</keycap>.</para>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+        operations. Reboot to end the test.</para>
       </listitem>
+
       <listitem>
-        <para><keycap>F2</keycap> <emphasis role="bold">Language</emphasis></para>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
         <para>Press <keycap>F2</keycap> to have the installer use a specific
         language during the installation. Use the arrow keys to select the
         language then press <keycap>Enter</keycap>.</para>
       </listitem>
-      <listitem>
-        <para><keycap>F3</keycap> <emphasis role="bold">Video
-        Mode</emphasis></para>
-        <para>If needed, change the screen resolution by pressing
-        <keycap>F3</keycap>. Options are: 640x480, 800x600, 1024x768.</para>
-      </listitem>
-      <listitem>
-        <para><keycap>F4</keycap> <emphasis role="bold">Source</emphasis></para>
-        <para>Normally, the installation is performed from the inserted installation medium. Here, you may select other sources, like FTP or NFS servers.</para>
-        <para>If the installation is carried out in a network with an SLP server, then select one of the installation sources available on the server with this option.</para>
-      </listitem>
-      <listitem>
-        <para><keycap>F5</keycap> <emphasis role="bold">Driver</emphasis></para>
-        <para>If you have a driver update that you wish to use, select this
-        option and then answer <emphasis>Yes</emphasis>. You will be prompted
-        to insert the update disc at the appropriate time.</para>
-      </listitem>
-      <listitem>
-        <para><keycap>F6</keycap> <emphasis role="bold">Kernel
-        Options</emphasis></para>
-        <para>If you experience problems with the installation, you could try
-        modifying the default settings using the <emphasis>Kernel
-        Option</emphasis> menu:</para>
-        <itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">Default:</emphasis> splash quiet noiswmd resume audit=0</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Safe Settings:</emphasis>
-            <literal>apm=off acpi=off mce=off barrier=off ide=nodma idewait=50
-            i8042.nomux psmouse.proto=bare irqpoll
-            pci=nommconf</literal></para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">No ACPI:</emphasis> (Advanced
-            Configuration and Power Interface): Power management features are
-            not used.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">No Local APIC:</emphasis> (Local
-            Advanced Programmable Interrupt Controller): CPU interrupt. Select
-            this option if you experience system misbehaviour like a kernel
-            panic in relation to APIC.</para>
-          </listitem>
-        </itemizedlist>
-        <para>If you open any of the above <keycap>F6</keycap> menu items, and
-        then click on <keycap>F1</keycap>, an info window will open to show
-        more details for that particular item:</para>
-      </listitem>
     </itemizedlist>
   </section>
+
   <section xml:id="uefimode">
     <info>
       <title xml:id="uefimode-ti1">In UEFI mode</title>
     </info>
+
     <mediaobject condition="live">
       <imageobject>
-        <imagedata format="PNG" fileref="live-bootUEFI.png" align="center" xml:id="bootUEFI-im1" revision="1"/>
+        <imagedata align="center" fileref="live-bootUEFI.png" format="PNG"
+                   revision="1" xml:id="bootUEFI-im1"/>
       </imageobject>
+
       <caption>
         <para>First screen while booting in UEFI mode</para>
       </caption>
     </mediaobject>
-    <para>In UEFI mode, you have just the two menu options to choose from:</para>
+
     <itemizedlist>
+      <title>Menu</title>
+
       <listitem>
         <para><emphasis role="bold">Boot Mageia</emphasis></para>
-        <para>This option will boot the Mageia Live system from the connected Dvd/USB media (expect a very slow system compared to an installed OS). Once the boot is done, you can proceed to the installation</para>
+
+        <para>This option will boot the Mageia Live system from the connected
+        Dvd/USB media (expect a very slow system compared to an installed OS).
+        Once the boot is done, you can proceed to the installation</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Install Mageia</emphasis></para>
+
         <para>This option will install Mageia to a hard disk.</para>
       </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific
+        language during the installation. Use the arrow keys to select the
+        language then press <keycap>Enter</keycap>.</para>
+      </listitem>
     </itemizedlist>
+
     <note>
       <para>If you booted from a USB stick, you will see the above menu
       options duplicated, and in this case, you should choose from the menu
       pair that will be suffixed with "USB".</para>
     </note>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/installer.xml b/docs/docs/stable/installer/en/installer.xml
index dcb3cb27..58f9720f 100644
--- a/docs/docs/stable/installer/en/installer.xml
+++ b/docs/docs/stable/installer/en/installer.xml
@@ -1,120 +1,188 @@
-<?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="installer">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+
   <!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
   Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
   So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+
   <!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+
   <!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+
   <!--2018/02/24 apb: Changed main list type-->
+
   <!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+
   <!--2018/02/27 apb: Fixed UEFI section nest level.-->
+
   <!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
-  <!--2019/01/02 apb: 2.2 Typo. 2.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+
+  <!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+
+  <!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+
   <info>
     <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
   </info>
+
   <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
   Installer is designed to help make your installation or upgrade as easy as
   possible.</para>
+
   <section>
     <title>The installation steps</title>
+
     <itemizedlist>
       <listitem>
         <para>The install process is divided into a number of steps - the
         status of which is indicated in a panel to the left of the
         screen.</para>
       </listitem>
+
       <listitem>
         <para>Each step has one or more screens, which may also have
         <emphasis>Advanced</emphasis> sections with extra, less commonly
         required options.</para>
       </listitem>
+
       <listitem>
         <para>Most screens have <emphasis>Help</emphasis> buttons for further
         details about the particular step.</para>
       </listitem>
     </itemizedlist>
+
     <caution>
       <para>If at some point during the install you decide to abort the
       installation, it is possible to reboot, but please think twice before
       you do this. Once a partition has been formatted or updates have started
       to be installed, your computer is no longer in the same state and
       rebooting it could very well leave you with an unusable system.</para>
+
       <para>If, in spite of this, you are very sure rebooting is what you
-      want, go to a text terminal by pressing the keys <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. After that, press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Delete</keycap></keycombo> together to reboot.</para>
+      want, go to a text terminal by pressing the keys <keycombo>
+          <keycap>Ctrl</keycap>
+
+          <keycap>Alt</keycap>
+
+          <keycap>F2</keycap>
+        </keycombo> together. After that, press <keycombo>
+          <keycap>Ctrl</keycap>
+
+          <keycap>Alt</keycap>
+
+          <keycap>Delete</keycap>
+        </keycombo> together to reboot.</para>
     </caution>
   </section>
+
   <section>
     <title>Installation Welcome Screen</title>
+
     <para>The particular screen that you will first see when booting from the
     Installation media will depend on whether your computer motherboard is of
     the Legacy (BIOS) or UEFI type.</para>
+
     <para>The welcome menu screen has various options, however the default
     option will start the installer, and is normally all that you will
     need.</para>
+
     <section>
       <title>Legacy (BIOS) Systems</title>
+
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome.png" align="center"/>
+          <imagedata align="center" fileref="dx-welcome.png"/>
         </imageobject>
       </mediaobject>
+
       <itemizedlist>
         <title>Menu</title>
+
         <listitem>
           <para><emphasis role="bold">Install Mageia</emphasis></para>
-          <para>Install Mageia to a hard disk. This is the default option, and will automatically start after a short while unless another option is selected.</para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and
+          will automatically start after a short while unless another option
+          is selected.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Rescue System</emphasis></para>
+
           <para>This option allows you to either re-install the bootloader for
           an existing Mageia installation or you can use it to restore a
           Windows bootloader.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Memory Test</emphasis></para>
+
           <para>Test the installed RAM by performing multiple read and write
           operations. Reboot to end the test.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">F2: Language</emphasis></para>
+
           <para>Press F2 for alternative languages.</para>
         </listitem>
       </itemizedlist>
     </section>
+
     <section>
       <title>UEFI Systems</title>
+
       <para>From this screen, you can access options by pressing
       <keycap>e</keycap> to enter the edit mode. To come back to this screen,
       press <keycap>Esc</keycap> to quit without saving or press
       <keycap>F10</keycap> to save and quit.</para>
+
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome2.png" align="center"/>
+          <imagedata align="center" fileref="dx-welcome2.png"/>
         </imageobject>
       </mediaobject>
-      <para>In UEFI mode you have only two menu options to choose from:</para>
+
       <itemizedlist>
+        <title>Menu</title>
+
         <listitem>
           <para><emphasis role="bold">Install:</emphasis> Start the Install
           process</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Rescue:</emphasis> This option allows
           you to either re-install the bootloader for an existing Mageia
           installation or you can use it to restore a Windows
           bootloader.</para>
         </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press
+          <keycap>F2</keycap> for alternative languages.</para>
+        </listitem>
       </itemizedlist>
+
       <para>If you booted from a USB stick, you will see the above options
       duplicated, and in this case, you should use the set that will be
       suffixed with "USB".</para>
     </section>
   </section>
+
   <section>
     <title>Installation Problems and Possible Solutions</title>
+
     <section>
       <title>No Graphical Interface</title>
+
       <itemizedlist>
         <listitem>
           <para>After the initial screen you did not progress to the
@@ -122,6 +190,7 @@
           some graphic cards and older systems. Try using low resolution by
           typing <command>vgalo</command> at the prompt.</para>
         </listitem>
+
         <listitem>
           <para>If the hardware is very old, a graphical installation may not
           be possible. In this case it is worth trying a text-mode
@@ -134,28 +203,35 @@
         </listitem>
       </itemizedlist>
     </section>
+
     <section>
       <title>The Install Freezes</title>
+
       <para>If the system appeared to freeze during the installation, this may
       be a problem with hardware detection. In this case the automatic
       hardware detection may be bypassed and dealt with later. To try this,
       type <command>noauto</command> at the prompt. This option may also be
       combined with other parameters as necessary.</para>
     </section>
+
     <section>
       <title>RAM problem</title>
+
       <para>This will rarely be needed, but in some cases the hardware may
       report the available RAM incorrectly. To specify this manually, you can
       use the <literal>mem=<replaceable>xxx</replaceable>M</literal>
       parameter, where <replaceable>xxx</replaceable> is the correct amount of
       RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
+
     <section>
       <title>Dynamic partitions</title>
+
       <para>If you converted your hard disk from <literal>Basic</literal>
       format to <literal>Dynamic</literal> format in Microsoft Windows, then
       it is not possible to install Mageia on this disc. To revert to a
-      <literal>Basic</literal> disk, see the Microsoft documentation: <link ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+      <literal>Basic</literal> disk, see the Microsoft documentation: <link
+      ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/testing.xml b/docs/docs/stable/installer/en/testing.xml
index 5f9d97fc..ade5cad7 100644
--- a/docs/docs/stable/installer/en/testing.xml
+++ b/docs/docs/stable/installer/en/testing.xml
@@ -1,4 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/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="testing">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+
   <info>
     <title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
@@ -8,7 +16,8 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
-    <para>This is the screen you will see if you selected the <emphasis role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+    <para>This is the screen you will see if you selected the <emphasis
+    role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
 
     <mediaobject>
       <imageobject>
@@ -37,10 +46,6 @@
         </listitem>
 
         <listitem>
-          <para>webcam:</para>
-        </listitem>
-
-        <listitem>
           <para>sound: a jingle has already been played</para>
         </listitem>
 
@@ -80,4 +85,4 @@
       </mediaobject>
     </section>
   </section>
-</section>
\ No newline at end of file
+</section>