Add Drakelive manual and adapt some files.

14 files changed, 574 insertions, 104 deletions

diff --git a/docs/installer/en/DrakLive.xml b/docs/installer/en/DrakLive.xml
new file mode 100644
index 00000000..2141248e
--- /dev/null
+++ b/docs/installer/en/DrakLive.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en" xml:id="Quick-Startup">
+  <info>
+    <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>
+        </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>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>
+    </cover>
+  </info>
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="bootLive.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="bestTime.xml"/>
+
+  <xi:include href="selectKeyboardLive.xml"/>
+
+  <xi:include href="testing.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="unused.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  <xi:include href="reboot.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="login.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml
index 6970d3ea..12a8c2e6 100644
--- a/docs/installer/en/SelectAndUseISOs2.xml
+++ b/docs/installer/en/SelectAndUseISOs2.xml
@@ -6,6 +6,34 @@
   </info>
 
   <section>
+    <title>Introduction</title>
+
+    <para>Mageia is distributed via ISO images. This page will help you to
+    choose which image match your needs.</para>
+
+    <para>There is two families of media:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Classical installer: After booting the media, it will follow a
+        process allowing to choose what to install and how to configure your
+        target system. This give you the maximal flexibility for a customized
+        installation, in particular to choose which Desktop Environment you
+        will install.</para>
+      </listitem>
+
+      <listitem>
+        <para>LIVE media: you can boot the media in a real Mageia system
+        without installing it, to see what you will get after installation.
+        The installation process is simpler, but you get lesser
+        choices.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Details are given in the next sections.</para>
+  </section>
+
+  <section>
     <title>Media</title>
 
     <section>
@@ -269,12 +297,8 @@
       </mediaobject>
 
       <para>md5sum and sha1sum are tools to check the ISO integrity. Use only
-      one of them. Both hexadecimal numbers have been calculated by an
-      algorithm from the file to be downloaded. When you ask these algorithms
-      to recalculate this number from your downloaded file, either you have
-      the same number and your downloaded file is correct, or the number is
-      different and you have a failure. A failure infers that you should retry
-      the download.Then this window appears:</para>
+      one of them. Keep one of them <link linkend="integrity">for further
+      usage</link>. Then this window appears:</para>
 
       <mediaobject>
         <imageobject>
@@ -286,7 +310,15 @@
     </section>
 
     <section>
-      <title>Checking the downloaded media integrity</title>
+      <title xml:id="integrity">Checking the downloaded media
+      integrity</title>
+
+      <para>Both checksums are hexadecimal numbers calculated by an algorithm
+      from the file to be downloaded. When you ask these algorithms to
+      recalculate this number from your downloaded file, either you have the
+      same number and your downloaded file is correct, or the number is
+      different and you have a failure. A failure infers that you should retry
+      the download.</para>
 
       <para>Open a console, no need to be root, and:</para>
 
@@ -337,13 +369,34 @@
         partition capacity will be reduced to the image size.</para>
       </warning>
 
-      <para>To recover the original capacity, you must re-format the USB
-      stick.</para>
+      <para>To recover the original capacity, you must redo partitioning and
+      re-format the USB stick.</para>
 
       <section>
-        <title>Using Mageia</title>
+        <title>Using a graphical tool within Mageia</title>
 
         <para>You can use a graphical tool like <link ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+      </section>
+
+      <section>
+        <title>Using a graphical tool within Windows</title>
+
+        <para>You could try:</para>
+
+        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+        "ISO image" option;</para>
+
+        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+        Imager</link></para>
+      </section>
+
+      <section>
+        <title>Using Command line within a GNU/Linux system</title>
+
+        <warning>
+          <para>It is potentially *dangerous* to do this by hand. You risk to
+          overwrite a disc partition if you get the device-ID wrong.</para>
+        </warning>
 
         <para>You can also use the dd tool in a console:</para>
 
@@ -377,12 +430,36 @@
                 <imagedata fileref="../Fdisk.png"/>
               </imageobject>
             </mediaobject>
+
+            <para>Alternatively, you can get the device name with the command
+            <code>dmesg</code>: at end, you see the device name starting with
+            <emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this
+            case:</para>
+
+            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251]  <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
           </listitem>
 
           <listitem>
             <para>Find the device name for your USB stick (by its size), for
-            example /dev/sdb in the screenshot above, it is a 8Go USB
-            stick.</para>
+            example <code>/dev/sdb</code> in the screenshot above, it is a 8GB
+            USB stick.</para>
           </listitem>
 
           <listitem>
@@ -405,29 +482,6 @@
           </listitem>
         </orderedlist>
       </section>
-
-      <section>
-        <title>Using Windows</title>
-
-        <para>You could try:</para>
-
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
-        Imager</link></para>
-
-        <para/>
-      </section>
     </section>
   </section>
-
-  <section>
-    <title>Mageia Installation</title>
-
-    <para>This step is detailed in <link ns4:href="http://www.mageia.org/en/doc/">the Mageia
-    documentation</link>.</para>
-
-    <para>More information is available in <link ns4:href="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-    wiki</link>.</para>
-  </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/acceptLicense.xml b/docs/installer/en/acceptLicense.xml
index dfe0a8ed..192ea5df 100644
--- a/docs/installer/en/acceptLicense.xml
+++ b/docs/installer/en/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="acceptLicense"
-         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: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:id="acceptLicense" version="5.0">
   <!-- Made by marja on 2012 03 27 -->
 
   <!-- NEEDS TO BE REVIEWED! -->
@@ -32,11 +25,13 @@
     <title xml:id="acceptLicense-ti1">License and Release Notes</title>
   </info>
 
-  <mediaobject condition="expert">
+  <mediaobject>
+    <imageobject condition="classical">
+      <imagedata xml:id="acceptLicense-im1" revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+    </imageobject>
+
     <imageobject>
-      <imagedata align="center"  fileref="dx2-license.png"
-                 format="PNG" revision="1" 
-                 xml:id="acceptLicense-im1"/>
+      <imagedata xml:id="acceptLicense-im2" revision="5" align="center" condition="live" format="PNG" fileref="live-license.png"/>
     </imageobject>
   </mediaobject>
 
@@ -72,8 +67,8 @@
   <para>Release Notes</para>
 -->
 
-    <para>To see what's new in this release of
-    <application>Mageia</application>, click on the <guibutton>Release
-    Notes</guibutton> button.</para>
+    <para>Important information are given about this release of
+    <application>Mageia</application> and and are accessible clicking on the
+    <guibutton>Release Notes</guibutton> button.</para>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml
index 6db02454..7676bdc2 100644
--- a/docs/installer/en/addUser.xml
+++ b/docs/installer/en/addUser.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/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:id="addUser" version="5.0">
-
+<?xml version='1.0' encoding='UTF-8'?><section 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:id="addUser" version="5.0">
   <info>
     <title xml:id="addUser-ti1">User and Superuser Management</title>
   </info>
@@ -20,12 +19,18 @@
        "rbash" in the xguest warning - is that correct? -->
 
   <!-- JohnR 2012-04-19 Language proofreading  -->
+
   <!-- marja 2012-04-24 Added screenshot -->
-  <!-- marja 2013-04-26 added new note -->
-  
-   <mediaobject>
+
+  <!-- marja 2013-04-26 added new note-->
+
+  <mediaobject>
+    <imageobject condition="classical">
+      <imagedata revision="1" align="center" xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png" format="PNG"/>
+    </imageobject>
+
     <imageobject>
-      <imagedata revision="1" fileref="dx2-setRootPassword.png"   format="PNG" align="center"   xml:id="setRootPassword-im1"></imagedata>
+      <imagedata format="PNG" fileref="live-user1.png"/>
     </imageobject>
   </mediaobject>
 
@@ -80,7 +85,7 @@
       <listitem>
         <para><guilabel>Password</guilabel>: In this text box you should 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"></xref>)</para>
+        that indicates the strength of the password. (See also <xref linkend="givePassword"/>)</para>
       </listitem>
 
       <listitem>
@@ -90,44 +95,48 @@
       </listitem>
     </itemizedlist>
 
-   <note>
-      <para>Any user you add while installing Mageia, will have a world readable
-       (but write protected) home directory.</para>
+    <note>
+      <para>Any user you add while installing Mageia, will have a world
+      readable (but write protected) home directory.</para>
 
       <para>However, while using your new install, any user you add in
-       <emphasis>MCC - System - Manage users on system</emphasis> will have a 
-       home directory that is both read and write protected.</para>
-
-      <para>If you don't want a world readable home directory for anyone, it is
-       advised to only add a temporary user now and to add the real one(s) after
-       reboot.</para>
+      <emphasis>MCC - System - Manage users on system</emphasis> will have a
+      home directory that is both read and write protected.</para>
 
-      <para>If you prefer world readable home directories, you might want to add
-       all extra needed users in the <emphasis>Configuration - Summary</emphasis>
-       step during the install. Choose <emphasis>User management</emphasis>.</para>
+      <para>If you don't want a world readable home directory for anyone, it
+      is advised to only add a temporary user now and to add the real one(s)
+      after reboot.</para>
 
-      <para>The access permissions can also be changed after the install.</para>
-   </note>
+      <para>If you prefer world readable home directories, you might want to
+      add all extra needed users in the <emphasis>Configuration -
+      Summary</emphasis> step during the install. Choose <emphasis>User
+      management</emphasis>.</para>
 
+      <para>The access permissions can also be changed after the
+      install.</para>
+    </note>
   </section>
 
-  <section xml:id="addUserAdvanced">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
       <title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
     </info>
 
     <para>If the <guibutton>advanced</guibutton> button is clicked you are
     offered a screen that allows you to edit the settings for the user you are
-    adding. Additionally, you can disable or enable a guest account.</para>
+    adding.</para>
 
-    <warning>
+    <para condition="classical">Additionally, you can disable or enable a
+    guest account.</para>
+
+    <warning condition="classical">
       <para>Anything a guest with a default <emphasis>rbash</emphasis> guest
       account saves to his /home directory will be erased when he logs out.
       The guest should save his important files to a USB key.</para>
     </warning>
 
     <itemizedlist>
-      <listitem>
+      <listitem condition="classical">
         <para><guilabel>Enable guest account</guilabel>: Here you can enable
         or disable a guest account. The guest account allows a guest to log
         into and use the PC, but he has more restricted access than normal
diff --git a/docs/installer/en/ask_mntpoint_s.xml b/docs/installer/en/ask_mntpoint_s.xml
index b1211a03..39c064c0 100644
--- a/docs/installer/en/ask_mntpoint_s.xml
+++ b/docs/installer/en/ask_mntpoint_s.xml
@@ -24,10 +24,14 @@
   <!-- 2012-04-19  Language proofreading done -->
 
 <mediaobject>
-    <imageobject>
+    <imageobject condition='classical'>
       <imagedata revision="1" fileref="dx2-chooseMountpoints.png" align="center" 
        format="PNG"  xml:id="chooseMountPoints-im1"></imagedata>
     </imageobject>
+    <imageobject condition='live'>
+      <imagedata revision="1" fileref="live-chooseMountpoints.png" align="center" 
+       format="PNG"  xml:id="live-chooseMountPoints-im1"></imagedata>
+    </imageobject>
   </mediaobject>
 
   <para>Here you see the Linux partitions that have been found on your
diff --git a/docs/installer/en/bestTime.xml b/docs/installer/en/bestTime.xml
new file mode 100644
index 00000000..e7227e6a
--- /dev/null
+++ b/docs/installer/en/bestTime.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="bestTime"
+         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">
+  <info>
+    <title xml:id="bestTime-ti1">Clock settings</title>
+  </info>
+
+  <mediaobject condition="live">
+    <imageobject>
+      <imagedata align="center" fileref="live-bestTime.png" format="PNG"
+                 revision="1" xml:id="bestTime-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>In this step, you have to select on which time your internal clock is
+  set, either local time or UTC time.</para>
+
+  <para>In advanced tab, you will find more options about clock
+  settings.</para>
+</section>
diff --git a/docs/installer/en/bootLive.xml b/docs/installer/en/bootLive.xml
new file mode 100644
index 00000000..21f9fcaa
--- /dev/null
+++ b/docs/installer/en/bootLive.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='UTF-8'?><section 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:id="bootLive" version="5.0">
+  <info>
+    <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <section>
+      <info>
+        <title xml:id="bootLive11-ti1">From a disc</title>
+      </info>
+
+      <para>You can boot directly from the media you used to burn your image
+      (CD-ROM, DVD-ROM...). You usually just need to insert it in your CD/DVD
+      drive for the bootloader to launch the installation automatically after
+      rebooting the computer. If that does not happen you may need to
+      reconfigure your BIOS or press one key that will offer you to choose the
+      peripheral from which the computer will boot.</para>
+
+      <para>According to which hardware you have, and how it is configured,
+      you get either one or another of the two screens below.</para>
+    </section>
+
+    <section>
+      <info>
+        <title xml:id="bootLive12-ti1">From a USB device</title>
+      </info>
+
+      <para>You can boot from the USB device on which you dumped your image
+      ISO. According to your BIOS settings, the computer boots perhaps
+      directly on the USB device already plugged in a port. If that does not
+      happen you may need to reconfigure your BIOS or press one key that will
+      offer you to choose the peripheral from which the computer will
+      boot.</para>
+    </section>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-bootCSM.png"/>
+      </imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <para>In the middle menu, you have the choice between three
+    actions:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Boot Mageia: That means Mageia 5 will start from the connected
+        media (CD/DVD or USB stick) without writing anything on the disk, so
+        expect a very slow system. Once the boot is done, you can proceed to
+        the installation on a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para>Install Mageia: This choice will directly install Mageia on a
+        hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para>Boot from hard disk: This choice allows to boot from hard disk,
+        as usual, when no media (CD/DVD or USB stick) is connected. (not
+        working with Mageia 5).</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>In the bottom menu, are the Boot Options:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>F1 - Help. Explain the options "splash", "apm", "acpi" and
+        "Ide"</para>
+      </listitem>
+
+      <listitem>
+        <para>F2 - Language. Choose the display language of the
+        screens.</para>
+      </listitem>
+
+      <listitem>
+        <para>F3 - Screen resolution. Choice between text, 640x400, 800x600,
+        1024x728</para>
+      </listitem>
+
+      <listitem>
+        <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is
+        performed from the inserted installation medium. Here, select other
+        sources, like FTP or NFS servers. If the installation is carried out
+        in a network with an SLP server, select one of the installation
+        sources available on the server with this option.</para>
+      </listitem>
+
+      <listitem>
+        <para>F5 - Driver. Yes or No. The system is aware about the presence
+        of an optional disk with a driver update and will require its
+        insertion during installation process.</para>
+      </listitem>
+
+      <listitem>
+        <para>F6 - Kernel options. This is a way to specify options according
+        to your hardware and the drivers to use.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject>
+        <imagedata revision="1" align="center" fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
+      </imageobject>
+
+      <caption>
+        <para>First screen while booting on UEFI system from disk</para>
+      </caption>
+    </mediaobject>
+
+    <para>You have only the choice to run Mageia in Live mode (first choice)
+    or to process the installation (second choice).</para>
+    <para>If you booted form a USB stick, you get wo supplemental lines which
+        are a duplicata of the previous lines suffixed with "USB". You have to
+        choose them.</para>
+
+    <para>In each case, the first steps will be the same to choose language,
+    timezone and keyboard, then the processes differ, with <link linkend="testing">additional steps in Live mode</link>.</para>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/login.xml b/docs/installer/en/login.xml
new file mode 100644
index 00000000..14e5f130
--- /dev/null
+++ b/docs/installer/en/login.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?><section 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:id="login" version="5.0">
+  <info>
+    <title xml:id="label-to-adapt-ti1">Login screen</title>
+  </info>
+
+  <mediaobject condition="live">
+    <imageobject>
+      <imagedata revision="1" align="center" xml:id="login-im1" format="PNG" fileref="live-login.png"/>
+    </imageobject>
+
+    <caption>
+      <para>KDM login screen</para>
+    </caption>
+  </mediaobject>
+
+  <para>Finally, you will come to the login screen.</para>
+
+  <para>Enter your user name and user password, and in a few seconds you will
+  find yourself with a loaded KDE or GNOME desktop, depending on which live
+  medium you used. You can now start using your Mageia installation.</para>
+
+  <para>You can find another part of our documentation in <link linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/reboot.xml b/docs/installer/en/reboot.xml
new file mode 100644
index 00000000..84f9412f
--- /dev/null
+++ b/docs/installer/en/reboot.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="reboot" 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">
+  <info>
+    <title xml:id="reboot-ti1">Reboot</title>
+  </info>
+
+  <mediaobject condition="live">
+    <imageobject>
+      <imagedata align="center" fileref="live-reboot.png" format="PNG"
+                 revision="1" xml:id="reboot-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>Once the bootloader has been installed, you will be prompted to halt
+  your computer, remove the live CD and restart the computer. When you
+  restart, you will see a succession of download progress bars. These indicate
+  that the software media are being downloaded (see Software
+  management).</para>
+</section>
diff --git a/docs/installer/en/selectKeyboardLive.xml b/docs/installer/en/selectKeyboardLive.xml
new file mode 100644
index 00000000..05243493
--- /dev/null
+++ b/docs/installer/en/selectKeyboardLive.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?><section 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" version="5.0" xml:id="selectKeyboardLive">
+  <info>
+    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata xml:id="selectKeyboardLive-im1" revision="1" align="center" format="PNG" fileref="live-selectKeyboard.png"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>You will be required to set the keyboard layout you wish to use in
+  Mageia​​. The default one is selected according to your language and
+  timezone previously selected.</para>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/selectLanguage.xml b/docs/installer/en/selectLanguage.xml
index af9b19d0..95c4ffa4 100644
--- a/docs/installer/en/selectLanguage.xml
+++ b/docs/installer/en/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section 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"
- version="5.0" xml:id="selectLanguage">
-
+<?xml version='1.0' encoding='UTF-8'?><section 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:id="selectLanguage" version="5.0">
   <!-- Made by marja on 2012 04 01, using barjac's text -->
 
   <!-- NEEDS TO BE REVIEWED! -->
@@ -27,43 +19,47 @@
   continent. <application>Mageia</application> will use this selection during
   the installation and for your installed system.</para>
 
-  <para>If it is likely that you will require several languages installed on
-  your system, for yourself or other users, then you should use the
-  <guibutton>Multiple languages</guibutton> button to add them now. It will be
-  difficult to add extra language support after installation.</para>
+  <para condition="classical">If it is likely that you will require several
+  languages installed on your system, for yourself or other users, then you
+  should use the <guibutton>Multiple languages</guibutton> button to add them
+  now. It will be difficult to add extra language support after
+  installation.</para>
 
   <mediaobject>
-    <imageobject>
-      <imagedata fileref="dx2-selectLanguage.png" align="center"  
-        format="PNG" >
-      </imagedata>
+    <imageobject condition="classical">
+      <imagedata align="center" fileref="dx2-selectLanguage.png" format="PNG"/>
+    </imageobject>
+
+    <imageobject condition="live">
+      <imagedata format="PNG" fileref="live-language.png"/>
     </imageobject>
   </mediaobject>
 
-  <warning>
+  <warning condition="classical">
     <para>Even if you choose more than one language, you must first choose one
     of them as your preferred language in the first language screen. It will
     also be marked as chosen in the multiple languages screen .</para>
   </warning>
 
   <itemizedlist>
-    <listitem>
+    <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred
       language, then it is advisable to install the language of your keyboard
       as well.</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default. This may be
-      disabled in the "multiple languages" screen if you know that it is
-      inappropriate for your language. Disabling UTF-8 applies to all
-      installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. </para>
+
+      <para condition="classical">This may be disabled in the "multiple
+      languages" screen if you know that it is inappropriate for your
+      language. Disabling UTF-8 applies to all installed languages.</para>
     </listitem>
 
     <listitem>
       <para>You can change the language of your system after installation in
-      the Mageia Control Center -&gt; System -&gt; Manage localization for
+      the Mageia Control Center -> System -> Manage localization for
       your system.</para>
     </listitem>
   </itemizedlist>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/testing.xml b/docs/installer/en/testing.xml
new file mode 100644
index 00000000..315ce8a6
--- /dev/null
+++ b/docs/installer/en/testing.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="testing" 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">
+  <info>
+    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+  </info>
+
+  <section xml:id="testing-1">
+    <info>
+      <title xml:id="testing1-ti1">Live mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-liveMode.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <para>You get this screen if you selected "Boot Mageia". If not, you get
+    the "<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+    <section>
+      <info>
+        <title xml:id="testing2-ti1">Testing hardware</title>
+      </info>
+
+      <para>One of the Live mode goals is to test if the hardware is
+      correctly managed by Mageia. You can check if all devices have a driver in
+      the Hardware section of the Mageia Control Centre. You can test the most
+      current devices:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>network interface: configure it with net_applet</para>
+        </listitem>
+
+        <listitem>
+          <para>graphical card: if you see the previous screen, it's already
+          OK.</para>
+        </listitem>
+
+        <listitem>
+          <para>webcam:</para>
+        </listitem>
+
+        <listitem>
+          <para>sound: a jingle has already been played</para>
+        </listitem>
+
+        <listitem>
+          <para>printer: configure it and print a test page</para>
+        </listitem>
+
+        <listitem>
+          <para>scanner: scan a document from ...</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If all is OK for you, you can process to the installation. If not,
+      you can leave with the quit button.</para>
+
+      <remark>The configuration settings you made here are kept for the
+      installation.</remark>
+    </section>
+
+    <section>
+      <info>
+        <title xml:id="testing3-ti1">Launch installation</title>
+      </info>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="live-liveMode-install.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
+      SSD drive, simply click on the icon "Install on Hard Disk". You will get
+      this screen, and then the "<link
+      linkend="doPartitionDisks">Partitioning</link> step" as for the direct
+      installation.</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/installer/en/uninstall-Mageia.xml b/docs/installer/en/uninstall-Mageia.xml
index 3ec3ac61..b5be8f5a 100644
--- a/docs/installer/en/uninstall-Mageia.xml
+++ b/docs/installer/en/uninstall-Mageia.xml
@@ -3,7 +3,7 @@
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
-  <!-- -->
+  <!--Lebarhon 2015-07-06 Not true with UEFI -->
 
   <section>
     <title xml:id="uninstall-Mageia-ti2">Howto</title>
diff --git a/docs/installer/en/unused.xml b/docs/installer/en/unused.xml
new file mode 100644
index 00000000..ff18bf00
--- /dev/null
+++ b/docs/installer/en/unused.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="unused" 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">
+  <info>
+    <title xml:id="unused-ti1">Keep or delete unused material</title>
+  </info>
+
+  <mediaobject condition="live">
+    <imageobject>
+      <imagedata align="center" fileref="live-unused.png" format="PNG"
+                 revision="1" xml:id="unused-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and
+  unused hardware packages. Then it proposes you to delete them. It is a good
+  idea to accept, except if you prepare an installation which has to run on
+  different hardware.</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="live-unused-InstallationProgress.png"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>The next step is the copying of files on hard disk. This takes some
+  minutes. At the end, you get a blank screen for some time, it's
+  normal.</para>
+</section>