Sync docs with Calenco

1 files changed, 148 insertions, 38 deletions

diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index eb7e9fca..344e0ef8 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.xml
@@ -1,5 +1,4 @@
-<?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" version="5.0" xml:id="installer">
-
+<?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="installer" version="5.0">
   <!-- Made by marja on 2012 03 30, using barjac's text -->
 
   <!-- NEEDS TO BE REVIEWED! -->
@@ -35,17 +34,152 @@
       <title xml:id="installer-ti2">Installation Welcome Screen</title>
     </info>
 
+    <para>Here is the by default welcome screen when using a Mageia
+    DVD:</para>
+
     <mediaobject>
       <imageobject>
-        <imagedata revision="1" fileref="../dx-welcome.png" align="center" 
-         format="PNG"  xml:id="BId-drakx-intro-im1">
-        </imagedata>
+        <imagedata xml:id="BId-drakx-intro-im1" revision="1" align="center" format="PNG" fileref="../dx-welcome.png"/>
       </imageobject>
     </mediaobject>
   </figure>
 
-  <para>If there are problems during install, then it may be necessary to use
-  special installation options, see <xref linkend="installationOptions"></xref>.</para>
+  <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>
+
+      <para/>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome-lang.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Use the arrow keys to select the language and press the key
+      Enter.</para>
+
+      <para>Here is for example, the French welcome screen when using a Live
+      DVD/CD. Note that the Live DVD/CD menu does not propose:
+      <guilabel>Rescue System, Memory test</guilabel> and <guilabel>Hardware
+      Detection Tool</guilabel>.</para>
+
+      <para/>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome4fr.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para/>
+    </listitem>
+
+    <listitem>
+      <para>The screen definition by pressing the key F3</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome5def.png"/>
+        </imageobject>
+      </mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Add some kernel options by pressing the key F6.</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
+      line called <guilabel>Boot options</guilabel> and propose four
+      entries:</para>
+
+      <para>- Default, it doesn't alter anything in the by default
+      options.</para>
+
+      <para>- Safe Settings, priority is given to the safer options to the
+      detriment of performances.</para>
+
+      <para>- No ACPI (Advanced Configuration and Power Interface), power
+      management isn't taken into account.</para>
+
+      <para>- No Local APIC (Local Advanced Programmable Interrupt
+      Controller), it is about CPU interruptions, select this option if you
+      are askrd for.</para>
+
+      <para>When you select one of these entries, it modifies the already by
+      default options displayed in the <guilabel>Boot option</guilabel>
+      line.</para>
+
+      <note>
+        <para>In some Mageia release, it may happen that the entries selected
+        with the key F6 does not appear in the Boot Option line, however, they
+        are really taken into account.</para>
+      </note>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome6opt.png"/>
+        </imageobject>
+      </mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Add more kernel options by pressing the key F1</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
+      the key ESC to go back to the welcome screen.</para>
+
+      <para/>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcomeHelp1.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para/>
+
+      <para>The detailed view about the option splash. Press ESC or select
+      <guilabel>Return to Boot Options</guilabel> to go back to the options
+      list. These options can by added by hand in the <guilabel>Boot
+      option</guilabel> line.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcomeHelp2.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para/>
+
+      <note>
+        <para>The help is translated in the chosen language with the F2
+        key.</para>
+      </note>
+    </listitem>
+  </itemizedlist>
+
+  <para>Here is the by default welcome screen when using a Wired Network-based
+  Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+
+  <para>It does not allow to change the language, the available options are
+  described in the screen. For more information about using a Wired
+  Network-based Installation CD, see the Mageia Wiki <link ns2:href="???">https://wiki.mageia.org/en/Boot.iso_install</link></para>
+
+  <warning>
+    <para>The keyboard layout is the American one.</para>
+  </warning>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata revision="1" xml:id="installer-im2" align="center" format="PNG" fileref="../dx-help.png"/>
+    </imageobject>
+  </mediaobject>
 
   <section xml:id="installationSteps">
     <info>
@@ -76,30 +210,6 @@
   </section>
 
   <section xml:id="installationOptions">
-    <info>
-      <title xml:id="installationOptions-ti1">Installation options</title>
-    </info>
-
-    <para>If the installation fails then it may be necessary to try again by
-    using one of the extra options available by hitting the <guibutton>F1
-    (Help)</guibutton> key see <xref linkend="dx-welcome"></xref></para>
-
-    <para>This will open the following text based help.</para>
-
-    <figure xml:id="dx-help">
-      <info>
-        <title xml:id="installationOptions-ti2">Installation Help
-        Screen</title>
-      </info>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata revision="1" fileref="../dx-help.png" align="center" 
-           format="PNG"  xml:id="installer-im2"></imagedata>
-        </imageobject>
-      </mediaobject>
-    </figure>
-
     <section xml:id="installationProblems">
       <info>
         <title xml:id="installationProblems-ti1">Installation Problems and
@@ -120,12 +230,12 @@
           </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.<emphasis></emphasis></para>
+            <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.<emphasis/></para>
           </listitem>
         </itemizedlist>
       </section>
@@ -144,7 +254,7 @@
 
       <section xml:id="kernelOptions">
         <info>
-          <title xml:id="kernelOptions-ti1">Kernel Options</title>
+          <title xml:id="kernelOptions-ti1">RAM problem</title>
         </info>
 
         <para>These will rarely be needed, but in some cases the hardware may