Update XML

22 files changed, 678 insertions, 231 deletions

diff --git a/docs/installer/eo/DrakLive-cover.xml b/docs/installer/eo/DrakLive-cover.xml
new file mode 100644
index 00000000..3e5b555d
--- /dev/null
+++ b/docs/installer/eo/DrakLive-cover.xml
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='utf-8'?>
+<book 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="eo" xml:id="Quick-Startup">
+  <info>
+    <title>Installation from LIVE medium</title>
+   <publisher> <publishername>Mageia.org</publishername> </publisher>
+   <revhistory>
+     <revision>
+          <date>January 2015</date>
+        <revremark>Mageia 5</revremark>
+     </revision>
+   </revhistory>
+    <cover>
+        <para role="tagline">The Official Documentation for Mageia</para>
+      <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+            <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco 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>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <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>
+  <article>
+    <title>Installation from LIVE medium</title>
+       <para><note>
+          <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
+        </note></para>
+  <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>
+</book>
\ No newline at end of file
diff --git a/docs/installer/eo/DrakLive.xml b/docs/installer/eo/DrakLive.xml
new file mode 100644
index 00000000..46d59863
--- /dev/null
+++ b/docs/installer/eo/DrakLive.xml
@@ -0,0 +1,64 @@
+<?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="eo" xml:id="Quick-Startup">
+  <info>
+    <title>Installation from LIVE medium</title>
+
+    <cover>
+      <para><note>
+          <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco 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>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <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/eo/SelectAndUseISOs2.xml b/docs/installer/eo/SelectAndUseISOs2.xml
index a9df02e2..f17cc465 100644
--- a/docs/installer/eo/SelectAndUseISOs2.xml
+++ b/docs/installer/eo/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
   </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>
@@ -260,12 +286,8 @@ http is chosen, you may also see something like</para>
 <imageobject> <imagedata fileref="Checking.png"/> </imageobject></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>
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
 
       <mediaobject>
 <imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -274,7 +296,13 @@ window appears:</para>
     </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>
 
@@ -323,13 +351,35 @@ the device; any other data will be lost and the 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>
 
@@ -356,11 +406,34 @@ application or file manager that could access or read it)</para>
 
             <mediaobject>
 <imageobject> <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>
+            <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
           </listitem>
 
           <listitem>
@@ -382,30 +455,6 @@ of=/dev/sdb bs=1M</userinput></para>
           </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/eo/acceptLicense.xml b/docs/installer/eo/acceptLicense.xml
index 961898be..a5783d56 100644
--- a/docs/installer/eo/acceptLicense.xml
+++ b/docs/installer/eo/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" 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" xml:lang="eo">
   
 
   
@@ -41,10 +34,12 @@
 <title xml:id="acceptLicense-ti1">Licenco kaj publikig-notoj</title>
   </info>
 
-  <mediaobject condition="expert">
-<imageobject> <imagedata revision="1" fileref="dx2-license.png" width="800"
-align="center" format="PNG" depth="600"
-xml:id="acceptLicense-im1"></imagedata> </imageobject></mediaobject>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
@@ -83,6 +78,6 @@ Release Notes</para>
 
     <para>Por vidi kio estas nova en ĉi tiu versio de
 <application>Magejo</application>, klaku sur la butono
-<guibutton>Publikig-notoj (Release Notes)  </guibutton>.</para>
+<guibutton>Publikig-notoj (Release Notes)</guibutton>.</para>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/eo/addUser.xml b/docs/installer/eo/addUser.xml
index f909c16a..5bc1f60e 100644
--- a/docs/installer/eo/addUser.xml
+++ b/docs/installer/eo/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:lang="eo">
-
+<?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:lang="eo">
   <info>
     <title xml:id="addUser-ti1">Uzula kaj superuzula administrado</title>
   </info>
@@ -15,10 +14,12 @@
   
 
   
+
   
+
   
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Started by marja,using Led43's text, on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
        "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 -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="setRootPassword-im1"></imagedata> </imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<imageobject condition="classical"> <imagedata revision="1" align="center"
+xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png"
+format="PNG"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-user1.png"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
@@ -86,7 +88,7 @@ minuskloj.</emphasis></para>
       <listitem>
         <para><guilabel>Pasvorto</guilabel>: En ĉi tiu teksta skatolo vi devus tajpi la
 uzulan pasvorton. Estas kampo je la fino de la teksto-skatolo indikanta la
-forton de la pasvorto. (Vidu ankaŭ <xref linkend="givePassword"></xref>)</para>
+forton de la pasvorto. (Vidu ankaŭ <xref linkend="givePassword"/>)</para>
       </listitem>
 
       <listitem>
@@ -96,7 +98,7 @@ uzulaj pasvortaj teksto-skatoloj.</para>
       </listitem>
     </itemizedlist>
 
-   <note>
+    <note>
       <para>Any user you add while installing Mageia, will have a world readable (but
 write protected) home directory.</para>
 
@@ -112,27 +114,27 @@ 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>
-
+    </note>
   </section>
 
-  <section xml:id="addUserAdvanced">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
       <title xml:id="addUserAdvanced-ti3">Sperta uzulo-administrado</title>
     </info>
 
     <para>Se la <guibutton>Progresinta</guibutton> butono estas klakita aperos ekrano
-ebliganta eldoni la konfiguron de la aldonata uzulo.  Krome, vi povas
-aktivigi aŭ malaktivigi gastan konton.</para>
+ebliganta eldoni la konfiguron de la aldonata uzulo.</para>
 
-    <warning>
+    <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+    <warning condition="classical">
       <para>Ĉio konservita de gasto uzanta defaŭltan <emphasis>rbash-an</emphasis>
 gastan konton en la dosierujo /home estos forigita post la elsaluto.  La
 gasto devus konservi gravajn dosierojn en USB-ŝlosilo.</para>
     </warning>
 
     <itemizedlist>
-      <listitem>
+      <listitem condition="classical">
         <para><guilabel>Aktivigi gastan konton (Enable guest account)</guilabel>: Ĉi tie
 vi povas aktivigi aŭ malaktivigi gastan konton. Gasta konto ebligos gaston
 ensaluti kaj uzi la komputilon, sed ĝi havas pli da limigoj ol tiu de
diff --git a/docs/installer/eo/ask_mntpoint_s.xml b/docs/installer/eo/ask_mntpoint_s.xml
index 21364f97..03c34df5 100644
--- a/docs/installer/eo/ask_mntpoint_s.xml
+++ b/docs/installer/eo/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
        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 -->
-<imageobject> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" width="100%" format="PNG" depth="600"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
+<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>Ĉi tie vi vidas la linuksajn subdiskojn kiuj estis trovitaj en via
 komputilo. Se vi ne akordas kun la sugestoj de
diff --git a/docs/installer/eo/bestTime.xml b/docs/installer/eo/bestTime.xml
new file mode 100644
index 00000000..bf18e542
--- /dev/null
+++ b/docs/installer/eo/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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/eo/bootLive.xml b/docs/installer/eo/bootLive.xml
new file mode 100644
index 00000000..cc964324
--- /dev/null
+++ b/docs/installer/eo/bootLive.xml
@@ -0,0 +1,29 @@
+<?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" xml:id="bootLive" version="5.0" xml:lang="eo"><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. Choose 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 format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></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 from a USB stick, you get two 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/eo/configureTimezoneUTC.xml b/docs/installer/eo/configureTimezoneUTC.xml
index e470a981..6680322d 100644
--- a/docs/installer/eo/configureTimezoneUTC.xml
+++ b/docs/installer/eo/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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="configureTimezoneUTC" version="5.0" xml:lang="eo">
+<?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:lang="eo" xml:id="configureTimezoneUTC">
+  <info>
+    <title xml:id="configureTimezoneUTC-ti6">Konfiguru vian horzonon</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureTimezoneUTC-ti6">Konfiguru vian horzonon</title>
-    </info>
+  
 
-    
-    
-
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="configureTimezoneUTC-pa1">Elektu vian horzonon selektante vian landon aŭ urbon proksiman kiu troviĝu
+  <para revision="1" xml:id="configureTimezoneUTC-pa1">Elektu vian horzonon selektante vian landon aŭ urbon proksiman kiu troviĝu
 en la sama tempo-zono.</para>
 
-    <para revision="1" xml:id="configureTimezoneUTC-pa2">En la sekva ekrano vi povas alĝustigi vian sisteman horloĝon je la loka horo
+  <para revision="1" xml:id="configureTimezoneUTC-pa2">En la sekva ekrano vi povas alĝustigi vian sisteman horloĝon je la loka horo
 aŭ je GTM, ankaŭ konata kiel UTC.</para>
 
-    <note>
-      <para revision="1" xml:id="configureTimezoneUTC-pa3">Se vi havas pli ol unu operacia sistemo en via komputilo, certiĝu pri tio ke
+  <note>
+    <para revision="1" xml:id="configureTimezoneUTC-pa3">Se vi havas pli ol unu operacia sistemo en via komputilo, certiĝu pri tio ke
 ili estas alĝustigitaj ĉiuj je la loka horo aŭ je UTC/GTM.</para>
-    </note>
-  </section>
-
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/installer/eo/diskdrake.xml b/docs/installer/eo/diskdrake.xml
index bff741b6..c039e029 100644
--- a/docs/installer/eo/diskdrake.xml
+++ b/docs/installer/eo/diskdrake.xml
@@ -29,8 +29,9 @@
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png"
+align="center"/> </imageobject> <imageobject condition='live' > <imagedata
+fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
 
   <warning>
     <para revision="3" xml:id="diskdrake-pa1">Se vi volas utiligi ĉifradon en via subdisko <literal>/</literal> vi devas
@@ -39,9 +40,9 @@ subdisko <literal>/boot</literal> ne devas esti selektita, alie via sistemo
 ne startos.</para>
   </warning>
 
-  <para revision="2" xml:id="diskdrake-pa3">Adjust the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view what is in them before you start.</para>
+  <para revision="2" xml:id="diskdrake-pa3">Agordu via(j)n disko(j)n ĉi tie. Vi povas forigi aŭ krei subdiskojn, ŝanĝi
+la dosiersistemon de subdisko aŭ ŝanĝi ĝian grandon kaj eĉ vidi kio estas en
+ĝi antaŭ ol komenci.</para>
 
   <para revision="1" xml:id="diskdrake-pa4">Estas langeto por ĉiu trovita fiksita disko aŭ alispeca stor-aparato kiel
 USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri.</para>
@@ -63,5 +64,4 @@ System Partition) is present and correctly mounted on /boot/EFI (see above)</par
     <para><mediaobject>
 <imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
   </note>
-</section>
-
+</section>
\ No newline at end of file
diff --git a/docs/installer/eo/doPartitionDisks.xml b/docs/installer/eo/doPartitionDisks.xml
index 4d3d4f04..dca1e69c 100644
--- a/docs/installer/eo/doPartitionDisks.xml
+++ b/docs/installer/eo/doPartitionDisks.xml
@@ -3,35 +3,9 @@
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <info>
-    <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer 
-       if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back.  -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+    <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
 <title xml:id="doPartitionDisks-ti1">Kreo de subdiskoj</title>
   </info>
 
@@ -80,7 +54,7 @@ personaj dosieroj.</para>
         <para>With this option, the installer displays the remaining Windows partition in
 light blue and the future Mageia partition in dark blue with their intended
 sizes just under. You have the possibility to adapt these sizes by clicking
-and draging the gap between both partitions. See the screen-shot below.</para>
+and dragging the gap between both partitions. See the screen-shot below.</para>
 
         <mediaobject>
 <imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
@@ -98,7 +72,7 @@ zorgema!</para>
         <para revision="1" xml:id="doPartitionDisks-pa15">Se vi volas uzi parton de la disko por alia celo aŭ vi havas datumojn en la
 disko kiujn vi ne volas perdi, ne elektu ĉi tion.</para>
       </listitem>
-    </itemizedlist> <itemizedlist>
+    </itemizedlist><itemizedlist>
       <listitem>
         <para revision="1" xml:id="doPartitionDisks-pa16">Subdiskigo</para>
 
@@ -107,6 +81,47 @@ fiksita(j)  disko(j).</para>
       </listitem>
     </itemizedlist></para>
 
+  <para><emphasis role="bold">Partitions sizing:</emphasis></para>
+
+  <para>The installer will share the available place out according to the following
+rules:</para>
+
+  <para><itemizedlist>
+      <listitem>
+        <para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para>
+      </listitem>
+
+      <listitem>
+        <para>If the total available place is over 50 GB, then three partitions are
+created</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
+          </listitem>
+
+          <listitem>
+            <para>1/19 is allocated to swap with a maximum of 4 GB</para>
+          </listitem>
+
+          <listitem>
+            <para>the rest (at least 12/19) is allocated to /home</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist></para>
+
+  <para>That means that from 160 GB and over of available place, the installer will
+create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+
+  <note>
+    <para>If you are using an UEFI system, the ESP (EFI System Partition) will be
+automatically detected, or created if it does not exist yet, and mounted on
+/boot/EFI. The "Custom" option is the only one that allows to check it has
+been correctly done</para>
+  </note>
+
   <warning>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512 byte logical sectors. Due to lack of available
@@ -114,13 +129,12 @@ hardware, the partitioning tool used in the installer has not been tested
 with such a drive. Also some ssd drives now use an erase block size over 1
 MB. We suggest to pre-partition the drive, using an alternative partitioning
 tool like gparted, if you own such a device, and to use the following
-settings: </para>
+settings:</para>
 
-    <para>"Align to" "MiB" </para>
+    <para>"Align to" "MiB"</para>
 
-    <para>"Free space preceding (MiB)" "2" </para>
+    <para>"Free space preceding (MiB)" "2"</para>
 
     <para>Also make sure all partitions are created with an even number of megabytes.</para>
   </warning>
-</section>
-
+</section>
\ No newline at end of file
diff --git a/docs/installer/eo/formatPartitions.xml b/docs/installer/eo/formatPartitions.xml
index 6a6590f9..775dfa99 100644
--- a/docs/installer/eo/formatPartitions.xml
+++ b/docs/installer/eo/formatPartitions.xml
@@ -19,9 +19,12 @@
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="formatPartitions-im1"></imagedata> </imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
 
   <para revision="2" xml:id="formatPartitions-pa1">Ĉi tie vi povas elekti kiu(j)n subdisko(j)n vi ŝatus strukturi. Iu ajn
 datumo en subdisko(j) <emphasis>ne</emphasis> markita(j) por strukturado
diff --git a/docs/installer/eo/login.xml b/docs/installer/eo/login.xml
new file mode 100644
index 00000000..d47e4324
--- /dev/null
+++ b/docs/installer/eo/login.xml
@@ -0,0 +1,6 @@
+<?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" xml:id="login" version="5.0" xml:lang="eo"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></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/eo/reboot.xml b/docs/installer/eo/reboot.xml
new file mode 100644
index 00000000..b2fe9c83
--- /dev/null
+++ b/docs/installer/eo/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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/eo/selectKeyboardLive.xml b/docs/installer/eo/selectKeyboardLive.xml
new file mode 100644
index 00000000..1b75d8d8
--- /dev/null
+++ b/docs/installer/eo/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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:lang="eo" 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/eo/selectLanguage.xml b/docs/installer/eo/selectLanguage.xml
index cf6e03a2..26591366 100644
--- a/docs/installer/eo/selectLanguage.xml
+++ b/docs/installer/eo/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:lang="eo" 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" xml:lang="eo">
   
 
   
@@ -32,36 +24,40 @@
 listo. <application>Magejo</application> uzos ĉi tiun selekton dum la
 instalado kaj por la instalita sistemo.</para>
 
-  <para>Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj
+  <para condition="classical">Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj
 uzuloj, tiam vi devas utiligi la butonon <guibutton>Multaj lingvoj (Multiple
 languages)</guibutton> por aldoni ilin nun. Estos malfacile aldoni plian
 lingvan eltenon post la instalo.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-width="800" format="PNG" depth="600"></imagedata> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-language.png" format=""/>
+</imageobject></mediaobject>
 
-  <warning>
+  <warning condition="classical">
     <para>Se vi elektas pli ol unu lingvon, vi devas selekti unu el ili kiel vian
 preferatan lingvon en la komenca lingva ekrano. Ĝi markiĝos ankaŭ en la
 plurlingva ekrano .</para>
   </warning>
 
   <itemizedlist>
-    <listitem>
+    <listitem condition="classical">
       <para>Se via klavara lingvo ne estas la sama kiel via preferata lingvo, tiam estas
 rekomendinde instali la lingvon de via klavaro ankaŭ.</para>
     </listitem>
 
     <listitem>
-      <para>Magejo uzas UTF-8 (Unikodon) defaŭlte. Ĉi tio povas esti malŝaltita en la
-plurlingva ekrano se vi certas pri tio ke ĝi estas neadekvata por via
-lingvo. Malŝalti unikodon havos konsekvencojn sur ĉiuj instalitaj lingvoj.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
+
+      <para condition="classical">Ĉi tio povas esti malŝaltita en la plurlingva ekrano se vi certas pri tio ke
+ĝi estas neadekvata por via lingvo. Malŝalti unikodon havos konsekvencojn
+sur ĉiuj instalitaj lingvoj.</para>
     </listitem>
 
     <listitem>
       <para>Vi povas ŝanĝi la lingvon de via sistemo post la instalo per la Kontrolilo
-de Magejo -&gt; Sistemo -&gt; Agordi skrib-sistemojn.</para>
+de Magejo -> Sistemo -> Agordi skrib-sistemojn.</para>
     </listitem>
   </itemizedlist>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/eo/setupBootloader.xml b/docs/installer/eo/setupBootloader.xml
index dcca4a95..a7c91607 100644
--- a/docs/installer/eo/setupBootloader.xml
+++ b/docs/installer/eo/setupBootloader.xml
@@ -1,92 +1,117 @@
 <?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" version="5.0" xml:lang="eo" xml:id="setupBootloader">
-  <info>
-    <title xml:id="setupBootloader-ti1">Lanĉilaj ĉefaj elektoj</title>
-  </info>
+  
 
   
 
-  <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
+  <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-->
+<title xml:id="setupBootloader-ti1">Lanĉilaj ĉefaj elektoj</title>
+  </info>
 
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></mediaobject>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="setupBootloader-im1"
+format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata
+xml:id="setupBootloader-im1" format="PNG" align="center" revision="1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
 
-  <para><note>
-      <para>With an UEFI system, the user interface is slightly different as you cannot
-choose the boot loader (first drop down list) since only one is available</para>
-    </note></para>
+  <section>
+    <title>With a Bios system</title>
 
-  <para xml:id="setupBootloader-pa1" revision="4">Se vi preferas malsaman lanĉilan konfiguron al tiu elektita aŭtomate fare de
+    <para xml:id="setupBootloader-pa1" revision="4">Se vi preferas malsaman lanĉilan konfiguron al tiu elektita aŭtomate fare de
 la instalilo, vi povas ŝanĝi ĝin ĉi tie.</para>
 
-  <para xml:id="setupBootloader-pa2" revision="4">Eble vi havas jam alian operacian sistemon en via maŝino, tiukaze vi devas
+    <para xml:id="setupBootloader-pa2" revision="4">Eble vi havas jam alian operacian sistemon en via maŝino, tiukaze vi devas
 decidi ĉu vi volas aldoni Magejon al via ekzistanta lanĉilo aŭ ebligi al
 Magejo krei novan.</para>
 
-  <tip>
-    <para revision="2" xml:id="setupBootloader-pa3">La grafika menuo de Magejo estas bela :)</para>
-  </tip>
+    <tip>
+      <para>La grafika menuo de Magejo estas bela :)</para>
+    </tip>
 
-  <section xml:id="usingMageiaBootloader">
-    <info>
-      <title xml:id="usingMageiaBootloader-ti2">Uzi la lanĉilon de Magejo</title>
-    </info>
+    <section xml:id="usingMageiaBootloader">
+      <info>
+        <title xml:id="usingMageiaBootloader-ti2">Uzi la lanĉilon de Magejo</title>
+      </info>
 
-    <para revision="3" xml:id="setupBootloader-pa4">Defaŭlte Magejo skribas novan GRUB-lanĉilon en la MBR de via unua fiksita
+      <para xml:id="setupBootloader-pa4" revision="3">Defaŭlte Magejo skribas novan GRUB-lanĉilon en la MBR de via unua fiksita
 disko.  Se vi jam havas aliajn operaciajn sistemojn, Magejo provos aldoni
 ilin al via nova Mageja lanĉilo.</para>
 
-    <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
+      <para revision="3">Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
 legacy and Lilo.</para>
 
-    <warning>
-      <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+      <warning>
+        <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by
 GRUB (legacy) and will not be recognised if the default GRUB bootloader is
 used.</para>
 
-      <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
+        <para revision="3">The best solution here is to use the GRUB2 bootloader which is available at
 the Summary page during installation.</para>
-    </warning>
-  </section>
+      </warning>
+    </section>
 
-  <section xml:id="usingExistingBootloader">
-    <info>
-      <title revision="2" xml:id="usingExistingBootloader-ti4">Uzi ekzistantan lanĉilon</title>
-    </info>
+    <section xml:id="usingExistingBootloader">
+      <info>
+        <title xml:id="usingExistingBootloader-ti4" revision="2">Uzi ekzistantan lanĉilon</title>
+      </info>
 
-    <para revision="3" xml:id="setupBootloader-pa46">Se vi decidas uzi ekzistantan lanĉilon tiam vi devos klaki sur la lanĉila
+      <para xml:id="setupBootloader-pa46" revision="3">Se vi decidas uzi ekzistantan lanĉilon tiam vi devos klaki sur la lanĉila
 butono <guibutton>Konfiguru</guibutton>, kiu ebligos vin ŝanĝi la
 instal-lokon de la lanĉilo.</para>
 
-    <para revision="1" xml:id="setupBootloader-pa47">Ne selektu aparaton kiel "sda" aŭ vi anstataŭigos la ekzistantan MBR. Vi
+      <para xml:id="setupBootloader-pa47" revision="1">Ne selektu aparaton kiel "sda" aŭ vi anstataŭigos la ekzistantan MBR. Vi
 devas selekti la saman radikan subdiskon kiun vi elektis dum la subdiskigo,
 ekzemple sda7.</para>
 
-    <para xml:id="setupBootloader-pa48" revision="1">Klarigcele, sda estas aparato, sda7 subdisko.</para>
+      <para xml:id="setupBootloader-pa48" revision="1">Klarigcele, sda estas aparato, sda7 subdisko.</para>
 
-    <tip>
-      <para revision="1" xml:id="setupBootloader-pa48a">Iru al tty2 per la premo de Ctrl+Alt+F2 kaj tajpu <literal>df</literal> por
+      <tip>
+        <para revision="1" xml:id="setupBootloader-pa48a">Iru al tty2 per la premo de Ctrl+Alt+F2 kaj tajpu <literal>df</literal> por
 vidi kie estas via radika subdisko <literal>/</literal>. Ctrl+Alt+F7 venigos
 vin ree al la instal-ekrano.</para>
-    </tip>
+      </tip>
 
-    <para revision="2" xml:id="setupBootloader-pa49">La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo
+      <para xml:id="setupBootloader-pa49" revision="2">La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo
 estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj
 estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri
 ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo.</para>
-  </section>
+    </section>
 
-  <section xml:id="advancedOptionBootloader">
-    <info>
-      <title revision="2" xml:id="advancedOptionBootloader-ti5">Lanĉila sperta elekto</title>
-    </info>
+    <section xml:id="advancedOptionBootloader">
+      <info>
+        <title xml:id="advancedOptionBootloader-ti5" revision="2">Lanĉila sperta elekto</title>
+      </info>
 
-    <para revision="3" xml:id="setupBootloader-pa52">Se vi havas tre limigitan spacon en via disko por subdisko
+      <para xml:id="setupBootloader-pa52" revision="3">Se vi havas tre limigitan spacon en via disko por subdisko
 <literal>/</literal> enhavanta samtempe la dosierujon
 <literal>/tmp</literal>, klaku sur <guibutton>Progresinta</guibutton> kaj
 aktivigu la skatolon dirantan <guilabel>Purigu /tmp dum ĉiuj
 startadoj</guilabel>. Tio helpos teni iom da libera spaco.</para>
+    </section>
+  </section>
+
+  <section>
+    <title>With an UEFI system</title>
+
+    <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+    <mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader2.png"/>
+</imageobject></mediaobject>
+
+    <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+    <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/installer/eo/setupBootloaderAddEntry.xml b/docs/installer/eo/setupBootloaderAddEntry.xml
index 22ee604e..41e831dd 100644
--- a/docs/installer/eo/setupBootloaderAddEntry.xml
+++ b/docs/installer/eo/setupBootloaderAddEntry.xml
@@ -1,39 +1,68 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="eo">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="setupBootloaderAddEntry">
+  
+
   <info>
-    <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
+    <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="dx2-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject> <imageobject condition="live"> <imagedata format="PNG"
+xml:id="bootloaderConfiguration-im1"
+fileref="live-bootloaderConfiguration.png" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <section>
+    <title>With a Bios system</title>
 
-  <para>You can add an entry or modify the one you select first, by pressing the
+    <para>You can add an entry or modify the one you select first, by pressing the
 relevant button in the <emphasis>Bootloader Configuration</emphasis> screen
 and editing the screen that pops up on top of it.</para>
 
-  <note>
-    <para>If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for
-UEFI systems, you cannot use this tool to edit entries at this step, press
-'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use
-<code>grub-customizer</code> instead.</para>
-  </note>
+    <note>
+      <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
+this tool to edit entries at this step, press 'Next'. You need to manually
+edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead.</para>
+    </note>
 
-  <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+    <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Some things that can be done without any risk, are changing the label of an
+    <para>Some things that can be done without any risk, are changing the label of an
 entry and ticking the box to make an entry the default one.</para>
 
-  <para>You can add the proper version number of an entry, or rename it completely.</para>
+    <para>You can add the proper version number of an entry, or rename it completely.</para>
 
-  <para>The default entry is the one the systems boots into if you don't make a
+    <para>The default entry is the one the systems boots into if you don't make a
 choice while booting up.</para>
 
-  <warning>
-    <para>Editing other things can leave you with an unbootable system. Please don't
+    <warning>
+      <para>Editing other things can leave you with an unbootable system.  Please don't
 just try something without knowing what you are doing.</para>
-  </warning>
+    </warning>
+  </section>
+
+  <section>
+    <title>With an UEFI system</title>
+
+    <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+    <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+    <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+  </section>
 </section>
\ No newline at end of file
diff --git a/docs/installer/eo/takeOverHdConfirm.xml b/docs/installer/eo/takeOverHdConfirm.xml
index 122889ca..f6b70f35 100644
--- a/docs/installer/eo/takeOverHdConfirm.xml
+++ b/docs/installer/eo/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
 
   
 
-<mediaobject>
+  <mediaobject>
 <!-- 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 -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
 
   <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <guibutton>Previous</guibutton> if you are not sure about your
 choice.</para>
diff --git a/docs/installer/eo/testing.xml b/docs/installer/eo/testing.xml
new file mode 100644
index 00000000..d098402e
--- /dev/null
+++ b/docs/installer/eo/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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 Center. 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/eo/uninstall-Mageia.xml b/docs/installer/eo/uninstall-Mageia.xml
index 2022fa83..ea9245b2 100644
--- a/docs/installer/eo/uninstall-Mageia.xml
+++ b/docs/installer/eo/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
 <?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:lang="eo" xml:id="uninstall-Mageia">
-  <!-- -->
+  <!--Lebarhon 2015-07-06 Not true with UEFI -->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
diff --git a/docs/installer/eo/unused.xml b/docs/installer/eo/unused.xml
new file mode 100644
index 00000000..87dee252
--- /dev/null
+++ b/docs/installer/eo/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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>