Update Installer catalog

1 files changed, 176 insertions, 129 deletions

diff --git a/docs/docs/stable/installer/en/setupBootloader.xml b/docs/docs/stable/installer/en/setupBootloader.xml
index ff5fff22..d27036b4 100644
--- a/docs/docs/stable/installer/en/setupBootloader.xml
+++ b/docs/docs/stable/installer/en/setupBootloader.xml
@@ -1,169 +1,216 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:id="setupBootloader">
-  <!---->
-  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+<?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" xreflabel="Bootloader" version="5.0" xml:id="setupBootloader">
+  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
+  <!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+  <!--2018/02/22 apb: Changed list styles.-->
+  <!--2018/02/22 apb: Changed 'Advanced' list style.-->
+  <!--2018/02/24 apb: Changed main list style.-->
+  <!--2018/02/25 apb: Added xreflabel to this section.-->
   <info>
-    <title xml:id="setupBootloader-ti1">Bootloader main options</title>
+    <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or
-        Legacy/GPT system</para>
+        <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>GRUB2-efi for a UEFI system.</para>
+        <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>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
+    <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
+      <listitem>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI
+        system.</para>
+      </listitem>
+      <listitem>
+        <para>By default, a new bootloader (Grub2-efi) will be written into
+        the ESP (EFI System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on
+        your computer (Windows 8 for example), the Mageia installer will
+        detect the existing ESP created by Windows and add grub2-efi to it. If
+        no ESP exists, then one will be created. Although it is possible to
+        have several ESPs, only one is required, whatever the number of
+        operating systems you have.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
+      <title>Bootloader main options</title>
       <mediaobject>
         <imageobject condition="classical">
-          <imagedata fileref="dx2-setupBootloader.png" align="center"/>
+          <imagedata align="center" fileref="dx2-setupBootloader.png"/>
         </imageobject>
+
         <imageobject condition="live">
-          <imagedata xml:id="setupBootloader-im1" fileref="live-setupBootloader.png"/>
+          <imagedata fileref="live-setupBootloader.png"
+                     xml:id="setupBootloader-im1"/>
         </imageobject>
       </mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis>
-      unless you really know what you are doing.</para>
+      <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>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are
+          doing</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>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot choose between the <emphasis role="bold">with</emphasis> or
-      <emphasis role="bold">without graphical menu</emphasis> options.</para>
+      <title>Bootloader Configuration</title>
       <mediaobject>
-        <imageobject condition="classical">
-          <imagedata fileref="dx2-setupBootloader2.png" align="center"/>
-        </imageobject>
-        <imageobject condition="live">
-          <imagedata fileref="live-setupBootloader2.png"/>
-        </imageobject>
-      </mediaobject>
-      <para>If Mageia is the only system installed on your computer, the
-      installer created an ESP (EFI System Partition) to house the bootloader
-      (GRUB2-efi). If there are already UEFI operating systems installed on
-      your computer (Windows 8 for example), the Mageia installer detects the
-      existing ESP created by Windows and adds GRUB2-efi. Although it is
-      possible to have several ESPs, only one is required (and advised),
-      whatever the number of operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis>
-      unless you really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-    <para>By default, and according to your system, Mageia writes one of the
-    following:</para>
-    <itemizedlist>
-      <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of
-        your first hard drive or in the BIOS boot partition.</para>
-      </listitem>
-      <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
-      </listitem>
-    </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia
-    attempts to add them to your new Mageia boot menu. If you don't want this
-    behaviour, click on <guibutton>Next</guibutton> and then untick the
-    <emphasis role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
       <imageobject condition="classical">
         <imagedata align="center" fileref="dx2-setupBootloader3.png"/>
       </imageobject>
+
       <imageobject condition="live">
-        <imagedata fileref="live-setupBootloader3.png" align="center"/>
+        <imagedata align="center" fileref="live-setupBootloader3.png"/>
       </imageobject>
     </mediaobject>
-  </section>
-  <section>
-    <title>Using an existing bootloader</title>
-    <para>The exact procedure for adding your Mageia system to an existing
-    bootloader is beyond the scope of this documentation, however in most
-    cases it will involve running the relevant bootloader installation program
-    which should detect and add it automatically. See the documentation for
-    the operating system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from
-    another OS, click on <guibutton>Next</guibutton>, then on
-    <guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch
-    ESP or MBR</guilabel>.</para>
-    <mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to 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>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
       <imageobject condition="classical">
-        <imagedata fileref="dx2-setupBootloader4.png" align="center"/>
+        <imagedata align="center" fileref="dx2-setupBootloader4.png"/>
       </imageobject>
+
       <imageobject condition="live">
-        <imagedata fileref="live-setupBootloader4.png" align="center"/>
-      </imageobject>
-    </mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by
-    clicking <guibutton>OK</guibutton>.</para>
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="live-setupBootloader5.png"/>
+        <imagedata align="center" fileref="live-setupBootloader4.png"/>
       </imageobject>
     </mediaobject>
-  </section>
-  <section>
-    <title>Options</title>
-    <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>:
-            This lets you set a delay in seconds before the default operating
-            system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a
-            password for the bootloader. This means a username and password
-            will be required when booting to select a booting entry or change
-            settings. The username is <emphasis role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the
-            bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password
-            and DrakX will check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced
-                Configuration and Power Interface) is a standard for 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><guilabel>Enable SMP</guilabel>: This option
-                enables/disables symmetric multiprocessing for multi core
-                processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the
-                operating system access to the Advanced Programmable Interrupt
-                Controller. APIC devices permit more complex priority models,
-                and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC
-                manages all external interrupts for a specific processor in an
-                SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
-    </section>
-    <section>
-      <title>Next page</title>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by
-          default</para>
+          <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><guilabel>Append:</guilabel> This option lets you pass the
-          kernel information or tell the kernel to give you more information
-          as it boots.</para>
-        </listitem>
-        <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia
-          bootloader</link></para>
-        </listitem>
-        <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen
-                size and colour depth 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 role="bold">Do not touch ESP or
-                MBR</emphasis>: see above <link linkend="setupChainLoading">Using the chain
-                loading</link></para></listitem></itemizedlist></para>
+          <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>
         </listitem>
       </itemizedlist>
+      <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 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>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+      <filename>/boot/grub2/custom.cfg</filename> or use the software
+      <application>grub-customizer</application> tool instead (available in
+      the Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file