From 0e5dcf856a358b2434e78f49bff8b63796767b82 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 5 Jul 2020 17:20:55 +0300
Subject: Sync the docs for all locales

---
 docs/docs/stable/installer/ast/DrakLive.xml        |   7 +-
 docs/docs/stable/installer/ast/installUpdates.xml  |  27 ++-
 docs/docs/stable/installer/ast/setupBootloader.xml | 154 ++++--------
 docs/docs/stable/installer/bg/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/bg/addUser.xml          |  33 ++-
 docs/docs/stable/installer/bg/bootLive.xml         |  56 +----
 .../stable/installer/bg/configureX_card_list.xml   |  10 +-
 .../stable/installer/bg/configureX_chooser.xml     |  19 +-
 .../stable/installer/bg/configureX_monitor.xml     |  31 ++-
 docs/docs/stable/installer/bg/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/bg/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/bg/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/bg/firewall.xml         |  32 ++-
 docs/docs/stable/installer/bg/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/bg/installer.xml        |   3 +
 docs/docs/stable/installer/bg/setupBootloader.xml  | 252 ++++++++++---------
 docs/docs/stable/installer/ca/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/ca/addUser.xml          |  71 ++++--
 docs/docs/stable/installer/ca/bootLive.xml         |  56 +----
 .../stable/installer/ca/configureX_card_list.xml   |   8 +-
 .../stable/installer/ca/configureX_chooser.xml     |  19 +-
 .../stable/installer/ca/configureX_monitor.xml     |  25 +-
 docs/docs/stable/installer/ca/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/ca/doPartitionDisks.xml |  50 ++--
 docs/docs/stable/installer/ca/firewall.xml         |  32 ++-
 docs/docs/stable/installer/ca/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/ca/installer.xml        |   3 +
 docs/docs/stable/installer/ca/setupBootloader.xml  | 246 ++++++++++---------
 docs/docs/stable/installer/cs/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/cs/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/cs/setupBootloader.xml  | 154 ++++--------
 docs/docs/stable/installer/eo/DrakLive.xml         |   7 +-
 .../docs/stable/installer/eo/SelectAndUseISOs2.xml |   2 +-
 docs/docs/stable/installer/eo/addUser.xml          |  33 ++-
 docs/docs/stable/installer/eo/bootLive.xml         |  56 +----
 .../stable/installer/eo/configureX_card_list.xml   |  10 +-
 .../stable/installer/eo/configureX_chooser.xml     |  19 +-
 .../stable/installer/eo/configureX_monitor.xml     |  29 ++-
 docs/docs/stable/installer/eo/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/eo/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/eo/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/eo/firewall.xml         |  34 ++-
 docs/docs/stable/installer/eo/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/eo/installer.xml        |   3 +
 docs/docs/stable/installer/eo/reboot.xml           |   2 +-
 docs/docs/stable/installer/eo/setupBootloader.xml  | 250 ++++++++++---------
 docs/docs/stable/installer/eo/soundConfig.xml      |   2 +-
 docs/docs/stable/installer/es/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/es/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/es/setupBootloader.xml  | 170 ++++---------
 docs/docs/stable/installer/eu/DrakLive.xml         |   7 +-
 .../docs/stable/installer/eu/SelectAndUseISOs2.xml |  12 +-
 docs/docs/stable/installer/eu/addUser.xml          |  35 ++-
 docs/docs/stable/installer/eu/bestTime.xml         |   2 +-
 docs/docs/stable/installer/eu/bootLive.xml         |  56 +----
 .../stable/installer/eu/choosePackageGroups.xml    |   6 +-
 .../stable/installer/eu/configureX_card_list.xml   |  10 +-
 .../stable/installer/eu/configureX_chooser.xml     |  21 +-
 .../stable/installer/eu/configureX_monitor.xml     |  33 ++-
 docs/docs/stable/installer/eu/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/eu/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/eu/doPartitionDisks.xml |  51 ++--
 docs/docs/stable/installer/eu/firewall.xml         |  32 ++-
 docs/docs/stable/installer/eu/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/eu/installer.xml        |   5 +-
 docs/docs/stable/installer/eu/misc-params.xml      |   6 +-
 docs/docs/stable/installer/eu/securityLevel.xml    |   2 +-
 .../stable/installer/eu/selectKeyboardLive.xml     |   2 +-
 docs/docs/stable/installer/eu/setupBootloader.xml  | 258 +++++++++++---------
 docs/docs/stable/installer/eu/software.xml         |   2 +-
 docs/docs/stable/installer/fr/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/fr/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/fr/setupBootloader.xml  | 165 ++++---------
 docs/docs/stable/installer/hr/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/hr/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/hr/setupBootloader.xml  | 154 ++++--------
 docs/docs/stable/installer/hu/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/hu/addUser.xml          |  33 ++-
 docs/docs/stable/installer/hu/bootLive.xml         |  56 +----
 .../stable/installer/hu/configureX_card_list.xml   |  10 +-
 .../stable/installer/hu/configureX_chooser.xml     |  19 +-
 .../stable/installer/hu/configureX_monitor.xml     |  31 ++-
 docs/docs/stable/installer/hu/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/hu/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/hu/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/hu/firewall.xml         |  32 ++-
 docs/docs/stable/installer/hu/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/hu/installer.xml        |   3 +
 docs/docs/stable/installer/hu/setupBootloader.xml  | 252 ++++++++++---------
 docs/docs/stable/installer/hu/software.xml         |   2 +-
 docs/docs/stable/installer/id/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/id/addUser.xml          |  33 ++-
 docs/docs/stable/installer/id/bootLive.xml         |  56 +----
 .../stable/installer/id/configureX_card_list.xml   |   8 +-
 .../stable/installer/id/configureX_chooser.xml     |  19 +-
 .../stable/installer/id/configureX_monitor.xml     |  28 ++-
 docs/docs/stable/installer/id/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/id/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/id/doPartitionDisks.xml |  48 ++--
 docs/docs/stable/installer/id/firewall.xml         |  32 ++-
 docs/docs/stable/installer/id/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/id/installer.xml        |   3 +
 docs/docs/stable/installer/id/setupBootloader.xml  | 250 ++++++++++---------
 docs/docs/stable/installer/id/software.xml         |   2 +-
 docs/docs/stable/installer/it/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/it/addUser.xml          |  33 ++-
 docs/docs/stable/installer/it/bootLive.xml         |  56 +----
 .../stable/installer/it/configureX_card_list.xml   |  10 +-
 .../stable/installer/it/configureX_chooser.xml     |  19 +-
 .../stable/installer/it/configureX_monitor.xml     |  27 ++-
 docs/docs/stable/installer/it/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/it/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/it/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/it/firewall.xml         |  32 ++-
 docs/docs/stable/installer/it/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/it/installer.xml        |   3 +
 docs/docs/stable/installer/it/setupBootloader.xml  | 250 ++++++++++---------
 docs/docs/stable/installer/it/software.xml         |   2 +-
 docs/docs/stable/installer/nb/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/nb/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/nb/setupBootloader.xml  | 164 ++++---------
 docs/docs/stable/installer/nl/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/nl/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/nl/setupBootloader.xml  | 154 ++++--------
 docs/docs/stable/installer/pl/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/pl/addUser.xml          |  33 ++-
 docs/docs/stable/installer/pl/bootLive.xml         |  56 +----
 .../stable/installer/pl/configureX_card_list.xml   |  10 +-
 .../stable/installer/pl/configureX_chooser.xml     |  19 +-
 .../stable/installer/pl/configureX_monitor.xml     |  27 ++-
 docs/docs/stable/installer/pl/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/pl/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/pl/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/pl/firewall.xml         |  34 ++-
 docs/docs/stable/installer/pl/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/pl/installer.xml        |   3 +
 docs/docs/stable/installer/pl/setupBootloader.xml  | 252 ++++++++++---------
 docs/docs/stable/installer/pl/software.xml         |   2 +-
 docs/docs/stable/installer/pt/DrakLive-cover.xml   |   6 +-
 docs/docs/stable/installer/pt/DrakLive.xml         |  13 +-
 docs/docs/stable/installer/pt/DrakX-cover.xml      |   6 +-
 docs/docs/stable/installer/pt/DrakX-inline.xml     |   6 +-
 docs/docs/stable/installer/pt/DrakX.xml            |   6 +-
 docs/docs/stable/installer/pt/addUser.xml          |  33 ++-
 docs/docs/stable/installer/pt/bootLive.xml         |  56 +----
 .../stable/installer/pt/configureX_card_list.xml   |  10 +-
 .../stable/installer/pt/configureX_chooser.xml     |  19 +-
 .../stable/installer/pt/configureX_monitor.xml     |  31 ++-
 docs/docs/stable/installer/pt/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/pt/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/pt/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/pt/firewall.xml         |  32 ++-
 docs/docs/stable/installer/pt/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/pt/installer.xml        |   3 +
 docs/docs/stable/installer/pt/setupBootloader.xml  | 252 ++++++++++---------
 docs/docs/stable/installer/pt/software.xml         |   2 +-
 docs/docs/stable/installer/pt_BR/DrakLive.xml      |   7 +-
 .../docs/stable/installer/pt_BR/installUpdates.xml |  27 ++-
 .../stable/installer/pt_BR/setupBootloader.xml     | 165 ++++---------
 docs/docs/stable/installer/ro/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/ro/addUser.xml          |  33 ++-
 docs/docs/stable/installer/ro/bootLive.xml         |  56 +----
 .../stable/installer/ro/configureX_card_list.xml   |  10 +-
 .../stable/installer/ro/configureX_chooser.xml     |  19 +-
 .../stable/installer/ro/configureX_monitor.xml     |  28 ++-
 docs/docs/stable/installer/ro/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/ro/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/ro/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/ro/firewall.xml         |  34 ++-
 docs/docs/stable/installer/ro/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/ro/installer.xml        |   3 +
 docs/docs/stable/installer/ro/setupBootloader.xml  | 252 ++++++++++---------
 docs/docs/stable/installer/ro/software.xml         |   2 +-
 docs/docs/stable/installer/ru/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/ru/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/ru/setupBootloader.xml  | 165 ++++---------
 docs/docs/stable/installer/sk/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/sk/addUser.xml          |  33 ++-
 docs/docs/stable/installer/sk/bootLive.xml         |  56 +----
 .../stable/installer/sk/configureX_card_list.xml   |  10 +-
 .../stable/installer/sk/configureX_chooser.xml     |  19 +-
 .../stable/installer/sk/configureX_monitor.xml     |  29 ++-
 docs/docs/stable/installer/sk/diskPartitioning.xml |   2 +-
 docs/docs/stable/installer/sk/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/sk/doPartitionDisks.xml |  48 ++--
 docs/docs/stable/installer/sk/firewall.xml         |  32 ++-
 docs/docs/stable/installer/sk/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/sk/installer.xml        |   3 +
 docs/docs/stable/installer/sk/setupBootloader.xml  | 252 ++++++++++---------
 docs/docs/stable/installer/sk/software.xml         |   2 +-
 docs/docs/stable/installer/sl/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/sl/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/sl/setupBootloader.xml  | 154 ++++--------
 docs/docs/stable/installer/sq/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/sq/addUser.xml          |  76 ++++--
 docs/docs/stable/installer/sq/bootLive.xml         |  56 +----
 .../stable/installer/sq/configureX_card_list.xml   |   8 +-
 .../stable/installer/sq/configureX_chooser.xml     |  19 +-
 .../stable/installer/sq/configureX_monitor.xml     |  26 +-
 docs/docs/stable/installer/sq/diskdrake.xml        |  15 +-
 docs/docs/stable/installer/sq/doPartitionDisks.xml |  61 +++--
 docs/docs/stable/installer/sq/firewall.xml         |  34 ++-
 docs/docs/stable/installer/sq/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/sq/installer.xml        |   3 +
 docs/docs/stable/installer/sq/setupBootloader.xml  | 269 +++++++++++----------
 docs/docs/stable/installer/sr/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/sr/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/sr/setupBootloader.xml  | 164 ++++---------
 docs/docs/stable/installer/sv/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/sv/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/sv/setupBootloader.xml  | 154 ++++--------
 docs/docs/stable/installer/tg/DrakLive-cover.xml   |  30 +--
 docs/docs/stable/installer/tg/DrakLive.xml         |  25 +-
 docs/docs/stable/installer/tg/DrakX-cover.xml      |  30 +--
 docs/docs/stable/installer/tg/DrakX-inline.xml     |  26 +-
 docs/docs/stable/installer/tg/DrakX.xml            |  26 +-
 docs/docs/stable/installer/tg/addUser.xml          |  33 ++-
 docs/docs/stable/installer/tg/bootLive.xml         |  56 +----
 .../stable/installer/tg/configureX_card_list.xml   |  10 +-
 .../stable/installer/tg/configureX_chooser.xml     |  19 +-
 .../stable/installer/tg/configureX_monitor.xml     |  29 ++-
 docs/docs/stable/installer/tg/diskPartitioning.xml |   4 +-
 docs/docs/stable/installer/tg/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/tg/doPartitionDisks.xml |  49 ++--
 docs/docs/stable/installer/tg/firewall.xml         |  32 ++-
 docs/docs/stable/installer/tg/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/tg/installer.xml        |   3 +
 docs/docs/stable/installer/tg/setupBootloader.xml  | 250 ++++++++++---------
 docs/docs/stable/installer/tg/software.xml         |   2 +-
 docs/docs/stable/installer/tr/DrakLive.xml         |   7 +-
 docs/docs/stable/installer/tr/addUser.xml          |  71 ++++--
 docs/docs/stable/installer/tr/bootLive.xml         |  56 +----
 .../stable/installer/tr/configureX_card_list.xml   |   8 +-
 .../stable/installer/tr/configureX_chooser.xml     |  19 +-
 .../stable/installer/tr/configureX_monitor.xml     |  26 +-
 docs/docs/stable/installer/tr/diskdrake.xml        |  13 +-
 docs/docs/stable/installer/tr/doPartitionDisks.xml |  48 ++--
 docs/docs/stable/installer/tr/firewall.xml         |  34 ++-
 docs/docs/stable/installer/tr/installUpdates.xml   |  27 ++-
 docs/docs/stable/installer/tr/installer.xml        |   3 +
 docs/docs/stable/installer/tr/setupBootloader.xml  | 246 ++++++++++---------
 docs/docs/stable/installer/uk.po                   | 139 +++++------
 docs/docs/stable/installer/zh_CN/DrakLive.xml      |   7 +-
 docs/docs/stable/installer/zh_CN/addUser.xml       |  33 ++-
 docs/docs/stable/installer/zh_CN/bootLive.xml      |  56 +----
 .../installer/zh_CN/configureX_card_list.xml       |  10 +-
 .../stable/installer/zh_CN/configureX_chooser.xml  |  19 +-
 .../stable/installer/zh_CN/configureX_monitor.xml  |  30 ++-
 .../stable/installer/zh_CN/diskPartitioning.xml    |   2 +-
 docs/docs/stable/installer/zh_CN/diskdrake.xml     |  15 +-
 .../stable/installer/zh_CN/doPartitionDisks.xml    |  45 ++--
 docs/docs/stable/installer/zh_CN/firewall.xml      |  34 ++-
 .../docs/stable/installer/zh_CN/installUpdates.xml |  27 ++-
 docs/docs/stable/installer/zh_CN/installer.xml     |   3 +
 .../stable/installer/zh_CN/setupBootloader.xml     | 252 ++++++++++---------
 docs/docs/stable/installer/zh_CN/software.xml      |   2 +-
 docs/docs/stable/installer/zh_TW/DrakLive.xml      |   7 +-
 .../docs/stable/installer/zh_TW/installUpdates.xml |  27 ++-
 .../stable/installer/zh_TW/setupBootloader.xml     | 154 ++++--------
 259 files changed, 5586 insertions(+), 5409 deletions(-)

diff --git a/docs/docs/stable/installer/ast/DrakLive.xml b/docs/docs/stable/installer/ast/DrakLive.xml
index ba43133c..4314b913 100644
--- a/docs/docs/stable/installer/ast/DrakLive.xml
+++ b/docs/docs/stable/installer/ast/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/ast/installUpdates.xml b/docs/docs/stable/installer/ast/installUpdates.xml
index dc77bfff..4c3e3cc2 100644
--- a/docs/docs/stable/installer/ast/installUpdates.xml
+++ b/docs/docs/stable/installer/ast/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ast">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ast" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Updates</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ast/setupBootloader.xml b/docs/docs/stable/installer/ast/setupBootloader.xml
index 7307e843..a1797029 100644
--- a/docs/docs/stable/installer/ast/setupBootloader.xml
+++ b/docs/docs/stable/installer/ast/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ast" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="ast" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
     <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
@@ -81,19 +56,15 @@ 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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Bootloader main options</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Other Options</title>
-
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/DrakLive.xml b/docs/docs/stable/installer/bg/DrakLive.xml
index 7e1277de..e8c59aea 100644
--- a/docs/docs/stable/installer/bg/DrakLive.xml
+++ b/docs/docs/stable/installer/bg/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Инсталиране от ЖИВ образ</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/bg/addUser.xml b/docs/docs/stable/installer/bg/addUser.xml
index 38124cd4..3a23c69a 100644
--- a/docs/docs/stable/installer/bg/addUser.xml
+++ b/docs/docs/stable/installer/bg/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/bg/bootLive.xml b/docs/docs/stable/installer/bg/bootLive.xml
index 6d968203..99a2fd47 100644
--- a/docs/docs/stable/installer/bg/bootLive.xml
+++ b/docs/docs/stable/installer/bg/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" 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" xml:lang="bg">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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> <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"/> </imageobject>
-
+      <imageobject> <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/bg/configureX_card_list.xml b/docs/docs/stable/installer/bg/configureX_card_list.xml
index 0de1accc..9a20916d 100644
--- a/docs/docs/stable/installer/bg/configureX_card_list.xml
+++ b/docs/docs/stable/installer/bg/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="bg"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Производител</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/bg/configureX_chooser.xml b/docs/docs/stable/installer/bg/configureX_chooser.xml
index 5279e24a..a77996b9 100644
--- a/docs/docs/stable/installer/bg/configureX_chooser.xml
+++ b/docs/docs/stable/installer/bg/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="bg" 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>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/bg/configureX_monitor.xml b/docs/docs/stable/installer/bg/configureX_monitor.xml
index 31d5747f..7f7eb36d 100644
--- a/docs/docs/stable/installer/bg/configureX_monitor.xml
+++ b/docs/docs/stable/installer/bg/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="bg" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+      <term revision="1" xml:id="configureX_monitor-pa2">Позволи на отделни потребители</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -60,7 +66,7 @@ consult your monitor documentation.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug & Play</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Производител</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Общ</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/bg/diskPartitioning.xml b/docs/docs/stable/installer/bg/diskPartitioning.xml
index ac4e29b5..677c101e 100644
--- a/docs/docs/stable/installer/bg/diskPartitioning.xml
+++ b/docs/docs/stable/installer/bg/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Управление на дискови дялове</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/bg/diskdrake.xml b/docs/docs/stable/installer/bg/diskdrake.xml
index 19eb5f05..332e7c69 100644
--- a/docs/docs/stable/installer/bg/diskdrake.xml
+++ b/docs/docs/stable/installer/bg/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/bg/doPartitionDisks.xml b/docs/docs/stable/installer/bg/doPartitionDisks.xml
index b2caf84a..0aa395ef 100644
--- a/docs/docs/stable/installer/bg/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/bg/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ your new Mageia installation.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </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>
@@ -107,12 +120,6 @@ hard drive(s).</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/bg/firewall.xml b/docs/docs/stable/installer/bg/firewall.xml
index 321e8298..086167dd 100644
--- a/docs/docs/stable/installer/bg/firewall.xml
+++ b/docs/docs/stable/installer/bg/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="bg" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Защитна стена</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/bg/installUpdates.xml b/docs/docs/stable/installer/bg/installUpdates.xml
index d97faf9d..e53a3a52 100644
--- a/docs/docs/stable/installer/bg/installUpdates.xml
+++ b/docs/docs/stable/installer/bg/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Обновявания</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/installer.xml b/docs/docs/stable/installer/bg/installer.xml
index 17f127ab..50bc5985 100644
--- a/docs/docs/stable/installer/bg/installer.xml
+++ b/docs/docs/stable/installer/bg/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, инсталатора на Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/bg/setupBootloader.xml b/docs/docs/stable/installer/bg/setupBootloader.xml
index b4f035b8..6044f476 100644
--- a/docs/docs/stable/installer/bg/setupBootloader.xml
+++ b/docs/docs/stable/installer/bg/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="bg" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Програма за начално зареждане</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Опции на програмата за начално зареждане</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Конфигуриране на програмата за начално зареждане</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Други параметри</title>
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/DrakLive.xml b/docs/docs/stable/installer/ca/DrakLive.xml
index 9fd4fc16..02d0b699 100644
--- a/docs/docs/stable/installer/ca/DrakLive.xml
+++ b/docs/docs/stable/installer/ca/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instal·lació des d'un mitjà AUTÒNOM</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/ca/addUser.xml b/docs/docs/stable/installer/ca/addUser.xml
index c0d96256..e4c538f4 100644
--- a/docs/docs/stable/installer/ca/addUser.xml
+++ b/docs/docs/stable/installer/ca/addUser.xml
@@ -1,12 +1,28 @@
-<?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:lang="ca" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" 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>
+
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -14,47 +30,63 @@
 <!--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.-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+<!--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.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Estableix la contrasenya d'administrador (root):</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">Introduïu un usuari</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">Icona</emphasis></para>
+
         <para>Feu clic a aquest botó si voleu canviar la icona de l'usuari</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
@@ -62,45 +94,54 @@ 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">Contrasenya</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>Els permisos d'accés també es poden modificar després de la instal·lació.</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 change the
 shell available to any user you added in the previous 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/ca/bootLive.xml b/docs/docs/stable/installer/ca/bootLive.xml
index a32017a4..d72ae170 100644
--- a/docs/docs/stable/installer/ca/bootLive.xml
+++ b/docs/docs/stable/installer/ca/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" 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" xml:lang="ca">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Arrencada de Mageia com a sistema autònom</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Arrencada del mitjà</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">En mode BIOS/CSM/Legacy</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>La primera pantalla de l'arrencada en mode BIOS</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Menú</title>
-
       <listitem>
         <para><emphasis role="bold">Arrenca 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">Instal·la Mageia</emphasis></para>
-
         <para>Aquesta opció instal·larà Mageia a un disc dur.</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">En mode UEFI</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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>Menú</title>
-
       <listitem>
         <para><emphasis role="bold">Arrenca 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">Instal·la Mageia</emphasis></para>
-
         <para>Aquesta opció instal·larà Mageia a un disc dur.</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/ca/configureX_card_list.xml b/docs/docs/stable/installer/ca/configureX_card_list.xml
index cd70945a..7e1c1328 100644
--- a/docs/docs/stable/installer/ca/configureX_card_list.xml
+++ b/docs/docs/stable/installer/ca/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ca"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Tria del servidor de les X (configura la targeta gràfica)</title>
   </info>
 
diff --git a/docs/docs/stable/installer/ca/configureX_chooser.xml b/docs/docs/stable/installer/ca/configureX_chooser.xml
index 201c958f..b1e47162 100644
--- a/docs/docs/stable/installer/ca/configureX_chooser.xml
+++ b/docs/docs/stable/installer/ca/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ca" 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">Configuració de targeta gràfica i monitor</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/ca/configureX_monitor.xml b/docs/docs/stable/installer/ca/configureX_monitor.xml
index 58ce21ad..2f9daff0 100644
--- a/docs/docs/stable/installer/ca/configureX_monitor.xml
+++ b/docs/docs/stable/installer/ca/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ca" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Tria del monitor</title>
   </info>
 
@@ -72,8 +78,8 @@ type from the monitor database.</para>
       <term revision="1" xml:id="configureX_monitor-pa7">Fabricant</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Si l'instal·lador no ha detectat correctament el monitor i sabeu quin és, el
-podeu seleccionar de l'arbre:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -93,11 +99,12 @@ podeu seleccionar de l'arbre:</para>
       <term revision="1" xml:id="configureX_monitor-pa9">Genèric</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/ca/diskdrake.xml b/docs/docs/stable/installer/ca/diskdrake.xml
index 497a139f..9af5c4a1 100644
--- a/docs/docs/stable/installer/ca/diskdrake.xml
+++ b/docs/docs/stable/installer/ca/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/ca/doPartitionDisks.xml b/docs/docs/stable/installer/ca/doPartitionDisks.xml
index d05e4814..ecea41d7 100644
--- a/docs/docs/stable/installer/ca/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/ca/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ instal·lació de Mageia.</para>
 
       <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>
+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>
@@ -88,16 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Tingueu present que això implica encongir la partició de Windows. La
-partició ha d'estar «neta», és a dir, Windows s'ha d'haver tancat
-correctament la darrera vegada que es va fer servir. També cal que hagi
-estat desfragmentada, tot i que això no és garantia que els fitxers de la
-partició hagin estat desplaçats fora de la regió que s'està a punt de fer
-servir. És altament recomanable fer una còpia de seguretat dels fitxers
-personals.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -108,12 +120,6 @@ al(s) disc(s) dur(s).</para>
     </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>
@@ -186,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/ca/firewall.xml b/docs/docs/stable/installer/ca/firewall.xml
index f6c60729..2c827bbf 100644
--- a/docs/docs/stable/installer/ca/firewall.xml
+++ b/docs/docs/stable/installer/ca/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="ca" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Tallafoc</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/ca/installUpdates.xml b/docs/docs/stable/installer/ca/installUpdates.xml
index 6c9d0d4a..43bdd868 100644
--- a/docs/docs/stable/installer/ca/installUpdates.xml
+++ b/docs/docs/stable/installer/ca/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Actualitzacions</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/installer.xml b/docs/docs/stable/installer/ca/installer.xml
index bfebff38..9cea8252 100644
--- a/docs/docs/stable/installer/ca/installer.xml
+++ b/docs/docs/stable/installer/ca/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, l'instal·lador de Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/ca/setupBootloader.xml b/docs/docs/stable/installer/ca/setupBootloader.xml
index 60625113..80f9afe8 100644
--- a/docs/docs/stable/installer/ca/setupBootloader.xml
+++ b/docs/docs/stable/installer/ca/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="ca" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Gestor d'arrencada</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Opcions principals del menú d'arrencada</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Contrasenya</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Configuració del gestor d'arrencada</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Altres opcions</title>
-
     <section>
       <title>Ús d'un gestor d'arrencada existent</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/DrakLive.xml b/docs/docs/stable/installer/cs/DrakLive.xml
index e3546975..c0499c31 100644
--- a/docs/docs/stable/installer/cs/DrakLive.xml
+++ b/docs/docs/stable/installer/cs/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalace ze ŽIVÉHO datového nosiče</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/cs/installUpdates.xml b/docs/docs/stable/installer/cs/installUpdates.xml
index d773f1b1..498e6f4f 100644
--- a/docs/docs/stable/installer/cs/installUpdates.xml
+++ b/docs/docs/stable/installer/cs/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="cs">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Aktualizace</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/setupBootloader.xml b/docs/docs/stable/installer/cs/setupBootloader.xml
index e1de2617..c3444e91 100644
--- a/docs/docs/stable/installer/cs/setupBootloader.xml
+++ b/docs/docs/stable/installer/cs/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="cs" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="cs" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Zaváděcí program</title>
   </info>
-
   <section>
     <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
@@ -81,19 +56,15 @@ 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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Základní nastavení zaváděcího programu</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Zabezpečení</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Heslo</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Heslo (znovu)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Povolit ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Povolit SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Povolit APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Povolit lokální APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Nastavení zaváděcího programu</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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Výchozí</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video režim</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Neměnit ESP nebo MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Další volby</title>
-
     <section>
       <title>Použití už existujícího zavaděče</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/DrakLive.xml b/docs/docs/stable/installer/eo/DrakLive.xml
index 54ae3f45..8bcb3071 100644
--- a/docs/docs/stable/installer/eo/DrakLive.xml
+++ b/docs/docs/stable/installer/eo/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
@@ -75,7 +78,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml b/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
index 1e71f1c6..efb5c285 100644
--- a/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
@@ -22,7 +22,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
 <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
   <section>
-    <title>Introduction</title>
+    <title>Enkonduko</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
     <para>There are three types of installation media:</para>
diff --git a/docs/docs/stable/installer/eo/addUser.xml b/docs/docs/stable/installer/eo/addUser.xml
index cbf45996..83edfc08 100644
--- a/docs/docs/stable/installer/eo/addUser.xml
+++ b/docs/docs/stable/installer/eo/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/eo/bootLive.xml b/docs/docs/stable/installer/eo/bootLive.xml
index 544dcea9..707de9ef 100644
--- a/docs/docs/stable/installer/eo/bootLive.xml
+++ b/docs/docs/stable/installer/eo/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" 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" xml:lang="eo">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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> <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"/> </imageobject>
-
+      <imageobject> <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/eo/configureX_card_list.xml b/docs/docs/stable/installer/eo/configureX_card_list.xml
index e7f485d6..c0b036f7 100644
--- a/docs/docs/stable/installer/eo/configureX_card_list.xml
+++ b/docs/docs/stable/installer/eo/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eo"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Vendinto</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/eo/configureX_chooser.xml b/docs/docs/stable/installer/eo/configureX_chooser.xml
index 2964adb2..8e377ad6 100644
--- a/docs/docs/stable/installer/eo/configureX_chooser.xml
+++ b/docs/docs/stable/installer/eo/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eo" 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">Konfiguri X, grafik-karton kaj monitoron</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/eo/configureX_monitor.xml b/docs/docs/stable/installer/eo/configureX_monitor.xml
index a16a2d78..06f7620a 100644
--- a/docs/docs/stable/installer/eo/configureX_monitor.xml
+++ b/docs/docs/stable/installer/eo/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eo" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa2">Subdiskigo</term>
+      <term revision="1" xml:id="configureX_monitor-pa2">Akomodata</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendinto</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Genera</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/eo/diskPartitioning.xml b/docs/docs/stable/installer/eo/diskPartitioning.xml
index 77bcd2fe..de9fdc1c 100644
--- a/docs/docs/stable/installer/eo/diskPartitioning.xml
+++ b/docs/docs/stable/installer/eo/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Subdiskigante</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/eo/diskdrake.xml b/docs/docs/stable/installer/eo/diskdrake.xml
index ad59994b..31023ce6 100644
--- a/docs/docs/stable/installer/eo/diskdrake.xml
+++ b/docs/docs/stable/installer/eo/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/eo/doPartitionDisks.xml b/docs/docs/stable/installer/eo/doPartitionDisks.xml
index a465f50d..72a45196 100644
--- a/docs/docs/stable/installer/eo/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/eo/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ nova Mageja instalo.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko
-devas esti "pura", tio estas Vindozo devis fermiĝi senprobleme la lastan
-fojon kiam ĝi estis uzita. Ĝi ankaŭ devas esti malfragmentiĝita kvankam tio
-ne estas garantio pri tio ke ĉiuj dosieroj en la subdisko estis movitaj el
-la areo uzota. Estas ege rekomendinde realigi sekurec-kopion de viaj
-personaj dosieroj.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -107,12 +120,6 @@ fiksita(j)  disko(j).</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/eo/firewall.xml b/docs/docs/stable/installer/eo/firewall.xml
index 000b3001..7bbeef89 100644
--- a/docs/docs/stable/installer/eo/firewall.xml
+++ b/docs/docs/stable/installer/eo/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="eo" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/25 apb: Added xreflabel for this section.-->
-<title xml:id="firewall-ti1">Firewall</title>
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+<title xml:id="firewall-ti1">Fajromuro (Firewall)</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/eo/installUpdates.xml b/docs/docs/stable/installer/eo/installUpdates.xml
index a96fb4d2..a4bf3deb 100644
--- a/docs/docs/stable/installer/eo/installUpdates.xml
+++ b/docs/docs/stable/installer/eo/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="eo">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Ĝisdatigoj</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/installer.xml b/docs/docs/stable/installer/eo/installer.xml
index e7dc4af6..3ce7d27b 100644
--- a/docs/docs/stable/installer/eo/installer.xml
+++ b/docs/docs/stable/installer/eo/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, la instalilo de Magejo</title>
   </info>
 
diff --git a/docs/docs/stable/installer/eo/reboot.xml b/docs/docs/stable/installer/eo/reboot.xml
index 8015ff6c..c21a8202 100644
--- a/docs/docs/stable/installer/eo/reboot.xml
+++ b/docs/docs/stable/installer/eo/reboot.xml
@@ -2,7 +2,7 @@
   <!--Lebarhon 20170210 updated for Mageia6-->
 <!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
-    <title xml:id="reboot-ti1">Reboot</title>
+    <title xml:id="reboot-ti1">Restarto</title>
   </info>
   
   
diff --git a/docs/docs/stable/installer/eo/setupBootloader.xml b/docs/docs/stable/installer/eo/setupBootloader.xml
index 961314c8..22c8cbe3 100644
--- a/docs/docs/stable/installer/eo/setupBootloader.xml
+++ b/docs/docs/stable/installer/eo/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="eo" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Startŝargilo</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Lanĉilaj ĉefaj elektoj</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Aliaj opcioj</title>
     <section>
       <title>Uzi ekzistantan lanĉilon</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/soundConfig.xml b/docs/docs/stable/installer/eo/soundConfig.xml
index e22567ca..c172100d 100644
--- a/docs/docs/stable/installer/eo/soundConfig.xml
+++ b/docs/docs/stable/installer/eo/soundConfig.xml
@@ -7,7 +7,7 @@
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="soundConfig-ti1">Sound Configuration</title>
+    <title xml:id="soundConfig-ti1">Sonoagordo</title>
   </info>
 
   
diff --git a/docs/docs/stable/installer/es/DrakLive.xml b/docs/docs/stable/installer/es/DrakLive.xml
index ee313ac9..1ffde448 100644
--- a/docs/docs/stable/installer/es/DrakLive.xml
+++ b/docs/docs/stable/installer/es/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalación desde un medio LIVE</title>
 
     <cover>
@@ -76,7 +79,9 @@ documentación</link> si quiere ayudar a mejorar este manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/es/installUpdates.xml b/docs/docs/stable/installer/es/installUpdates.xml
index 83ce77f5..c7f1468b 100644
--- a/docs/docs/stable/installer/es/installUpdates.xml
+++ b/docs/docs/stable/installer/es/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Actualizaciones</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Desde que se lanzó esta versión de Mageia, algunos paquetes se habrán
+  <para revision="1" xml:id="installUpdates-pa1">Desde que se lanzó esta versión de Mageia, algunos paquetes se habrán
 actualizado o mejorado.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Seleccione "Sí" si desea descargarlos e instalarlos.</para>
+      <para revision="1" xml:id="installUpdates-pa2">Seleccione "Sí" si desea descargarlos e instalarlos.</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ está conectado a Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Pulse <emphasis>Siguiente</emphasis> para continuar</para>
+      <para revision="1" xml:id="installUpdates-pa3">Pulse <emphasis>Siguiente</emphasis> para continuar</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/setupBootloader.xml b/docs/docs/stable/installer/es/setupBootloader.xml
index d77e0ed0..1e6b2d1a 100644
--- a/docs/docs/stable/installer/es/setupBootloader.xml
+++ b/docs/docs/stable/installer/es/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="es" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="es" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,42 +22,34 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Cargador de arranque</title>
   </info>
-
   <section>
     <title>Cargadores de arranque disponibles</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 en sistemas MBR / GPT antiguos</emphasis></para>
-
         <listitem>
           <para>GRUB2 (con o sin menú gráfico) se utilizará exclusivamente como cargador de
 arranque para un sistema Legacy/MBR o Legacy/GPT.</para>
         </listitem>
-
         <listitem>
           <para>De forma predeterminada, se escribirá un nuevo cargador de arranque en el
 MBR (Registro de arranque maestro) de su primer disco duro o en la partición
 de arranque del BIOS.</para>
         </listitem>
       </itemizedlist>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2-efi en sistemas UEFI</emphasis></para>
-
         <listitem>
           <para>GRUB2-efi o rEFInd puede usarse como gestor de arranque para un sistema
 UEFI.</para>
         </listitem>
-
         <listitem>
           <para>De forma predeterminada, un nuevo cargador de arranque (Grub2-efi) se
 escribirá en el ESP (partición del sistema EFI).</para>
-
           <para>Si ya hay instalados sistemas operativos basados en UEFI en su computadora
 (Windows 8, por ejemplo), el instalador de Mageia detectará el ESP existente
 creado por Windows y le agregará grub2-efi. Si no existe ESP, se creará
@@ -83,20 +58,16 @@ independientemente de la cantidad de sistemas operativos que tenga.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd en sistemas UEFI</emphasis></para>
-
         <listitem>
           <para>rEFInd tiene un buen conjunto gráfico de opciones y puede detectar
 automáticamente los cargadores de arranque EFI instalados. Véase:
 http://www.rodsbooks.com/refind/</para>
         </listitem>
       </itemizedlist>
-
       <note>
         <para>Tenga en cuenta que para poder utilizar la opción <literal>rEFInd</literal>,
 una partición del sistema EFI instalada debe coincidir con la arquitectura
@@ -106,67 +77,53 @@ estará disponible para usted.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Configuración del cargador de arranque.</title>
     </info>
-
     <section>
       <title>Opciones principales del cargador de arranque</title>
-
       <mediaobject>
-<imageobject condition="classical"><imagedata align="center"
-fileref="dx2-setupBootloader.png"/></imageobject><imageobject
-condition="live"><imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/></imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Cargador de arranque a usar</emphasis></para>
-
           <itemizedlist>
             <listitem>
               <para><guimenuitem>GRUB2</guimenuitem>(con un menú gráfico o de texto), se puede
 elegir para tanto sistemas <literal>MBR/BIOS antiguos</literal> como
 sistemas <literal>UEFI</literal>.</para>
             </listitem>
-
             <listitem>
               <para><guimenuitem>rEFInd</guimenuitem> (con un menú gráfico) es una opción
 alternativa únicamente para usar en sistemas <literal>UEFI</literal>.</para>
             </listitem>
           </itemizedlist>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Dispositivo de arranque</emphasis></para>
-
           <warning>
             <para>No cambie esto a menos que realmente sepa lo que está haciendo.</para>
           </warning>
-
           <note>
             <para>No hay opción para escribir GRUB en el sector de arranque de una partición
 (ej: <filename>sda1</filename>), ya que este método se considera poco
 fiable.</para>
           </note>
-
           <para>Cuando se utiliza el modo UEFI, el <guilabel>dispositivo de
 arranque</guilabel> aparecerá como <guimenuitem>Partición de Sistema
 EFI</guimenuitem>.</para>
         </listitem>
-
         <listitem>
           <para>1</para>
-
           <para>Este cuadro de texto le permite establecer un retraso, en segundos, antes de
 que se inicie el sistema operativo predeterminado.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Seguridad</emphasis></para>
-
           <para>Esto le permite establecer una contraseña para el cargador de arranque. Esto
 significa que se requerirá un nombre de usuario y una contraseña al iniciar
 para poder seleccionar una entrada de inicio o cambiar la
@@ -174,27 +131,20 @@ configuración. Esto es opcional, y es probable que la mayoría de las
 personas no lo necesiten. El nombre de usuario es root y la contraseña es la
 que se elige a continuación.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Contraseña</emphasis></para>
-
           <para>Elija una contraseña para el cargador de arranque (opcional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Contraseña (otra vez)</emphasis></para>
-
           <para>Vuelva a escribir la contraseña y DrakX verificará que coincida con la
 establecida arriba</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Avanzado</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Habilitar ACPI</emphasis></para>
-
           <para>ACPI (Configuración avanzada e interfaz de energía) es un estándar para la
 administración de energía. Puede ahorrar energía al detener los dispositivos
 no utilizados. Deseleccionarlo podría ser útil si, por ejemplo, su equipo no
@@ -202,122 +152,110 @@ es compatible con ACPI o si cree que la implementación de ACPI podría causar
 algunos problemas (por ejemplo, reinicios aleatorios o bloqueos del
 sistema).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Activar SMP</emphasis></para>
-
           <para>Esta opción habilita/deshabilita el multiprocesamiento simétrico para
 procesadores multi-core</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Activar APIC</emphasis></para>
-
           <para>Al habilitar esto, el sistema operativo tiene acceso al controlador de
 interrupción programable avanzado. Los dispositivos APIC permiten modelos de
 prioridad más complejos, y administración avanzada de IRQ (solicitud de
 interrupción).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Habilitar APIC local</emphasis></para>
-
           <para>Aquí puede establecer Local APIC, que administra todas las interrupciones
 externas para un procesador específico en un sistema SMP</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Configuración del cargador de arranque</title>
-
       <para>Si, en la sección anterior, seleccionó<literal>rEFInd</literal> como el
 gestor de arranque, se le presentarán las opciones que se muestran en la
 captura de pantalla directamente debajo. De lo contrario, pase a la
 siguiente captura de pantalla para ver sus opciones.</para>
-
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
 fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+      <para>Sus opciones de configuración de rEFInd:</para>
       <itemizedlist>
-        <para>Sus opciones de configuración de rEFInd:</para>
-
         <listitem>
-          <para><guimenuitem>Instalar o actualizar rEFInd en la partición del sistema
-EFI.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
         </listitem>
-
         <listitem>
-          <para><guimenuitem>Instalar en la partición EFI / Boot (solución para algunas
-BIOS) .1</guimenuitem></para>
-
-          <para>Con algunas BIOS, no se reconocerá el gestor de arranque recién escrito para
-Mageia al final de la instalación. En ese caso, puede usar esta opción como
-solución del problema.</para>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para>Si no seleccionó rEFInd como el gestor de arranque para usar en la sección
-anterior, las configuraciones de su gestor de arranque se muestran a
-continuación:</para>
-
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
-<imageobject condition="classical"><imagedata align="center"
-fileref="dx2-setupBootloader3.png"/></imageobject><imageobject
-condition="live"><imagedata align="center"
-fileref="live-setupBootloader3.png"/></imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Por defecto</emphasis></para>
-
           <para>El sistema operativo se inicia de forma predeterminada.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Adjuntar</emphasis></para>
-
           <para>Esta opción le permite pasar información al kernel o decirle al kernel que
 le brinde más información mientras arranca.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Sondeo SO distinto</emphasis></para>
-
           <para>Si ya tiene otros sistemas operativos instalados, Mageia intenta agregarlos
 a su nuevo menú de inicio de Mageia. Si no desea este comportamiento,
 desmarque la opción <guimenuitem>Listar otros OS</guimenuitem>.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Avanzado</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"><imagedata align="center"
-fileref="dx2-setupBootloader4.png"/></imageobject><imageobject
-condition="live"><imagedata align="center"
-fileref="live-setupBootloader4.png"/></imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para>Modo de vídeo</para>
-
           <para>Esto establece el tamaño de la pantalla y la profundidad del color que se
 utilizará en el menú de inicio. Si hace clic en el triángulo hacia abajo, se
 le ofrecerán otras opciones de tamaño y profundidad de color.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>No toque ni ESP ni MBR</emphasis></para>
-
           <para>Seleccione esta opción si no desea un Mageia de arranque, sino que prefiere
 cargarlo en cadena desde otro sistema operativo. Recibirá una advertencia de
 que falta el gestor de arranque. Haga clic en <guimenuitem>Ok </guimenuitem>
 solo si está seguro de comprender las implicaciones y desea continuar.</para>
-
           <warning>
             <para>Mageia ya no admite la carga en cadena a través de cargadores de arranque
 antiguos (GRUB Legacy y LiLo), ya que es probable que falle al intentar
@@ -326,36 +264,28 @@ GRUB2 o rEFInd para este propósito, ¡es bajo su propia responsibilidad!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject><imagedata align="center"
-fileref="live-setupBootloader5.png"/></imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Otras opciones</title>
-
     <section>
       <title>Usando un cargador de arranque existente</title>
-
-      <para>El procedimiento exacto para agregar Mageia a un cargardor de arranque
-existente está fuera del alcance de esta documentación. Sin embargo, en la
-mayoría de los casos implicará ejecutar el programa de instalación del
-cargador de arranque correspondiente, que debería detectar Mageia y agregar
-automáticamente una entrada para él en el menú del cargador de
-arranque. Consulte la documentación del sistema operativo correspondiente.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Instalación sin un cargador de arranque</title>
-
       <para>Si bien puede optar por instalar Mageia sin un cargador de arranque
 (consulte la sección 2.1 Avanzado), esto no se recomienda a menos que sepa
 absolutamente lo que está haciendo, ya que sin algún tipo de cargador de
 arranque su sistema operativo no podrá iniciar.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/DrakLive.xml b/docs/docs/stable/installer/eu/DrakLive.xml
index 4a066be9..18b803aa 100644
--- a/docs/docs/stable/installer/eu/DrakLive.xml
+++ b/docs/docs/stable/installer/eu/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>LIVE euskarriko instalazioa</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml b/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
index 23f01df2..9e571f0b 100644
--- a/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
@@ -68,8 +68,8 @@ DVD drive or is unable to boot from a USB stick.</para>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
 install and/or update Mageia and, by extension, any physical medium (DVD,
 USB stick, ...) the ISO file is copied to.</para>
-      <para>You can find Mageia ISO's <link
-ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
+      <para>Mageia-ren ISO-ak <link
+ns4:href="http://www.mageia.org/en/downloads/">hemen</link> aurki ditzakezu.</para>
     </section>
     <section>
       <title>Instalazioa Klasiko baliabidea</title>
@@ -167,7 +167,7 @@ it</para>
       </section>
     </section>
     <section>
-      <title>Net install media</title>
+      <title>Sare instalatze hedabidea</title>
       <section>
         <title>Ezaugarri komunak</title>
         <itemizedlist>
@@ -247,7 +247,7 @@ path/to/the/image/file.iso</command></para>
 path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para>Example:</para>
+      <para>Adibidea:</para>
       <mediaobject>
 <imageobject> <imagedata align="center" fileref="Md5sum.png"/>
 </imageobject></mediaobject>
@@ -300,8 +300,8 @@ bezalako tresna grafiko bat erabil dezakezu</para>
 "ISO image" option</para>
           </listitem>
           <listitem>
-            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
-Imager</link></para>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disko
+Irudi bat</link></para>
           </listitem>
         </itemizedlist>
       </section>
diff --git a/docs/docs/stable/installer/eu/addUser.xml b/docs/docs/stable/installer/eu/addUser.xml
index 72d76741..9fd20b5f 100644
--- a/docs/docs/stable/installer/eu/addUser.xml
+++ b/docs/docs/stable/installer/eu/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -68,7 +76,7 @@ computer for.</para>
       </listitem>
 
       <listitem>
-        <para><emphasis role="bold">Real Name</emphasis></para>
+        <para><emphasis role="bold">Benetako Izena</emphasis></para>
 
         <para>Insert the user's real name into this text box</para>
       </listitem>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/eu/bestTime.xml b/docs/docs/stable/installer/eu/bestTime.xml
index 2b052f32..e28848b4 100644
--- a/docs/docs/stable/installer/eu/bestTime.xml
+++ b/docs/docs/stable/installer/eu/bestTime.xml
@@ -4,7 +4,7 @@
   <info>
     <!--2018/03/01 apb: Slight adjustment to text-->
 <!--2018/03/03/ apb: Redo definition for the Advanced option,-->
-<title xml:id="bestTime-ti1">Clock Settings</title>
+<title xml:id="bestTime-ti1">Erloju Ezarpenak</title>
   </info>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" align="center"
diff --git a/docs/docs/stable/installer/eu/bootLive.xml b/docs/docs/stable/installer/eu/bootLive.xml
index 5646d9f2..1ea5278b 100644
--- a/docs/docs/stable/installer/eu/bootLive.xml
+++ b/docs/docs/stable/installer/eu/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" 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" xml:lang="eu">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Abiatu Mageia Zuzeneko sistema bezala</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Euskarria abiarazten</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">BIOS/CSM/Legacy moduan</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Lehen pantaila BIOS moduan abiarazten den bitartean</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">UEFI moduan</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/eu/choosePackageGroups.xml b/docs/docs/stable/installer/eu/choosePackageGroups.xml
index cf6d95da..c6d317d1 100644
--- a/docs/docs/stable/installer/eu/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/eu/choosePackageGroups.xml
@@ -20,15 +20,15 @@ become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para><emphasis role="bold">Workstation</emphasis></para>
+      <para><emphasis role="bold">Lanpostua</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Server</emphasis></para>
+      <para><emphasis role="bold">Zerbitzaria</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Graphical Environment</emphasis></para>
+      <para><emphasis role="bold">Ingurune Grafikoa</emphasis></para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/eu/configureX_card_list.xml b/docs/docs/stable/installer/eu/configureX_card_list.xml
index 42ba318e..e2a9fa64 100644
--- a/docs/docs/stable/installer/eu/configureX_card_list.xml
+++ b/docs/docs/stable/installer/eu/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eu"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Aukeratu X zerbitzari bat (Konfiguratu Txartel Grafikoa)</title>
   </info>
 
@@ -42,7 +46,7 @@ behar bezala identifikatuko du.</para>
   <para>Instalatzaileak ez du behar bezala zure txartel grafikoa detektatu, eta zein
 duzun baldin badakizu, hautatu ahal izango duzu zuhaitzean: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Hornitzailea</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/eu/configureX_chooser.xml b/docs/docs/stable/installer/eu/configureX_chooser.xml
index c4799d65..89cd994d 100644
--- a/docs/docs/stable/installer/eu/configureX_chooser.xml
+++ b/docs/docs/stable/installer/eu/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eu" 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">Txartel Grafikoa eta Pantaila Konfigurazioa</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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>
@@ -77,7 +80,7 @@ settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Aukerak</emphasis></para>
 
       <para>Here you can choose to enable or disable various options.</para>
     </listitem>
diff --git a/docs/docs/stable/installer/eu/configureX_monitor.xml b/docs/docs/stable/installer/eu/configureX_monitor.xml
index 3f3a45aa..0d3f915d 100644
--- a/docs/docs/stable/installer/eu/configureX_monitor.xml
+++ b/docs/docs/stable/installer/eu/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eu" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Aukeratu zure Pantaila</title>
   </info>
 
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+      <term revision="1" xml:id="configureX_monitor-pa2">Pertsonalizatua</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -69,18 +75,18 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Hornitzailea</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Instalatzaileak ez du behar bezala zure pantaila detektatu, eta zein duzun
-baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
 
   <itemizedlist>
     <listitem>
-      <para>Manufacturer</para>
+      <para>Fabrikatzailea</para>
     </listitem>
 
     <listitem>
@@ -90,14 +96,15 @@ baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generikoa</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/eu/diskPartitioning.xml b/docs/docs/stable/installer/eu/diskPartitioning.xml
index 93a9565f..788028d3 100644
--- a/docs/docs/stable/installer/eu/diskPartitioning.xml
+++ b/docs/docs/stable/installer/eu/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partizioa egiten</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/eu/diskdrake.xml b/docs/docs/stable/installer/eu/diskdrake.xml
index a801dad4..42a92e98 100644
--- a/docs/docs/stable/installer/eu/diskdrake.xml
+++ b/docs/docs/stable/installer/eu/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>EFI sistema partizioa</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/eu/doPartitionDisks.xml b/docs/docs/stable/installer/eu/doPartitionDisks.xml
index 6b36684f..96902e28 100644
--- a/docs/docs/stable/installer/eu/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/eu/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -50,7 +56,7 @@ fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
     <title>Main Options</title>
 
     <listitem>
-      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Erabili Dauden Partizioak</emphasis></para>
 
       <para revision="1" xml:id="doPartitionDisks-pa5">Aukera hori eskuragarri badago, orduan Linux partizioak bateragarria aurkitu
 egin dira eta instalazioa erabili ahal izango du.</para>
@@ -68,14 +74,30 @@ erabiliko da zure Mageia instalazio berriarentzat.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Kontutan prozedura hori dakar Windows partizioaren tamaina
-murrizteko. Partizio honek "garbi " egon beharko du, hau da, Windows azken
-aldiz erabili denean ondo itxita egon behar du. Halaber desfragmentatuta
-egon behar du, baina horrek ez du bermatzen partizioko fitxategi guztiak
-mugitu egin direla erabiliko den eremutik kanpo. Hori dela eta, Guztiz
-gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -107,12 +120,6 @@ gogorrean.</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/eu/firewall.xml b/docs/docs/stable/installer/eu/firewall.xml
index 4bd68a74..c67f850b 100644
--- a/docs/docs/stable/installer/eu/firewall.xml
+++ b/docs/docs/stable/installer/eu/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="eu" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Suhesia</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ service.</member>
 
   <para>Bi protokoloak erabiltzeko zerbitzu bat martxan jartzen denean, 2 bikote
 zehazten dira portu bererako.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/installUpdates.xml b/docs/docs/stable/installer/eu/installUpdates.xml
index 74d77a66..3d0f4c06 100644
--- a/docs/docs/stable/installer/eu/installUpdates.xml
+++ b/docs/docs/stable/installer/eu/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="eu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Eguneraketak</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/installer.xml b/docs/docs/stable/installer/eu/installer.xml
index c7fd4add..4a3a9e9f 100644
--- a/docs/docs/stable/installer/eu/installer.xml
+++ b/docs/docs/stable/installer/eu/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, Mageia Instalatzilea</title>
   </info>
 
@@ -124,7 +127,7 @@ operations. Reboot to end the test.</para>
         </listitem>
 
         <listitem>
-          <para><emphasis role="bold">F2: Language</emphasis></para>
+          <para><emphasis role="bold">F2: Hizkuntza</emphasis></para>
 
           <para>Press F2 for alternative languages.</para>
         </listitem>
diff --git a/docs/docs/stable/installer/eu/misc-params.xml b/docs/docs/stable/installer/eu/misc-params.xml
index 4cd24a6d..8b6fc5b9 100644
--- a/docs/docs/stable/installer/eu/misc-params.xml
+++ b/docs/docs/stable/installer/eu/misc-params.xml
@@ -136,7 +136,7 @@ can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Interfaze grafikoak</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
 more information, see <xref linkend="configureX_chooser"/></para>
@@ -172,7 +172,7 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxiak</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
 Internet.  This section allows you to configure your computer to utilize a
@@ -199,7 +199,7 @@ your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Suebaki</emphasis></para>
 
         <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
 your computer. The safe and secure default is to allow ZERO inbound
diff --git a/docs/docs/stable/installer/eu/securityLevel.xml b/docs/docs/stable/installer/eu/securityLevel.xml
index d81ed7fc..81a624d5 100644
--- a/docs/docs/stable/installer/eu/securityLevel.xml
+++ b/docs/docs/stable/installer/eu/securityLevel.xml
@@ -31,7 +31,7 @@ the average user.</para>
   <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
 instance if the system is to be used as a public server.</para>
 
-  <para><emphasis role="bold">Security Administrator</emphasis></para>
+  <para><emphasis role="bold">Segurtasun administratzailea</emphasis></para>
 
   <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
diff --git a/docs/docs/stable/installer/eu/selectKeyboardLive.xml b/docs/docs/stable/installer/eu/selectKeyboardLive.xml
index fa4641e4..ae393e4e 100644
--- a/docs/docs/stable/installer/eu/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/eu/selectKeyboardLive.xml
@@ -13,7 +13,7 @@
   <info>
     <!--2018/03/01 apb: Slight adjustment to text-->
 <!--2018/03/20 apb: Adjustment to text-->
-<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
+<title xml:id="selectKeyboardLive-ti1">Aukeratu Teklatua</title>
   </info>
 
   <mediaobject>
diff --git a/docs/docs/stable/installer/eu/setupBootloader.xml b/docs/docs/stable/installer/eu/setupBootloader.xml
index 74750809..37559187 100644
--- a/docs/docs/stable/installer/eu/setupBootloader.xml
+++ b/docs/docs/stable/installer/eu/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="eu" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Abio zamatzailea</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Abio kargatzailearen aukera nagusiak</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
-      <para><emphasis>Advanced</emphasis></para>
-
+      <para><emphasis>Aurreratuak</emphasis></para>
       <itemizedlist>
         <listitem>
-          <para><emphasis>Enable ACPI</emphasis></para>
-
+          <para><emphasis>Gaitu ACPI</emphasis></para>
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Abio zamatzailearen konfiguraketa</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para><emphasis>Advanced</emphasis></para>
-
+      <para><emphasis>Aurreratuak</emphasis></para>
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Beste aukera batzuk</title>
     <section>
       <title>Existitzen den abio kargatzaile bat erabiliz</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/software.xml b/docs/docs/stable/installer/eu/software.xml
index 6137a4a8..26acf331 100644
--- a/docs/docs/stable/installer/eu/software.xml
+++ b/docs/docs/stable/installer/eu/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Euskarri hautaketa</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/fr/DrakLive.xml b/docs/docs/stable/installer/fr/DrakLive.xml
index 7cd63bae..e6b4395b 100644
--- a/docs/docs/stable/installer/fr/DrakLive.xml
+++ b/docs/docs/stable/installer/fr/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation à partir du médium LIVE</title>
 
     <cover>
@@ -77,7 +80,9 @@ documentation</link>.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/fr/installUpdates.xml b/docs/docs/stable/installer/fr/installUpdates.xml
index 1292aea2..ba0bda20 100644
--- a/docs/docs/stable/installer/fr/installUpdates.xml
+++ b/docs/docs/stable/installer/fr/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Mises à jour</title>
   </info>
 
   <mediaobject>
-<imageobject><imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/></imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Depuis la publication de cette version de Mageia, un certain nombre de
+  <para revision="1" xml:id="installUpdates-pa1">Depuis la publication de cette version de Mageia, un certain nombre de
 paquets ont été mis à jour ou améliorés.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Sélectionnez <emphasis>Oui</emphasis> si vous voulez les télécharger et les
+      <para revision="1" xml:id="installUpdates-pa2">Sélectionnez <emphasis>Oui</emphasis> si vous voulez les télécharger et les
 installer</para>
     </listitem>
 
@@ -41,7 +54,7 @@ n'êtes pas connecté à Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Appuyez sur <emphasis>Suivant</emphasis> pour continuer</para>
+      <para revision="1" xml:id="installUpdates-pa3">Appuyez sur <emphasis>Suivant</emphasis> pour continuer</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/setupBootloader.xml b/docs/docs/stable/installer/fr/setupBootloader.xml
index 17e3d4ce..204223b7 100644
--- a/docs/docs/stable/installer/fr/setupBootloader.xml
+++ b/docs/docs/stable/installer/fr/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="fr" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="fr" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,42 +22,34 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Programme d'amorçage</title>
   </info>
-
   <section>
     <title>Programmes d'amorçage disponibles</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 pour systèmes Legacy MBR/GPT</emphasis></para>
-
         <listitem>
           <para>GRUB2 (avec ou sans menu graphique) sera utilisé pour un système MBR/Legacy
 ou GPT/Legacy</para>
         </listitem>
-
         <listitem>
           <para>Par défaut, un nouveau programme d'amorçage sera écrit soit dans le MBR
 (Master Boot Record) de votre disque dur, soit dans la partition BIOS
 d'amorçage.</para>
         </listitem>
       </itemizedlist>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2-efi pour systèmes UEFI</emphasis></para>
-
         <listitem>
           <para>Grub2-efi ou rEFInd peuvent être utilisés comme gestionnaire d'amorçage pour
 un système UEFI.</para>
         </listitem>
-
         <listitem>
           <para>Par défaut, un nouveau programme d'amorçage (Grub2-efi) sera écrit dans
 l'ESP (Partition de système EFI).</para>
-
           <para>S'il y a déjà des systèmes d'exploitation UEFI installés sur votre
 ordinateur (Windows 8 par exemple), l'installeur Mageia détecte l'ESP
 existante créée par Windows et ajoute grub2-efi. Bien qu'il soit possible
@@ -83,20 +58,16 @@ systèmes d'exploitation installés.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd pour systèmes UEFI</emphasis></para>
-
         <listitem>
           <para>rEFInd dispose d'une belle collection d'options graphiques, et peut détecter
 seul des programmes d'amorçage EFI déjà installés. Voir
 http://www.rodsbooks.com/refind/</para>
         </listitem>
       </itemizedlist>
-
       <note>
         <para>Veuillez noter que pour utiliser l'option <literal>rEFInd</literal>, la
 partition EFI doit avoir la même architecture que votre système : par
@@ -105,68 +76,54 @@ exemple, si vous avez une partition EFI 32bits installée sur une machine
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Configuration du programme d'amorçage</title>
     </info>
-
     <section>
       <title>Principales options du chargeur de démarrage</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Gestionnaire d'amorçage à utiliser</emphasis></para>
-
           <itemizedlist>
             <listitem>
               <para><guimenuitem>GRUB2</guimenuitem> (en mode graphique ou texte) peut être
 choisi aussi bien pour des systèmes avec <literal>Legacy MBR/BIOS</literal>
 que sur des systèmes <literal>UEFI</literal>.</para>
             </listitem>
-
             <listitem>
               <para><guimenuitem>rEFInd</guimenuitem> (avec un menu graphique) est une option
 qui ne peut être utilisée que sur des systèmes <literal>UEFI</literal>.</para>
             </listitem>
           </itemizedlist>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Périphérique d'amorçage</emphasis></para>
-
           <warning>
             <para>Ne modifiez rien ici, à moins que vous ne sachiez réellement ce que vous
 faites.</para>
           </warning>
-
           <note>
             <para>Il est impossible d'écrire GRUB sur le secteur de démarrage d'une partition
 (par ex. <filename>sda1</filename>), car cette méthode n'est pas considérée
 comme fiable.</para>
           </note>
-
           <para>En mode UEFI, le <guilabel>périphérique de démarrage</guilabel> apparaitra
 dans la liste en tant que <guimenuitem>Partition système EFI</guimenuitem>.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Délai avant le démarrage sur le système par
 défaut</emphasis></para>
-
           <para>Cette boîte de dialogue vous permet de définir le délai, en seconde, avant
 le démarrage du système d'exploitation par défaut.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Sécurité</emphasis></para>
-
           <para>Il est possible ici d'établir un mot de passe pour le programme
 d'amorçage. Dans ce cas, un nom d'utilisateur et un mot de passe seront
 demandés au démarrage pour sélectionner une entrée ou modifier sa
@@ -174,27 +131,20 @@ configuration. Ceci est optionnel, et la plupart des utilisateurs n'en aura
 probablement pas besoin. Le nom d'utilisateur est <literal>root</literal> et
 le mot de passe est celui défini ci-après.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Mot de passe</emphasis></para>
-
           <para>Choisissez un mot de passe pour le programme d'amorçage (optionnel)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Mot de passe (vérification)</emphasis></para>
-
           <para>Entrez à nouveau le mot de passe et DrakX va vérifier qu'il est bien
 identique au précédent. </para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Avancé</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Activer ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) est un standard de gestion
 de l'énergie. Il permet d'économiser de l'énergie en arrêtant des
 périphériques inutilisés. Décocher cette case peut être utile si, par
@@ -202,123 +152,112 @@ exemple, votre matériel n'est pas compatible ACPI ou si vous pensez que
 l'ACPI peut être source de problèmes (comme des redémarrages aléatoires ou
 des blocages).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Activer SMP</emphasis></para>
-
           <para>Cette option active/désactive le multi-processing symétrique pour les
 processeurs multi-cœurs.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Activer APIC</emphasis></para>
-
           <para>Cela donne au système d'exploitation l'accès au Contrôleur Programmable
 Avancé des Interruptions (Advanced Programmable Interrupt Controller). Les
 périphériques APIC autorisent des modèles prioritaires plus complexes et la
 gestion des IRQ (Interrupt Request, Requête d'interruption).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Activer APIC local</emphasis></para>
-
           <para>Il est possible ici d'établir l'APIC local, qui gère toutes les
 interruptions externes pour un processeur spécifique d'un système SMP.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Configuration du programme d'amorçage</title>
-
       <para>Si, dans la partie précédente, vous avez sélectionné le programme d'amorçage
 <literal>rEFInd</literal>, vous accèderez alors aux options visibles dans la
 capture d'écran ci-dessous. Sinon, continuez jusqu'à la capture suivante qui
 montre vos 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>
-
+      <para>Vos options de configuration de rEFInd :</para>
       <itemizedlist>
-        <para>Vos options de configuration de rEFInd :</para>
-
         <listitem>
-          <para><guimenuitem>Installer ou mettre à jour rEFInd dans la partition
-EFI.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
         </listitem>
-
         <listitem>
-          <para><guimenuitem>Installer dans /EFI/BOOT (contournement pour certains
-BIOS).</guimenuitem></para>
-
-          <para>Avec certains BIOS, le programme d'amorçage écrit pour Mageia à la fin de
-l'installation ne sera pas reconnu. Dans ce cas, vous pouvez utiliser cette
-option pour contourner le problème.</para>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para>Si vous n'avez pas choisi rEFInd comme programme d'amorçage dans la partie
-précédente, alors les paramètres de ce dernier se présenteront ainsi :</para>
-
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Choix par défaut</emphasis></para>
-
           <para>Système d'exploitation démarré par défaut.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Ajouter des options</emphasis></para>
-
           <para>Cela permet de passer des informations au noyau ou de lui demander plus
 d'informations lors du démarrage.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Détecter d'autres OS</emphasis></para>
-
           <para>Si vous avez d'autres systèmes d'exploitation installés, Mageia tente de les
 ajouter à votre nouveau menu de démarrage. Si vous ne le souhaitez pas,
 décochez la case <guimenuitem>Détecter d'autres OS</guimenuitem>.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Avancé</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Mode Vidéo</emphasis></para>
-
           <para>Définir ici la taille de l'écran et la profondeur de couleurs qui seront
 utilisés par le menu de démarrage. Si vous cliquez sur le triangle, des
 options supplémentaires de taille d'écran et de profondeur de couleurs vous
 seront proposées.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Ne pas toucher à l'ESP ou au MBR</emphasis></para>
-
           <para>Choisissez cette option si vous ne voulez pas démarrer sur Mageia, mais
 préférez le démarrer à partir d'un autre système d'exploitation. Un message
 d'erreur vous indiquera que le programme d'amorçage est absent. Cliquez sur
 <guimenuitem>Ok</guimenuitem> si vous êtes sûr de comprendre les
 implications et souhaitez quand-même continuer.</para>
-
           <warning>
             <para>Démarrer via des programmes d'amorçage anciens (GRUB Legacy et LiLo) n'est
 plus supporté par Mageia, car le démarrage échouera probablement en fin
@@ -327,36 +266,28 @@ faites-le à vos risques et périls !</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Autres options</title>
-
     <section>
       <title>Utiliser un chargeur de démarrage existant.  </title>
-
-      <para>La procédure correcte pour ajouter votre système Mageia dans un programme de
-démarrage existant dépasse le cadre de cette documentation, néanmoins, dans
-la plupart des cas, cela impliquera d'exécuter le programme d'installation
-du chargeur de démarrage concerné, qui devrait le détecter et l'ajouter
-automatiquement. Voir la documentation du système d'exploitation en
-question.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installer sans programme d'amorçage</title>
-
       <para>Bien que vous puissiez choisir d'installer Mageia sans programme d'amorçage
 (voir la partie 2.1 Avancé), cela n'est pas recommandé à moins que vous
 sachiez parfaitement ce que vous faites, car sans aucun programme
 d'amorçage, votre système d'exploitation ne pourra démarrer.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/DrakLive.xml b/docs/docs/stable/installer/hr/DrakLive.xml
index a9a478c2..71899948 100644
--- a/docs/docs/stable/installer/hr/DrakLive.xml
+++ b/docs/docs/stable/installer/hr/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
@@ -77,7 +80,9 @@ tim</link>, ako želite pomoći u poboljšanju ovog priručnika.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/hr/installUpdates.xml b/docs/docs/stable/installer/hr/installUpdates.xml
index d5086cd4..37336daf 100644
--- a/docs/docs/stable/installer/hr/installUpdates.xml
+++ b/docs/docs/stable/installer/hr/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="hr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Nadogradnje</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/setupBootloader.xml b/docs/docs/stable/installer/hr/setupBootloader.xml
index f2b1a057..3a0e49e6 100644
--- a/docs/docs/stable/installer/hr/setupBootloader.xml
+++ b/docs/docs/stable/installer/hr/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="hr" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Program za pokretanje sustava</title>
   </info>
-
   <section>
     <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
@@ -81,19 +56,15 @@ 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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Glavne postavke bootloadera</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Lozinka</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Podešavanje bootloadera</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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Ostali izbori</title>
-
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/DrakLive.xml b/docs/docs/stable/installer/hu/DrakLive.xml
index 0c428eac..3e33b51f 100644
--- a/docs/docs/stable/installer/hu/DrakLive.xml
+++ b/docs/docs/stable/installer/hu/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Telepítés a LIVE médiumról</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/hu/addUser.xml b/docs/docs/stable/installer/hu/addUser.xml
index 4a38add0..87d6e78e 100644
--- a/docs/docs/stable/installer/hu/addUser.xml
+++ b/docs/docs/stable/installer/hu/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/hu/bootLive.xml b/docs/docs/stable/installer/hu/bootLive.xml
index c21b65f7..eece2dcb 100644
--- a/docs/docs/stable/installer/hu/bootLive.xml
+++ b/docs/docs/stable/installer/hu/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" 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" xml:lang="hu">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Mageia indítása mint Live rendszer</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Betöltés az adathordozóról</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">BIOS/CSM/Legacy módban</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Az első képernyő a BIOS módban történő indítás során</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">UEFI módal</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/hu/configureX_card_list.xml b/docs/docs/stable/installer/hu/configureX_card_list.xml
index 6d4ecf3d..352f6a34 100644
--- a/docs/docs/stable/installer/hu/configureX_card_list.xml
+++ b/docs/docs/stable/installer/hu/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="hu"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Gyártó</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/hu/configureX_chooser.xml b/docs/docs/stable/installer/hu/configureX_chooser.xml
index 4a71407d..d9f7d734 100644
--- a/docs/docs/stable/installer/hu/configureX_chooser.xml
+++ b/docs/docs/stable/installer/hu/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="hu" 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">Videó-kártya és Monitor beállítások</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/hu/configureX_monitor.xml b/docs/docs/stable/installer/hu/configureX_monitor.xml
index b4a9f398..5e7fbe36 100644
--- a/docs/docs/stable/installer/hu/configureX_monitor.xml
+++ b/docs/docs/stable/installer/hu/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="hu" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Monitor kiválasztása</title>
   </info>
 
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+      <term revision="1" xml:id="configureX_monitor-pa2">Egyéni</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -60,7 +66,7 @@ consult your monitor documentation.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug and Play</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Gyártó</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Általános</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/hu/diskPartitioning.xml b/docs/docs/stable/installer/hu/diskPartitioning.xml
index 62016ae3..2ec8d52f 100644
--- a/docs/docs/stable/installer/hu/diskPartitioning.xml
+++ b/docs/docs/stable/installer/hu/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partícionálás</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/hu/diskdrake.xml b/docs/docs/stable/installer/hu/diskdrake.xml
index 042c8afd..6ba5ce7f 100644
--- a/docs/docs/stable/installer/hu/diskdrake.xml
+++ b/docs/docs/stable/installer/hu/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>EFI rendszer partíció</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/hu/doPartitionDisks.xml b/docs/docs/stable/installer/hu/doPartitionDisks.xml
index 01f1035d..1fcc5af7 100644
--- a/docs/docs/stable/installer/hu/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/hu/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ your new Mageia installation.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </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>
@@ -107,12 +120,6 @@ hard drive(s).</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/hu/firewall.xml b/docs/docs/stable/installer/hu/firewall.xml
index cbe683c3..5aafa39e 100644
--- a/docs/docs/stable/installer/hu/firewall.xml
+++ b/docs/docs/stable/installer/hu/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="hu" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Tűzfal</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/hu/installUpdates.xml b/docs/docs/stable/installer/hu/installUpdates.xml
index 7e8d7383..d9318485 100644
--- a/docs/docs/stable/installer/hu/installUpdates.xml
+++ b/docs/docs/stable/installer/hu/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="hu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Frissítések</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hu/installer.xml b/docs/docs/stable/installer/hu/installer.xml
index 2caf7a37..e4d5861c 100644
--- a/docs/docs/stable/installer/hu/installer.xml
+++ b/docs/docs/stable/installer/hu/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, a Mageia telepítő</title>
   </info>
 
diff --git a/docs/docs/stable/installer/hu/setupBootloader.xml b/docs/docs/stable/installer/hu/setupBootloader.xml
index 0404f312..b402980d 100644
--- a/docs/docs/stable/installer/hu/setupBootloader.xml
+++ b/docs/docs/stable/installer/hu/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="hu" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Rendszerbetöltő</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Rendszerindítási beállítások</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Rendszerindító beállítása</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Egyéb beállítások</title>
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/software.xml b/docs/docs/stable/installer/hu/software.xml
index c0ec6656..ad982191 100644
--- a/docs/docs/stable/installer/hu/software.xml
+++ b/docs/docs/stable/installer/hu/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Adathordozó kiválasztása</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/id/DrakLive.xml b/docs/docs/stable/installer/id/DrakLive.xml
index 26d270d1..4e80229a 100644
--- a/docs/docs/stable/installer/id/DrakLive.xml
+++ b/docs/docs/stable/installer/id/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
@@ -75,7 +78,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/id/addUser.xml b/docs/docs/stable/installer/id/addUser.xml
index 38523127..a55ee381 100644
--- a/docs/docs/stable/installer/id/addUser.xml
+++ b/docs/docs/stable/installer/id/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/id/bootLive.xml b/docs/docs/stable/installer/id/bootLive.xml
index 86bc2c3b..1db58c83 100644
--- a/docs/docs/stable/installer/id/bootLive.xml
+++ b/docs/docs/stable/installer/id/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" 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" xml:lang="id">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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> <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"/> </imageobject>
-
+      <imageobject> <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/id/configureX_card_list.xml b/docs/docs/stable/installer/id/configureX_card_list.xml
index 6a138217..73f8c3af 100644
--- a/docs/docs/stable/installer/id/configureX_card_list.xml
+++ b/docs/docs/stable/installer/id/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="id"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Pilih Server X (Konfigurasi Perangkat Grafis Anda)</title>
   </info>
 
diff --git a/docs/docs/stable/installer/id/configureX_chooser.xml b/docs/docs/stable/installer/id/configureX_chooser.xml
index a09011f2..2b36d830 100644
--- a/docs/docs/stable/installer/id/configureX_chooser.xml
+++ b/docs/docs/stable/installer/id/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="id" 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">Konfigurasi Perangkat Grafis dan Monitor</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/id/configureX_monitor.xml b/docs/docs/stable/installer/id/configureX_monitor.xml
index cd08c01c..496906ed 100644
--- a/docs/docs/stable/installer/id/configureX_monitor.xml
+++ b/docs/docs/stable/installer/id/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="id" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Pemilihan Monitor</title>
   </info>
 
@@ -72,9 +78,8 @@ type from the monitor database.</para>
       <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Jika installer tidak mendeteksi monitor Anda dengan benar dan Anda
-mengetahui jenis monitor yang Anda miliki, Anda bisa memilihnya dari pohon
-dengan memilih:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -91,14 +96,15 @@ dengan memilih:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generik</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/id/diskPartitioning.xml b/docs/docs/stable/installer/id/diskPartitioning.xml
index 32a5d70d..03e6d70f 100644
--- a/docs/docs/stable/installer/id/diskPartitioning.xml
+++ b/docs/docs/stable/installer/id/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Pemartisian</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/id/diskdrake.xml b/docs/docs/stable/installer/id/diskdrake.xml
index 6b0f4b00..d9415d74 100644
--- a/docs/docs/stable/installer/id/diskdrake.xml
+++ b/docs/docs/stable/installer/id/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>Sistem Partisi EFI</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/id/doPartitionDisks.xml b/docs/docs/stable/installer/id/doPartitionDisks.xml
index e99fc4af..f79c203a 100644
--- a/docs/docs/stable/installer/id/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/id/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ ini akan menggunakannya untuk menginstall Mageia.</para>
 
       <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>
+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>
@@ -88,14 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Perhatikan bahwa ini akan mengurangi ukuran dari partisi Windows. Partisi
-harus "bersih", maksudnya, Windows harus dimatikan dengan benar saat
-terakhir kali digunakan. Juga harus sudah didefrag, walaupun tidak ada
-jaminan bahwa semua file telah dipindahkan dari area yang akan
-digunakan. Sangat disarankan untuk membuat cadangan semua file pribadi.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -105,12 +119,6 @@ digunakan. Sangat disarankan untuk membuat cadangan semua file pribadi.</para>
     </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>
@@ -183,8 +191,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/id/firewall.xml b/docs/docs/stable/installer/id/firewall.xml
index a6130645..f6d02b6e 100644
--- a/docs/docs/stable/installer/id/firewall.xml
+++ b/docs/docs/stable/installer/id/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="id" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/id/installUpdates.xml b/docs/docs/stable/installer/id/installUpdates.xml
index c31f76c1..761d09e9 100644
--- a/docs/docs/stable/installer/id/installUpdates.xml
+++ b/docs/docs/stable/installer/id/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="id">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Update</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/id/installer.xml b/docs/docs/stable/installer/id/installer.xml
index 601aa2ca..9882eff3 100644
--- a/docs/docs/stable/installer/id/installer.xml
+++ b/docs/docs/stable/installer/id/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, Installer Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/id/setupBootloader.xml b/docs/docs/stable/installer/id/setupBootloader.xml
index 65d38075..b88c91e2 100644
--- a/docs/docs/stable/installer/id/setupBootloader.xml
+++ b/docs/docs/stable/installer/id/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="id" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Pilihan utama Bootloader</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Konfigurasi Bootloader</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Opsi Lain</title>
     <section>
       <title>Gunakan bootloader yang ada</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/software.xml b/docs/docs/stable/installer/id/software.xml
index dea9f35b..ef7b3eac 100644
--- a/docs/docs/stable/installer/id/software.xml
+++ b/docs/docs/stable/installer/id/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Pemilihan Media</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/it/DrakLive.xml b/docs/docs/stable/installer/it/DrakLive.xml
index 260bf469..47030d3b 100644
--- a/docs/docs/stable/installer/it/DrakLive.xml
+++ b/docs/docs/stable/installer/it/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/it/addUser.xml b/docs/docs/stable/installer/it/addUser.xml
index c062fee6..e63b4725 100644
--- a/docs/docs/stable/installer/it/addUser.xml
+++ b/docs/docs/stable/installer/it/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/it/bootLive.xml b/docs/docs/stable/installer/it/bootLive.xml
index 7c54eb23..cff9c00d 100644
--- a/docs/docs/stable/installer/it/bootLive.xml
+++ b/docs/docs/stable/installer/it/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" 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" xml:lang="it">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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> <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"/> </imageobject>
-
+      <imageobject> <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/it/configureX_card_list.xml b/docs/docs/stable/installer/it/configureX_card_list.xml
index e4b50f2a..8d97b23b 100644
--- a/docs/docs/stable/installer/it/configureX_card_list.xml
+++ b/docs/docs/stable/installer/it/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="it"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Scegli un server X (configura la tua scheda video)</title>
   </info>
 
@@ -42,7 +46,7 @@ correttamente il dispositivo video.</para>
   <para>Se l'installer non ha identificato correttamente la tua scheda video e tu
 sai di quale si trtta puoi selezionarla dall'elenco: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Marca</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/it/configureX_chooser.xml b/docs/docs/stable/installer/it/configureX_chooser.xml
index d1f932b5..eb778e9a 100644
--- a/docs/docs/stable/installer/it/configureX_chooser.xml
+++ b/docs/docs/stable/installer/it/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="it" 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">Scheda video e configurazione del monitor</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/it/configureX_monitor.xml b/docs/docs/stable/installer/it/configureX_monitor.xml
index 8d3d8adb..2c94b215 100644
--- a/docs/docs/stable/installer/it/configureX_monitor.xml
+++ b/docs/docs/stable/installer/it/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="it" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Scegliere proprio monitor</title>
   </info>
 
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Marca</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generico</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/it/diskPartitioning.xml b/docs/docs/stable/installer/it/diskPartitioning.xml
index 8ded6fc0..51b9726f 100644
--- a/docs/docs/stable/installer/it/diskPartitioning.xml
+++ b/docs/docs/stable/installer/it/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partizionamento</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/it/diskdrake.xml b/docs/docs/stable/installer/it/diskdrake.xml
index 458848b8..c45929aa 100644
--- a/docs/docs/stable/installer/it/diskdrake.xml
+++ b/docs/docs/stable/installer/it/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/it/doPartitionDisks.xml b/docs/docs/stable/installer/it/doPartitionDisks.xml
index 734e2b1e..2fc54b5f 100644
--- a/docs/docs/stable/installer/it/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/it/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ per la tua nuova installazione di Mageia.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </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>
@@ -107,12 +120,6 @@ hard drive(s).</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/it/firewall.xml b/docs/docs/stable/installer/it/firewall.xml
index 37d08f20..0bbe2a58 100644
--- a/docs/docs/stable/installer/it/firewall.xml
+++ b/docs/docs/stable/installer/it/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="it" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/it/installUpdates.xml b/docs/docs/stable/installer/it/installUpdates.xml
index 483556c2..cdc9d76f 100644
--- a/docs/docs/stable/installer/it/installUpdates.xml
+++ b/docs/docs/stable/installer/it/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="it">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Aggiornamenti</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/it/installer.xml b/docs/docs/stable/installer/it/installer.xml
index e63d3336..9be210ce 100644
--- a/docs/docs/stable/installer/it/installer.xml
+++ b/docs/docs/stable/installer/it/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, l'assistente all'installazione di Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/it/setupBootloader.xml b/docs/docs/stable/installer/it/setupBootloader.xml
index 9fe08531..0cc0c4a6 100644
--- a/docs/docs/stable/installer/it/setupBootloader.xml
+++ b/docs/docs/stable/installer/it/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="it" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Opzioni principali del bootloader</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Configurazione del bootloader</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Altre Opzioni</title>
     <section>
       <title>Usare un bootloader esistente</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/software.xml b/docs/docs/stable/installer/it/software.xml
index 34856255..45319d7b 100644
--- a/docs/docs/stable/installer/it/software.xml
+++ b/docs/docs/stable/installer/it/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Selezione delle fonti d'installazione</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/nb/DrakLive.xml b/docs/docs/stable/installer/nb/DrakLive.xml
index 2c8f5b09..bee5de0c 100644
--- a/docs/docs/stable/installer/nb/DrakLive.xml
+++ b/docs/docs/stable/installer/nb/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installerer fra LIVE medium</title>
 
     <cover>
@@ -76,7 +79,9 @@ hvis du vil bidra til å forbedre denne håndboken.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/nb/installUpdates.xml b/docs/docs/stable/installer/nb/installUpdates.xml
index 4f95ed6b..fd139c1f 100644
--- a/docs/docs/stable/installer/nb/installUpdates.xml
+++ b/docs/docs/stable/installer/nb/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="nb">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nb" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Oppdateringer</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Siden denne versjonen av Mageia ble utgitt, noen pakker vil ha blitt
+  <para revision="1" xml:id="installUpdates-pa1">Siden denne versjonen av Mageia ble utgitt, noen pakker vil ha blitt
 oppdatert eller forbedret.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Velg <emphasis>Ja</emphasis> hvis du ønsker å laste ned og installere dem</para>
+      <para revision="1" xml:id="installUpdates-pa2">Velg <emphasis>Ja</emphasis> hvis du ønsker å laste ned og installere dem</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ hvis du ikke er koblet til internett.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Trykk <emphasis>Neste</emphasis> for å fortsette</para>
+      <para revision="1" xml:id="installUpdates-pa3">Trykk <emphasis>Neste</emphasis> for å fortsette</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nb/setupBootloader.xml b/docs/docs/stable/installer/nb/setupBootloader.xml
index dbba3496..24fd831c 100644
--- a/docs/docs/stable/installer/nb/setupBootloader.xml
+++ b/docs/docs/stable/installer/nb/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="nb" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="nb" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Oppstartslaster</title>
   </info>
-
   <section>
     <title>Tilgjengelige oppstartlastere</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 på Eldre MBR/GPT systemer</emphasis></para>
-
         <listitem>
           <para>GRUB2 (med eller uten grafisk meny) vil bli brukt utelukkende som
 oppstartslaster for et Legacy/MBR eller Legacy/GPT-system.</para>
         </listitem>
-
         <listitem>
           <para>Som standard vil en ny oppstartslaster skrives inn i enten MBR (Master Boot
 Record) på den første harddisken eller i BIOS-oppstartspartisjonen.</para>
         </listitem>
       </itemizedlist>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2-efi på UEFI systemer</emphasis></para>
-
         <listitem>
           <para>GRUB2-efi eller rEFInd kan brukes som oppstartslaster for et UEFI-system.</para>
         </listitem>
-
         <listitem>
           <para>Som standard skrives en ny oppstarstlaster (Grub2-efi) inn i ESP (EFI System
 Partition).</para>
-
           <para>Hvis det allerede er UEFI-baserte operativsystemer installert på
 datamaskinen din (for eksempel Windows 8), vil
 Mageia-installasjonsprogrammet oppdage den eksisterende ESP som ble
@@ -82,19 +57,15 @@ som kreves, uansett antall operativsystemer du har.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd på UEFI systemer</emphasis></para>
-
         <listitem>
           <para>rEFInd har et fint grafisk sett med alternativer, og kan automatisk oppdage
 installerte EFI-oppstartlastere. Se: http://www.rodsbooks.com/refind/</para>
         </listitem>
       </itemizedlist>
-
       <note>
         <para>Vær oppmerksom på at for å kunne bruke <literal>rEFInd</literal>
 alternativet, må en installert EFI System Partisjon samsvare med
@@ -104,93 +75,72 @@ tilgjengelig for deg.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Oppsett av Oppstartslaster</title>
     </info>
-
     <section>
       <title>Hovedvalg for oppstartslaster</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Velg Oppstarter</emphasis></para>
-
           <itemizedlist>
             <listitem>
               <para><guimenuitem>GRUB2</guimenuitem> (med enten en grafisk eller en tekstmeny),
 kan velges for både<literal> Eldre MBR / BIOS</literal>-systemer og
 <literal>UEFI</literal>systemer.</para>
             </listitem>
-
             <listitem>
               <para><guimenuitem>rEFInd</guimenuitem> (med en grafisk meny)  er et alternativ
 kun for bruk med <literal>UEFI</literal> systemer.</para>
             </listitem>
           </itemizedlist>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Oppstartsenhet</emphasis></para>
-
           <warning>
             <para>Ikke endre dette med mindre du virkelig vet hva du gjør.</para>
           </warning>
-
           <note>
             <para>Det er ikke noe alternativ å skrive GRUB til boot-sektoren til en partisjon
 (f.eks. <filename>sda1</filename>), siden denne metoden anses som
 upålitelig.</para>
           </note>
-
           <para>Når du bruker UEFI-modus, blir Oppstartsenheten oppført som
 EFI-systempartisjon.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Forsinkelse før oppstart av
 standardversjonen</emphasis></para>
-
           <para>Denne tekstboksen lar deg angi en forsinkelse i sekunder før standard
 operativsystemet er startet opp.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Sikkerhet</emphasis></para>
-
           <para>Dette lar deg sette et passord for oppstartslasteren. Dette betyr at
 brukernavn og passord må oppgis ved oppstartstidspunkt for å velge en
 oppstartspost eller endre innstillinger. Brukernavnet er <literal>"root"
 </literal>og passordet er det som er valgt her etter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Passord</emphasis></para>
-
           <para>Velg et passord for oppstartslasteren (alternativt).</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Passord (igjen)</emphasis></para>
-
           <para>Skriv inn passordet igjen, og Drakx vil kontrollere at det samsvarer med det
 som er angitt ovenfor.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Avansert</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Aktiver ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) er en standard for
 strømstyring. Det kan spare energi ved å stoppe ubrukte enheter, dette var
 metoden som ble brukt før APM. Hvis du fjerner avmerkningen, kan det være
@@ -198,122 +148,111 @@ nyttig hvis datamaskinen din ikke støtter ACPI, eller hvis du tror at
 implementeringen av ACPI kan forårsake noen problemer (for eksempel
 tilfeldige omstart eller systemlåsing).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Aktiver SMP</emphasis></para>
-
           <para>Dette alternativet aktiverer / deaktiverer symmetrisk multiprosessering  for
 fler-kjerne prosessorer.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Aktiver APIC</emphasis></para>
-
           <para>Aktivering eller deaktivering av dette gir operativsystemet tilgang til den
 avanserte programmerbare avbruddskontrollen. APIC-enheter tillater mer
 komplekse prioritetsmodeller, og Avansert IRQ (Interrupt Request)
 -administrasjon.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Aktiver Lokal APIC</emphasis></para>
-
           <para>Her kan du angi lokale APIC, som administrerer alle eksterne avbrudd for en
 bestemt prosessor i et SMP-system.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Oppsett av oppstartslaster</title>
-
       <para>Hvis du i forrige avsnitt valgte <literal>rEFInd</literal> som
 oppstartslasteren du vil bruke, vil du bli presentert for alternativene vist
 på skjermdumpen rett nedenfor. Ellers kan du i stedet gå videre til det
 påfølgende skjermbildet for alternativer.</para>
-
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
 fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+      <para>rEFInd-konfigurasjonsalternativene dine:</para>
       <itemizedlist>
-        <para>rEFInd-konfigurasjonsalternativene dine:</para>
-
         <listitem>
-          <para><guimenuitem>Installer eller oppdater rEFInd i EFI
-systempartisjonen.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
         </listitem>
-
         <listitem>
-          <para><guimenuitem>Installer i EFI/Boot partisjonen (alternativ løsning for noen
-BIOS'er).</guimenuitem></para>
-
-          <para>Med noen BIOS-er vil den nyskrevne bootloaderen for Mageia ikke bli
-gjenkjent. I så fall kan du bruke dette alternativet som en løsning på
-problemet.</para>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para>Hvis du ikke valgte rEFInd som bootloaderen som skal brukes i forrige
-seksjon, vises bootloader-konfigurasjonene nedenfor:</para>
-
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Standard</emphasis></para>
-
           <para> Operativsystemet som startes opp som standard</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Legg til</emphasis></para>
-
           <para>Dette alternativet lar deg sende informasjon eller fortelle kjernen til å gi
 deg mer informasjon når den starter opp.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Sjekk for fremmed OS</emphasis></para>
-
           <para>Hvis du allerede har andre operativsystemer installert, prøver Mageia å
 legge dem til i den nye Mageia-oppstartsmenyen. Hvis du ikke vil ha denne
 funksjonen, må du fjerne avmerkningen for <guimenuitem>Sjekk for  andre
 OS-alternativet</guimenuitem>.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Avansert</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video modus</emphasis></para>
-
           <para>Dette setter skjermstørrelsen og fargedybden som startmenyen vil bruke. Hvis
 du klikker på nedre trekant, vil du bli tilbudt andre størrelses- og
 fargedybdealternativer.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Ikke rør ESP eller MBR</emphasis></para>
-
           <para>Velg dette alternativet hvis du ikke vil ha en oppstartbar Mageia, men
 heller vil lenke den fra et annet operativsystem. Du vil få en advarsel om
 at bootloader mangler. Klikk på<guimenuitem> Ok</guimenuitem> bare hvis du
 er sikker på at du forstår implikasjonene, og ønsker å fortsette.</para>
-
           <warning>
             <para>Kjedelasting via eldre oppstatslastere (GRUB Legacy og LiLo) støttes ikke
 lenger av Mageia, da det sannsynligvis vil mislykkes når du prøver å starte
@@ -322,34 +261,27 @@ REFInd til dette formålet, gjør du det på egen risiko!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Andre valg</title>
-
     <section>
       <title>Bruker en eksisterende oppstartslaster</title>
-
-      <para>Den nøyaktige prosedyren for å legge til Mageia-systemet til i en
-eksisterende oppstartslaster er utenfor omfanget av denne dokumentasjonen,
-men i de fleste tilfeller vil det innebære å kjøre det aktuelle
-startprogrammet for opplastingsprogrammer, som skal oppdage og legge til det
-automatisk. Se dokumentasjonen for det aktuelle operativsystemet.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Innstaller uten en oppstartslaster</title>
-
       <para>Du kan velge å installere Mageia uten oppstartslaster (se avsnitt 2.1
 Avansert), anbefales dette ikke med mindre du absolutt vet hva du gjør, som
 uten noen form for oppstartslader, kan operativsystemet ikke starte.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/DrakLive.xml b/docs/docs/stable/installer/nl/DrakLive.xml
index 131bac1d..66c7e4d0 100644
--- a/docs/docs/stable/installer/nl/DrakLive.xml
+++ b/docs/docs/stable/installer/nl/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installatie vanaf een Live-medium</title>
 
     <cover>
@@ -77,7 +80,9 @@ als je mee wil helpen deze handleiding te verbeteren</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/nl/installUpdates.xml b/docs/docs/stable/installer/nl/installUpdates.xml
index d9f856fd..308f067d 100644
--- a/docs/docs/stable/installer/nl/installUpdates.xml
+++ b/docs/docs/stable/installer/nl/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Updates</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/setupBootloader.xml b/docs/docs/stable/installer/nl/setupBootloader.xml
index e3396013..08f75a9e 100644
--- a/docs/docs/stable/installer/nl/setupBootloader.xml
+++ b/docs/docs/stable/installer/nl/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="nl" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="nl" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Opstartlader</title>
   </info>
-
   <section>
     <title>Available Bootloaders</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 op verouderde MBR/GPT-systemen</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 op UEFI-systemen</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
@@ -81,19 +56,15 @@ required, whatever the number of operating systems you have.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd op UEFI-systemen</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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Algemene opties voor de opstartlader</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Beveiliging</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Wachtwoord</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Wachtwoord (nogmaals)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Geavanceerd</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>ACPI inschakelen</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>SMP inschakelen</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>APIC inschakelen</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Lokale APIC inschakelen</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Configuratie van opstartlader</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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Standaard</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Geavanceerd</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Videomodus</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Kom niet aan ESP of MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Andere opties</title>
-
     <section>
       <title>Een bestaande opstartlader gebruiken</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/DrakLive.xml b/docs/docs/stable/installer/pl/DrakLive.xml
index 6f2c2470..a6202745 100644
--- a/docs/docs/stable/installer/pl/DrakLive.xml
+++ b/docs/docs/stable/installer/pl/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalacja z trybu Live</title>
 
     <cover>
@@ -75,7 +78,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/pl/addUser.xml b/docs/docs/stable/installer/pl/addUser.xml
index 095f9ba3..81cc907c 100644
--- a/docs/docs/stable/installer/pl/addUser.xml
+++ b/docs/docs/stable/installer/pl/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/pl/bootLive.xml b/docs/docs/stable/installer/pl/bootLive.xml
index bdc63aee..24378914 100644
--- a/docs/docs/stable/installer/pl/bootLive.xml
+++ b/docs/docs/stable/installer/pl/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" 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" xml:lang="pl">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Uruchom Mageia jako wersję Live</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Uruchamianie 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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">W trybie BIOS/CSM/Legacy</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Pierwszy ekran podczas uruchamiania w trybie BIOS</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">W trybie UEFI</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/pl/configureX_card_list.xml b/docs/docs/stable/installer/pl/configureX_card_list.xml
index 625ac299..9b8d2370 100644
--- a/docs/docs/stable/installer/pl/configureX_card_list.xml
+++ b/docs/docs/stable/installer/pl/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="pl"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Wybierz System Graficzny (Skonfiguruj swoją Kartę Graficzną)</title>
   </info>
 
@@ -42,7 +46,7 @@ zidentyfikuje twoje urządzenie wideo poprawnie.</para>
   <para>Jeżeli instalator nie wykrył twojej karty graficznej poprawnie i wiesz, jaką
 kartę posiadasz, możesz wybrać jedną za pomocą: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Dostawca</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/pl/configureX_chooser.xml b/docs/docs/stable/installer/pl/configureX_chooser.xml
index 7a4efdda..ea4e6a20 100644
--- a/docs/docs/stable/installer/pl/configureX_chooser.xml
+++ b/docs/docs/stable/installer/pl/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="pl" 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">Konfiguracja Karty Graficznej i Monitora</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/pl/configureX_monitor.xml b/docs/docs/stable/installer/pl/configureX_monitor.xml
index d52232e5..61823e9a 100644
--- a/docs/docs/stable/installer/pl/configureX_monitor.xml
+++ b/docs/docs/stable/installer/pl/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="pl" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Wybór monitora</title>
   </info>
 
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Dostawca</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Standardowa</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/pl/diskPartitioning.xml b/docs/docs/stable/installer/pl/diskPartitioning.xml
index 4e494c3e..18e13759 100644
--- a/docs/docs/stable/installer/pl/diskPartitioning.xml
+++ b/docs/docs/stable/installer/pl/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partycjonowanie</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/pl/diskdrake.xml b/docs/docs/stable/installer/pl/diskdrake.xml
index 1b414120..c62cd01c 100644
--- a/docs/docs/stable/installer/pl/diskdrake.xml
+++ b/docs/docs/stable/installer/pl/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>Partycja Systemowa EFI</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/pl/doPartitionDisks.xml b/docs/docs/stable/installer/pl/doPartitionDisks.xml
index 099ee181..5f048f9f 100644
--- a/docs/docs/stable/installer/pl/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/pl/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ wykorzystane do instalacji Magei.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Zauważ, że ta metoda spowoduje zmniejszenie rozmiaru partycji
-Windows. Partycja musi być "czysta", co oznacza, że Windows musi być
-poprawnie zamknięty za ostatnim razem gdy był używany. Musi być także
-zdefragmentowany, choć to nie daje pewności że wszystkie pliki zostały
-przesunięte poza obszar dysku, który zostanie użyty. Dlatego też bardzo
-wskazane jest zrobienie kopii zapasowej ważnych plików.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -106,12 +119,6 @@ wskazane jest zrobienie kopii zapasowej ważnych plików.</para>
     </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>
@@ -184,8 +191,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/pl/firewall.xml b/docs/docs/stable/installer/pl/firewall.xml
index 068e910c..cddb5c44 100644
--- a/docs/docs/stable/installer/pl/firewall.xml
+++ b/docs/docs/stable/installer/pl/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="pl" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/25 apb: Added xreflabel for this section.-->
-<title xml:id="firewall-ti1">Firewall</title>
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+<title xml:id="firewall-ti1">Zapora sieciowa</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/pl/installUpdates.xml b/docs/docs/stable/installer/pl/installUpdates.xml
index 3279d681..b059d1d6 100644
--- a/docs/docs/stable/installer/pl/installUpdates.xml
+++ b/docs/docs/stable/installer/pl/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Aktualizacje</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/installer.xml b/docs/docs/stable/installer/pl/installer.xml
index 8ade0558..4e679758 100644
--- a/docs/docs/stable/installer/pl/installer.xml
+++ b/docs/docs/stable/installer/pl/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX instalator Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/pl/setupBootloader.xml b/docs/docs/stable/installer/pl/setupBootloader.xml
index 68569e10..c98de9e2 100644
--- a/docs/docs/stable/installer/pl/setupBootloader.xml
+++ b/docs/docs/stable/installer/pl/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="pl" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Program rozruchowy</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Podstawowe opcje programu rozruchowego</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Konfiguracja programu rozruchowego</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Inne opcje</title>
     <section>
       <title>Użyj istniejącego bootloader'a.</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/software.xml b/docs/docs/stable/installer/pl/software.xml
index f6d0209c..4fa514a5 100644
--- a/docs/docs/stable/installer/pl/software.xml
+++ b/docs/docs/stable/installer/pl/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Wybór nośników</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/pt/DrakLive-cover.xml b/docs/docs/stable/installer/pt/DrakLive-cover.xml
index e256a182..245adc91 100644
--- a/docs/docs/stable/installer/pt/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/pt/DrakLive-cover.xml
@@ -40,9 +40,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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>Foi escrito por voluntários nos tempos livres. Entre em contacto com a <link
+ns6:href="https://wiki.mageia.org/en/Equipa_da_Documenta%C3%A7%C3%A3o_pt_PT">Equipa
+de documentação </link> se quiser ajudar a melhorar este manual.</para>
     </cover>
   </info>
 
diff --git a/docs/docs/stable/installer/pt/DrakLive.xml b/docs/docs/stable/installer/pt/DrakLive.xml
index e7f7c09e..6badf942 100644
--- a/docs/docs/stable/installer/pt/DrakLive.xml
+++ b/docs/docs/stable/installer/pt/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalação a partir do disco LIVE</title>
 
     <cover>
@@ -32,9 +35,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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 the <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+      <para>Foi escrito por voluntários nos tempos livres. Entre em contacto com a <link
+ns6:href="https://wiki.mageia.org/en/Equipa_da_Documenta%C3%A7%C3%A3o_pt_PT">Equipa
+de documentação </link> se quiser ajudar a melhorar este manual.</para>
     </cover>
   </info>
 
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/pt/DrakX-cover.xml b/docs/docs/stable/installer/pt/DrakX-cover.xml
index cf9a7219..8d3ae253 100644
--- a/docs/docs/stable/installer/pt/DrakX-cover.xml
+++ b/docs/docs/stable/installer/pt/DrakX-cover.xml
@@ -37,9 +37,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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>Foi escrito por voluntários nos tempos livres. Entre em contacto com a <link
+ns6:href="https://wiki.mageia.org/en/Equipa_da_Documenta%C3%A7%C3%A3o_pt_PT">Equipa
+de documentação </link> se quiser ajudar a melhorar este manual.</para>
     </cover>
   </info>
 
diff --git a/docs/docs/stable/installer/pt/DrakX-inline.xml b/docs/docs/stable/installer/pt/DrakX-inline.xml
index 43646b4d..f4a48486 100644
--- a/docs/docs/stable/installer/pt/DrakX-inline.xml
+++ b/docs/docs/stable/installer/pt/DrakX-inline.xml
@@ -26,9 +26,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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>Foi escrito por voluntários nos tempos livres. Entre em contacto com a <link
+ns6:href="https://wiki.mageia.org/en/Equipa_da_Documenta%C3%A7%C3%A3o_pt_PT">Equipa
+de documentação </link> se quiser ajudar a melhorar este manual.</para>
     </cover>
   </info>
 
diff --git a/docs/docs/stable/installer/pt/DrakX.xml b/docs/docs/stable/installer/pt/DrakX.xml
index cf1b3fda..07c235d4 100644
--- a/docs/docs/stable/installer/pt/DrakX.xml
+++ b/docs/docs/stable/installer/pt/DrakX.xml
@@ -64,9 +64,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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>Foi escrito por voluntários nos tempos livres. Entre em contacto com a <link
+ns6:href="https://wiki.mageia.org/en/Equipa_da_Documenta%C3%A7%C3%A3o_pt_PT">Equipa
+de documentação </link> se quiser ajudar a melhorar este manual.</para>
     </cover>
   </info>
 
diff --git a/docs/docs/stable/installer/pt/addUser.xml b/docs/docs/stable/installer/pt/addUser.xml
index a927561d..8aec116a 100644
--- a/docs/docs/stable/installer/pt/addUser.xml
+++ b/docs/docs/stable/installer/pt/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/pt/bootLive.xml b/docs/docs/stable/installer/pt/bootLive.xml
index f2351c6d..379c2b48 100644
--- a/docs/docs/stable/installer/pt/bootLive.xml
+++ b/docs/docs/stable/installer/pt/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt" 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" xml:lang="pt">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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> <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"/> </imageobject>
-
+      <imageobject> <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/pt/configureX_card_list.xml b/docs/docs/stable/installer/pt/configureX_card_list.xml
index 4aadb702..d600e492 100644
--- a/docs/docs/stable/installer/pt/configureX_card_list.xml
+++ b/docs/docs/stable/installer/pt/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="pt"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Vendedor</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/pt/configureX_chooser.xml b/docs/docs/stable/installer/pt/configureX_chooser.xml
index 85edb36c..5e3eaaec 100644
--- a/docs/docs/stable/installer/pt/configureX_chooser.xml
+++ b/docs/docs/stable/installer/pt/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="pt" 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">Configuração da Placa Gráfica e do Monitor</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/pt/configureX_monitor.xml b/docs/docs/stable/installer/pt/configureX_monitor.xml
index f8722f0a..3bcaa03d 100644
--- a/docs/docs/stable/installer/pt/configureX_monitor.xml
+++ b/docs/docs/stable/installer/pt/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="pt" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Escolha o seu Monitor</title>
   </info>
 
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+      <term revision="1" xml:id="configureX_monitor-pa2">Personalizado</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -60,7 +66,7 @@ consult your monitor documentation.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+      <term revision="1" xml:id="configureX_monitor-pa5">'Plug'n Play'</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendedor</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Genérico</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/pt/diskPartitioning.xml b/docs/docs/stable/installer/pt/diskPartitioning.xml
index 7ac2d624..56f6571d 100644
--- a/docs/docs/stable/installer/pt/diskPartitioning.xml
+++ b/docs/docs/stable/installer/pt/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Particionamento</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/pt/diskdrake.xml b/docs/docs/stable/installer/pt/diskdrake.xml
index b000ee1b..5d78062a 100644
--- a/docs/docs/stable/installer/pt/diskdrake.xml
+++ b/docs/docs/stable/installer/pt/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>Partição do Sistema EFI</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/pt/doPartitionDisks.xml b/docs/docs/stable/installer/pt/doPartitionDisks.xml
index 5ff76ab8..80316feb 100644
--- a/docs/docs/stable/installer/pt/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/pt/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -69,14 +75,30 @@ your new Mageia installation.</para>
 
       <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>
+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>
@@ -89,15 +111,6 @@ screenshot:</para>
 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>
       </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>
@@ -108,12 +121,6 @@ hard drive(s).</para>
     </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>
@@ -186,8 +193,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/pt/firewall.xml b/docs/docs/stable/installer/pt/firewall.xml
index 515ecd2f..9eddb03f 100644
--- a/docs/docs/stable/installer/pt/firewall.xml
+++ b/docs/docs/stable/installer/pt/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="pt" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/pt/installUpdates.xml b/docs/docs/stable/installer/pt/installUpdates.xml
index 3948b4db..9df57027 100644
--- a/docs/docs/stable/installer/pt/installUpdates.xml
+++ b/docs/docs/stable/installer/pt/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pt">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Atualizões</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt/installer.xml b/docs/docs/stable/installer/pt/installer.xml
index 0701d908..a7a62a40 100644
--- a/docs/docs/stable/installer/pt/installer.xml
+++ b/docs/docs/stable/installer/pt/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, o Instalador do Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/pt/setupBootloader.xml b/docs/docs/stable/installer/pt/setupBootloader.xml
index b2e61b0a..dc3ba221 100644
--- a/docs/docs/stable/installer/pt/setupBootloader.xml
+++ b/docs/docs/stable/installer/pt/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="pt" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Carregador de Arranque</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Opções principais do carregador de arranque</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Configuração do Carregador de Arranque</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Outras Opções</title>
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/software.xml b/docs/docs/stable/installer/pt/software.xml
index b3e3c16d..d243c066 100644
--- a/docs/docs/stable/installer/pt/software.xml
+++ b/docs/docs/stable/installer/pt/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Selecção de Média</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/pt_BR/DrakLive.xml b/docs/docs/stable/installer/pt_BR/DrakLive.xml
index 9a9aa9ad..dcb6e60b 100644
--- a/docs/docs/stable/installer/pt_BR/DrakLive.xml
+++ b/docs/docs/stable/installer/pt_BR/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalação do LIVE CD</title>
 
     <cover>
@@ -76,7 +79,9 @@ Documentação </link>, se você quiser ajudar a melhorar este manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/pt_BR/installUpdates.xml b/docs/docs/stable/installer/pt_BR/installUpdates.xml
index 2eefdcd5..b2b57ca0 100644
--- a/docs/docs/stable/installer/pt_BR/installUpdates.xml
+++ b/docs/docs/stable/installer/pt_BR/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Atualizações</title>
   </info>
 
   <mediaobject>
-<imageobject><imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/></imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Desde o lançamento desta versão da Mageia, alguns pacotes foram atualizados
+  <para revision="1" xml:id="installUpdates-pa1">Desde o lançamento desta versão da Mageia, alguns pacotes foram atualizados
 ou melhorados.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Selecione <emphasis>Sim</emphasis> se você deseja baixar e instalá-los</para>
+      <para revision="1" xml:id="installUpdates-pa2">Selecione <emphasis>Sim</emphasis> se você deseja baixar e instalá-los</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ estiver conectado à Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Pressione <emphasis>Próximo</emphasis> para continuar</para>
+      <para revision="1" xml:id="installUpdates-pa3">Pressione <emphasis>Próximo</emphasis> para continuar</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/setupBootloader.xml b/docs/docs/stable/installer/pt_BR/setupBootloader.xml
index 1513937e..89dc090e 100644
--- a/docs/docs/stable/installer/pt_BR/setupBootloader.xml
+++ b/docs/docs/stable/installer/pt_BR/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt_BR" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="pt_BR" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,41 +22,33 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
     <title>Bootloaders disponíveis</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 em sistemas Legacy MBR/GPT</emphasis></para>
-
         <listitem>
           <para>O GRUB2 (com ou sem menu gráfico) será usado exclusivamente como o
 "bootloader" para um sistema "Legacy"/MBR ou "Legacy"/GPT.</para>
         </listitem>
-
         <listitem>
           <para>Por padrão, um novo "bootloader" será gravado no MBR (Master Boot Record) do
 seu primeiro disco rígido ou na partição "boot" de inicialização do BIOS.</para>
         </listitem>
       </itemizedlist>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2-efi em sistemas UEFI</emphasis></para>
-
         <listitem>
           <para>GRUB2-efi ou rEFInd pode ser usado como o carregador de inicialização para
 um sistema UEFI.</para>
         </listitem>
-
         <listitem>
           <para>Por padrão, um novo bootloader (Grub2-efi) será gravado no ESP (EFI System
 Partition).</para>
-
           <para>Se já houver sistemas operacionais baseados em UEFI instalados no seu
 computador (Windows 8 por exemplo), o instalador da Mageia detectará o ESP
 existente criado pelo Windows e adicionará grub2-efi a ele. Se não houver
@@ -83,20 +58,16 @@ possui.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd em sistemas UEFI</emphasis></para>
-
         <listitem>
           <para>O rEFInd possui um bom conjunto gráfico de opções e pode detectar
 automaticamente os gerenciadores de inicialização EFI instalados. Consulte:
 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
@@ -106,65 +77,51 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Configuração "Bootloader"</title>
     </info>
-
     <section>
       <title>Principais Opções do Gerenciador de Inicialização</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Para usar Bootloader</emphasis></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">dispositivo  de inicialização de boot</emphasis></para>
-
           <warning>
             <para>Não mude isso, a menos que você realmente saiba o que está fazendo.</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>
           <para><emphasis role="bold">Atraso antes de inicializar a imagem padrão</emphasis></para>
-
           <para>Essa caixa de diálogo permite definir um atraso, em segundos, antes que o
 sistema operacional padrão seja inicializado.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Segurança</emphasis></para>
-
           <para>Isso permite que você defina uma senha para o gerenciador de
 inicialização. Significa que um nome de usuário e senha serão solicitados
 durante a inicialização, para escolher uma entrada de inicialização ou
@@ -172,26 +129,19 @@ alterar as configurações. Isso é opcional, e a maioria das pessoas
 provavelmente não precisará disso. O nome de usuário é <literal>root
 </literal>e a senha é a escolhida daqui em diante.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Senha</emphasis></para>
-
           <para>Escolha uma senha para o "bootloader" (opcional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Senha (novamente)</emphasis></para>
-
           <para>Repita a senha e o DrakX verificará se corresponde ao que foi definido acima</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Avançado</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Ativar ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration e Power Interface) é um padrão para
 gerenciamento de energia. Pode poupar energia parando os dispositivos não
 utilizados. A desmarcação pode ser útil se, por exemplo, seu computador não
@@ -199,122 +149,111 @@ suportar o ACPI ou se você achar que a implementação da ACPI pode causar
 alguns problemas (por exemplo, reinicializações aleatórias ou travamentos do
 sistema).</para>
         </listitem>
-
         <listitem>
           <para>Ativar SMP</para>
-
           <para>Esta opção ativa/desativa o multiprocessamento simétrico para processadores
 "multi-core"</para>
         </listitem>
-
         <listitem>
           <para>Ativar APIC</para>
-
           <para>Habilitar APIC dá ao sistema operacional acesso ao "Advanced Programmable
 Interrupt Controller". Os dispositivos APIC permitem modelos de prioridade
 mais complexos e gerenciamento avançado de IRQ (solicitação de interrupção).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Ativar APIC local</emphasis></para>
-
           <para>Aqui você pode definir o APIC Local, que gerencia todas as interrupções
 externas para um processador específico em um sistema SMP</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Configuração do Gerenciador de Inicialização</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>
-
+      <para> Suas opções de configuração do rEFInd:</para>
       <itemizedlist>
-        <para> Suas opções de configuração do rEFInd:</para>
-
         <listitem>
-          <para><guimenuitem>Instale ou atualize o rEFInd na partição do sistema
-EFI.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
         </listitem>
-
         <listitem>
-          <para><guimenuitem>Instale na partição EFI/Boot (solução alternativa para algumas
-BIOS).</guimenuitem></para>
-
-          <para> Em alguns BIOSs, o recém-carregado gerenciador de inicialização para Mageia
-no final da instalação não será reconhecido. Nesse caso, você pode usar esta
-opção como uma solução alternativa para o problema.</para>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para>Se você não selecionou rEFInd como o carregador de inicialização a ser usado
-na seção anterior, suas configurações são mostradas abaixo:</para>
-
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Padrão</emphasis></para>
-
           <para>O sistema operacional a ser iniciado por padrão.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Acrescentar</emphasis></para>
-
           <para>Esta opção permite que você passe informações para o "kernel' ou diga ao
 "kernel" para lhe dar mais informações ao inicializar.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Examinar sistema estrangeiro OS</emphasis></para>
-
           <para>Se você já possui outros sistemas operacionais instalados, a Mageia tenta
 adicioná-los ao seu novo menu de inicialização da Mageia. Se você não quiser
 esse comportamento, desmarque a opção <guimenuitem>Probe Foreign
 OS</guimenuitem>.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Avançado</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Modo de vídeo</emphasis></para>
-
           <para>Isso define o tamanho da tela e a profundidade de cor a serem usadas pelo
 menu de inicialização de boot. Se você clicar no triângulo abaixo, terá
 outras opções de tamanho e profundidade de cor.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Não toque em ESP ou MBR</emphasis></para>
-
           <para>Selecione essa opção se você não quiser uma Mageia inicializável, mas
 gostaria de carregá-la em cadeia de outro sistema operacional. Você receberá
 um aviso de que o carregador de inicialização está ausente. Clique em
 <guimenuitem>Ok </guimenuitem>apenas se tiver certeza de que entende as
 implicações e deseja continuar.</para>
-
           <warning>
             <para>O carregamento em cadeia via gerenciadores de inicialização herdados (GRUB
 Legacy e LiLo) não é mais suportado pela Mageia, pois provavelmente falhará
@@ -324,36 +263,28 @@ conta e risco!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Outras Opções</title>
-
     <section>
       <title>Usando um Gerenciador de Inicialização existente</title>
-
-      <para>O procedimento exato para adicionar a Mageia a um gerenciador de
-inicialização existente está além do escopo desta documentação. No entanto,
-na maioria dos casos, isso envolverá a execução do programa de instalação do
-carregador de inicialização relevante, que deve detectar a Mageia e incluir,
-automaticamente, uma entrada para ela no menu do carregador de
-inicialização. Consulte a documentação do sistema operacional relevante.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Instalando sem um gerenciador de inicialização</title>
-
       <para>Embora você possa optar por instalar o Mageia sem um "bootloader" (consulte
 a seção 2.1 Avançado), isso não é recomendado, a menos que você saiba
 absolutamente o que está fazendo, pois, sem algum tipo de "bootloader", o
 sistema operacional não poderá ser iniciado.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/DrakLive.xml b/docs/docs/stable/installer/ro/DrakLive.xml
index 1aaaedcd..03ad837e 100644
--- a/docs/docs/stable/installer/ro/DrakLive.xml
+++ b/docs/docs/stable/installer/ro/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalare de pe mediul LIVE</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/ro/addUser.xml b/docs/docs/stable/installer/ro/addUser.xml
index e3a2cfa4..64055a71 100644
--- a/docs/docs/stable/installer/ro/addUser.xml
+++ b/docs/docs/stable/installer/ro/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/ro/bootLive.xml b/docs/docs/stable/installer/ro/bootLive.xml
index 44c83ffb..2a23a8e9 100644
--- a/docs/docs/stable/installer/ro/bootLive.xml
+++ b/docs/docs/stable/installer/ro/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" 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" xml:lang="ro">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Demarează Mageia ca un sistem Live</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Se demarează de pe mediu</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">În mod BIOS/CSM/Legacy</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Primul ecran la demararea în mod BIOS</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">În mod UEFI</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/ro/configureX_card_list.xml b/docs/docs/stable/installer/ro/configureX_card_list.xml
index ce931f07..6b2ab3f0 100644
--- a/docs/docs/stable/installer/ro/configureX_card_list.xml
+++ b/docs/docs/stable/installer/ro/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ro"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Alegeți un server X (configurați placa grafică)</title>
   </info>
 
@@ -42,7 +46,7 @@ identifica, în general, corect placa grafică. </para>
   <para>Dacă instalatorul nu a detectat corect placa grafică și știți ce model
 aveți, o puteți alege din arborescență: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Producător</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/ro/configureX_chooser.xml b/docs/docs/stable/installer/ro/configureX_chooser.xml
index e30b65d4..8edc5508 100644
--- a/docs/docs/stable/installer/ro/configureX_chooser.xml
+++ b/docs/docs/stable/installer/ro/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ro" 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">Configurare placă grafică și ecran</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/ro/configureX_monitor.xml b/docs/docs/stable/installer/ro/configureX_monitor.xml
index 7d895f1f..38d9d652 100644
--- a/docs/docs/stable/installer/ro/configureX_monitor.xml
+++ b/docs/docs/stable/installer/ro/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ro" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Alegeți monitorul</title>
   </info>
 
@@ -69,12 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Producător</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Dacă instalatorul nu a detectat corect monitorul și îi cunoașteți
-referințele, atunci îl puteți alege din arborescență selecționîndu-l în
-ordine:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -94,11 +99,12 @@ ordine:</para>
       <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/ro/diskPartitioning.xml b/docs/docs/stable/installer/ro/diskPartitioning.xml
index b3882473..5fbf00c4 100644
--- a/docs/docs/stable/installer/ro/diskPartitioning.xml
+++ b/docs/docs/stable/installer/ro/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partiționare</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/ro/diskdrake.xml b/docs/docs/stable/installer/ro/diskdrake.xml
index e7f1f7ab..6a9140df 100644
--- a/docs/docs/stable/installer/ro/diskdrake.xml
+++ b/docs/docs/stable/installer/ro/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>Partiție de sistem EFI</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/ro/doPartitionDisks.xml b/docs/docs/stable/installer/ro/doPartitionDisks.xml
index 966bf821..37515d89 100644
--- a/docs/docs/stable/installer/ro/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/ro/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ utiliza pentru noua instalare de Mageia.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Țineți cont că acest lucru implică reducerea dimensiunii partiției
-Windows. Partiția trebuie să fie „curată”, adică Windows a fost închis
-corect ultima dată cînd a fost utilizat. De asemenea, partiția trebuie să
-fie și defragmentată, cu toate că această operație nu garantează că toate
-fișierele de pe partiție au fost mutate din zona care este pe cale să fie
-utilizată. Este foarte recomandat să vă salvați toate fișierele personale.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -107,12 +120,6 @@ dure.</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/ro/firewall.xml b/docs/docs/stable/installer/ro/firewall.xml
index 04287b54..769b9475 100644
--- a/docs/docs/stable/installer/ro/firewall.xml
+++ b/docs/docs/stable/installer/ro/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="ro" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/25 apb: Added xreflabel for this section.-->
-<title xml:id="firewall-ti1">Firewall</title>
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+<title xml:id="firewall-ti1">Parafoc</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/ro/installUpdates.xml b/docs/docs/stable/installer/ro/installUpdates.xml
index 2ab789ad..8039aaac 100644
--- a/docs/docs/stable/installer/ro/installUpdates.xml
+++ b/docs/docs/stable/installer/ro/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Actualizări</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/installer.xml b/docs/docs/stable/installer/ro/installer.xml
index a5756cb9..8e289be5 100644
--- a/docs/docs/stable/installer/ro/installer.xml
+++ b/docs/docs/stable/installer/ro/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, instalatorul Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/ro/setupBootloader.xml b/docs/docs/stable/installer/ro/setupBootloader.xml
index 6393df8f..895c9e71 100644
--- a/docs/docs/stable/installer/ro/setupBootloader.xml
+++ b/docs/docs/stable/installer/ro/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="ro" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Încărcător de sistem</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Opțiunile principale ale încărcătorului de sistem</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Configurare încărcător de sistem</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Alte opțiuni</title>
     <section>
       <title>Se utilizează încărcătorul de sistem existent</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/software.xml b/docs/docs/stable/installer/ro/software.xml
index c28c58de..8cfc2428 100644
--- a/docs/docs/stable/installer/ro/software.xml
+++ b/docs/docs/stable/installer/ro/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Selectare mediu</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/ru/DrakLive.xml b/docs/docs/stable/installer/ru/DrakLive.xml
index ec598414..7dedbf43 100644
--- a/docs/docs/stable/installer/ru/DrakLive.xml
+++ b/docs/docs/stable/installer/ru/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Установка с LIVE носителя</title>
 
     <cover>
@@ -77,7 +80,9 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команды
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/ru/installUpdates.xml b/docs/docs/stable/installer/ru/installUpdates.xml
index 769db0c7..fb9dcc1a 100644
--- a/docs/docs/stable/installer/ru/installUpdates.xml
+++ b/docs/docs/stable/installer/ru/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ru">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ru" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Обновления</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Со времени выпуска этой версии Mageia некоторые пакеты могли быть обновлены
+  <para revision="1" xml:id="installUpdates-pa1">Со времени выпуска этой версии Mageia некоторые пакеты могли быть обновлены
 или улучшены.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Нажмите кнопку <emphasis>Да</emphasis>, если вы хотите загрузить и
+      <para revision="1" xml:id="installUpdates-pa2">Нажмите кнопку <emphasis>Да</emphasis>, если вы хотите загрузить и
 установить эти пакеты.</para>
     </listitem>
 
@@ -41,8 +54,8 @@ align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediao
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Как только выбор будет сделан, нажмите кнопку <emphasis>Далее</emphasis>,
+      <para revision="1" xml:id="installUpdates-pa3">Как только выбор будет сделан, нажмите кнопку <emphasis>Далее</emphasis>,
 чтобы продолжить работу с программой.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ru/setupBootloader.xml b/docs/docs/stable/installer/ru/setupBootloader.xml
index 08c5a52a..b5d9e93f 100644
--- a/docs/docs/stable/installer/ru/setupBootloader.xml
+++ b/docs/docs/stable/installer/ru/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ru" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="ru" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,41 +22,33 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Начальный загрузчик</title>
   </info>
-
   <section>
     <title>Доступные начальные загрузчики</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 на устаревших системах MBR/GPT</emphasis></para>
-
         <listitem>
           <para>GRUB2 (с графическим меню или без него) будет единственным вариантом
 загрузчика для устаревших систем с MBR или GPT.</para>
         </listitem>
-
         <listitem>
           <para>По умолчанию новый загрузчик будет записан в MBR (Master Boot Record) вашего
 первого диска, или в загрузочный раздел BIOS.</para>
         </listitem>
       </itemizedlist>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2-efi на системах UEFI</emphasis></para>
-
         <listitem>
           <para>GRUB2-efi или rEFInd могут использоваться в качестве начального загрузчика
 для системы UEFI.</para>
         </listitem>
-
         <listitem>
           <para>По умолчанию новый загрузчик (Grub2-efi) будет записан в ESP (системный
 раздел EFI).</para>
-
           <para>Если на компьютере уже установлены операционные системы с UEFI (например
 Windows 8), инсталлятор Mageia обнаружит имеющиеся разделы ESP, созданные
 Windows, добавит GRUB2-efi. Если раздела ESP ещё не существует, такой раздел
@@ -83,20 +58,16 @@ Windows, добавит GRUB2-efi. Если раздела ESP ещё не су
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd на системах UEFI</emphasis></para>
-
         <listitem>
           <para>rEFInd имеет приятный графический набор опций и может автоматически
 определять установленные загрузчики EFI. Смотрите:
 http://www.rodsbooks.com/refind/</para>
         </listitem>
       </itemizedlist>
-
       <note>
         <para>Обратите внимание, что для того, чтобы использовать опцию
 <literal>rEFInd</literal>, установленный системный раздел EFI должен
@@ -106,32 +77,26 @@ http://www.rodsbooks.com/refind/</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Настройка загрузчика</title>
     </info>
-
     <section>
       <title>Основные параметры загрузчика</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Использовать загрузчик</emphasis></para>
-
           <itemizedlist>
             <listitem>
               <para><guimenuitem>GRUB2</guimenuitem> (с графическим или текстовым меню) можно
 выбрать как для <literal>устаревших систем MBR/BIOS</literal>, так и для
 систем <literal>UEFI</literal>.</para>
             </listitem>
-
             <listitem>
               <para><guimenuitem>rEFInd</guimenuitem> (с графическим меню) - альтернативный
 вариант, предназначенный исключительно для использования с системами
@@ -139,61 +104,46 @@ xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
             </listitem>
           </itemizedlist>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Загрузочное устройство</emphasis></para>
-
           <warning>
             <para>Не вносите изменений, если не уверены в их последствиях</para>
           </warning>
-
           <note>
             <para>Нет возможности записать GRUB в загрузочный сектор раздела (например,
 <filename>sda1</filename>), так как этот метод считается ненадёжным.</para>
           </note>
-
           <para>При использовании режима UEFI <guilabel>загрузочное устройство</guilabel>
 будет указано как <guimenuitem>системный раздел EFI</guimenuitem>.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Пауза перед загрузкой основной системы</emphasis></para>
-
           <para>С помощью этого пункта можно установить задержку в секундах перед загрузкой
 операционной системы по умолчанию.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Безопасность</emphasis></para>
-
           <para>С помощью этого раздела вы можете установить пароль для доступа к
 загрузчику. Использование пароля будет означать, что для выбора записи для
 загрузки или изменения параметров придётся вводить пароль. Такой пароль не
 является обязательным. Именем будет <literal>root</literal>, а пароль можно
 будет выбрать на следующем этапе.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Пароль</emphasis></para>
-
           <para>С помощью этого поля для ввода текста вы можете указать пароль для
 загрузчика (опционально).</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Пароль (ещё раз)</emphasis></para>
-
           <para>Повторите ввод пароля пользователя в этом поле. DrakX проверит, совпадает ли
 введённый повторно пароль с его первоначальным вариантом.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Дополнительно</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Включить ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) является стандартом
 управления питанием компьютера. С его помощью компьютер может экономить
 энергию, выключая устройства, которые не используются. Этот метод
@@ -202,128 +152,117 @@ xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
 вы считаете, что реализация ACPI создаёт проблемы в работе компьютера
 (например неожиданные перезагрузки системы или «зависания» системы).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Включить SMP</emphasis></para>
-
           <para>С помощью этого пункта можно включить или выключить симметричное
 использование многих процессоров, если на компьютере установлен многоядерный
 процессор.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Включить APIC</emphasis></para>
-
           <para>Обозначение этого пункта предоставляет операционной системе доступ к
 расширенному программируемому контроллеру прерываний (Advanced Programmable
 Interrupt Controller). Устройства с APIC дают возможность использовать более
 сложные модели с приоритетностью процессов и управления расширенными IRQ
 (запросами в отношении прерываний).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Включить локальный APIC</emphasis></para>
-
           <para>С помощью этого пункта можно включить локальный APIC, то есть управление
 всеми внешними прерываниями для определённых процессоров в многопроцессорных
 системах.</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Настройка загрузчика</title>
-
       <para>Если в предыдущем разделе вы выбрали <literal>rEFInd</literal> в качестве
 начального загрузчика для использования, вам будут представлены параметры,
 показанные на снимке экрана ниже. В противном случае, пожалуйста, перейдите
 к следующему снимку экрана для ваших вариантов.</para>
-
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
 fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+      <para>Ваши параметры конфигурации rEFInd:</para>
       <itemizedlist>
-        <para>Ваши параметры конфигурации rEFInd:</para>
-
         <listitem>
-          <para><guimenuitem>Установить или обновить rEFInd на системном разделе
-EFI.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
         </listitem>
-
         <listitem>
-          <para><guimenuitem>Установить в EFI/Boot (обходной манёвр для некоторых
-BIOS).</guimenuitem></para>
-
-          <para>С некоторыми BIOS, недавно написанный загрузчик для Mageia в конце установки
-не будет распознан. В этом случае вы можете использовать эту опцию в
-качестве обходного пути для решения проблемы.</para>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para>Если вы не выбрали rEFInd в качестве загрузчика для использования в
-предыдущем разделе, то конфигурации вашего загрузчика показаны ниже:</para>
-
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">По умолчанию</emphasis></para>
-
           <para>Типичный вариант операционной системы для загрузки.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Присоединить</emphasis></para>
-
           <para>С помощью этого параметра вы можете передать ядру системы какие-то данные
 или сообщить ядру о том, что следует предоставить вам больше информации во
 время загрузки системы.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Зондирование посторонней ОС</emphasis></para>
-
           <para>Если на компьютере уже установлены другие операционные системы, Mageia
 попытается добавить эти системы к вашему новому меню загрузки Mageia. Если
 вам это не нужно, снимите отметку с пункта <guimenuitem>Зондирования
 посторонней ОС</guimenuitem>.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Дополнительно</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Видеорежим</emphasis></para>
-
           <para>С помощью этого пункта можно указать разрешение экрана (в пикселях) и
 глубину цветов для меню загрузки. Если вы нажмёте кнопку списка с маленьким
 треугольником острием вниз, программа покажет варианты разрешений и глубины
 цветов, которыми можно воспользоваться.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Не трогайте ESP или MBR</emphasis></para>
-
           <para>Выберите этот вариант, если вам не нужна отдельная загружаемая версия
 Mageia, а нужна лишь система, которая будет использоваться в цепной загрузке
 с другой операционной системы. Вы будете предупреждены о том, что не
 устанавливается загрузчик. Нажмите кнопку <guimenuitem>ОК</guimenuitem>
 только если вы уверены в последствиях и хотите продолжить установку.</para>
-
           <warning>
             <para>Цепная загрузка через устаревшие загрузчики (GRUB Legacy и LiLo) больше не
 поддерживается Mageia, так как она может потерпеть неудачу при попытке
@@ -333,36 +272,28 @@ Mageia, а нужна лишь система, которая будет исп
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Другие варианты</title>
-
     <section>
       <title>Использование уже установленного загрузчика</title>
-
-      <para>Полный перечень шагов добавления пункта операционной системы Mageia в меню
-уже установленного загрузчика не является предметом этой справочной
-страницы. Впрочем, в основном, эти шаги связаны с запуском соответствующей
-программы установки загрузчика, которая умеет выявить Mageia и добавить
-пункт системы в автоматическом режиме. Соответствующие пояснения должны быть
-приведены в документации к другой операционной системе.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Установка без загрузчика</title>
-
       <para>Хотя вам будет предложен вариант установки Mageia без загрузчика (см. Раздел
 2.1), не рекомендуем им пользоваться, если вы не уверены в результатах,
 поскольку без определённого загрузчика вашу операционную систему нельзя
 будет запустить.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/DrakLive.xml b/docs/docs/stable/installer/sk/DrakLive.xml
index f909a86c..698c461a 100644
--- a/docs/docs/stable/installer/sk/DrakLive.xml
+++ b/docs/docs/stable/installer/sk/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Inštalácia zo ŽIVÉHO dátového nosiča</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/sk/addUser.xml b/docs/docs/stable/installer/sk/addUser.xml
index 23bb8fcc..608db00e 100644
--- a/docs/docs/stable/installer/sk/addUser.xml
+++ b/docs/docs/stable/installer/sk/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/sk/bootLive.xml b/docs/docs/stable/installer/sk/bootLive.xml
index 52a5efa9..f15f7781 100644
--- a/docs/docs/stable/installer/sk/bootLive.xml
+++ b/docs/docs/stable/installer/sk/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" 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" xml:lang="sk">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Zaviesť Mageiu ako Živý systém</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Zavedenie z dátového nosiča</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">V zastaralom BIOS/CSM režime</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Prvá obrazovka počas spúšťania v BIOSovom režime</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">V UEFI režime</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/sk/configureX_card_list.xml b/docs/docs/stable/installer/sk/configureX_card_list.xml
index 17c2413d..6ff4ef16 100644
--- a/docs/docs/stable/installer/sk/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sk/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sk"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Výber X Servera (Konfigurácia vašej grafickej karty)</title>
   </info>
 
@@ -42,7 +46,7 @@ identifikuje video zariadenie.</para>
   <para>Ak vaša grafická karta nie je správne rozpoznaná inštalačným programom a vy
 viete, akú máte kartu, môžete ju vybrať zo stromu: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Výrobca</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/sk/configureX_chooser.xml b/docs/docs/stable/installer/sk/configureX_chooser.xml
index ad23d833..e915baf9 100644
--- a/docs/docs/stable/installer/sk/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sk/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sk" 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">Nastavenie grafickej karty a monitoru</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/sk/configureX_monitor.xml b/docs/docs/stable/installer/sk/configureX_monitor.xml
index fa1df415..733f492c 100644
--- a/docs/docs/stable/installer/sk/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sk/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sk" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Výber vášho monitoru</title>
   </info>
 
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Výrobca</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Ak inštalátor korektne nerozpoznal váš monitor a vy viete, ktorý máte,
-môžete si ho zvoliť zo stromu pomocou výberu:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ môžete si ho zvoliť zo stromu pomocou výberu:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Všeobecný</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/sk/diskPartitioning.xml b/docs/docs/stable/installer/sk/diskPartitioning.xml
index 6b190123..67579023 100644
--- a/docs/docs/stable/installer/sk/diskPartitioning.xml
+++ b/docs/docs/stable/installer/sk/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Rozdelenie diskov</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/sk/diskdrake.xml b/docs/docs/stable/installer/sk/diskdrake.xml
index 030a6949..8ec58c2c 100644
--- a/docs/docs/stable/installer/sk/diskdrake.xml
+++ b/docs/docs/stable/installer/sk/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/sk/doPartitionDisks.xml b/docs/docs/stable/installer/sk/doPartitionDisks.xml
index 6ff2c940..74367c16 100644
--- a/docs/docs/stable/installer/sk/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sk/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ využije pre vašu novú inštaláciu Mageie.</para>
 
       <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>
+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>
@@ -88,14 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Pamätajte, že toto znamená zmenšenie veľkosti Windowsovej partície. Partícia
-musí byť "čistá", to znamená že Windows museli byť korektne vypnuté, keď
-boli naposledy použité. Tiež musela byť defragmentovaná, hoci toto nie je
-zárukou, že všetky súbory na partícii boli presunuté z oblasti, ktorá má byť
-použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -106,12 +120,6 @@ disku (resp. diskoch).</para>
     </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>
@@ -184,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/sk/firewall.xml b/docs/docs/stable/installer/sk/firewall.xml
index 5400221a..a0ab9528 100644
--- a/docs/docs/stable/installer/sk/firewall.xml
+++ b/docs/docs/stable/installer/sk/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="sk" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/sk/installUpdates.xml b/docs/docs/stable/installer/sk/installUpdates.xml
index d378041c..4a10307d 100644
--- a/docs/docs/stable/installer/sk/installUpdates.xml
+++ b/docs/docs/stable/installer/sk/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Aktualizácie</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/installer.xml b/docs/docs/stable/installer/sk/installer.xml
index 911e1c87..e946be00 100644
--- a/docs/docs/stable/installer/sk/installer.xml
+++ b/docs/docs/stable/installer/sk/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, inštalátor Mageie</title>
   </info>
 
diff --git a/docs/docs/stable/installer/sk/setupBootloader.xml b/docs/docs/stable/installer/sk/setupBootloader.xml
index 063e7e25..feefa9e3 100644
--- a/docs/docs/stable/installer/sk/setupBootloader.xml
+++ b/docs/docs/stable/installer/sk/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="sk" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Zavádzač</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Hlavné parametre zavádzača</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>Nastavenie zavádzača</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Ďalšie voľby</title>
     <section>
       <title>Použitie už existujúceho zavádzača</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/software.xml b/docs/docs/stable/installer/sk/software.xml
index 3252815e..df70ce4f 100644
--- a/docs/docs/stable/installer/sk/software.xml
+++ b/docs/docs/stable/installer/sk/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Výber zdroja</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/sl/DrakLive.xml b/docs/docs/stable/installer/sl/DrakLive.xml
index e983d0fc..2186e8c3 100644
--- a/docs/docs/stable/installer/sl/DrakLive.xml
+++ b/docs/docs/stable/installer/sl/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Namestitev z Medija Live</title>
 
     <cover>
@@ -75,7 +78,9 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/sl/installUpdates.xml b/docs/docs/stable/installer/sl/installUpdates.xml
index 6c43973c..8063d7a5 100644
--- a/docs/docs/stable/installer/sl/installUpdates.xml
+++ b/docs/docs/stable/installer/sl/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Posodobitve</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/setupBootloader.xml b/docs/docs/stable/installer/sl/setupBootloader.xml
index 4011e3cc..3aa6df0a 100644
--- a/docs/docs/stable/installer/sl/setupBootloader.xml
+++ b/docs/docs/stable/installer/sl/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sl" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="sl" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Zagonski nalagalnik</title>
   </info>
-
   <section>
     <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
@@ -81,19 +56,15 @@ 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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Glavne možnosti zagonskega nalagalnika</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Nastavitev zagonskega nalagalnika</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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Druge možnosti</title>
-
     <section>
       <title>Uporaba obstoječega zagonskega nalagalnika</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/DrakLive.xml b/docs/docs/stable/installer/sq/DrakLive.xml
index e220a9cb..926ae12f 100644
--- a/docs/docs/stable/installer/sq/DrakLive.xml
+++ b/docs/docs/stable/installer/sq/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Instalime nga mjedisi LIVE</title>
 
     <cover>
@@ -76,7 +79,9 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/sq/addUser.xml b/docs/docs/stable/installer/sq/addUser.xml
index 49946503..c41065dd 100644
--- a/docs/docs/stable/installer/sq/addUser.xml
+++ b/docs/docs/stable/installer/sq/addUser.xml
@@ -1,12 +1,28 @@
-<?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:lang="sq" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" 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">Administrim Përdorues</title>
   </info>
+
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -14,50 +30,65 @@
 <!--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.-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+<!--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.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Vendos Fjalëkalim administratori (root):</title>
     </info>
-    <para>Është e këshillueshme që të gjitha instalimet Mageia të vendosin një
-fjalëkalim për <literal>superuser</literal> (Administrator), zakonisht quhet
-fjalëkalim <emphasis>root </emphasis>në Linux. Ndërsa shkruani një
-fjalëkalim në kutinë e sipërme, një mburojë do të ndryshojë nga e kuqe në të
-verdhë në të gjelbër në varësi të fuqisë së fjalëkalimit. Një mburojë e
-gjelbër tregon se po përdorni një fjalëkalim të fortë. Ju duhet të
-përsërisni të njëjtin fjalëkalim në kutinë poshtë, për të parë nëse hyrja e
-parë nuk është gabuar.</para>
+
+    <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. 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>Të gjitha fjalëkalimet janë germa të vogla. Është mirë të përdorni një
 përzierje letrash (shkronja të mëdha dhe të vogla), numra dhe karaktere të
 tjerë në një fjalëkalim.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Fut një përdorues</title>
     </info>
+
     <para>Shto një përdorues këtu. Një përdorues i rregullt ka më pak privilegje sesa
 <literal>superuser</literal> (root), por të mjaftueshme për të përdorur
 internetin, programet e zyrës ose lojërat dhe çdo gjë tjetër që përdoruesi
 mesatar mund të përdorë në një kompjuter.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis role="bold">Ikonë</emphasis></para>
+
         <para>Klikoni mbi këtë buton nëse dëshironi të ndryshoni ikonën e përdoruesit</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Emri Vërtetë</emphasis></para>
+
         <para>Futni emrin e vërtetë të përdoruesit në këtë kuti teksti</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Emër Hyrës</emphasis></para>
+
         <para>Futni emrin e përdoruesit ose le DrakX përdorni një version të emrit të
 vërtetë të përdoruesit. <emphasis role="bold">Emri i identifikimit është i
 ndjeshëm.</emphasis></para>
+
         <caution condition="live">
           <simpara>Identifikimi i dhënë këtu duhet të jetë i ndryshëm nga çdo hyrje që
 aktualisht është në përdorim për dosjet <filename>/home</filename> . Disa
@@ -66,31 +97,38 @@ mund të mbishkruajnë të dhënat aktuale si të dhënat Firefox, Thunderbird o
 Kmail ...</simpara>
         </caution>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Fjalëkalimi</emphasis></para>
-        <para>Shkruani fjalëkalimin e përdoruesit. Ekziston një mburojë në fund të kutisë
-së tekstit që tregon fuqinë e fjalëkalimit. (Shih gjithashtu <xref
-linkend="givePassword"/>)</para>
+
+        <para>Type in the user password (remembering the advice in the Note above).</para>
+
         <para><emphasis role="bold">Fjalëkalimin (përsëri):</emphasis> Rivendos
 fjalëkalimin e përdoruesit. DrakX do të kontrollojë nëse nuk e keni gabuar
 fjalëkalimin.</para>
       </listitem>
     </itemizedlist>
+
     <note>
       <para>Çdo përdorues i shtuar gjatë instalimit të Mageia, do të ketë një dosje home
 që lexohet dhe shkruhet në mënyrë të mbrojtur (umask=0027)</para>
+
       <para>Ju mund të shtoni ndonjë përdorues shtesë të nevojshëm në hapat
 <emphasis>Konfigurimi - Përmbledhje</emphasis> gjatë instalimit. Zgjedh
 <emphasis>Menaxhimi Përdoruesit</emphasis>.</para>
+
       <para>Lejet hyrëse gjithashtu mund të ndryshohet pas instalimit.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
       <title xml:id="addUserAdvanced-ti3">Administrim Përdoruesit (përparuar)</title>
     </info>
+
     <para>Opsioni <emphasis>Përparuar</emphasis> ju lejon të redaktoni cilësime të
 mëtejshme për përdoruesin që po shtoni.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis>Shell</emphasis>: Kjo listë zbritëse ju lejon të ndryshoni shell
@@ -98,15 +136,17 @@ në dispozicion për çdo përdorues që keni shtuar në ekranin e
 mëparshëm. Opsionet janë <literal>Bash</literal>, <literal>Dash</literal>
 dhe <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
         <para><emphasis>User ID</emphasis>: Këtu mund të vendosni ID-në e përdoruesit për
 çdo përdorues që keni shtuar në ekranin e mëparshëm. Nëse nuk jeni të sigurt
 se cili është qëllimi i kësaj, atëherë lini atë bosh.</para>
       </listitem>
+
       <listitem>
         <para><emphasis>Group ID</emphasis>: Kjo ju lejon të vendosni ID-në e
 grupit. Përsëri, nëse nuk jeni i sigurt, lini atë bosh.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/bootLive.xml b/docs/docs/stable/installer/sq/bootLive.xml
index ca1c89b7..a2c123e2 100644
--- a/docs/docs/stable/installer/sq/bootLive.xml
+++ b/docs/docs/stable/installer/sq/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" 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" xml:lang="sq">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Ndez Mageia si Sistem Live</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Ndezje një medium</title>
     </info>
-
     <para>Ju mund të ndezi direkt nga një DVD Live ose USB. Zakonisht, vetëm duhet të
 futni pajisjen USB ose vendosni DVD-në në makinë dhe rinisni kompjuterin.</para>
-
     <para>Nëse kompjuteri nuk ndizet automatikisht nga USB ose DVD ju mund të duhet të
 rikonfiguroni prioritetin tuaj të Boot Disk BIOS. Përndryshe, mund të
 provoni të hyni në menynë e pajisjes së nisjes për të zgjedhur një pajisje
 nga e cila do të nisë kompjuteri.</para>
-
     <tip>
       <para>Për të hyrë në BIOS ose menunë e nisjes kur kompjuteri po fillon, mund të
 provoni të shtypni ose <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -52,125 +35,96 @@ provoni të shtypni ose <keycap>F2</keycap>, <keycap>Del</keycap> or
 menunë e pajisjes së nisjes. Këto (mjaft të zakonshme) janë çelësa vetëm një
 përzgjedhje e alternativave të mundshme.</para>
     </tip>
-
     <note>
       <para>Ekrani aktual që do të shihni së pari kur të nisni nga media Live do të
 varet nga fakti nëse motherboard i kompjuterit tuaj është i Legacy (BIOS)
 ose lloji UEFI.</para>
     </note>
   </section>
-
   <section xml:id="biosmode">
     <info>
       <title xml:id="biosmode-ti1">Në BIOS/CSM/Legacy mode</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Menu</title>
-
       <listitem>
         <para><emphasis role="bold">Ndez Mageia</emphasis></para>
-
         <para>Ky opsion do të nisë sistemin Mageia Live nga mënyrat e lidhura DVD/USB
 (prisni një sistem shumë të ngadaltë në krahasim me një SO të instaluar).</para>
-
         <para>Pasi të kryhet ndezja, mund të vazhdoni me instalimin.</para>
-
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ përdor shoferë videoje jo-falas (ngadalë në
 ndezje)</emphasis></para>
-
             <para>Ndez sistemin Mageia Live duke përdorur drejtues jo-video të lirë</para>
           </listitem>
         </itemizedlist>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Instalo Mageia</emphasis></para>
-
         <para>Ky opsion do ta instalojë Mageia në një disk.</para>
-
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ përdor shoferë videoje jo-falas (ngadalë në
 ndezje)</emphasis></para>
-
             <para>Instaloni Mageia duke përdorur drejtues jo-falas videoje</para>
           </listitem>
         </itemizedlist>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Memory Test</emphasis></para>
-
         <para>Provoni RAM-in e instaluar duke kryer operacione të shumta leximi dhe
 shkrimi. Rifillo për t'i dhënë fund provës.</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold"> F2 Gjuhë</emphasis></para>
-
         <para>Shtyp <keycap>F2</keycap> që instaluesi të përdorë një gjuhë të caktuar
 gjatë instalimit. Përdorni tastet e shigjetave për të zgjedhur gjuhën dhe më
 pas shtypni <keycap>Enter</keycap>.</para>
       </listitem>
     </itemizedlist>
   </section>
-
   <section xml:id="uefimode">
     <info>
       <title xml:id="uefimode-ti1">Në mënyrë UEFI</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
       <caption>
         <para>Ekrani fillestarë gjatë ndezjes në mënyrë të UEFI</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Menu</title>
-
       <listitem>
         <para><emphasis role="bold">Ndez Mageia</emphasis></para>
-
         <para>Kjo alternativë do të nisë sistemin Mageia Live nga media e lidhura DVD/USB
 (presim një sistem shumë të ngadaltë në krahasim me një OS të
 instaluar). Pasi të kryhet ndezja, mund të vazhdoni me instalimin</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Instalo Mageia</emphasis></para>
-
         <para>Ky opsion do ta instalojë Mageia në një disk.</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold"> F2 Gjuhë</emphasis></para>
-
         <para>Shtyp <keycap>F2</keycap> që instaluesi të përdorë një gjuhë të caktuar
 gjatë instalimit. Përdorni tastet e shigjetave për të zgjedhur gjuhën dhe më
 pas shtypni <keycap>Enter</keycap>.</para>
       </listitem>
     </itemizedlist>
-
     <note>
       <para>Nëse e keni ndezur nga një USB, do të shihni alternativat e mësipërme të
 duplikuara, dhe në këtë rast duhet të zgjidhni nga pala e menysë që do të
 plotësohet me "USB".</para>
     </note>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/configureX_card_list.xml b/docs/docs/stable/installer/sq/configureX_card_list.xml
index 2a98c447..ad1f8840 100644
--- a/docs/docs/stable/installer/sq/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sq/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sq"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Zgjidhni një X Server (Konfiguro Kartën tuaj Grafike)</title>
   </info>
 
diff --git a/docs/docs/stable/installer/sq/configureX_chooser.xml b/docs/docs/stable/installer/sq/configureX_chooser.xml
index c06a59e9..8dab22c6 100644
--- a/docs/docs/stable/installer/sq/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sq/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sq" 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">Karta Grafike dhe Konfigurimi Monitorit</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ pasakta, ose nëse asnjë nuk është treguar.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Kartë Grafike</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
 
       <para>Nëse keni nevojë, mund të zgjidhni një kartë të veçantë nga kjo listë e
 zgjeruar. Shiko <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/sq/configureX_monitor.xml b/docs/docs/stable/installer/sq/configureX_monitor.xml
index 1a25f9ce..1627902c 100644
--- a/docs/docs/stable/installer/sq/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sq/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sq" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Zgjidhni Monitorin tuaj</title>
   </info>
 
@@ -73,8 +79,8 @@ përcaktojë llojin e ekranit nga baza e të dhënave të ekraneve.</para>
       <term revision="1" xml:id="configureX_monitor-pa7">Shitës</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Nëse instaluesi nuk e ka zbuluar saktësisht monitoruar tuaj dhe ju e dini
-cilin ju keni, ju mund të zgjidhni atë nga pema duke përzgjedhur:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -94,12 +100,12 @@ cilin ju keni, ju mund të zgjidhni atë nga pema duke përzgjedhur:</para>
       <term revision="1" xml:id="configureX_monitor-pa9">Përgjithshëm</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa10">Përzgjedhja e këtij grupi do të listojë afro 30 konfigurime të ekranit si
-1024x768 @ 60Hz dhe përfshin ekranet e paneleve të sheshta siç përdoren në
-laptopë. Kjo shpesh është një grup i mirë përzgjedhës i ekranit nëse keni
-nevojë të përdorni drejtuesin e kartës VESA kur pajisja juaj i videove nuk
-mund të përcaktohet automatikisht. Edhe një herë mund të jetë e mençur që të
-jeni konservatore në zgjedhjet tuaja.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/sq/diskdrake.xml b/docs/docs/stable/installer/sq/diskdrake.xml
index e8c1665b..b3f51944 100644
--- a/docs/docs/stable/installer/sq/diskdrake.xml
+++ b/docs/docs/stable/installer/sq/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Personalizo Ndarjen e Diskut me DiskDrake</title>
   </info>
 
@@ -40,9 +43,9 @@ detajet e tyre para se të filloni.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="diskdrake-pa4">Ekziston një skedë në krye për çdo disku të zbuluar (ose pajisje tjetër
-ruajtëse, si një çelës USB). Në pamjen më lart ekzistojnë dy pajisje të
-disponueshme: <filename>sda </filename>dhe <filename>sdb</filename>.</para>
+      <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), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/sq/doPartitionDisks.xml b/docs/docs/stable/installer/sq/doPartitionDisks.xml
index ec0cac1d..73afb0ff 100644
--- a/docs/docs/stable/installer/sq/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sq/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Ndarja Sugjeruar</title>
   </info>
 
@@ -67,16 +73,32 @@ do të përdorë atë për instalimin tuaj të ri Mageia.</para>
       <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Përdor hapësirën e lirë në një ndarje
 Windows</emphasis></para>
 
-      <para revision="1" xml:id="suggestedPartitioning-pa9">Nëse keni hapësirë të papërdorur në një ndarje ekzistuese të Windows-it,
-instaluesi mund të ofrojë ta përdorni atë. Kjo mund të jetë një mënyrë e
-dobishme për të bërë hapësira për instalimin tuaj të ri të Mageia, por është
-një operacion i rrezikshëm kështu që duhet të siguroheni që keni kopjuar të
-gjitha skedarët e rëndësishme!</para>
+      <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 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:<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>
 
-      <para>Me këtë alternativë, instaluesi shfaq ndarjen e mbetur të Windows në dritën
-blu dhe ndarjen e propozuar Mageia në blu të errët me madhësinë e synuar
-vetëm nën. Ju keni mundësi të modifikoni këto madhësi duke klikuar dhe
-zvarritur hendekun midis të dy ndarjeve. Shikoni fotografinë në vijim:</para>
+      <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>
@@ -90,15 +112,6 @@ keni ndërmend të përdorni një pjesë të diskut për diçka tjetër, ose tas
 keni të dhëna në diskun dhe nuk jeni të përgatitur për ta humbur, atëherë
 mos e përdorni këtë alternativë.</para>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Vini re se kjo përfshin pakësimin madhësinë e ndarjes Windows. Ndarja duhet
-të jetë "e pastër", që do të thotë që Windows duhet të jenë mbyllur në
-mënyrë korrekte herën e fundit që është përdorur. Ajo duhet të ketë qenë
-de-fragmentuar, edhe pse kjo nuk është një garanci që të gjitha dosjet në
-ndarje janë zhvendosur nga zona që është gati për t'u përdorur. Është shumë
-e rekomanduar për të ruajtur dosjet tuaja personale rezervë.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -109,12 +122,6 @@ tuaja.</para>
     </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>Nëse nuk po përdorni alternativën <emphasis>Modifiko ndarjet
 diskut</emphasis>, atëherë instaluesi do të caktojë hapësirën në dispozicion
 sipas rregullave të mëposhtme:</para>
@@ -188,8 +195,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Disa drejtues më të ri tani po përdorin sektorë logjik 4096 byte, në vend të
diff --git a/docs/docs/stable/installer/sq/firewall.xml b/docs/docs/stable/installer/sq/firewall.xml
index 591b2c06..716defb5 100644
--- a/docs/docs/stable/installer/sq/firewall.xml
+++ b/docs/docs/stable/installer/sq/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="sq" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Mur i Zjarrt</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">Ky seksion ju lejon të konfiguroni disa rregulla të thjeshta firewall: ata
+  <para revision="1" xml:id="firewall-pa1">Ky seksion ju lejon të konfiguroni disa rregulla të thjeshta firewall: ata
 përcaktojnë se cili lloj i mesazhit nga interneti do të pranohet nga sistemi
 i synuar. Kjo, nga ana tjetër, lejon që shërbimet përkatëse në sistem të
 jenë të arritshme nga interneti.</para>
 
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/>
+</imageobject></mediaobject>
+
   <para>Në cilësimin e parazgjedhura (asnjë buton nuk është i kontrolluar), asnjë
 shërbim i sistemit nuk mund të arrihet nga rrjeti. Alternativa
 <emphasis>Gjithçka (jo firewall)</emphasis> mundëson qasje në të gjitha
@@ -34,16 +48,16 @@ në kompjuterin tuaj të jenë të arritshëm nga rrjeti.</para>
 mundësoni një sërë shërbimesh duke shtypur një listë të <quote>çifte</quote>
 (ndarëse bosh)</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> është vlera e portit të caktuar për
-shërbimin që dëshironi të mundësoni (p.sh. 873 për shërbimin RSYNC) siç
-përcaktohet në <emphasis>RFC-433</emphasis>;</member>
+    <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> është një nga protokollet e internetit
-që përdoren nga shërbimi  <emphasis>TCP</emphasis> ose
-<emphasis>UDP</emphasis>.</member>
+    <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>
 
   <para>Për shembull, hyrja për mundësimin e qasjes në shërbimin RSYNC është kështu
@@ -51,4 +65,4 @@ që përdoren nga shërbimi  <emphasis>TCP</emphasis> ose
 
   <para>Në rast se një shërbim zbatohet për të përdorur të dy protokollet, ju
 specifikoni 2 çifte për të njëjtin port.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/installUpdates.xml b/docs/docs/stable/installer/sq/installUpdates.xml
index e08cf13f..1a30c5f8 100644
--- a/docs/docs/stable/installer/sq/installUpdates.xml
+++ b/docs/docs/stable/installer/sq/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Përditësime</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Që kur ky version i Mageia u lëshua, disa programe do të jenë përditësuar
+  <para revision="1" xml:id="installUpdates-pa1">Që kur ky version i Mageia u lëshua, disa programe do të jenë përditësuar
 ose përmirësuar.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Zgjedh <emphasis>Po</emphasis> nëse dëshironi të shkarkoni dhe instaloni ato</para>
+      <para revision="1" xml:id="installUpdates-pa2">Zgjedh <emphasis>Po</emphasis> nëse dëshironi të shkarkoni dhe instaloni ato</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ nëse nuk jeni të lidhur në internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Shtyp <emphasis>Tjetër</emphasis> për të vazhduar</para>
+      <para revision="1" xml:id="installUpdates-pa3">Shtyp <emphasis>Tjetër</emphasis> për të vazhduar</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/installer.xml b/docs/docs/stable/installer/sq/installer.xml
index dfdfb91b..58f8f642 100644
--- a/docs/docs/stable/installer/sq/installer.xml
+++ b/docs/docs/stable/installer/sq/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, instaluesi Mageia</title>
   </info>
 
diff --git a/docs/docs/stable/installer/sq/setupBootloader.xml b/docs/docs/stable/installer/sq/setupBootloader.xml
index 38a4c03e..e34d6994 100644
--- a/docs/docs/stable/installer/sq/setupBootloader.xml
+++ b/docs/docs/stable/installer/sq/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="sq" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,112 +20,126 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Grub2</title>
-
-    <itemizedlist>
-      <title>Grub2 në sisteme Legacy MBR/GPT</title>
-
-      <listitem>
-        <para>GRUB2 (me ose pa menu grafike) do të përdoren ekskluzivisht si bootloader
+    <title>Available Bootloaders</title>
+    <section>
+      <title>Grub2</title>
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
+        <listitem>
+          <para>GRUB2 (me ose pa menu grafike) do të përdoren ekskluzivisht si bootloader
 për një Sistem Legacy/MBR ose Legacy/GPT.</para>
-      </listitem>
-
-      <listitem>
-        <para>Si parazgjedhje, një bootloader i ri do të shkruhet në MBR (Master Boot
+        </listitem>
+        <listitem>
+          <para>Si parazgjedhje, një bootloader i ri do të shkruhet në MBR (Master Boot
 Record) të diskuit të parë ose në ndarjen e BIOS boot.</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist>
-      <title>Grub2-efi në sisteme UEFI</title>
-
-      <listitem>
-        <para>GRUB2-efi do të përdoren ekskluzivisht si bootloader për një sistem UEFI.</para>
-      </listitem>
-
-      <listitem>
-        <para>Si parazgjedhje, një bootloader i ri (Grub2-efi) do të shkruhet në ESP
+        </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>Si parazgjedhje, një bootloader i ri (Grub2-efi) do të shkruhet në ESP
 (Ndarjen e Sistemit EFI).</para>
-
-        <para>Nëse ka sisteme operative të bazuara në UEFI në kompjuterin tuaj (Windows 8
-për shembull), instaluesi i Mageia do të zbulojë ESP-në ekzistuese të
-krijuar nga Windows dhe shtoj grub2-efi në të. Nëse nuk ekziston ESP,
-atëherë do të krijohet një. Megjithëse është e mundur që të ketë disa ESP,
-kërkohet vetëm një, pavarësisht nga numri i sistemeve operative që keni.</para>
-      </listitem>
-    </itemizedlist>
+          <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>
     <info>
       <title xml:id="setupBootloader-ti2">Konfiguro Bootloader</title>
     </info>
-
     <section>
       <title>Opsionet kryesore të programit Bootloader</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader për përdorim</emphasis></para>
-
-          <para>Kjo veçori është në dispozicion vetëm për sistemet MBR/BIOS
-Legacy. Përdoruesit e sistemeve UEFI nuk do ta shohin këtë alternativë këtu.</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 pajisje</emphasis></para>
-
-          <para>Mos e ndryshoni këtë nëse nuk e dini vërtet atë që po bëni</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>
           <para><emphasis role="bold">Vonesë para nisjes së imazhit të
 parazgjedhur</emphasis></para>
-
           <para>Kjo kuti teksti ju lejon të vendosni një vonesë, në sekonda, para fillimit
 të sistemit operativ të parazgjedhur.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Siguri</emphasis></para>
-
           <para>Kjo ju lejon të vendosni një fjalëkalim për bootloader. Kjo do të thotë se
 një emër përdoruesi dhe fjalëkalimi do të kërkohen kur të nisni për të
 zgjedhur një hyrje booting ose ndryshuar parametrat. Kjo është e detyrueshme
 dhe shumica e njerëzve nuk kanë gjasa që të kenë nevojë për të. Përdoruesi
 është <literal>root</literal> dhe fjalëkalimi është ai i zgjedhur më pas.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Fjalëkalimi</emphasis></para>
-
           <para>Zgjidhni një fjalëkalim për bootloader (opsional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Fjalëkalim (përsëri)</emphasis></para>
-
           <para>Rivendosni fjalëkalimin dhe DrakX do të kontrollojë se përputhet me atë të
 vendosur më sipër</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Përparuar</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Mundëso ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) është një standard për
 menaxhimin e energjisë. Mund të kursejë energji duke ndaluar pajisjet e
 papërdorura. Heqja e zgjedhjes mund të jetë e dobishme nëse, për shembull,
@@ -145,120 +147,139 @@ kompjuteri juaj nuk e mbështet ACPI-në ose nëse mendoni se zbatimi i ACPI
 mund të shkaktojë disa probleme (për shembull rindezjet e rastit ose
 mbylljet e sistemit).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Mundëso SMP</emphasis></para>
-
           <para>Kjo alternativë  mundëson/çaktivizon multiprocessing simetrik për procesorë
 multi-core</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Mundëso APIC</emphasis></para>
-
           <para>Mundësimi i kësaj siguron qasjen e sistemit operativ në Kontrolluesin e
 Ndërprerjes Programore të Avancuar. Pajisjet KNPA lejojnë modele prioritare
 më komplekse dhe menaxhimin e avancuar IRQ (Interrupt Request).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Mundëso Lokale APIC</emphasis></para>
-
           <para>Këtu mund të vendosni APIC lokal, i cili menaxhon të gjitha ndërprerjet e
 jashtme për një procesor të caktuar në një sistem SMP</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Konfigurimi i Ngarkuesit Ndezës</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Paraygjedhur</emphasis></para>
-
           <para>Sistemi operativ që do të fillojë nga parazgjedhja.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Shtoj</emphasis></para>
-
           <para>Kjo alternativë ju lejon të kaloni informacionin në kernel ose tregoni
 kernelin t'ju japë më shumë informacione gjatë ndezje.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Provo OS të huaj</emphasis></para>
-
-          <para>Nëse tashmë keni instaluar sisteme të tjera operative, Mageia përpiqet t'i
-shtojë ato te menyja e re boot Mageia. Nëse nuk e doni këtë sjellje, hiqni
-menjëherë alternativën e Provo Sistemin e Huaj.</para>
+          <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Përparuar</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Mënyrë Video</emphasis></para>
-
           <para>Kjo përcakton madhësinë e ekranit dhe thellësinë e ngjyrës që do të përdoret
 nga menyja e nisjes. Nëse klikoni poshtë trekëndëshit do ju ofrohen mundësi
 të tjera madhësie dhe thellësie të ngjyrave.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Mos prek ESP ose MBR</emphasis></para>
-
-          <para>Zgjidh këtë alternativë nëse nuk doni një Mageia bootable, por do ta
-ngarkoni me zinxhirë nga një OS tjetër. Ju do të merrni një paralajmërim se
-bootloader mungon. Kliko<emphasis> Dakord</emphasis> nëse jeni të sigurt që
-kuptoni implikimet dhe dëshironi të vazhdoni.</para>
+          <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 <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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Opsione tjera</title>
-
     <section>
       <title>Përdorim i një bootloader ekzistues</title>
-
-      <para>Procedura e saktë për shtimin e Mageia në një bootloader ekzistues është
-përtej fushëveprimit të këtij dokumentacioni. Megjithatë, në shumicën e
-rasteve kjo do të përfshijë drejtimin e programit të instalimit të
-ngarkuesit bootloader, i cili duhet të zbulojë Mageia dhe automatikisht të
-shtojë një hyrje për atë në menynë bootloader. Shih dokumentacionin për
-sistemin përkatës operativ.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Instalimi pa një Bootloader</title>
-
       <para>Ndërsa ju mund të zgjedhni të instaloni Mageia pa bootloader (shih seksionin
 2.1 Përparuar), kjo nuk rekomandohet nëse nuk e dini plotësisht se çfarë po
 bëni, pasi pa ndonjë formë të bootloader sistemi juaj operativ nuk do të
 jetë në gjendje të fillojë.</para>
     </section>
-
-    <xi:include href="setupBootloaderAddEntry.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sr/DrakLive.xml b/docs/docs/stable/installer/sr/DrakLive.xml
index b82c707c..afbb0e87 100644
--- a/docs/docs/stable/installer/sr/DrakLive.xml
+++ b/docs/docs/stable/installer/sr/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Инсталација са LIVE медија</title>
 
     <cover>
@@ -77,7 +80,9 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">Тим за
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/sr/installUpdates.xml b/docs/docs/stable/installer/sr/installUpdates.xml
index eeb26785..2aca8faa 100644
--- a/docs/docs/stable/installer/sr/installUpdates.xml
+++ b/docs/docs/stable/installer/sr/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sr" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Надоградње</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Од када је објављена ова верзија Mageia, неки пакети ће бити надограђени или
+  <para revision="1" xml:id="installUpdates-pa1">Од када је објављена ова верзија Mageia, неки пакети ће бити надограђени или
 унапређени.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Изаберите <emphasis>Да</emphasis> уколико желите да их преузмете и
+      <para revision="1" xml:id="installUpdates-pa2">Изаберите <emphasis>Да</emphasis> уколико желите да их преузмете и
 инсталирате</para>
     </listitem>
 
@@ -41,7 +54,7 @@ align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediao
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Притисни <emphasis>Даље</emphasis> за наставак</para>
+      <para revision="1" xml:id="installUpdates-pa3">Притисни <emphasis>Даље</emphasis> за наставак</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sr/setupBootloader.xml b/docs/docs/stable/installer/sr/setupBootloader.xml
index 4602194d..dd331905 100644
--- a/docs/docs/stable/installer/sr/setupBootloader.xml
+++ b/docs/docs/stable/installer/sr/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sr" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="sr" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Стартер</title>
   </info>
-
   <section>
     <title>Доступни Стартери</title>
-
     <section>
       <title>Grub2</title>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2 на старим MBR/GPT системима</emphasis></para>
-
         <listitem>
           <para>GRUB2 (са или без графичког менија) ће бити коришћен као стартер за
 Старе/MBR или Старе/GPT системе.</para>
         </listitem>
-
         <listitem>
           <para>Подразумевано, нови стартер ће бити уписан или у MBR (Master Boot Record) на
 вашем првом тврдом диску или на BIOS boot партицију.</para>
         </listitem>
       </itemizedlist>
-
       <itemizedlist>
         <para><emphasis role="bold">Grub2-efi на UEFI системима</emphasis></para>
-
         <listitem>
           <para>GRUB2-efi или rEFInd се може користити као стартер за UEFI систем.</para>
         </listitem>
-
         <listitem>
           <para>Подразумевано, нови стартер (Grub2-efi) ће бити уписан на ESP (EFI Системску
 партицију).</para>
-
           <para>Уколико већ постоје оперативни системи базирани на UEFI-ју инсталирани на
 вашем рачунару (Windows 8 на пример), Mageia инсталер ће детектовати
 постојећу ESP партицију од стране Windows-а и додати grub2-efi на
@@ -82,19 +57,15 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>rEFInd</title>
-
       <itemizedlist>
         <para><emphasis role="bold">rEFInd на UEFI системима</emphasis></para>
-
         <listitem>
           <para>rEFInd поседује добар графички сет опција, и може аутоматски детектовати EFI
 стартере. Погледајте: http://www.rodsbooks.com/refind/</para>
         </listitem>
       </itemizedlist>
-
       <note>
         <para>Имајте на уму да би могли да користите <literal>rEFInd</literal> опцију,
 инсталирана EFI Системска Партиција мора одговарати вашој архитектури
@@ -104,92 +75,71 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Подешавање Стартера</title>
     </info>
-
     <section>
       <title>Главне опције стартера</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Користити Стартер</emphasis></para>
-
           <itemizedlist>
             <listitem>
               <para><guimenuitem>GRUB2</guimenuitem> (или са графичким или са текстуалним
 менијем), се може изабрати за оба <literal>Legacy MBR/BIOS</literal>
 <literal>UEFI</literal> система.</para>
             </listitem>
-
             <listitem>
               <para><guimenuitem>rEFInd</guimenuitem> (са графичким менијем)  је алтернативна
 опција искључиво за употребу са <literal>UEFI</literal> системима.</para>
             </listitem>
           </itemizedlist>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Boot уређај</emphasis></para>
-
           <warning>
             <para>Не мењајте ово осим уколико заиста нисте сигурни да знате шта радите.</para>
           </warning>
-
           <note>
             <para>Не постоји опција за уписивање GRUBa на boot сектор партиције (нпр:
 <filename>sda1</filename>), јер се овај метод сматра непоузданим.</para>
           </note>
-
           <para>Када се користи UEFI мод, тада ће <guilabel>boot уређај</guilabel> бити
 приказан као <guimenuitem>EFI Системска партиција</guimenuitem>.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Пауза пре подизања подразумеваног одраза</emphasis></para>
-
           <para>Овај текст бокс вам омогућава да подесите одлагање, у секундама, пре него се
 покрене подизање оперативног система.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Сигурност</emphasis></para>
-
           <para>Ово омогућава да подесите лозинку за ваш стартер. То значи да ће бити
 потребно корисничко име и лозинка при стартовању да би покренули систем или
 изменили подешавања. Ово је опција, и већина људи неће имати потребу да је
 користи. Корисничко име је  <literal>root</literal> а лозинка је она која се
 овде одабере.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Лозинка</emphasis></para>
-
           <para>Изаберите лозинку за стартер (опција)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Лозинка (поново)</emphasis></para>
-
           <para>Поново унесите лозинку и DrakX ће проверити да ли се поклапа са оном коју
 сте уписали горе</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Напредно</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Омогући ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) је стандард у управљању
 енергијом. Он може да сачува енергију заустављањем некоришћених
 уређаја. Његово искључивање може бити корисно уколико , на пример, ваш
@@ -197,121 +147,110 @@ xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
 направити неке проблеме (на пример непредвиђена рестатовања или блокирања
 система).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Омогући SMP</emphasis></para>
-
           <para>Ова опција укључује/искључује симетрично мулти-процесирање за процесоре са
 више језгара</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Омогући APIC</emphasis></para>
-
           <para>Када омогућите ово дајете оперативном систему приступ Advanced Programmable
 Interrupt Контролеру. APIC уређаји дозвољавају сложеније моделе за
 приоритете, и напредно управљање IRQ-има (Interrupt Request).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Омогући Local APIC</emphasis></para>
-
           <para>Овде можете подесити Local APIC, који управља свим спољним прекидима за
 појединачне просцесоре у SMP систему</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Подешавање Стартера</title>
-
       <para>Уколико сте на претходној секцији изабрали <literal>rEFInd</literal> као
 стартер који желите да корситите, онда би требало да вам буду презентоване
 опције приказане на снимку екрана доле. У супротном, пређите на следећи
 снимак екрана за ваше опције.</para>
-
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
 fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+      <para>Опције ваше rEFInd конфигурације:</para>
       <itemizedlist>
-        <para>Опције ваше rEFInd конфигурације:</para>
-
         <listitem>
-          <para><guimenuitem>Инсталирајте или надоградите rEFInd на EFI системској
-партицији.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
         </listitem>
-
         <listitem>
-          <para><guimenuitem>Инсталирајте у EFI/Boot партицију (заобилазница за поједине
-BIOS-е).</guimenuitem></para>
-
-          <para>Са неким BIOS-има, ново инсталирани стартер за Mageia на крају инсталације
-неће бити препознат. У том случају, можете користити ову опцију да би
-превазишли овај проблем.</para>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
-      <para>Уколико нисте изабрали rEFInd као стартер у претходној секцији, онда ће
-конфигурација вашег стартера бити приказане доле:</para>
-
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Подразумевано</emphasis></para>
-
           <para>Подразумевани Оперативни систем за покретање</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Додај</emphasis></para>
-
           <para>Ова опција вам омогућава да проследите информације кернелу или да кажете
 кернелу да вам да више информација при покретању система.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Претражи друге ОС-ове</emphasis></para>
-
           <para>Уколико већ имате инсталиран неки други оперативни систем, Mageia ће
 покушати да их дода у ваш нови Mageia мени за покретање. Уколико не желите
 ово, онда деселектујте опцију <guimenuitem>Претражи друге
 ОС-ове</guimenuitem>.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Напредно</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Видео мод</emphasis></para>
-
           <para>Ово подешава величину екрана и број боја који се користе у стартном
 менију. Уколико кликнете на доњи троугао моћи ћете да видите друге величине
 и број боја.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Не дирај ESP или MBR</emphasis></para>
-
           <para>Изаберите ову опцију уколико не желите бутабилни  Mageia, већ желите да је
 радије покрећете из другог оперативног система. Добићете упозорење да
 недостаје стартер. Кликните на <guimenuitem>У Реду </guimenuitem> уколико
 сте сигурни да сте разумели последице, и желите да наставите.</para>
-
           <warning>
             <para>Ланчано подизање преко старих стартера (GRUB Legacy и LiLo)  више није
 подржано од стране Mageia јер је вероватно да неће успети подизање ове
@@ -320,35 +259,28 @@ fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Остале опције</title>
-
     <section>
       <title>Користи постојећи стартер</title>
-
-      <para>Тачна процедура за додавање Mageia у постојећи стартер је ван домашаја ове
-документације. Међутим, у већини случајева укључиваће одговарајући програм
-за инсталацију стартера, који би требао да открије Mageia и аутоматски дода
-унос за њу у менију стартера. Погледајте документацију за одговарајући
-оперативни систем.</para>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Инсталирај без Стартера</title>
-
       <para>Иако можете изабрати да инсталирате Mageia без стартера (погледајте секцију
 2.1 Напредно), ово није порепоручљиво осим уколико нисте апсолутно сигурни
 да знате шта радите, јер без неке форме стартера нећете бити у могућности да
 покренете оперативни систем.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/DrakLive.xml b/docs/docs/stable/installer/sv/DrakLive.xml
index 9ee60e8e..8bd0a349 100644
--- a/docs/docs/stable/installer/sv/DrakLive.xml
+++ b/docs/docs/stable/installer/sv/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation från ett LIVE-media</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/sv/installUpdates.xml b/docs/docs/stable/installer/sv/installUpdates.xml
index 8df58225..15b7473d 100644
--- a/docs/docs/stable/installer/sv/installUpdates.xml
+++ b/docs/docs/stable/installer/sv/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Uppdateringar</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Välj <emphasis>Ja</emphasis> om du önskar ladda ner och installera dem</para>
+      <para revision="1" xml:id="installUpdates-pa2">Välj <emphasis>Ja</emphasis> om du önskar ladda ner och installera dem</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ inte är ansluten till internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1"><emphasis>Tryck Nästa</emphasis> för att fortsätta</para>
+      <para revision="1" xml:id="installUpdates-pa3"><emphasis>Tryck Nästa</emphasis> för att fortsätta</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/setupBootloader.xml b/docs/docs/stable/installer/sv/setupBootloader.xml
index fde5dbd4..d01472fc 100644
--- a/docs/docs/stable/installer/sv/setupBootloader.xml
+++ b/docs/docs/stable/installer/sv/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="sv" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Starthanterare</title>
   </info>
-
   <section>
     <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
@@ -81,19 +56,15 @@ 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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Huvudalternativ för startshanteraren</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Uppstartshanterare att använda</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Fördröj innan standard-avbilden startas</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Säkerhet</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Lösenord</emphasis></para>
-
           <para>Välj ett lösenord för uppstartshanteraren (valfritt)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Lösenordet (igen)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Avancerad</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Aktivera ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Aktivera SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Aktivera APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Aktivera Lokal APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Konfiguration av starthanterare</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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Standard</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Fäst</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Undersök främmande OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Avancerad</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Grafikläge</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Rör inte ESP eller MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Fler alternativ</title>
-
     <section>
       <title>Använder en befintlig startshanterare</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installera utan en uppstartshanterare</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/DrakLive-cover.xml b/docs/docs/stable/installer/tg/DrakLive-cover.xml
index 5bae0247..6c4df496 100644
--- a/docs/docs/stable/installer/tg/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/tg/DrakLive-cover.xml
@@ -32,17 +32,19 @@
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
 
-      <para>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>Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
+дастрасанд.</para>
+
+      <para>Ин дастурамал ба воситаи барномаи <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link> таҳия карда шудааст.</para>
+
+      <para>Ин дастурамал бо мутахассисон ба тариқи ихтиёрӣ дар вақти озод аз кор таҳия
+карда шудааст. Барои маълумоти муфассал бо <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Дастаи
+ҳуҷҷатнигорӣ</link> дар тамос шавед, агар хоҳед, ки дастурамали ҷориро
+мукаммал созед.</para>
     </cover>
   </info>
 
@@ -50,9 +52,9 @@ Team</link>, if you would like to help improve this manual.</para>
     <title>Installation from LIVE medium</title>
 
     <para><note>
-        <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+        <para>Эҳтимол аст, ки шумо ҳамаи аксҳои пешниҳодкардаи ин дастурамалро ҳангоми
+раванди насби ҳақиқӣ намебинед, зеро ки раванди ҳақиқӣ аз сахтафзори шумо ва
+интихоботе, ки шумо ҳангоми насб мекунед, вобаста аст.</para>
       </note></para>
 
     <xi:include href="SelectAndUseISOs2.xml"/>
diff --git a/docs/docs/stable/installer/tg/DrakLive.xml b/docs/docs/stable/installer/tg/DrakLive.xml
index 470b3300..5ebb7f29 100644
--- a/docs/docs/stable/installer/tg/DrakLive.xml
+++ b/docs/docs/stable/installer/tg/DrakLive.xml
@@ -11,26 +11,29 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+          <para>Эҳтимол аст, ки шумо ҳамаи аксҳои пешниҳодкардаи ин дастурамалро ҳангоми
+раванди насби ҳақиқӣ намебинед, зеро ки раванди ҳақиқӣ аз сахтафзори шумо ва
+интихоботе, ки шумо ҳангоми насб мекунед, вобаста аст.</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">Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <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>Ин дастурамал ба воситаи барномаи <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link> таҳия карда шудааст.</para>
 
       <para>It was written by volunteers in their free time. Please contact the <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/tg/DrakX-cover.xml b/docs/docs/stable/installer/tg/DrakX-cover.xml
index 6ff19fd1..87acc983 100644
--- a/docs/docs/stable/installer/tg/DrakX-cover.xml
+++ b/docs/docs/stable/installer/tg/DrakX-cover.xml
@@ -29,17 +29,19 @@
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
 
-      <para>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>Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
+дастрасанд.</para>
+
+      <para>Ин дастурамал ба воситаи барномаи <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link> таҳия карда шудааст.</para>
+
+      <para>Ин дастурамал бо мутахассисон ба тариқи ихтиёрӣ дар вақти озод аз кор таҳия
+карда шудааст. Барои маълумоти муфассал бо <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Дастаи
+ҳуҷҷатнигорӣ</link> дар тамос шавед, агар хоҳед, ки дастурамали ҷориро
+мукаммал созед.</para>
     </cover>
   </info>
 
@@ -65,9 +67,9 @@ Team</link>, if you would like to help improve this manual.</para>
 <title>Installation with DrakX</title>
 
     <para><note>
-        <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+        <para>Эҳтимол аст, ки шумо ҳамаи аксҳои пешниҳодкардаи ин дастурамалро ҳангоми
+раванди насби ҳақиқӣ намебинед, зеро ки раванди ҳақиқӣ аз сахтафзори шумо ва
+интихоботе, ки шумо ҳангоми насб мекунед, вобаста аст.</para>
       </note></para>
 
     
diff --git a/docs/docs/stable/installer/tg/DrakX-inline.xml b/docs/docs/stable/installer/tg/DrakX-inline.xml
index 878ba88f..88fd4ae1 100644
--- a/docs/docs/stable/installer/tg/DrakX-inline.xml
+++ b/docs/docs/stable/installer/tg/DrakX-inline.xml
@@ -13,22 +13,24 @@
 
     <cover>
       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+          <para>Эҳтимол аст, ки шумо ҳамаи аксҳои пешниҳодкардаи ин дастурамалро ҳангоми
+раванди насби ҳақиқӣ намебинед, зеро ки раванди ҳақиқӣ аз сахтафзори шумо ва
+интихоботе, ки шумо ҳангоми насб мекунед, вобаста аст.</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">Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <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>Ин дастурамал ба воситаи барномаи <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <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>Ин дастурамал бо мутахассисон ба тариқи ихтиёрӣ дар вақти озод аз кор таҳия
+карда шудааст. Барои маълумоти муфассал бо <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Дастаи
+ҳуҷҷатнигорӣ</link> дар тамос шавед, агар хоҳед, ки дастурамали ҷориро
+мукаммал созед.</para>
     </cover>
   </info>
 
diff --git a/docs/docs/stable/installer/tg/DrakX.xml b/docs/docs/stable/installer/tg/DrakX.xml
index 53a1c501..cf758521 100644
--- a/docs/docs/stable/installer/tg/DrakX.xml
+++ b/docs/docs/stable/installer/tg/DrakX.xml
@@ -51,22 +51,24 @@
 
     <cover>
       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+          <para>Эҳтимол аст, ки шумо ҳамаи аксҳои пешниҳодкардаи ин дастурамалро ҳангоми
+раванди насби ҳақиқӣ намебинед, зеро ки раванди ҳақиқӣ аз сахтафзори шумо ва
+интихоботе, ки шумо ҳангоми насб мекунед, вобаста аст.</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">Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <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>Ин дастурамал ба воситаи барномаи <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <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>Ин дастурамал бо мутахассисон ба тариқи ихтиёрӣ дар вақти озод аз кор таҳия
+карда шудааст. Барои маълумоти муфассал бо <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Дастаи
+ҳуҷҷатнигорӣ</link> дар тамос шавед, агар хоҳед, ки дастурамали ҷориро
+мукаммал созед.</para>
     </cover>
   </info>
 
diff --git a/docs/docs/stable/installer/tg/addUser.xml b/docs/docs/stable/installer/tg/addUser.xml
index f4eb1bed..f0cf4fc9 100644
--- a/docs/docs/stable/installer/tg/addUser.xml
+++ b/docs/docs/stable/installer/tg/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/tg/bootLive.xml b/docs/docs/stable/installer/tg/bootLive.xml
index b8f4275e..7256ff79 100644
--- a/docs/docs/stable/installer/tg/bootLive.xml
+++ b/docs/docs/stable/installer/tg/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tg" 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" xml:lang="tg">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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> <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"/> </imageobject>
-
+      <imageobject> <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/tg/configureX_card_list.xml b/docs/docs/stable/installer/tg/configureX_card_list.xml
index a515f6ef..81acf8f1 100644
--- a/docs/docs/stable/installer/tg/configureX_card_list.xml
+++ b/docs/docs/stable/installer/tg/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tg" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="tg"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>Баранда</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/tg/configureX_chooser.xml b/docs/docs/stable/installer/tg/configureX_chooser.xml
index 5d94f997..7b955ee2 100644
--- a/docs/docs/stable/installer/tg/configureX_chooser.xml
+++ b/docs/docs/stable/installer/tg/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tg" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="tg" 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>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/tg/configureX_monitor.xml b/docs/docs/stable/installer/tg/configureX_monitor.xml
index a34ca00d..cce89671 100644
--- a/docs/docs/stable/installer/tg/configureX_monitor.xml
+++ b/docs/docs/stable/installer/tg/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tg" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="tg" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+      <term revision="1" xml:id="configureX_monitor-pa2">Интихобӣ</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -69,11 +75,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">Баранда</term>
 
       <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>
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">Одатӣ</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/tg/diskPartitioning.xml b/docs/docs/stable/installer/tg/diskPartitioning.xml
index efdeb9a9..14c85d44 100644
--- a/docs/docs/stable/installer/tg/diskPartitioning.xml
+++ b/docs/docs/stable/installer/tg/diskPartitioning.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="en" version="5.0" xml:lang="tg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="tg" version="5.0" xml:lang="tg">
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Ҷузъбандӣ</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/tg/diskdrake.xml b/docs/docs/stable/installer/tg/diskdrake.xml
index 977cc871..3247acb9 100644
--- a/docs/docs/stable/installer/tg/diskdrake.xml
+++ b/docs/docs/stable/installer/tg/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/tg/doPartitionDisks.xml b/docs/docs/stable/installer/tg/doPartitionDisks.xml
index 005ae5c0..bac2091b 100644
--- a/docs/docs/stable/installer/tg/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/tg/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ your new Mageia installation.</para>
 
       <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>
+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>
@@ -88,15 +110,6 @@ screenshot:</para>
 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>
       </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>
@@ -107,12 +120,6 @@ hard drive(s).</para>
     </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>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/tg/firewall.xml b/docs/docs/stable/installer/tg/firewall.xml
index 746aced0..430a93d2 100644
--- a/docs/docs/stable/installer/tg/firewall.xml
+++ b/docs/docs/stable/installer/tg/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="tg" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Девори оташ</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/tg/installUpdates.xml b/docs/docs/stable/installer/tg/installUpdates.xml
index 47a0cc0f..d4bd3fdd 100644
--- a/docs/docs/stable/installer/tg/installUpdates.xml
+++ b/docs/docs/stable/installer/tg/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="tg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Нав кардан</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tg/installer.xml b/docs/docs/stable/installer/tg/installer.xml
index 201cec89..ee20d1b1 100644
--- a/docs/docs/stable/installer/tg/installer.xml
+++ b/docs/docs/stable/installer/tg/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
   </info>
 
diff --git a/docs/docs/stable/installer/tg/setupBootloader.xml b/docs/docs/stable/installer/tg/setupBootloader.xml
index 4265a473..0c56c24f 100644
--- a/docs/docs/stable/installer/tg/setupBootloader.xml
+++ b/docs/docs/stable/installer/tg/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tg" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="tg" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Корандози худборшав</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Хосиятҳои асосии корандози худборшав</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>Имконоти дигар</title>
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/software.xml b/docs/docs/stable/installer/tg/software.xml
index b3f8db11..6b20096b 100644
--- a/docs/docs/stable/installer/tg/software.xml
+++ b/docs/docs/stable/installer/tg/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>Интихоби медиа</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/tr/DrakLive.xml b/docs/docs/stable/installer/tr/DrakLive.xml
index c9aa7974..78f87209 100644
--- a/docs/docs/stable/installer/tr/DrakLive.xml
+++ b/docs/docs/stable/installer/tr/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>ÇalışanCD ortamından kurulum</title>
 
     <cover>
@@ -77,7 +80,9 @@ Ekibi</link> ile iletişime geçin.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/tr/addUser.xml b/docs/docs/stable/installer/tr/addUser.xml
index dbddec94..104b8c04 100644
--- a/docs/docs/stable/installer/tr/addUser.xml
+++ b/docs/docs/stable/installer/tr/addUser.xml
@@ -1,12 +1,28 @@
-<?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:lang="tr" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" 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>
+
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -14,47 +30,63 @@
 <!--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.-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+<!--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.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Yönetici (kök) Parolasını Ayarlayın:</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">Bir kullanıcı girin</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
@@ -62,45 +94,54 @@ 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">Şifre</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>Erişim izinleri kurulumdan sonra da değiştirilebilir.</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 change the
 shell available to any user you added in the previous 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/tr/bootLive.xml b/docs/docs/stable/installer/tr/bootLive.xml
index 026dd8ea..d7791a22 100644
--- a/docs/docs/stable/installer/tr/bootLive.xml
+++ b/docs/docs/stable/installer/tr/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" 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" xml:lang="tr">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Mageia' yı ÇalışanCD Sistemi olarak başlatmak</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Kurulum ortamını başlatmak</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">BIOS/CSM/Legacy kipinde</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>BIOS kipinde önyükleme yapılırken ilk ekran</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">UEFI kipinde</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/tr/configureX_card_list.xml b/docs/docs/stable/installer/tr/configureX_card_list.xml
index a5d88a03..6b9fbac2 100644
--- a/docs/docs/stable/installer/tr/configureX_card_list.xml
+++ b/docs/docs/stable/installer/tr/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="tr"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Bir X Sunucusu Seçme (Ekran Kartını Yapılandırma)</title>
   </info>
 
diff --git a/docs/docs/stable/installer/tr/configureX_chooser.xml b/docs/docs/stable/installer/tr/configureX_chooser.xml
index e60843f5..7d0ed5b9 100644
--- a/docs/docs/stable/installer/tr/configureX_chooser.xml
+++ b/docs/docs/stable/installer/tr/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="tr" 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">Ekran Kartı ve Monitör Yapılandırma</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/tr/configureX_monitor.xml b/docs/docs/stable/installer/tr/configureX_monitor.xml
index 8330dd6b..fbfb5490 100644
--- a/docs/docs/stable/installer/tr/configureX_monitor.xml
+++ b/docs/docs/stable/installer/tr/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="tr" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Monitör Seçimi</title>
   </info>
 
@@ -72,9 +78,8 @@ type from the monitor database.</para>
       <term revision="1" xml:id="configureX_monitor-pa7">Üretici</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Kurulum aracı monitörünüzü doğru olarak algılayamamışsa ve monitörünüzün
-hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre
-seçebilirsiniz:</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -94,11 +99,12 @@ seçebilirsiniz:</para>
       <term revision="1" xml:id="configureX_monitor-pa9">Genel</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/tr/diskdrake.xml b/docs/docs/stable/installer/tr/diskdrake.xml
index 67fa4f8f..d3c91c9d 100644
--- a/docs/docs/stable/installer/tr/diskdrake.xml
+++ b/docs/docs/stable/installer/tr/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+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/tr/doPartitionDisks.xml b/docs/docs/stable/installer/tr/doPartitionDisks.xml
index 1462ab15..8216f684 100644
--- a/docs/docs/stable/installer/tr/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/tr/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -68,14 +74,30 @@ bu seçenek o alanı kullanacaktır.</para>
 
       <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>
+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>
@@ -88,14 +110,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Bu işlemin Windows bölümünün boyutunu azaltacağını unutmayın. Disk bölümü
-"temiz" olmalıdır; yani son kullanımında Windows düzgün şekilde kapatılmış
-olmalıdır. Bölümdeki tüm dosyaların kullanılacak alanın dışına taşındığına
-dair garanti sunmazsa da ayrıca mutlaka disk birleştirme
-yapılmalıdır. Kişisel dosyalarınızı yedeklemeniz önerilir.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -105,12 +119,6 @@ yapılmalıdır. Kişisel dosyalarınızı yedeklemeniz önerilir.</para>
     </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>
@@ -183,8 +191,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/tr/firewall.xml b/docs/docs/stable/installer/tr/firewall.xml
index 1d1fc660..54af68ea 100644
--- a/docs/docs/stable/installer/tr/firewall.xml
+++ b/docs/docs/stable/installer/tr/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="tr" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--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.-->
 <title xml:id="firewall-ti1">Güvenlik duvarı</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,16 +47,16 @@ from the network.</para>
 a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
-  <para><emphasis>&lt;port-numarasır>/&lt;protokol></emphasis></para>
+  <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
 
   <simplelist>
-    <member>- <emphasis>&lt;port-numarası></emphasis>, <emphasis>RFC-433</emphasis>'de
-tanımlandığı gibi etkinleştirmek istediğiniz hizmete ilişkin port değeridir
-(mesela RSYNC hizmeti için 873);</member>
+    <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>, <emphasis>TCP</emphasis> veya
-<emphasis>UDP</emphasis> - hizmet tarafından kullanılan internet
-protokolüdür.</member>
+    <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>
 
   <para>Mesela, RSYNC hizmetine erişimi etkinleştirmek için girilecek değer
@@ -50,4 +64,4 @@ protokolüdür.</member>
 
   <para>Hizmetin her iki protokolü de kullandığı durumlarda,  aynı port için iki
 ayrı girdi oluşturmanız gerekir.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/installUpdates.xml b/docs/docs/stable/installer/tr/installUpdates.xml
index 7c577329..36a5f827 100644
--- a/docs/docs/stable/installer/tr/installUpdates.xml
+++ b/docs/docs/stable/installer/tr/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">Güncellemeler</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/installer.xml b/docs/docs/stable/installer/tr/installer.xml
index c40d8450..fb7d7e10 100644
--- a/docs/docs/stable/installer/tr/installer.xml
+++ b/docs/docs/stable/installer/tr/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, Mageia Kurulum Aracı</title>
   </info>
 
diff --git a/docs/docs/stable/installer/tr/setupBootloader.xml b/docs/docs/stable/installer/tr/setupBootloader.xml
index 2109d44a..5348ae68 100644
--- a/docs/docs/stable/installer/tr/setupBootloader.xml
+++ b/docs/docs/stable/installer/tr/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="tr" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">Önyükleyici</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
+    <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
+        </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>UEFI sistemler üzerinde Grub2-efi</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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>Önyükleyici ana seçenekleri</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Şifre</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>Önyükleme Yapılandırması</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>Diğer Seçenekler</title>
-
     <section>
       <title>Mevcut bir önyükleyiciyi kullanmak</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/uk.po b/docs/docs/stable/installer/uk.po
index f399e118..de338523 100644
--- a/docs/docs/stable/installer/uk.po
+++ b/docs/docs/stable/installer/uk.po
@@ -15,10 +15,10 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11"
-" ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 >"
-" 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n %"
-" 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 "X-Generator: Lokalize 20.07.70\n"
 
 #. type: Content of: <section><info><title>
@@ -103,9 +103,9 @@ msgstr ""
 msgid "Supplemental Installation Media"
 msgstr "Додаткові носії пакунків для встановлення"
 
-#.  papoteur 2013-04-13  - created
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#.  papoteur 2013-04-13  - created 
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. 2018/02/10 apb: Text and typgraphy.
 #. 2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6
 #. type: Content of: <section><mediaobject>
@@ -409,17 +409,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Вибір точок монтування"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. 2018/02/12 apb: Text and typography.
 #. 2019/01/04 apb: Typo & minor reword on custom mount-points.
 #. type: Content of: <section><mediaobject>
@@ -932,8 +932,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Налаштування ваших служб"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #.  2018/02/16 apb: Minor text adjustment.
 #. 2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.
 #. type: Content of: <section><mediaobject>
@@ -983,8 +983,8 @@ msgstr "Вносьте зміни, лише якщо вам добре відо
 msgid "Configure your Timezone"
 msgstr "Налаштування часового поясу"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. 2018/02/13 apb: Minor text adjustment.
 #. 2018/02/25 apb: Added xreflabel to this section.
 #. type: Content of: <section><mediaobject>
@@ -2206,10 +2206,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Форматування"
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. 2018/02/10 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:24
@@ -2714,9 +2714,9 @@ msgstr ""
 msgid "Available Media"
 msgstr "Доступні джерела пакунків"
 
-#.  papoteur 2013-04-11  - created
+#.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
 #. 2019.01.16 apb: Changed title to Available Media.
@@ -3330,8 +3330,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Рівень безпеки"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. 2018/02/12 apb: Minor wording.
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:20
@@ -4091,21 +4091,16 @@ msgstr ""
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2,"
-" SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep"
-" desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep"
-" desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100"
-" PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14"
-" GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -4115,21 +4110,16 @@ msgid ""
 msgstr ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2,"
-" SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep"
-" desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep"
-" desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100"
-" PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14"
-" GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -4570,10 +4560,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Вибір драйвера миші"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot
+#.  marja 2012-04-24 adding screenshot 
 #. 2018/02/15 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:24
@@ -4999,9 +4989,8 @@ msgid ""
 "<emphasis role=\"bold\">Install or update rEFInd in the EFI system partition."
 "</emphasis>"
 msgstr ""
-"<emphasis role=\"bold\">Встановити або оновити rEFInd на системному розділі"
-" EFI."
-"</emphasis>"
+"<emphasis role=\"bold\">Встановити або оновити rEFInd на системному розділі "
+"EFI.</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:195
@@ -5014,8 +5003,8 @@ msgid ""
 "This option installs the bootloader in the /EFI/BOOT directory of the ESP "
 "(EFI System Partition). This can be useful when:"
 msgstr ""
-"Використання цього варіанта призведе до встановлення завантажувача до"
-" каталогу /EFI/BOOT ESP (системного розділу EFI). Це може бути корисно"
+"Використання цього варіанта призведе до встановлення завантажувача до "
+"каталогу /EFI/BOOT ESP (системного розділу EFI). Це може бути корисно"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:198 en/setupBootloader.xml:241
@@ -5024,10 +5013,10 @@ msgid ""
 "and plugged into a different machine. If the bootloader is stored in /EFI/"
 "BOOT, UEFI BIOS's will detect it and allow you to boot from that drive)."
 msgstr ""
-"(а) При встановленні на портативний носій (наприклад флешку USB), який може"
-" бути від'єднано і з'єднано із іншим комп'ютером. Якщо завантажувач"
-" зберігається у /EFI/"
-"BOOT, BIOS UEFI виявить його і дозволить вам завантажитися із цього диска."
+"(а) При встановленні на портативний носій (наприклад флешку USB), який може "
+"бути від'єднано і з'єднано із іншим комп'ютером. Якщо завантажувач "
+"зберігається у /EFI/BOOT, BIOS UEFI виявить його і дозволить вам "
+"завантажитися із цього диска."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:202 en/setupBootloader.xml:245
@@ -5035,8 +5024,8 @@ msgid ""
 "(b) As a workaround where, due to a buggy UEFI BIOS, the newly written "
 "bootloader for Mageia will not be recognized at end of the installation."
 msgstr ""
-"(б) Як обхідний маневр там, де через вади у BIOS UEFI, новозаписаний засіб"
-" завантаження для Mageia не буде розпізнано наприкінці встановлення."
+"(б) Як обхідний маневр там, де через вади у BIOS UEFI, новозаписаний засіб "
+"завантаження для Mageia не буде розпізнано наприкінці встановлення."
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:207
@@ -5109,9 +5098,9 @@ msgid ""
 "option only becomes available where the installer detects that a machine is "
 "in UEFI mode)."
 msgstr ""
-"<emphasis role=\"bold\">Встановити до /EFI/BOOT. </emphasis>(Зауваження: цим"
-" пунктом меню можна буде скористатися, лише якщо засобу встановлення вдасться"
-" виявити, що комп'ютер працює у режимі UEFI.)"
+"<emphasis role=\"bold\">Встановити до /EFI/BOOT. </emphasis>(Зауваження: цим "
+"пунктом меню можна буде скористатися, лише якщо засобу встановлення вдасться "
+"виявити, що комп'ютер працює у режимі UEFI.)"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/setupBootloader.xml:252
@@ -5234,14 +5223,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Налаштування SCSI"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file
+#.        Mdv doc instead of on our setupSCSI file 
 #. 2018/02/15 apb: Text and typography.
 #. 2018/0217 apb: Merge 2nd/3rd paras and reword.
 #. type: Content of: <section><mediaobject>
@@ -5342,12 +5331,12 @@ msgstr "Додатково"
 msgid "Confirm hard disk to be formatted"
 msgstr "Підтвердження форматування жорсткого диска"
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD
-#.  2013-05-05 marja added screenshot
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. 2018/02/15 apb: Text and typography
 #. 2018/02/20 apb: Change the 2 paras to itemized listitems.
 #. type: Content of: <section><mediaobject>
diff --git a/docs/docs/stable/installer/zh_CN/DrakLive.xml b/docs/docs/stable/installer/zh_CN/DrakLive.xml
index d9aac8e9..39567f4f 100644
--- a/docs/docs/stable/installer/zh_CN/DrakLive.xml
+++ b/docs/docs/stable/installer/zh_CN/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>从 LIVE 介质安装</title>
 
     <cover>
@@ -72,7 +75,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/zh_CN/addUser.xml b/docs/docs/stable/installer/zh_CN/addUser.xml
index 88e2459d..e284c8df 100644
--- a/docs/docs/stable/installer/zh_CN/addUser.xml
+++ b/docs/docs/stable/installer/zh_CN/addUser.xml
@@ -19,6 +19,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
 <!--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.-->
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
     <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>
@@ -78,14 +86,19 @@ computer for.</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>
+        </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>
diff --git a/docs/docs/stable/installer/zh_CN/bootLive.xml b/docs/docs/stable/installer/zh_CN/bootLive.xml
index 9be3a579..b93f078f 100644
--- a/docs/docs/stable/installer/zh_CN/bootLive.xml
+++ b/docs/docs/stable/installer/zh_CN/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" 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" xml:lang="zh_CN">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">引导 Mageia Live 系统</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">引导媒体</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
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 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">在 BIOS/CSM/Legacy 模式下</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>在 BIOS 模式下引导时的第一个画面</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">在 UEFI 模式下</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <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/zh_CN/configureX_card_list.xml b/docs/docs/stable/installer/zh_CN/configureX_card_list.xml
index e20bfb9a..9ae51896 100644
--- a/docs/docs/stable/installer/zh_CN/configureX_card_list.xml
+++ b/docs/docs/stable/installer/zh_CN/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="zh_CN"
+         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 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">选择一个X服务器(配置您的显示卡)</title>
   </info>
 
@@ -40,7 +44,7 @@ xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>若安装程序无法正确检测您的显卡，请在以下列表中选择一个合适的配置： <itemizedlist>
       <listitem>
-        <para>Vendor</para>
+        <para>厂家</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/zh_CN/configureX_chooser.xml b/docs/docs/stable/installer/zh_CN/configureX_chooser.xml
index 3d1db26c..cee5eec4 100644
--- a/docs/docs/stable/installer/zh_CN/configureX_chooser.xml
+++ b/docs/docs/stable/installer/zh_CN/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="zh_CN" 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">显示卡和显示器配置</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- 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-->
+  <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.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--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-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis 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/zh_CN/configureX_monitor.xml b/docs/docs/stable/installer/zh_CN/configureX_monitor.xml
index 5bffddc0..5a4a8e5e 100644
--- a/docs/docs/stable/installer/zh_CN/configureX_monitor.xml
+++ b/docs/docs/stable/installer/zh_CN/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="zh_CN" 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 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">选择您的显示器</title>
   </info>
 
@@ -56,7 +62,7 @@ displayed.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+      <term revision="1" xml:id="configureX_monitor-pa5">即插即用</term>
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
@@ -65,10 +71,11 @@ type from the monitor database.</para>
     </varlistentry>
 
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+      <term revision="1" xml:id="configureX_monitor-pa7">厂家</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置：</para>
+        <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 choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -85,14 +92,15 @@ type from the monitor database.</para>
 
   <variablelist spacing="compact">
     <varlistentry>
-      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+      <term revision="1" xml:id="configureX_monitor-pa9">通用</term>
 
       <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 selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this 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>
   </variablelist>
diff --git a/docs/docs/stable/installer/zh_CN/diskPartitioning.xml b/docs/docs/stable/installer/zh_CN/diskPartitioning.xml
index 3e9ce183..78449c73 100644
--- a/docs/docs/stable/installer/zh_CN/diskPartitioning.xml
+++ b/docs/docs/stable/installer/zh_CN/diskPartitioning.xml
@@ -2,7 +2,7 @@
   
 
   <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>分区</title>
 
   <xi:include href="doPartitionDisks.xml"/>
 
diff --git a/docs/docs/stable/installer/zh_CN/diskdrake.xml b/docs/docs/stable/installer/zh_CN/diskdrake.xml
index e38fa70a..dc6c9cbf 100644
--- a/docs/docs/stable/installer/zh_CN/diskdrake.xml
+++ b/docs/docs/stable/installer/zh_CN/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--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).-->
 <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <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>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
   </important>
 
   <figure>
-    <title>EFI System Partition</title>
+    <title>EFI 系统分区</title>
 
 <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
index e099a0ed..4e7e0d19 100644
--- a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--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' -->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -66,14 +72,30 @@ fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
       <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>
+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>
@@ -86,11 +108,6 @@ screenshot:</para>
 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>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows
-时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -100,12 +117,6 @@ on the drive that you are not prepared to lose, then do not use this option.</pa
     </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>
@@ -178,8 +189,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/zh_CN/firewall.xml b/docs/docs/stable/installer/zh_CN/firewall.xml
index 7e8238e1..063361fe 100644
--- a/docs/docs/stable/installer/zh_CN/firewall.xml
+++ b/docs/docs/stable/installer/zh_CN/firewall.xml
@@ -1,4 +1,13 @@
-<?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" xml:lang="zh_CN" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" 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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/25 apb: Added xreflabel for this section.-->
-<title xml:id="firewall-ti1">Firewall</title>
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+<title xml:id="firewall-ti1">防火墙</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <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 -
@@ -33,15 +47,15 @@ from the network.</para>
 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 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;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 <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <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>
 
@@ -50,4 +64,4 @@ 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
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/installUpdates.xml b/docs/docs/stable/installer/zh_CN/installUpdates.xml
index 9c7c2ccc..a23dc248 100644
--- a/docs/docs/stable/installer/zh_CN/installUpdates.xml
+++ b/docs/docs/stable/installer/zh_CN/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">更新</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/installer.xml b/docs/docs/stable/installer/zh_CN/installer.xml
index 1f79636e..ba45bd4d 100644
--- a/docs/docs/stable/installer/zh_CN/installer.xml
+++ b/docs/docs/stable/installer/zh_CN/installer.xml
@@ -24,6 +24,8 @@
 
   
 
+  
+
   
 
   <info>
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX，Mageia 的安装器</title>
   </info>
 
diff --git a/docs/docs/stable/installer/zh_CN/setupBootloader.xml b/docs/docs/stable/installer/zh_CN/setupBootloader.xml
index b6bb79a5..6f84bd40 100644
--- a/docs/docs/stable/installer/zh_CN/setupBootloader.xml
+++ b/docs/docs/stable/installer/zh_CN/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" xreflabel="Bootloader" xml:id="setupBootloader"
-         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 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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="zh_CN" xml:id="setupBootloader">
+  
+  
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">引导程序</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
+    <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
+        </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
+        </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
+          <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
+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>
+        </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>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>引导程序的主要选项</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
-      <title>Bootloader Configuration</title>
-
+      <title>引导程序配置</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="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+      <para>Your rEFInd configuration options:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
+      </itemizedlist>
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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>
+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>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
-    <title>Other Options</title>
-
+    <title>其他选项</title>
     <section>
       <title>使用现存的引导器</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your 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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/software.xml b/docs/docs/stable/installer/zh_CN/software.xml
index 62f17a67..7dd7dcd6 100644
--- a/docs/docs/stable/installer/zh_CN/software.xml
+++ b/docs/docs/stable/installer/zh_CN/software.xml
@@ -5,7 +5,7 @@
 <title>Software</title>
 
   <section>
-    <title>Media Selection</title>
+    <title>介质选择</title>
 
     <xi:include href="add_supplemental_media.xml"/>
 
diff --git a/docs/docs/stable/installer/zh_TW/DrakLive.xml b/docs/docs/stable/installer/zh_TW/DrakLive.xml
index 61c6e540..457e73ce 100644
--- a/docs/docs/stable/installer/zh_TW/DrakLive.xml
+++ b/docs/docs/stable/installer/zh_TW/DrakLive.xml
@@ -11,10 +11,13 @@
 
   
 
+  
+
   <info>
     <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
 <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
 <title>Installation from LIVE medium</title>
 
     <cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
diff --git a/docs/docs/stable/installer/zh_TW/installUpdates.xml b/docs/docs/stable/installer/zh_TW/installUpdates.xml
index 9dbbd4b5..31ce01f7 100644
--- a/docs/docs/stable/installer/zh_TW/installUpdates.xml
+++ b/docs/docs/stable/installer/zh_TW/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="installUpdates"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns5="http://www.w3.org/1999/xlink"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   
 
   
@@ -19,19 +28,23 @@
 <!-- marja, 2012-04-24 added screenshot -->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
 <title xml:id="installUpdates-ti1">更新</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+  <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
 updated or improved.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+      <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
     </listitem>
 
     <listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
     </listitem>
 
     <listitem>
-      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+      <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/setupBootloader.xml b/docs/docs/stable/installer/zh_TW/setupBootloader.xml
index a0a379b4..1c6f2e28 100644
--- a/docs/docs/stable/installer/zh_TW/setupBootloader.xml
+++ b/docs/docs/stable/installer/zh_TW/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_TW" 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"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         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/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" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="zh_TW" xml:id="setupBootloader">
+  
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -39,40 +22,32 @@ 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.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
 <title xml:id="setupBootloader-ti1">開機載入器</title>
   </info>
-
   <section>
     <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
@@ -81,19 +56,15 @@ 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
@@ -103,212 +74,180 @@ to you.</para>
       </note>
     </section>
   </section>
-
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
-
     <section>
       <title>開機載入程式主要選項</title>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></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>
-
           <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>
           <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
           <para>This text box lets you set a delay, in seconds, before the default operating
 system is started up.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
-
           <para>This allows you to set a password for the bootloader. This means a username
 and password will be required when booting in order to select a booting
 entry or change settings. This is optional, and most people are not likely
 to have a need for it. The username is <literal>root</literal> and the
 password is the one chosen hereafter.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
-
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
-
           <para>Retype the password and DrakX will check that it matches with the one set
 above</para>
         </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
-
           <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
 management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
-
           <para>This option enables/disables symmetric multiprocessing for multi-core
 processors</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
-
           <para>Enabling this gives the operating system access to the Advanced Programmable
 Interrupt Controller. APIC devices permit more complex priority models, and
 Advanced IRQ (Interrupt Request)  management.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
-
           <para>Here you can set Local APIC, which manages all external interrupts for a
 specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
-
     <section>
       <title>開機載入程式組態設定</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>
-
+      <para>Your rEFInd configuration options:</para>
       <itemizedlist>
-        <para>Your rEFInd configuration options:</para>
-
         <listitem>
-          <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+          <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></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 bootloader 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>
+          <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</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>
-
+section, then your bootloader configuration options are shown below:</para>
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-
           <para>The operating system to be started up by default.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
-
           <para>This option lets you pass information to the kernel or tell the kernel to
 give you more information as it boots.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
           <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 <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+          <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+          <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+          <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+        </listitem>
       </itemizedlist>
-
       <para><emphasis>Advanced</emphasis></para>
-
       <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
-
           <para>This sets the screen size and colour depth to be used by the boot menu. If
 you click the down-triangle you will be offered other size and colour depth
 options.</para>
         </listitem>
-
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
           <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 <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
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
           </warning>
         </listitem>
       </itemizedlist>
-
       <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
     </section>
   </section>
-
   <section>
     <title>其他選項</title>
-
     <section>
       <title>Using an existing bootloader</title>
-
       <para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
 running the relevant bootloader installation program, which should detect
 Mageia and automatically add an entry for it in the bootloader menu. See the
 documentation for the relevant operating system.</para>
     </section>
-
     <section>
       <title>Installing Without a Bootloader</title>
-
       <para>While you can opt to install Mageia without a bootloader (see section 2.1
 Advanced), this is not recommended unless you absolutely know what you are
 doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
-
     <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
-</section>
+</section>
\ No newline at end of file
-- 
cgit v1.2.1