From 7d6bb5c67c7757c7089be4b2f4db09d204bb259b Mon Sep 17 00:00:00 2001
From: Marja van Waes <marja@mageia.org>
Date: Mon, 4 May 2015 11:20:05 +0200
Subject: There's a different installer bootloader screen for UEFI o For this
 commit, too, please revert if all the additional changes that o (I assume)
 were made by a wysiwyg editor, mess up the pot/po files

---
 docs/installer/en/installer.xml | 158 +++++++++++++++++++++-------------------
 1 file changed, 85 insertions(+), 73 deletions(-)

(limited to 'docs/installer/en')

diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index de4619a3..9134e07f 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.xml
@@ -34,7 +34,9 @@
       <title xml:id="installer-ti2">Installation Welcome Screen</title>
     </info>
 
-    <para>Here is the default welcome screen when using a Mageia DVD:</para>
+    <para>Here are the default welcome screens when using a Mageia DVD, The
+    first one with a legacy system and the second one with an UEFI system:
+    </para>
 
     <mediaobject>
       <imageobject>
@@ -43,19 +45,26 @@
     </mediaobject>
   </figure>
 
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="dx-welcome2.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
   <para>From this first screen, it is possible to set some personal
   preferences:</para>
 
   <itemizedlist>
     <listitem>
       <para>The language (for the installation only, may be different that the
-      chosen language for the system) by pressing the key F2</para>
+      chosen language for the system) by pressing the key F2 (Legacy mode
+      only)</para>
 
       <para/>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome-lang.png"/>
+          <imagedata fileref="dx-welcome-lang.png" align="center"/>
         </imageobject>
       </mediaobject>
 
@@ -71,7 +80,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome4fr.png"/>
+          <imagedata fileref="dx-welcome4fr.png" align="center"/>
         </imageobject>
       </mediaobject>
 
@@ -79,17 +88,18 @@
     </listitem>
 
     <listitem>
-      <para>Change the screen resolution by pressing the F3 key.</para>
+      <para>Change the screen resolution by pressing the F3 key (Legacy mode
+      only).</para>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome5def.png"/>
+          <imagedata fileref="dx-welcome5def.png" align="center"/>
         </imageobject>
       </mediaobject>
     </listitem>
 
     <listitem>
-      <para>Add some kernel options by pressing the F6 key.</para>
+      <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis> key for the legacy mode or the <emphasis role="bold">e</emphasis> key for the UEFI mode.</para>
 
       <para>If the installation fails, then it may be necessary to try again
       using one of the extra options. The menu called by F6 displays a new
@@ -121,13 +131,14 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcome6opt.png"/>
+          <imagedata align="center" fileref="dx-welcome6opt.png"/>
         </imageobject>
       </mediaobject>
     </listitem>
 
     <listitem>
-      <para>Add more kernel options by pressing the key F1</para>
+      <para>Add more kernel options by pressing the key F1 (Legacy mode
+      only).</para>
 
       <para>Pressing F1 opens a new window with more available options. Select
       one with the arrow keys and press Enter to have more details or press
@@ -137,7 +148,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcomeHelp1.png"/>
+          <imagedata fileref="dx-welcomeHelp1.png" align="center"/>
         </imageobject>
       </mediaobject>
 
@@ -150,7 +161,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="dx-welcomeHelp2.png"/>
+          <imagedata align="center" fileref="dx-welcomeHelp2.png"/>
         </imageobject>
       </mediaobject>
 
@@ -160,6 +171,9 @@
         <para>The help is translated in the chosen language with the F2
         key.</para>
       </note>
+
+      <para>For more information about kernel options on legacy and UEFI
+      systems, see: <link ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
     </listitem>
   </itemizedlist>
 
@@ -209,70 +223,68 @@
     </note>
   </section>
 
-    <section xml:id="installationProblems">
+  <section xml:id="installationProblems">
+    <info>
+      <title xml:id="installationProblems-ti1">Installation Problems and
+      Possible Solutions</title>
+    </info>
+
+    <section xml:id="noX">
+      <info>
+        <title xml:id="noX-ti2">No Graphical Interface</title>
+      </info>
+
+      <itemizedlist>
+        <listitem>
+          <para>After the initial screen you did not reach the language
+          selection screen. This can happen with some graphic cards and older
+          systems. Try using low resolution by typing <code>vgalo</code> at
+          the prompt.</para>
+        </listitem>
+
+        <listitem>
+          <para revision="2">If the hardware is very old, a graphical
+          installation may not be possible. In this case it is worth trying a
+          text mode installation. To use this hit ESC at the first welcome
+          screen and confirm with ENTER. You will be presented with a black
+          screen with the word "boot:". Type "text" and hit ENTER. Now
+          continue with the installation in text mode.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section xml:id="installFreezes">
+      <info>
+        <title xml:id="installFreezes-ti1">The Install Freezes</title>
+      </info>
+
+      <para>If the system appeared to freeze during the installation, this may
+      be a problem with hardware detection. In this case the automatic
+      detection of hardware may be bypassed and dealt with later. To try this,
+      type <code>noauto</code> at the prompt. This option may also be combined
+      with other options as necessary.</para>
+    </section>
+
+    <section xml:id="kernelOptions">
       <info>
-        <title xml:id="installationProblems-ti1">Installation Problems and
-        Possible Solutions</title>
+        <title xml:id="kernelOptions-ti1">RAM problem</title>
       </info>
 
-      <section xml:id="noX">
-        <info>
-          <title xml:id="noX-ti2">No Graphical Interface</title>
-        </info>
-
-        <itemizedlist>
-          <listitem>
-            <para>After the initial screen you did not reach the language
-            selection screen. This can happen with some graphic cards and
-            older systems. Try using low resolution by typing
-            <code>vgalo</code> at the prompt.</para>
-          </listitem>
-
-          <listitem>
-            <para revision="2">If the hardware is very old, a graphical
-            installation may not be possible. In this case it is worth trying
-            a text mode installation. To use this hit ESC at the first welcome
-            screen and confirm with ENTER. You will be presented with a black
-            screen with the word "boot:". Type "text" and hit ENTER. Now
-            continue with the installation in text mode.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section xml:id="installFreezes">
-        <info>
-          <title xml:id="installFreezes-ti1">The Install Freezes</title>
-        </info>
-
-        <para>If the system appeared to freeze during the installation, this
-        may be a problem with hardware detection. In this case the automatic
-        detection of hardware may be bypassed and dealt with later. To try
-        this, type <code>noauto</code> at the prompt. This option may also be
-        combined with other options as necessary.</para>
-      </section>
-
-      <section xml:id="kernelOptions">
-        <info>
-          <title xml:id="kernelOptions-ti1">RAM problem</title>
-        </info>
-
-        <para>These will rarely be needed, but in some cases the hardware may
-        report the available RAM incorrectly. To specify this manually, you
-        can use the <code>mem=xxxM</code> parameter, where xxx is the correct
-        amount of RAM. e.g. <code>mem=256M</code> would specify 256MB of
-        RAM.</para>
-      </section>
-
-      <section xml:id="DynamicPartitions">
-        <info>
-          <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
-        </info>
-
-        <para>If you converted your hard disk from "basic" format to "dynamic"
-        format on Microsoft Windows, you must know that it is impossible to
-        install Mageia on this disc. To go back to a basic disk, see the
-        Microsoft documentation: <link ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
-      </section>
+      <para>These will rarely be needed, but in some cases the hardware may
+      report the available RAM incorrectly. To specify this manually, you can
+      use the <code>mem=xxxM</code> parameter, where xxx is the correct amount
+      of RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
     </section>
-</section>
 
+    <section xml:id="DynamicPartitions">
+      <info>
+        <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
+      </info>
+
+      <para>If you converted your hard disk from "basic" format to "dynamic"
+      format on Microsoft Windows, you must know that it is impossible to
+      install Mageia on this disc. To go back to a basic disk, see the
+      Microsoft documentation: <link ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+    </section>
+  </section>
+</section>
\ No newline at end of file
-- 
cgit v1.2.1