Sync Installer docs with Calenco

10 files changed, 304 insertions, 165 deletions

diff --git a/docs/docs/stable/installer/en/addUser.xml b/docs/docs/stable/installer/en/addUser.xml
index fbb69ad8..d4766e20 100644
--- a/docs/docs/stable/installer/en/addUser.xml
+++ b/docs/docs/stable/installer/en/addUser.xml
@@ -1,91 +1,136 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:id="addUser">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="addUser" 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">
   <info>
     <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+
   <!--2018/02/12 apb: Text and Typography.-->
+
   <!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+
   <!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
   Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+
   <!--2018/02/24 apb: Changed list style.-->
+
+  <!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+
+  <!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
+
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
+      <imagedata align="center" fileref="dx2-setRootPassword.png" format="PNG"
+                 revision="1" xml:id="setRootPassword-im1"/>
     </imageobject>
-    <imageobject>
-      <imagedata format="PNG" fileref="live-user1.png"/>
+
+    <imageobject condition="live">
+      <imagedata fileref="live-user1.png" format="PNG"/>
     </imageobject>
   </mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Set Administrator (root)
       Password:</title>
     </info>
+
     <para>It is advisable for all Mageia installations to set a
     <literal>superuser</literal> (Administrator) password, usually called the
-    <emphasis>root </emphasis>password in Linux. As you type a password into
-    the top box a shield will change from red-to-yellow-to-green depending on
-    the strength of the password. A green shield shows you are using a strong
-    password. You need to repeat the same password in the box underneath, to
-    check that the first entry was not mistyped.</para>
+    <emphasis>root </emphasis>password in Linux. You need to repeat the same
+    password in the box underneath, to check that the first entry was not
+    mistyped.</para>
+
     <note xml:id="givePassword">
+      <para>As you type a password into the top box a shield will change from
+      red-to-yellow-to-green depending on the strength of the password. A
+      green shield shows you are using a strong password.</para>
+
       <para>All passwords are case-sensitive. It is best to use a mixture of
       letters (upper and lower case), numbers and other characters in a
       password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Enter a user</title>
     </info>
+
     <para>Add a User here. A regular user has fewer privileges than the
     <literal>superuser</literal> (root), but enough to use the Internet,
     office applications or play games and anything else the average user might
     use a computer for.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis role="bold">Icon</emphasis></para>
+
         <para>Click on this button if you want to change the user's
         icon</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Real Name</emphasis></para>
+
         <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Login Name</emphasis></para>
+
         <para>Enter the user login name or let DrakX use a version of the
         user's real name. <emphasis role="bold">The login name is
         case-sensitive.</emphasis></para>
+
         <caution condition="live">
-          <simpara>The login entered here should be different to any login currently in use for your <filename>/home</filename> directory. Some user parameters will be written in the user space, and some can overwrite actual data such as Firefox, Thunderbird or Kmail data...</simpara>
+          <simpara>The login entered here should be different to any login
+          currently in use for your <filename>/home</filename> directory. Some
+          user parameters will be written in the user space, and some can
+          overwrite actual data such as Firefox, Thunderbird or Kmail
+          data...</simpara>
         </caution>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Password</emphasis></para>
-        <para>Type in the user password. There is a shield at the end of the
-        text box that indicates the strength of the password. (See also <xref linkend="givePassword"/>)</para>
+
+        <para>Type in the user password (remembering the advice in the Note
+        above).</para>
+
         <para><emphasis role="bold">Password (again):</emphasis> Retype the
         user password. DrakX will check that you have not mistyped the
         password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
       <para>Any users added while installing Mageia, will have a home
       directory that is both read and write protected (umask=0027)</para>
+
       <para>You can add any extra needed users in the <emphasis>Configuration
       - Summary</emphasis> step during the install. Choose <emphasis>User
       management</emphasis>.</para>
+
       <para>The access permissions can also be changed after the
       install.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
       <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
+
     <para>The <emphasis>Advanced</emphasis> option allows you to edit further
     settings for the user you are adding.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis>Shell</emphasis>: This drop-down list allows you to
@@ -93,15 +138,17 @@
         screen. Options are <literal>Bash</literal>, <literal>Dash</literal>
         and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
         <para><emphasis>User ID</emphasis>: Here you can set the user ID for
         any user you added in the previous screen. If you are unsure what the
         purpose of this is, then leave it blank.</para>
       </listitem>
+
       <listitem>
         <para><emphasis>Group ID</emphasis>: This lets you set the group ID.
         Again, if unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/bootLive.xml b/docs/docs/stable/installer/en/bootLive.xml
index 1facb419..eca99292 100644
--- a/docs/docs/stable/installer/en/bootLive.xml
+++ b/docs/docs/stable/installer/en/bootLive.xml
@@ -1,42 +1,25 @@
-<?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">
+<?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">
   <!--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.-->
-
   <!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd -> DVD.-->
-
   <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
@@ -45,131 +28,101 @@
       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"/>
+        <imagedata fileref="../live-bootCSM.png" align="center"/>
       </imageobject>
-
       <caption>
         <para>First screen while booting in BIOS mode</para>
       </caption>
     </mediaobject>
-
     <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).</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>
-
       <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 <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>
   </section>
-
   <section xml:id="uefimode">
     <info>
       <title xml:id="uefimode-ti1">In UEFI mode</title>
     </info>
-
     <mediaobject condition="live">
       <imageobject>
-        <imagedata align="center" fileref="live-bootUEFI.png" format="PNG"
-                   revision="1" xml:id="bootUEFI-im1"/>
+        <imagedata format="PNG" fileref="../live-bootUEFI.png" align="center" xml:id="bootUEFI-im1" revision="1"/>
       </imageobject>
-
       <caption>
         <para>First screen while booting in UEFI mode</para>
       </caption>
     </mediaobject>
-
     <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>
       </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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/configureX_card_list.xml b/docs/docs/stable/installer/en/configureX_card_list.xml
index 3f43ec2b..ead57c91 100644
--- a/docs/docs/stable/installer/en/configureX_card_list.xml
+++ b/docs/docs/stable/installer/en/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0"
+         xreflabel="Choose an X Server (Configure your Graphic Card)"
+         xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns4="http://www.w3.org/1998/Math/MathML"
          xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
 
   <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 
+  <!--2019/08/10 apb: Added xreflabel-->
+
   <info>
     <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
     your Graphic Card)</title>
diff --git a/docs/docs/stable/installer/en/configureX_chooser.xml b/docs/docs/stable/installer/en/configureX_chooser.xml
index 7bc9c8d7..f2dff75a 100644
--- a/docs/docs/stable/installer/en/configureX_chooser.xml
+++ b/docs/docs/stable/installer/en/configureX_chooser.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xreflabel="Graphics Card and Monitor Configuration"
+         xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          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">
-  <info>
-    <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor
-    Configuration</title>
-  </info>
-
   <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
 
   <!--2018/02/15 apb: Some text and typography.-->
@@ -22,6 +17,13 @@
 
   <!--2019/01/06 apb: Slight reword, split 1st para in two.-->
 
+  <!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+
+  <info>
+    <title xml:id="configureX_chooser-ti1">Graphics Card and Monitor
+    Configuration</title>
+  </info>
+
   <mediaobject>
     <imageobject>
       <imagedata align="center" fileref="dx2-configureX_chooser.png"
@@ -42,7 +44,7 @@
   <itemizedlist>
     <listitem>
       <para revision="1" xml:id="configureX_chooser-pa2"><emphasis
-      role="bold">Graphic Card</emphasis></para>
+      role="bold">Graphics Card</emphasis></para>
 
       <para>If you need to, you can select a specific card from this
       expandable list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/en/configureX_monitor.xml b/docs/docs/stable/installer/en/configureX_monitor.xml
index e31a96f1..2e24b531 100644
--- a/docs/docs/stable/installer/en/configureX_monitor.xml
+++ b/docs/docs/stable/installer/en/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xreflabel="Choosing your Monitor"
+         xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns4="http://www.w3.org/1998/Math/MathML"
          xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
 
   <!--2018/02/22 apb: Change list style.-->
 
+  <!--2019/01/06 apb: Slight rewording.-->
+
+  <!--2019/08/10 apb: Added xreflabel.-->
+
   <info>
     <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
@@ -76,7 +80,7 @@
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa8">If the installer
         has not correctly detected your monitor and you know which one you
-        have, you can select it from the tree by selecting:</para>
+        have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -97,11 +101,11 @@
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa10">Selecting this
-        group will list nearly 30 display configurations such as 1024x768 @
-        60Hz and includes flat-panel displays as used in laptops. This is
-        often a good monitor selection group if you need to use the VESA card
-        driver when your video hardware cannot be determined automatically.
-        Once again it may be wise to be conservative in your
+        group will list approximately 30 display configurations such as
+        1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+        This is often a good monitor selection group if you need to use the
+        VESA card driver when your video hardware cannot be determined
+        automatically. Once again, it may be wise to be conservative in your
         selections.</para>
       </listitem>
     </varlistentry>
diff --git a/docs/docs/stable/installer/en/diskdrake.xml b/docs/docs/stable/installer/en/diskdrake.xml
index 90caf8e7..60b3d9c6 100644
--- a/docs/docs/stable/installer/en/diskdrake.xml
+++ b/docs/docs/stable/installer/en/diskdrake.xml
@@ -15,8 +15,10 @@ Lebarhon 20170902 added SC-->
   <!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
 
   <!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-    
-    <!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+
+  <!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+
+  <!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
 
   <info>
     <title xml:id="diskdrake-ti1">Custom Disk Partitioning with
@@ -43,9 +45,9 @@ Lebarhon 20170902 added SC-->
 
     <listitem>
       <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for
-      every detected hard disk (or other storage device, like a USB key). In
-      the screenshot above there are two available devices: <filename>sda
-      </filename>and <filename>sdb</filename>.</para>
+      every detected hard disk (or other storage device, like a USB key), for
+      example: <filename>sda</filename>, <filename>sdb</filename>,
+      <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/en/doPartitionDisks.xml b/docs/docs/stable/installer/en/doPartitionDisks.xml
index 8914a615..11ee951a 100644
--- a/docs/docs/stable/installer/en/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/en/doPartitionDisks.xml
@@ -23,6 +23,10 @@ lebarhon 20170209 added SC-->
 
   <!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
 
+  <!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+
+  <!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
+
   <info>
     <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
@@ -73,14 +77,35 @@ lebarhon 20170209 added SC-->
       <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused
       space on an existing Windows partition, the installer may offer to use
       it. 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>
+      installation but see the warning below.</para>
 
       <para>With this option, the installer displays the remaining Windows
       partition in light blue and the proposed Mageia partition in dark blue
       with their intended sizes just underneath. You have the option to modify
       these sizes by clicking and dragging the gap between both partitions.
-      See the following screenshot:</para>
+      See the following screenshot:<mediaobject>
+          <imageobject condition="classical">
+            <imagedata align="center" fileref="dx2-doPartitionDisks2.png"/>
+          </imageobject>
+
+          <imageobject condition="live">
+            <imagedata align="center" fileref="live-doPartitionDisks2.png"/>
+          </imageobject>
+        </mediaobject></para>
+
+      <warning>
+        <para>This involves shrinking the size of the Windows partition, and
+        therefore is a risky operation, so you should make sure you have
+        backed up all important files before proceeding.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">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 for Mageia.</para>
+      </important>
     </listitem>
 
     <listitem>
@@ -96,16 +121,6 @@ lebarhon 20170209 added SC-->
         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>
       </warning>
-
-      <important>
-        <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>
-      </important>
     </listitem>
 
     <listitem>
@@ -118,16 +133,6 @@ lebarhon 20170209 added SC-->
     </listitem>
   </itemizedlist>
 
-  <mediaobject>
-    <imageobject condition="classical">
-      <imagedata align="center" fileref="dx2-doPartitionDisks2.png"/>
-    </imageobject>
-
-    <imageobject condition="live">
-      <imagedata align="center" fileref="live-doPartitionDisks2.png"/>
-    </imageobject>
-  </mediaobject>
-
   <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
   option, then the installer will allocate the available space according to
   the following rules:</para>
@@ -208,9 +213,13 @@ lebarhon 20170209 added SC-->
   </mediaobject>
 
   <mediaobject>
-    <imageobject>
+    <imageobject condition="classical">
       <imagedata align="center" fileref="dx2-doPartitionDisks4.png"/>
     </imageobject>
+
+    <imageobject condition="live">
+      <imagedata align="center" fileref="live-doPartitionDisks4.png"/>
+    </imageobject>
   </mediaobject>
 
   <important>
diff --git a/docs/docs/stable/installer/en/firewall.xml b/docs/docs/stable/installer/en/firewall.xml
index a27b09f2..a21ef293 100644
--- a/docs/docs/stable/installer/en/firewall.xml
+++ b/docs/docs/stable/installer/en/firewall.xml
@@ -1,18 +1,33 @@
-<?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" xreflabel="Firewall">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xreflabel="Firewall" xml:id="firewall"
+         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/15 apb: Text and typography.-->
 
   <!--2018/02/25 apb: Added xreflabel for this section.-->
 
+  <!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+
   <info>
     <title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to
+  <para revision="1" xml:id="firewall-pa1">This section allows you to
   configure some simple firewall rules: they determine which type of message
   from the Internet will be accepted by the target system. This, in turn,
   allows the corresponding services on the system to be accessible from the
   Internet.</para>
 
+  <mediaobject>
+    <imageobject>
+      <imagedata align="center" fileref="dx2-firewall.png"/>
+    </imageobject>
+  </mediaobject>
+
   <para>In the default setting (no button is checked), no service of the
   system is accessible from the network. The <emphasis>Everything (no
   firewall)</emphasis> option enables access to all services of the machine -
@@ -32,14 +47,14 @@
   enable a series of services by typing a list of <quote>couples</quote>
   (blank separated)</para>
 
-  <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+  <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
 
   <simplelist>
-    <member>- <emphasis>&lt;port-number></emphasis> is the value of the
+    <member>- <emphasis>&lt;port-number&gt;</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
+    <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of
     <emphasis>TCP</emphasis> or <emphasis>UDP</emphasis> - the internet
     protocol that is used by the service.</member>
   </simplelist>
@@ -49,4 +64,4 @@
 
   <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
+</section>
diff --git a/docs/docs/stable/installer/en/installer.xml b/docs/docs/stable/installer/en/installer.xml
index 58f9720f..3fa0bf2f 100644
--- a/docs/docs/stable/installer/en/installer.xml
+++ b/docs/docs/stable/installer/en/installer.xml
@@ -28,6 +28,8 @@
 
   <!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
 
+  <!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
+
   <info>
     <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
   </info>
diff --git a/docs/docs/stable/installer/en/setupBootloader.xml b/docs/docs/stable/installer/en/setupBootloader.xml
index 119f6630..4923786c 100644
--- a/docs/docs/stable/installer/en/setupBootloader.xml
+++ b/docs/docs/stable/installer/en/setupBootloader.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section version="5.0" xreflabel="Bootloader" xml:id="setupBootloader"
          xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
          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"
@@ -23,48 +24,81 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
   <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
 
+  <!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+
+  <!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+
   <info>
     <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
 
   <section>
-    <title>Grub2</title>
-
-    <itemizedlist>
-      <title>Grub2 on Legacy MBR/GPT systems</title>
-
-      <listitem>
-        <para>GRUB2 (with or without graphical menu) will be used exclusively
-        as the bootloader for a Legacy/MBR or Legacy/GPT system.</para>
-      </listitem>
-
-      <listitem>
-        <para>By default, a new bootloader will be written into either the MBR
-        (Master Boot Record) of your first hard drive or in the BIOS boot
-        partition.</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <listitem>
-        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI
-        system.</para>
-      </listitem>
-
-      <listitem>
-        <para>By default, a new bootloader (Grub2-efi) will be written into
-        the ESP (EFI System Partition).</para>
-
-        <para>If there are already UEFI-based operating systems installed on
-        your computer (Windows 8 for example), the Mageia installer will
-        detect the existing ESP created by Windows and add grub2-efi to it. If
-        no ESP exists, then one will be created. Although it is possible to
-        have several ESPs, only one is required, whatever the number of
-        operating systems you have.</para>
-      </listitem>
-    </itemizedlist>
+    <title>Available Bootloaders</title>
+
+    <section>
+      <title>Grub2</title>
+
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2 on Legacy MBR/GPT
+        systems</emphasis></para>
+
+        <listitem>
+          <para>GRUB2 (with or without graphical menu) will be used
+          exclusively as the bootloader for a Legacy/MBR or Legacy/GPT
+          system.</para>
+        </listitem>
+
+        <listitem>
+          <para>By default, a new bootloader will be written into either the
+          MBR (Master Boot Record) of your first hard drive or in the BIOS
+          boot partition.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2-efi on UEFI
+        systems</emphasis></para>
+
+        <listitem>
+          <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI
+          system.</para>
+        </listitem>
+
+        <listitem>
+          <para>By default, a new bootloader (Grub2-efi) will be written into
+          the ESP (EFI System Partition).</para>
+
+          <para>If there are already UEFI-based operating systems installed on
+          your computer (Windows 8 for example), the Mageia installer will
+          detect the existing ESP created by Windows and add grub2-efi to it.
+          If no ESP exists, then one will be created. Although it is possible
+          to have several ESPs, only one is required, whatever the number of
+          operating systems you have.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>rEFInd</title>
+
+      <itemizedlist>
+        <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+
+        <listitem>
+          <para>rEFInd has a nice graphical set of options, and can
+          auto-detect installed EFI bootloaders. See:
+          http://www.rodsbooks.com/refind/</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>Please note that in order to be able to use the
+        <literal>rEFInd</literal> option, an installed EFI System Partition
+        must match your system architecture: if you have a 32bit EFI System
+        Partition installed on a 64bit machine for instance, then the rEFInd
+        option will not be displayed/available to you.</para>
+      </note>
+    </section>
   </section>
 
   <section>
@@ -90,15 +124,39 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></para>
 
-          <para>This feature is only available to Legacy MBR/BIOS systems.
-          Users of UEFI systems will not see this option here.</para>
+          <itemizedlist>
+            <listitem>
+              <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical
+              or a text menu), can be chosen for both <literal>Legacy
+              MBR/BIOS</literal> systems and <literal>UEFI</literal>
+              systems.</para>
+            </listitem>
+
+            <listitem>
+              <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu)
+              is an alternative option solely for use with
+              <literal>UEFI</literal> systems.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Boot device</emphasis></para>
 
-          <para>Don't change this unless you really know what you are
-          doing</para>
+          <warning>
+            <para>Don't change this unless you really know what you are
+            doing.</para>
+          </warning>
+
+          <note>
+            <para>There is no option to write GRUB to the boot sector of a
+            partition (e.g: <filename>sda1</filename>), as this method is
+            considered unreliable.</para>
+          </note>
+
+          <para>When using UEFI mode, then the <guilabel>Boot
+          device</guilabel> will be listed as <guimenuitem>EFI System
+          Partition</guimenuitem>.</para>
         </listitem>
 
         <listitem>
@@ -176,6 +234,43 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
     <section>
       <title>Bootloader Configuration</title>
 
+      <para>If, in the previous section you selected <literal>rEFInd</literal>
+      as the bootloader to use, you would then be presented with the options
+      shown in the screenshot directly below. Otherwise, please instead move
+      on to the subsequent screenshot for your options.</para>
+
+      <mediaobject>
+        <imageobject condition="classical">
+          <imagedata align="center" fileref="rEFIndLoaderConfig.png"/>
+        </imageobject>
+
+        <imageobject condition="live">
+          <imagedata align="center" fileref="live-rEFIndLoaderConfig.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <para>Your rEFInd configuration options:</para>
+
+        <listitem>
+          <para><guimenuitem>Install or update rEFInd in the EFI system
+          partition.</guimenuitem></para>
+        </listitem>
+
+        <listitem>
+          <para><guimenuitem>Install in EFI/Boot partition (workaround for
+          some BIOS's).</guimenuitem></para>
+
+          <para>With some BIOS's, the newly written bootloaser for Mageia at
+          end of the installation will not be recognized. In that case, you
+          can use this option as a workaround for the issue.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you did not select rEFInd as the bootloader to use in the
+      previous section, then your bootloader configurations are shown
+      below:</para>
+
       <mediaobject>
         <imageobject condition="classical">
           <imagedata align="center" fileref="dx2-setupBootloader3.png"/>
@@ -205,7 +300,8 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
           <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, then untick the Probe Foreign OS option.</para>
+          this behaviour, then untick the <guimenuitem>Probe Foreign
+          OS</guimenuitem> option.</para>
         </listitem>
       </itemizedlist>
 
@@ -235,9 +331,16 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
           <para>Select this option if you don't want a bootable Mageia, but
           would rather chain-load it from another OS. You will get a warning
-          that the bootloader is missing. Click<emphasis> Ok</emphasis> if you
-          are sure you understand the implications, and wish to
-          proceed.</para>
+          that the bootloader is missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+          understand the implications, and wish to proceed.</para>
+
+          <warning>
+            <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)
+            is no longer supported by Mageia as it is likely to fail when
+            attempting to boot this resulting installation of Mageia. If you
+            use anything other than GRUB2 or rEFInd for this purpose, then you
+            do so at your own risk!</para>
+          </warning>
         </listitem>
       </itemizedlist>
 
@@ -272,7 +375,6 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       operating system will be unable to start.</para>
     </section>
 
-    <xi:include href="setupBootloaderAddEntry.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
 </section>