Update Manuals for UEFI hardware.

7 files changed, 254 insertions, 175 deletions

diff --git a/docs/installer/en/configureTimezoneUTC.xml b/docs/installer/en/configureTimezoneUTC.xml
index 2cf45401..7849edb8 100644
--- a/docs/installer/en/configureTimezoneUTC.xml
+++ b/docs/installer/en/configureTimezoneUTC.xml
@@ -1,40 +1,33 @@
-<?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 version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="configureTimezoneUTC">
+  <info>
+    <title xml:id="configureTimezoneUTC-ti6">Configure your Timezone</title>
+  </info>
 
+  <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 
-    <info>
-      <title xml:id="configureTimezoneUTC-ti6">Configure your
-      Timezone</title>
-    </info>
+  <!-- 2013-05-05 marja - added screenshot -->
 
-    <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
-    <!-- 2013-05-05 marja - added screenshot -->
+  <mediaobject>
+    <imageobject condition="classical">
+      <imagedata xml:id="configureTimezoneUTC-im1" revision="1" fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+    </imageobject>
 
-<mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"  align="center" format="PNG"  xml:id="configureTimezoneUTC-im1"></imagedata>
+      <imagedata fileref="live-timeZone.png" condition="live" format="PNG"/>
     </imageobject>
   </mediaobject>
 
+  <para revision="1" xml:id="configureTimezoneUTC-pa1">Choose your time zone
+  by choosing your country or a city close to you in the same time
+  zone.</para>
 
-    <para revision="1" xml:id="configureTimezoneUTC-pa1">Choose your
-    time zone by choosing your country or a city close to you in the same time
-    zone.</para>
-
-    <para revision="1" xml:id="configureTimezoneUTC-pa2">In next
-    screen you can choose to set your hardware clock to local time or to GMT,
-    also known as UTC.</para>
-
-    <note>
-      <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have
-      more than one operating system on your computer, make sure they are all
-      set to local time, or all to UTC/GMT.</para>
-    </note>
-  </section>
+  <para revision="1" xml:id="configureTimezoneUTC-pa2">In next screen you can
+  choose to set your hardware clock to local time or to GMT, also known as
+  UTC.</para>
 
+  <note>
+    <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than
+    one operating system on your computer, make sure they are all set to local
+    time, or all to UTC/GMT.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
index 3c0f73d4..0affba06 100644
--- a/docs/installer/en/diskdrake.xml
+++ b/docs/installer/en/diskdrake.xml
@@ -22,9 +22,12 @@
   </info>
 
   <mediaobject>
-    <imageobject>
+    <imageobject condition='classical'>
       <imagedata fileref="dx2-diskdrake.png" align="center"/>
     </imageobject>
+    <imageobject condition='live' >
+      <imagedata fileref="live-diskdrake.png" align="center"/>
+    </imageobject>
   </mediaobject>
 
   <warning>
@@ -68,5 +71,4 @@
         </imageobject>
       </mediaobject></para>
   </note>
-</section>
-
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
index 93ef91a7..e583d579 100644
--- a/docs/installer/en/doPartitionDisks.xml
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -1,25 +1,7 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="doPartitionDisks">
-  <!-- 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 -->
 
   <info>
     <title xml:id="doPartitionDisks-ti1">Partitioning</title>
@@ -82,7 +64,7 @@
         <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
+        adapt these sizes by clicking and dragging the gap between both
         partitions. See the screen-shot below.</para>
 
         <mediaobject>
@@ -107,7 +89,7 @@
         drive that you are not prepared to lose, then do not use this
         option.</para>
       </listitem>
-    </itemizedlist> <itemizedlist>
+    </itemizedlist><itemizedlist>
       <listitem>
         <para revision="1" xml:id="doPartitionDisks-pa16">Custom</para>
 
@@ -117,6 +99,50 @@
       </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
@@ -124,14 +150,13 @@
     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>
+    to use the following 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/en/formatPartitions.xml b/docs/installer/en/formatPartitions.xml
index 7665e7e4..4e6f0897 100644
--- a/docs/installer/en/formatPartitions.xml
+++ b/docs/installer/en/formatPartitions.xml
@@ -15,11 +15,16 @@
   
   
    <mediaobject>
-    <imageobject>
+    <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">Here you can choose which
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
index c3d164d4..a2b8fe03 100644
--- a/docs/installer/en/setupBootloader.xml
+++ b/docs/installer/en/setupBootloader.xml
@@ -1,107 +1,131 @@
 <?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:id="setupBootloader">
+  <!---->
+
+  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page-->
+
   <info>
     <title xml:id="setupBootloader-ti1">Bootloader main options</title>
   </info>
 
-  <!-- 2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
-
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
-
   <mediaobject>
     <imageobject>
       <imagedata revision="1" align="center" fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1" format="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>
-
-  <para xml:id="setupBootloader-pa1" revision="4">If you prefer different
-  bootloader settings to those chosen automatically by the installer, you can
-  change them here.</para>
-
-  <para xml:id="setupBootloader-pa2" revision="4">You may already have another
-  operating system on your machine, in which case you need to decide whether
-  to add Mageia to your existing bootloader, or allow Mageia to create a new
-  one.</para>
-
-  <tip>
-    <para revision="2" xml:id="setupBootloader-pa3">The Mageia graphical menus
-    are nice :)</para>
-  </tip>
-
-  <section xml:id="usingMageiaBootloader">
-    <info>
-      <title xml:id="usingMageiaBootloader-ti2">Using a Mageia
-      bootloader</title>
-    </info>
-
-    <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes
-    a new GRUB (legacy) bootloader into the MBR (Master Boot Record) of your
-    first hard drive. If you already have other operating systems installed,
-    Mageia attempts to add them to your new Mageia boot menu.</para>
-
-    <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 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 the Summary page during installation.</para>
-    </warning>
-  </section>
-
-  <section xml:id="usingExistingBootloader">
-    <info>
-      <title revision="2" xml:id="usingExistingBootloader-ti4">Using an
-      existing bootloader</title>
-    </info>
+  <section>
+    <title>With a Bios system</title>
 
-    <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an
-    existing bootloader then you will need to remember to STOP at the summary
-    page during the installation and click the Bootloader
-    <guibutton>Configure</guibutton> button, which will allow you to change
-    the bootloader install location.</para>
+    <para xml:id="setupBootloader-pa1" revision="4">If you prefer different
+    bootloader settings to those chosen automatically by the installer, you
+    can change them here.</para>
 
-    <para revision="1" xml:id="setupBootloader-pa47">Do not select a device
-    e.g."sda", or you will overwrite your existing MBR. You must select the
-    root partition that you chose during the partitioning phase earlier, e.g.
-    sda7.</para>
-
-    <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a
-    device, sda7 is a partition on that device.</para>
+    <para xml:id="setupBootloader-pa2" revision="4">You may already have
+    another operating system on your machine, in which case you need to decide
+    whether to add Mageia to your existing bootloader, or allow Mageia to
+    create a new one.</para>
 
     <tip>
-      <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with
-      Ctrl+Alt+F2 and type <literal>df</literal> to check where your
-      <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to
-      the installer screen.</para>
+      <para>The Mageia graphical menus are nice :</para>
     </tip>
 
-    <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for
-    adding your Mageia system to an existing bootloader is beyond the scope of
-    this help, however in most cases it will involve running the relevant
-    bootloader installation program which should detect and add it
-    automatically. See the documentation for the operating system in
-    question.</para>
+    <section xml:id="usingMageiaBootloader">
+      <info>
+        <title xml:id="usingMageiaBootloader-ti2">Using a Mageia
+        bootloader</title>
+      </info>
+
+      <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia
+      writes a new GRUB (legacy) bootloader into the MBR (Master Boot Record)
+      of your first hard drive. If you already have other operating systems
+      installed, Mageia attempts to add them to your new Mageia boot
+      menu.</para>
+
+      <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 GRUB (legacy)
+        and will not be recognized 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 the Summary page during
+        installation.</para>
+      </warning>
+    </section>
+
+    <section xml:id="usingExistingBootloader">
+      <info>
+        <title revision="2" xml:id="usingExistingBootloader-ti4">Using an
+        existing bootloader</title>
+      </info>
+
+      <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an
+      existing bootloader then you will need to remember to STOP at the
+      summary page during the installation and click the Bootloader
+      <guibutton>Configure</guibutton> button, which will allow you to change
+      the bootloader install location.</para>
+
+      <para revision="1" xml:id="setupBootloader-pa47">Do not select a device
+      e.g."sda", or you will overwrite your existing MBR. You must select the
+      root partition that you chose during the partitioning phase earlier,
+      e.g. sda7.</para>
+
+      <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a
+      device, sda7 is a partition on that device.</para>
+
+      <tip>
+        <para revision="1" xml:id="setupBootloader-pa48a">Go to tty2 with
+        Ctrl+Alt+F2 and type <literal>df</literal> to check where your
+        <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back
+        to the installer screen.</para>
+      </tip>
+
+      <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for
+      adding your Mageia system to an existing bootloader is beyond the scope
+      of this help, however in most cases it will involve running the relevant
+      bootloader installation program which should detect and add it
+      automatically. See the documentation for the operating system in
+      question.</para>
+    </section>
+
+    <section xml:id="advancedOptionBootloader">
+      <info>
+        <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader
+        advanced option</title>
+      </info>
+
+      <para revision="3" xml:id="setupBootloader-pa52">If you have very
+      limited disk space for the <literal>/</literal> partition that contains
+      <literal>/tmp</literal>, click on <guibutton>Advanced</guibutton> and
+      check the box for <guilabel>Clean /tmp at each boot</guilabel>. This
+      helps to maintain some free space.</para>
+    </section>
   </section>
 
-  <section xml:id="advancedOptionBootloader">
-    <info>
-      <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader
-      advanced option</title>
-    </info>
-
-    <para revision="3" xml:id="setupBootloader-pa52">If you have very limited
-    disk space for the <literal>/</literal> partition that contains
-    <literal>/tmp</literal>, click on <guibutton>Advanced</guibutton> and
-    check the box for <guilabel>Clean /tmp at each boot</guilabel>. This helps
-    to maintain some free space.</para>
+  <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>
+        <imagedata fileref="dx2-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/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml
index 72ed3087..43a03fa3 100644
--- a/docs/installer/en/setupBootloaderAddEntry.xml
+++ b/docs/installer/en/setupBootloaderAddEntry.xml
@@ -1,4 +1,6 @@
 <?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">
+  <!--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-->
+
   <info>
     <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu
     Entry</title>
@@ -10,35 +12,60 @@
     </imageobject>
   </mediaobject>
 
-  <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>
+  <section>
+    <title>With a Bios system</title>
 
-  <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>
+    <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>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1" align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
-    </imageobject>
-  </mediaobject>
+    <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>
 
-  <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>
+    <mediaobject>
+      <imageobject>
+        <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1" align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+      </imageobject>
+    </mediaobject>
 
-  <para>You can add the proper version number of an entry, or rename it
-  completely.</para>
+    <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>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 just try something without knowing what you are
+      doing.</para>
+    </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>The default entry is the one the systems boots into if you don't make
-  a choice while booting up.</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>
 
-  <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>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
 </section>
\ No newline at end of file
diff --git a/docs/installer/en/takeOverHdConfirm.xml b/docs/installer/en/takeOverHdConfirm.xml
index 1ca2f4ce..00c520c8 100644
--- a/docs/installer/en/takeOverHdConfirm.xml
+++ b/docs/installer/en/takeOverHdConfirm.xml
@@ -15,11 +15,14 @@
 
   <!-- 2013-05-05 marja added screenshot -->
 
-<mediaobject>
-      <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>
+  </mediaobject>
 
   <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on
   <guibutton>Previous</guibutton> if you are not sure about your choice.</para>