Tools to process installer help translation using Gettext catalogs

45 files changed, 3190 insertions, 0 deletions

diff --git a/docs/installer/en/DrakX.xml b/docs/installer/en/DrakX.xml
new file mode 100644
index 00000000..ee6d908a
--- /dev/null
+++ b/docs/installer/en/DrakX.xml
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Converted by db4-upgrade version 1.0 --><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 with DrakX</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>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>
+
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+  
+  <!-- <xi:include href="drakx-intro.xml"/> -->
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="resizeFATChoose.xml"/>
+
+  <xi:include href="takeOverHdChoose.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+<xi:include href="add_supplemental_media.xml"/>
+
+<xi:include href="media_selection.xml"/>
+
+<xi:include href="chooseDesktop.xml"></xi:include>
+
+<xi:include href="choosePackageGroups.xml"></xi:include>
+
+<xi:include href="minimal-install.xml"></xi:include>
+
+<xi:include href="choosePackagesTree.xml"></xi:include>
+
+  <!-- <xi:include href="setRootPassword.xml"></xi:include> -->
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  <!-- <xi:include href="setupYabootGeneral.xml"></xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+
+  <xi:include href="misc-params.xml"/>
+
+<xi:include href="configureTimezoneUTC.xml"></xi:include>
+ 
+<xi:include href="selectCountry.xml"></xi:include>
+
+<xi:include href="configureServices.xml"></xi:include>
+
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="securityLevel.xml"></xi:include>
+
+
+  <!-- <xi:include href="configureNetwork.xml"></xi:include> -->
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <!--STILL TO BE WRITTEN: <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uninstall-Mageia.xml"/> -->
+</article>
diff --git a/docs/installer/en/DraktoolsA-Z.xml b/docs/installer/en/DraktoolsA-Z.xml
new file mode 100644
index 00000000..eefd0c63
--- /dev/null
+++ b/docs/installer/en/DraktoolsA-Z.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<book xmlns="http://docbook.org/ns/docbook" version="5.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="DraktoolsA-Z" xml:lang="en">
+
+
+  <info>
+    <title>Draktools in Alphabetical Order</title>
+  </info>
+
+  
+
+
+  <xi:include href="drak3d.xml"></xi:include>
+
+  <!--
+  <xi:include href="drakauth.xml"></xi:include>
+
+  <xi:include href="drakboot.xml"></xi:include>
+
+  <xi:include href="drakconf.xml"></xi:include> -->
+
+  <xi:include href="drakconnect.xml"></xi:include>
+
+<xi:include href="drakconnect--del.xml"></xi:include>
+
+ <!-- <xi:include href="drakconsole.xml"></xi:include>
+  -->
+
+<xi:include href="drakdisk.xml"></xi:include>
+
+  <xi:include href="drakedm.xml"></xi:include>
+
+    <xi:include href="drakfont.xml"></xi:include>
+
+ <xi:include href="drakgw.xml"></xi:include>
+
+<xi:include href="drakhosts.xml"></xi:include>
+
+<!-- <xi:include href="drakids.xml"></xi:include> -->
+
+ <xi:include href="drakinvictus.xml"></xi:include> 
+
+<xi:include href="draknetcenter.xml"></xi:include>
+
+<xi:include href="draknetprofile.xml"></xi:include>
+
+
+<!--  <xi:include href="draknfs.xml"></xi:include>
+
+  <xi:include href="drakperm.xml"></xi:include> -->
+
+<xi:include href="drakproxy.xml"></xi:include>
+
+<!--  <xi:include href="drakroam.xml"></xi:include> -->
+
+<!-- <xi:include href="drakrpm-update.xml"></xi:include> use MageiaUpdate.xml instead!! -->
+
+<xi:include href="drakrpm-edit-media.xml"></xi:include>
+
+ <!-- <xi:include href="draksambashare.xml"></xi:include>
+  
+  <xi:include href="draksec.xml"></xi:include>
+
+  <xi:include href="draksnapshot"></xi:include> -->
+  
+  <xi:include href="draksound.xml"></xi:include>
+
+ <xi:include href="drakups.xml"></xi:include>
+
+<xi:include href="drakvpn.xml"></xi:include>
+
+<!--   <xi:include href="drakxservices.xml"></xi:include>
+-->
+  <xi:include href="harddrake2.xml"></xi:include>
+
+  <xi:include href="keyboarddrake.xml"></xi:include>
+<!--
+  <xi:include href="localedrake.xml"></xi:include>
+  <xi:include href="logdrake.xml"></xi:include>
+  <xi:include href="mcc.xml"></xi:include> -->
+
+ <xi:include href="mgaapplet-config.xml"></xi:include>
+<xi:include href="MageiaUpdate.xml"></xi:include>
+  <xi:include href="mousedrake.xml"></xi:include> 
+  <xi:include href="rpmdrake.xml"></xi:include>
+ <xi:include href="scannerdrake.xml"></xi:include> 
+  <xi:include href="system-config-printer.xml"></xi:include>
+<!--
+  <xi:include href="transfugdrake.xml"></xi:include> -->
+  <xi:include href="userdrake.xml"></xi:include> 
+  <xi:include href="XFdrake.xml"></xi:include>
+  
+
+
+</book>
diff --git a/docs/installer/en/acceptLicense.xml b/docs/installer/en/acceptLicense.xml
new file mode 100644
index 00000000..77b429dc
--- /dev/null
+++ b/docs/installer/en/acceptLicense.xml
@@ -0,0 +1,79 @@
+<?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">
+  <!-- Made by marja on 2012 03 27 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- JohnR: minor mods 2012-3-30 -->
+
+  <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+
+  <!-- JohnR: 2012-04-05 - Inserted text from barjac with some modifications:
+       http://mtf.no-ip.co.uk/doc/help/license.html  -->
+
+  <!-- marja:2012-04-05 - having a look because this isn't a DocBook5.0 type anymore,
+       but text/xml. First changing centimetres in screenshot to pixels (width="800" 
+       depth="600"), after that nested the two existing sections into a third one-->
+
+  <!-- removed para id's, corrected duplicate id's for segments, marja, 20120409 -->
+
+  <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
+       sure what is causing the corruption -->
+
+  <!-- JohnR  2012-04-19 language proofreading -->
+
+  <info>
+    <title xml:id="acceptLicense-ti1">License and Release Notes</title>
+  </info>
+
+  <mediaobject condition="expert">
+    <imageobject>
+      <imagedata align="center" depth="600" fileref="dx2-license.png"
+                 format="PNG" revision="1" width="800"
+                 xml:id="acceptLicense-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <section xml:id="license">
+    <info>
+      <title xml:id="license-ti1">License Agreement</title>
+    </info>
+
+    <para>Before installing <application>Mageia</application>, please read the
+    license terms and conditions carefully.</para>
+
+    <para>These terms and conditions apply to the entire
+    <application>Mageia</application> distribution and must be accepted before
+    you can continue.</para>
+
+    <para>To accept, simply select <guilabel>Accept</guilabel> and then click
+    on <guibutton>Next</guibutton>.</para>
+
+    <para>If you decide not to accept these conditions, then we thank you for
+    looking. Clicking <guibutton>Quit</guibutton> will reboot your
+    computer.</para>
+
+    <!-- if you want two sections in a file, both need to be nested in a third section -
+       marja, 20120405  -->
+  </section>
+
+  <section xml:id="releaseNotes">
+    <info>
+      <title xml:id="releaseNotes-ti1">Release Notes</title>
+    </info>
+
+    <!--
+  <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>
+  </section>
+</section>
diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml
new file mode 100644
index 00000000..45551951
--- /dev/null
+++ b/docs/installer/en/addUser.xml
@@ -0,0 +1,135 @@
+<?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>
+
+  <!-- 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 -->
+
+  <!-- removed para xml:id's, finished the page using Led43's text in the wiki, but
+       changed his text about the Advanced User Managment screen (the only thing 
+       about guest account there, is the box you can tick or untick to enable or 
+       disable it, the rest is about the normal user you're adding in the previous
+       screen), marja, 20120409-->
+
+  <!-- barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
+       "rbash" in the xguest warning - is that correct? -->
+
+  <!-- JohnR 2012-04-19 Language proofreading  -->
+  <!-- marja 2012-04-24 Added screenshot -->
+  
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-setRootPassword.png" width="100%" depth="600" format="PNG" align="center"   xml:id="setRootPassword-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <section xml:id="root-password">
+    <info>
+      <title xml:id="root-password-ti2">Set Administrator (root)
+      Password:</title>
+    </info>
+
+    <para>It is advisable for all <application>Mageia</application>
+    installations to set a superuser or administrator's password, usually
+    called the <emphasis>root password</emphasis> in Linux. As you type a
+    password into the top box the colour of its shield will change from red to
+    yellow to green depending on the strength of the password. A green shield
+    shows you are using a strong password. You need to repeat the same
+    password in the box just below the first password box, this checks that
+    you have not mistyped the first password by comparing them.</para>
+
+    <note xml:id="givePassword">
+      <para>All passwords are case sensitive, it is best to use a mixture of
+      letters (upper and lower case), numbers and other characters in a
+      password.</para>
+    </note>
+  </section>
+
+  <section xml:id="enterUser">
+    <info>
+      <title xml:id="enterUser-ti3">Enter a user</title>
+    </info>
+
+    <para>Add a user here. A user has fewer rights than the superuser (root),
+    but enough to surf the internet, use office applications or play games and
+    anything else the average user does with his computer</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><guibutton>Icon</guibutton>: if you click on this button it will
+        change the users icon.</para>
+      </listitem>
+
+      <listitem>
+        <para><guilabel>Real Name</guilabel>: Insert the users real name into
+        this text box.</para>
+      </listitem>
+
+      <listitem>
+        <para><guilabel>Login Name</guilabel>: Here you enter the user login
+        name or let drakx use a version of the users real name. <emphasis>The
+        login name is case sensitive.</emphasis></para>
+      </listitem>
+
+      <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>
+      </listitem>
+
+      <listitem>
+        <para><guilabel>Password (again)</guilabel>: Retype the user password
+        into this text box and drakx will check you have the same password in
+        each of the user password text boxes.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section 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>
+
+    <warning>
+      <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>
+        <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
+        users.</para>
+      </listitem>
+
+      <listitem>
+        <para><guilabel>Shell</guilabel>: This drop down list allows you to
+        change the shell used by the user you are adding in the previous
+        screen, options are Bash, Dash and Sh</para>
+      </listitem>
+
+      <listitem>
+        <para><guilabel>User ID</guilabel>: Here you can set the user ID for
+        the user you are adding in the previous screen. This is a number.
+        Leave it blank unless you know what you are doing.</para>
+      </listitem>
+
+      <listitem>
+        <para><guilabel>Group ID</guilabel>: This lets you set the group ID.
+        Also a number, usually the same one as for the user. Leave it blank
+        unless you know what you are doing.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/add_supplemental_media.xml b/docs/installer/en/add_supplemental_media.xml
new file mode 100644
index 00000000..869b22cc
--- /dev/null
+++ b/docs/installer/en/add_supplemental_media.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:lang="en" xml:id="add_supplemental_media"
+         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">
+  <info>
+    <title xml:id="add_supplemental_media-ti1">Media Selection (Configure Supplemental Installation Media)</title>
+    </info>
+
+  <!-- papoteur 2013-04-13  - created -->
+  <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
+  <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+
+<mediaobject>
+    <imageobject>
+      <imagedata align="center" depth="600" fileref="dx2-add_supplemental_media.png"
+                 format="PNG" revision="1" width="800" xml:id="dx2-add_supplemental_media-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>This screen gives you the list of already recognized repositories. You
+  can add other sources for packages, like an optical disc or a remote
+  source. The source selection determines which packages will be available for
+  selection during the next steps.</para>
+
+  <para>For a network source, there are two steps to follow:</para>
+
+  <orderedlist>
+    <listitem>
+      <para>Choosing and activation of the network, if not already up. </para>
+    </listitem>
+
+    <listitem>
+      <para>Selecting a mirror or specifying a URL (very first entry). By
+      selecting a mirror, you have access to the selection of all repositories
+      managed by Mageia, like the non-free , the tainted repositories and the
+      updates. With the URL, you can designate a specific repository or your
+      own NFS installation.</para>
+    </listitem>
+  </orderedlist>
+</section>
diff --git a/docs/installer/en/ask_mntpoint_s.xml b/docs/installer/en/ask_mntpoint_s.xml
new file mode 100644
index 00000000..ee533387
--- /dev/null
+++ b/docs/installer/en/ask_mntpoint_s.xml
@@ -0,0 +1,80 @@
+<?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="ask_mntpoint_s" version="5.0">
+
+  <info>
+    <title xml:id="ask_mntpoint_s-ti1">Choose the mount points</title>
+  </info>
+
+  <!-- Made by marja on 2012 03 28 -->
+  <!-- NEEDS TO BE REVIEWED! -->
+  <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+  <!-- removed para xml:id's, marja, 20120409 -->
+  <!-- barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
+       with "a", as I can't imagine having more than one root partition ;) -->
+  <!-- Lebarhon : I put [] where it seems having mistakes -->
+  <!-- Marja: you're right, in English English it is "its type", however, the Americans
+       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 -->
+
+<mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-chooseMountpoints.png" align="center" width="100%"
+       format="PNG" depth="600" xml:id="chooseMountPoints-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your
+  computer. If you don't agree with the <application>DrakX</application>
+  suggestions, you can change the mount points.</para>
+
+  <note>
+    <para>If you change anything, make sure you still have a
+    <literal>/</literal> (root) partition.</para>
+  </note>
+
+  <itemizedlist>
+    <listitem>
+      <para>Every partition is shown as follows: "Device" ("Capacity", "Mount
+      point", "Type").</para>
+    </listitem>
+
+    <listitem>
+      <para>"Device", is made up of: "hard drive", ["hard drive
+      number"(letter)], "partition number" (for example, "sda5").</para>
+    </listitem>
+
+    
+    <listitem>
+      <para>If you have many partitions, you can choose many different mount
+      points from the drop down menu, such as <literal>/</literal>,
+      <literal>/home</literal> and <literal>/var</literal>. You can even make
+      your own mount points, for instance <literal>/video</literal> for a
+      partition where you want to store your films, or
+      <literal>/cauldron-home</literal> for the <literal>/home</literal>
+      partition of a cauldron install.</para>
+    </listitem>
+
+    <listitem>
+      <para>For partitions you don't need to have access to, you can leave the
+      mount point field blank.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <para>Choose <guibutton>Previous</guibutton> if you are not sure what to
+    choose, and then tick <guilabel>Custom disk partitioning</guilabel>. In
+    the screen that follows, you can click on a partition to see its type
+    and size.</para>
+  </warning>
+
+  <para>If you are sure the mount points are correct, click on
+  <guibutton>Next</guibutton>, and choose whether you only want to format the
+  partition(s) DrakX suggests, or more.</para>
+</section>
diff --git a/docs/installer/en/chooseDesktop.xml b/docs/installer/en/chooseDesktop.xml
new file mode 100644
index 00000000..c6250655
--- /dev/null
+++ b/docs/installer/en/chooseDesktop.xml
@@ -0,0 +1,35 @@
+<?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="chooseDesktop">
+
+
+    <info>
+      <title xml:id="chooseDesktop-ti1">Desktop Selection</title>
+    </info>
+
+ <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+
+
+    <para>Depending on your selection here, you may be offered further screens to fine tune your choice.</para>
+
+    <para>After the selection step(s), you will see a slide show during package
+	        installation. The slide show can be disabled by pressing the
+		  <guilabel>Details</guilabel> button</para>
+
+
+
+<mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-chooseDesktop.png" align="center" format="PNG" width="800"
+         depth="600"></imagedata>
+      </imageobject>
+    </mediaobject>
+
+    <para>Choose whether you prefer to use the <application>KDE</application>
+    or <application>Gnome</application> desktop environment. Both come with a
+    full set of useful applications and tools. Tick
+    <guilabel>Custom</guilabel> if you want to use neither or both, or if you
+    want something other than the default software choices for these desktop
+    environments. The <application>LXDE</application> desktop is lighter than
+    the previous two, sporting less eye candy and fewer packages installed by
+    default.</para>
+  </section>
+
diff --git a/docs/installer/en/choosePackageGroups.xml b/docs/installer/en/choosePackageGroups.xml
new file mode 100644
index 00000000..6ad71798
--- /dev/null
+++ b/docs/installer/en/choosePackageGroups.xml
@@ -0,0 +1,41 @@
+<?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="choosePackageGroups">
+
+    <info>
+      <title xml:id="choosePackageGroups-ti1">Package Group Selection</title>
+    </info>
+
+    <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+
+<mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-choosePackageGroups.png" align="center" format="PNG" width="800"
+         depth="600"></imagedata>
+      </imageobject>
+    </mediaobject>
+
+    <para>Packages have been sorted into groups, to make choosing what you
+    need on your system a lot easier. The groups are fairly self explanatory,
+    however more information about the content of each is available in
+    tool-tips which become visible as the mouse is hovered over them.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Workstation.</para>
+      </listitem>
+
+      <listitem>
+        <para>Server.</para>
+      </listitem>
+
+      <listitem>
+        <para>Graphical Environment.</para>
+      </listitem>
+
+      <listitem>
+        <para>Individual Package Selection: You can use this option to
+        manually add or remove packages.</para>
+      </listitem>
+    </itemizedlist>
+    <para>Read  <xref linkend="minimal-install"></xref> for instructions on how to do a minimal install.</para> 
+  </section>
+
diff --git a/docs/installer/en/choosePackages.xml b/docs/installer/en/choosePackages.xml
new file mode 100644
index 00000000..609244e6
--- /dev/null
+++ b/docs/installer/en/choosePackages.xml
@@ -0,0 +1,32 @@
+<?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="choosePackages">
+
+  <info>
+    <title xml:id="choosePackages-ti1">Choosing Packages to be
+    Installed</title>
+  </info>
+
+  <!-- Started by marja on 2012 03 29 -->
+
+  <!-- Still NEEDS TO BE FINISHED AND THEN REVIEWED! -->
+
+  <!-- SimonNZG 2012-04-03 has taken a look but needs to come back-->
+
+  <!-- barjac 2012-04-12 has done some work on this - removed ADD TEXT notes just 
+       in case this is not done in time ;)-->
+
+  <!-- marja 2012-04-14 moved </para> tag that was to far down and included other
+       paragraphs up to the paragraph it should close-->
+
+  <!-- barjac 2012-04-14 minor edits and removed  "revision=1" from 1st para -->
+
+  <!-- marja 2012-05-08 added kbulgrien's line about the slide show -->
+  <!-- marja 2012-05-14 after discussion with JohnR and MrsB changed "either" back 
+       to "neither" in the Desktop Selection section -->
+<!--marja 2012-12-26 exported chooseDesktop, choosePackageGroups, minimal-install and choosePackagesTree to separate files -->
+<!--marja 2012-12-26 moved what was left of this page to chooseDesktop, because there doesn't seem to be a help button linking to this page -->
+<!-- marja 2013-01-03 Remove this page from DrakX.xml, but keep it in Calenco because it is part of the history for the 4 above mentioned files. -->
+
+  <para xml:id="choosePackages-pa1">This file is choosePackages.html.</para>
+  <para>This page was split into 4 new pages. We must keep it in Calenco for the history, but it shouldn't be used in a publication anymore.</para>
+
+</section>
diff --git a/docs/installer/en/choosePackagesTree.xml b/docs/installer/en/choosePackagesTree.xml
new file mode 100644
index 00000000..5f1d6404
--- /dev/null
+++ b/docs/installer/en/choosePackagesTree.xml
@@ -0,0 +1,26 @@
+<?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="choosePackagesTree">
+
+    <info>
+      <title xml:id="choosePackagesTree-ti1">Choose Individual
+      Packages</title>
+    </info>
+
+    <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+
+<mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-choosePackagesTree.png" align="center" format="PNG" width="800"
+         depth="600"></imagedata>
+      </imageobject>
+    </mediaobject>
+
+    <para>Here you can add or remove any extra packages to customise your
+    installation.</para>
+
+    <para>After having made your choice, you can click on the
+    <guibutton>floppy icon</guibutton> at the bottom of the page to save your
+    choice of packages (saving to a USB key works, too). You can then use this
+    file to install the same packages on another system, by pressing the same
+    button during install and choosing to load it.</para>
+  </section>
+
diff --git a/docs/installer/en/configureServices.xml b/docs/installer/en/configureServices.xml
new file mode 100644
index 00000000..cf511de7
--- /dev/null
+++ b/docs/installer/en/configureServices.xml
@@ -0,0 +1,36 @@
+<?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="configureServices" version="5.0">
+
+
+    <info>
+      <title xml:id="configureServices-ti1">Configure your
+      Services</title>
+    </info>
+
+    <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
+
+
+    <para revision="1" xml:id="configureServices-pa1">Here you can set
+    which services should (not) start when you boot your system.</para>
+
+    <para revision="1" xml:id="configureServices-pa2">There are four
+    groups, click on the triangle before a group to expand it and see all
+    services in it.</para>
+
+    <para revision="1" xml:id="configureServices-pa3">The setting
+    DrakX chose are usually good.</para>
+
+    <para revision="1" xml:id="configureServices-pa4">If you highlight
+    a service, some information about it is shown in the info box
+    below.</para>
+
+    <para revision="1" xml:id="configureServices-pa5">Only change
+    things when you know very well what you are doing.</para>
+  </section>
+
diff --git a/docs/installer/en/configureTimezoneUTC.xml b/docs/installer/en/configureTimezoneUTC.xml
new file mode 100644
index 00000000..121e027b
--- /dev/null
+++ b/docs/installer/en/configureTimezoneUTC.xml
@@ -0,0 +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">
+
+
+    <info>
+      <title xml:id="configureTimezoneUTC-ti6">Configure your
+      Timezone</title>
+    </info>
+
+    <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
+
+
+    <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>
+
diff --git a/docs/installer/en/configureX_card_list.xml b/docs/installer/en/configureX_card_list.xml
new file mode 100644
index 00000000..a8cba4cb
--- /dev/null
+++ b/docs/installer/en/configureX_card_list.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='utf-8'?>
+<section xmlns="http://docbook.org/ns/docbook" 
+xmlns:ns5="http://www.w3.org/1999/xhtml" 
+xmlns:ns4="http://www.w3.org/1998/Math/MathML" 
+xmlns:ns3="http://www.w3.org/2000/svg" 
+xmlns:ns2="http://www.w3.org/1999/xlink" 
+xmlns:ns="http://docbook.org/ns/docbook"
+version="5.0" xml:id="configureX_card_list">
+
+ <!-- Initiated by Marja  2012-08-08 -->
+ <!-- Further text JohnR  2012-08-29 -->
+ <!-- tproof  -->
+ <!-- lproof  -->
+ 
+  <info>
+    <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
+    your Graphic Card)</title>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata width="800" revision="1" align="center" xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png" format="PNG" depth="600"/>
+    </imageobject>
+  </mediaobject>
+
+ <para>DrakX has a very comprehensive database of video cards and will usually correctly identify your video device.</para>
+  
+  <para>If the installer has not correctly detected your graphic card and you know which one you have, you can select it from the tree by:
+    
+  <itemizedlist>
+      <listitem>
+        <para>vendor</para>
+      </listitem>
+
+      <listitem>
+        <para>then the name of your card</para>
+      </listitem>
+
+      <listitem>
+        <para>and the type of card</para>
+      </listitem>
+    </itemizedlist></para>
+
+  <para>If you cannot find your card in the vendor lists (because it's not yet in the database
+        or it's an older card) you may find a suitable driver in the Xorg category</para>
+  
+  <para>The Xorg listing provides more than 40 generic and open source video card drivers.
+        If you still can't find a named driver for your card there is the option of using
+	the vesa driver which provides basic capabilities.</para>
+	
+  <para>Be aware that if you select an incompatible driver you may only have access
+	to the Commandline Interface.</para>
+	
+
+  <para>Some video card manufacturers provide proprietary drivers for Linux which may only
+        be available in the Non-free or Tainted repositories and in some cases only from the
+	card manufacturers' websites </para>
+	
+  <para>The Non-free and Tainted repositories need to be explicitly enabled to access them,
+        you should do this after your first reboot.</para>
+	
+</section>
diff --git a/docs/installer/en/configureX_chooser.xml b/docs/installer/en/configureX_chooser.xml
new file mode 100644
index 00000000..29386184
--- /dev/null
+++ b/docs/installer/en/configureX_chooser.xml
@@ -0,0 +1,71 @@
+<?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="configureX_chooser" version="5.0">
+
+  <info>
+    <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor
+    Configuration</title>
+  </info>
+
+  <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+
+  <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-configureX_chooser.png" width="100%" align="center" 
+       format="PNG" depth="600" xml:id="configureX_chooser-im1">
+      </imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment
+  (also known as desktop environment) you chose for this install of
+  <application>Mageia</application>, they are all based on a graphical user
+  interface system called <acronym>X Window System</acronym>, or simply
+  <acronym>X</acronym>. So in order for <acronym>KDE</acronym>,
+  <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or any other graphical
+  environment to work well, the following <acronym>X</acronym> settings need
+  to be correct. Choose the correct settings if you can see that
+  <application>DrakX</application> didn't make a choice, or if you think the
+  choice is incorrect.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Graphic
+      card</guibutton></emphasis>: Choose your card from the list if
+      needed.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Monitor</guibutton></emphasis>:
+      You can choose <guilabel>Plug'n Play</guilabel> when applicable, or
+      choose your monitor from the <guilabel>Vendor</guilabel> or
+      <guilabel>Generic</guilabel> list. Choose <guilabel>Custom</guilabel> if
+      you prefer to manually set the horizontal and vertical refresh rates of
+      your monitor.</para>
+
+      <warning>
+        <para revision="1" xml:id="configureX_chooser-pa3a">Incorrect refresh rates may
+		damage your monitor</para>
+      </warning>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Resolution</guibutton></emphasis>:
+      Set the desired resolution and color depth of your monitor here.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Test</guibutton></emphasis>:
+      The test button does not always appear during install. If the button is
+      there, you can control your settings by pressing it. If you see a
+      question asking you whether your settings are correct, you can answer
+      "yes", and the settings will be kept. If you don't see anything, you'll
+      return to the configuration screen and be able to reconfigure everything
+      until the test is good. <emphasis>Make sure your settings are on the
+      safe side if the test button isn't available</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Options</guibutton></emphasis>:
+      Here you can choose to enable or disable various options.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/installer/en/configureX_monitor.xml b/docs/installer/en/configureX_monitor.xml
new file mode 100644
index 00000000..c24a3d8d
--- /dev/null
+++ b/docs/installer/en/configureX_monitor.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <!-- Initiated by Marga 2012-8-09 -->
+
+  <!-- Further text JohnR  2012-08-30 -->
+
+  <!-- tproof -->
+
+  <!-- lproof -->
+
+  <info>
+    <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
+  </info>
+
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very
+  comprehensive database of monitors and will usually correctly identify
+  yours.</para>
+
+  <warning>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Selecting a
+    monitor with different characteristics could damage your monitor or video
+    hardware. Please don't try something without knowing what you are
+    doing.</emphasis> If in doubt you should consult your monitor
+    documentation</para>
+  </warning>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata align="center" depth="600"
+                 fileref="dx2-configureX_monitor.png" format="PNG"
+                 revision="1" width="800" xml:id="configureX_monitor-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="1"
+  xml:id="configureX_monitor-pa2"><emphasis>Custom</emphasis></para>
+
+  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to
+  set two critical parameters, the vertical refresh rate and the horizontal
+  sync rate. Vertical refresh determines how often the screen is refreshed and
+  horizontal sync is the rate at which scan lines are displayed.</para>
+
+  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY
+  IMPORTANT</emphasis> that you do not specify a monitor type with a sync
+  range that is beyond the capabilities of your monitor: you may damage your
+  monitor. If in doubt, choose a conservative setting and consult your monitor
+  documentation.</para>
+
+  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n
+  Play</emphasis></para>
+
+  <para revision="1" xml:id="configureX_monitor-pa6">This is the default
+  option and tries to determine the monitor type from the monitor
+  database.</para>
+
+  <para revision="1"
+  xml:id="configureX_monitor-pa7"><emphasis>Vendor</emphasis></para>
+
+  <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not
+  correctly detected your monitor and you know which one you have, you can
+  select it from the tree by selecting: <itemizedlist>
+      <listitem>
+        <para>vendor</para>
+      </listitem>
+
+      <listitem>
+        <para>the monitor manufacturers name</para>
+      </listitem>
+
+      <listitem>
+        <para>the monitor description</para>
+      </listitem>
+    </itemizedlist></para>
+
+  <para revision="1"
+  xml:id="configureX_monitor-pa9"><emphasis>Generic</emphasis></para>
+
+  <para revision="1" xml:id="configureX_monitor-pa10">selecting this group
+  displays nearly 30 display configurations such as 1024x768 @ 60Hz and
+  includes Flat panel displays as used in laptops. This is often a good
+  monitor selection group if you need to use the Vesa card driver when your
+  video hardware cannot be determined automatically. Once again it may be wise
+  to be conservative in your selections.</para>
+</section>
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
new file mode 100644
index 00000000..ab2ccd5e
--- /dev/null
+++ b/docs/installer/en/diskdrake.xml
@@ -0,0 +1,51 @@
+<?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="diskdrake">
+  <!-- Started by marja on 2012 03 29 -->
+
+  <!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
+
+  <!-- JohnR added note for bug 133 re encrypted partitions -->
+
+  <!-- JohnR 2012-04-10 - tidy up module formatting -->
+  
+  <!-- Marja, 2012-04-18 changed "If you wish to use encryption on
+    any of your partitions" into "If you wish to use encryption on
+      your <literal>/</literal> partition" because pterjan said this is only for root 
+      Also added some text. -->
+	<!--marja 20120418 moved section end tag down to where it belongs-->
+	<!--marja 20120418 added para 6a-->
+	
+
+  <info>
+    <title xml:id="diskdrake-ti1">Custom disk partitioning with
+    DiskDrake</title>
+  </info>
+
+  
+
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="dx2-diskdrake.png" align="center"></imagedata>
+    </imageobject>
+  </mediaobject>
+
+
+<warning>
+    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on
+      your <literal>/</literal> partition you must ensure that you have a separate <literal>/boot</literal>
+    partition. The encryption option for the <literal>/boot</literal> partition must NOT be set,
+    otherwise your system will be unbootable.</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="1" xml:id="diskdrake-pa4">There is a tab for every detected hard disk or other storage device, like an USB key. For example sda, sdb and sdc if there are three of them.
+  </para>
+  
+  <para revision="1" xml:id="diskdrake-pa5">Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected storage device</para>
+  
+  <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it, or choose a filesystem and a mount point, resize it or wipe it.</para>
+  
+  <para revision="1" xml:id="diskdrake-pa6a">Continue until you adjusted everything to your wishes. </para>
+  
+  <para revision="1" xml:id="diskdrake-pa7">Click <guibutton>Done</guibutton> when you're ready.</para> </section>
\ No newline at end of file
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
new file mode 100644
index 00000000..852c4270
--- /dev/null
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -0,0 +1,123 @@
+<?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-->
+
+  <info>
+    <title xml:id="doPartitionDisks-ti1">Partitioning</title>
+  </info>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see
+  the content of your hard drive(s) and see the solutions the DrakX
+  partitioning wizard found for where to install
+  <application>Mageia</application>.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The options available from
+  the list below will vary depending on your particular hard drive(s) layout
+  and content.</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata width="800" align="center" fileref="dx2-doPartitionDisks.png" depth="600"/>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing
+        Partitions</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa5">If this option is
+        available, then existing Linux compatible partitions have been found
+        and may be used for the installation.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="doPartitionDisks-pa6">Use Free Space</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused
+        space on your hard drive then this option will use it for your new
+        Mageia installation.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="doPartitionDisks-pa8">Use Free Space on a
+        Windows Partition</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa9">If you have unused
+        space on an existing Windows partition, the installer may offer to use
+        it.</para>
+
+        <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful
+        way of making room for your new Mageia installation, but is a risky
+        operation so you should make sure you have backed up all important
+        files!</para>
+
+        <para xml:id="doPartitionDisks-pa11" revision="3">Note that this
+        involves shrinking the size of the Windows partition. The partition
+        must be "clean", meaning that Windows must have closed down correctly
+        the last time it was used. It must also have been defragmented,
+        although this is not a guarantee that all files in the partition have
+        been moved out of the area that is about to be used. It is highly
+        recommended to back up your personal files.</para>
+      </listitem>
+    </itemizedlist> <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="doPartitionDisks-pa12">Erase and use Entire
+        Disk.</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa13">This option will use
+        the complete drive for Mageia.</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa14">Note! This will
+        erase ALL data on the selected hard drive. Take care!</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa15">If you intend to use
+        part of the disk for something else, or you already have data on the
+        drive that you are not prepared to lose, then do not use this
+        option.</para>
+      </listitem>
+    </itemizedlist> <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="doPartitionDisks-pa16">Custom</para>
+
+        <para revision="1" xml:id="doPartitionDisks-pa17">This gives you
+        complete control over the placing of the installation on your hard
+        drive(s).</para>
+      </listitem>
+    </itemizedlist></para>
+
+  <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 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>
+
+    <para>"Align to" "MiB" </para>
+
+    <para>"Free space preceding (MiB)" "2" </para>
+
+    <para>Also make sure all partitions are create with an even number of
+    megabytes.</para>
+  </warning>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/drak3d.xml b/docs/installer/en/drak3d.xml
new file mode 100644
index 00000000..64351d7a
--- /dev/null
+++ b/docs/installer/en/drak3d.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drak3d" 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">
+  <info>
+    <title xml:id="drak3d-ti1">3D Desktop Effects</title>
+
+    <subtitle>drak3d</subtitle>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata align="center" depth="363" fileref="drak3d.png" format="PNG"
+                 revision="1" width="285" xml:id="drak3d-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <section>
+    <title>Introduction</title>
+
+    <para>This tool lets you manage the 3D desktop effects on your operating
+    system. 3D effects are turned off by default. You can start this tool from
+    the command line, by typing <emphasis role="bold">drak3d</emphasis> as
+    root.</para>
+  </section>
+
+  <section annotations="center">
+    <title>Getting Started</title>
+
+    <para>To use this tool, you need to have the glxinfo package installed. If
+    the package is not installed, you will be prompted to do so before drak3d
+    can start.</para>
+
+    <para>After starting drak3d, you will be presented with a menu window.
+    Here you can choose either <guilabel>No 3D Desktop Effects</guilabel> or
+    <guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a
+    composite/window manager, which includes hardware-accelerated special
+    effects for your desktop. Choose <guilabel>Compiz Fusion</guilabel>
+    to turn it on.</para>
+
+    <para>If this is your first time using this program after a clean
+    installation of Mageia, you will get a warning message telling you which
+    packages need to be installed in order to use Compiz Fusion. Click on the
+    <guibutton>Ok</guibutton> button to continue.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" depth="400"
+                   fileref="drak3d_installing_CompizFusion.png" format="PNG"
+                   width="550" xml:id="drak3d-im3"/>
+      </imageobject>
+    </mediaobject>
+
+    <para>Once the appropriate packages are installed, you will notice that
+    Compiz Fusion is selected in the drak3d menu, but you must log out and log
+    back in for the changes to take effect.</para>
+
+    <para>After logging back in, Compiz Fusion will be activated. To configure
+    Compiz Fusion, see the page for the ccsm (CompizConfig Settings Manager)
+    tool.</para>
+  </section>
+
+  <section>
+    <title>Troubleshooting</title>
+
+    <section>
+      <title>Can't See Desktop after Logging in</title>
+
+      <para>If after turning on Compiz Fusion you attempt to log back into
+      your desktop but can't see anything, restart your computer to get back
+      to the log in screen. Once there, click on the Desktop icon and select
+      drak3d.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" depth="450"
+                     fileref="drak3d_troubleshooting_login_option.png"
+                     format="PNG" width="600"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>When you log in, if your account is listed as an administrator,
+      you will be prompted for your password again. Otherwise, use the
+      administrator login with his/her account. Then you can undo any changes
+      that may have caused the log in problem.</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/installer/en/drakdisk.xml b/docs/installer/en/drakdisk.xml
new file mode 100644
index 00000000..8d689c5d
--- /dev/null
+++ b/docs/installer/en/drakdisk.xml
@@ -0,0 +1,74 @@
+<?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="drakdisk">
+  <!--
+ lebarhon 2012-08-30  Added some comments. Imho, the option button needs explanations -->
+
+  <!--marja 2012-09-02 changed title to visible title for this tool in MCC -->
+
+  <info>
+    <title xml:id="drakdisk-ti1">Manage disk partitions</title>
+
+    <subtitle>drakdisk or diskdrake</subtitle>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata xml:id="drakdiskBackup-im1" width="546" revision="1" depth="101" fileref="drakdiskBackup.png" align="center" format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+  <warning>
+    <para>This tool is very powerful, a tiny error or a cat jumping on your
+    keyboard can lead to losing all data on a partition or even to erasing the
+    entire hard disk. For that reason, you'll see the screen above on top of
+    the tool screen. Click on <emphasis>Exit</emphasis> if you're not sure you
+    want to continue.</para>
+  </warning>
+
+  <para>If you have more than one hard disk, you can switch to the hard disk
+  you want to work on by selecting the correct tab (sda, sdb, sdc etc).</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata revision="1" align="center" xml:id="drakdisk-im1" width="629" fileref="drakdisk.png" depth="404" format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>You can choose from many actions to adjust your hard disk to your
+  preferences. Wiping an entire hard disk, splitting or merging partitions,
+  resizing them or changing the filesystem, formatting or viewing what is in a
+  partition: it is all possible. The <emphasis><guibutton>Clear
+  all</guibutton></emphasis> button at the bottom is to erase the complete
+  disk, the other buttons become visible on the right after you click on a partition.</para>
+
+  <para>If the partition you select is mounted, like in the example below, you
+  cannot choose to resize, format or delete it. To be able to do that the
+  partition must be unmounted first.</para>
+
+  <para>It is only possible to resize a partition on its right side</para>
+
+  <para>To change a partition type (change ext3 to ext4 for example) you have
+  to delete the partition and then re-create it with the new type. The button
+  <guibutton role="bold">Create</guibutton> appears when a disk empty part is
+  selected</para>
+
+  <para>You can choose a mount point that doesn't exist, it will be
+  created.</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata xml:id="drakdiskMountedPartition-im1" revision="1" fileref="drakdiskMountedPartition.png" align="center" width="629" format="PNG" depth="434"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>Selecting <emphasis><guibutton>Toggle to expert
+  mode</guibutton></emphasis> gives some extra available actions, like
+  labelling the partition, as can be seen in the screenshot below.</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata revision="1" depth="449" xml:id="drakdiskExpertUnmounted-im1" align="center" fileref="drakdiskExpertUnmounted.png" width="629" format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>You can start this tool from the command line, by typing <emphasis role="bold">drakdisk</emphasis> or <emphasis role="bold">diskdrake</emphasis> as root.</para>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/drakedm.xml b/docs/installer/en/drakedm.xml
new file mode 100644
index 00000000..80b7aa66
--- /dev/null
+++ b/docs/installer/en/drakedm.xml
@@ -0,0 +1,24 @@
+<?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="drakedm" version="5.0">
+	<info> <!--2012-09-03 marja: changed title to the title of this screen in MCC -->
+    <title xml:id="drakedm-ti1">Set up display manager</title><subtitle>drakedm</subtitle>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata depth="437" xml:id="drakedm-im1" revision="1" align="center" format="PNG" width="616" fileref="drakedm.png"/>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="1" xml:id="drakedm-pa1">Here you can choose which display
+  manager to use to log into your desktop environment. Only the ones available
+  on your system will be shown.</para>
+
+  <para revision="1" xml:id="drakedm-pa2">Most users will only notice that the
+  provided login screens look different. However, there are differences in
+  supported features, too. LXDM is a lightweight display manager, KDM and GDM
+  have more extras. </para>
+
+  <para revision="1" xml:id="drakedm-pa3">You can start this tool from the
+  command line, by typing <emphasis role="bold">drakedm</emphasis> as
+  root.</para>
+</section>
diff --git a/docs/installer/en/exitInstall.xml b/docs/installer/en/exitInstall.xml
new file mode 100644
index 00000000..64e70b85
--- /dev/null
+++ b/docs/installer/en/exitInstall.xml
@@ -0,0 +1,37 @@
+<?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="exitInstall" version="5.0">
+
+  <info>
+    <title xml:id="exitInstall-ti1">Congratulations</title>
+  </info>
+
+  <!-- Started by marja on 2012 03 29 -->
+  <!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
+  
+  <!-- marja - 2012-04-24 added screenshot and text -->
+  <!-- same day, added "s" to "sytems"-->
+  
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-exitInstall.png" width="800" depth="600"
+       format="PNG" align="center"   xml:id="exitInstall-im1">
+      </imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="2" xml:id="exitInstall-pa1">You have finished installing
+  and configuring <application>Mageia</application> and it is now safe to 
+  remove the installation medium and reboot your computer.</para>
+
+  <para revision="2" xml:id="exitInstall-pa2">After reboot, in the bootloader screen,
+  you can choose between the operating systems on your computer (if you have more than one).</para>
+
+  <para revision="1" xml:id="exitInstall-pa3">If you didn't adjust the settings for
+   the bootloader, your Mageia install will be automatically selected and started. </para>
+  
+  <para revision="1" xml:id="exitInstall-pa4">Enjoy!</para>
+  
+  <para revision="1" xml:id="exitInstall-pa5">Visit www.mageia.org if you have any questions
+   or want to contribute to Mageia </para>
+  
+  
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/formatPartitions.xml b/docs/installer/en/formatPartitions.xml
new file mode 100644
index 00000000..fcb21494
--- /dev/null
+++ b/docs/installer/en/formatPartitions.xml
@@ -0,0 +1,47 @@
+<?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="formatPartitions">
+
+  <info>
+    <title xml:id="formatPartitions-ti1">Formatting</title>
+  </info>
+
+  <!-- Made by marja on 2012 03 29 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+  
+  <!-- marja 2012-04-24 added screenshot -->
+  
+  <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
+  
+  
+  
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-formatPartitions.png" width="100%" depth="600"
+       format="PNG" align="center"   xml:id="formatPartitions-im1">
+      </imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which
+    partition(s) you wish to format. Any data on partitions <emphasis>not</emphasis>
+    marked for formatting will be saved.</para>
+
+  <para revision="1" xml:id="formatPartitions-pa2">Usually at least the
+    partitions DrakX selected, need to be formatted</para>
+
+  <para revision="1" xml:id="formatPartitions-pa3">Click on
+    <guibutton>Advanced</guibutton> to choose partitions you want to check for
+    so called <emphasis>bad blocks</emphasis></para>
+
+  <tip>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you
+    have made the right choice, you can click on
+    <guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
+    and then on <guibutton>Custom</guibutton> to get back to the main screen.
+    In that screen you can choose to view what is in your partitions.</para>
+  </tip>
+
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident
+  about the selection, click on <guibutton>Next</guibutton> to
+  continue.</para>
+</section>
diff --git a/docs/installer/en/installUpdates.xml b/docs/installer/en/installUpdates.xml
new file mode 100644
index 00000000..32ca6d37
--- /dev/null
+++ b/docs/installer/en/installUpdates.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Updates</title></info>
+
+<!-- Made by marja on 2012 03 30 -->
+<!-- NEEDS TO BE REVIEWED! -->
+
+ <!-- marja 20120418 removed 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"" from section tag, trying to restore correct html filename-->
+ 
+ <!-- marja, 2012-04-24 added screenshot -->
+
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-installUpdates.png" width="100%" depth="600"
+        format="PNG" align="center"   xml:id="installUpdates-im1"></imagedata>
+      </imageobject>
+   </mediaobject> 
+
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of
+  <application>Mageia</application> was released, some packages will have been
+  updated or improved.</para>
+
+  <para revision="1" xml:id="installUpdates-pa2">Choose
+  <guilabel>yes</guilabel> if you wish to download and install them, select
+  <guilabel>no</guilabel> if you don't want to do this now, or if you aren't
+  connected to the Internet</para>
+
+  <para revision="1" xml:id="installUpdates-pa3">Then press
+  <guibutton>Next</guibutton> to continue</para>
+
+</section>
+  
\ No newline at end of file
diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
new file mode 100644
index 00000000..2acd2f0c
--- /dev/null
+++ b/docs/installer/en/installer.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="installer">
+
+  <!-- Made by marja on 2012 03 30, using barjac's text -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!--removed para id's, corrected duplicate id's for segments, marja, 20120409 -->
+
+  <!--barjac 2012-04-11 - corrected link to Welcome screen and unmangled header - 
+      seems to be corrupted by xxe addon when saving -->
+
+  <!-- JohnR - apparent corruption is caused by the positioning of this comment block 
+       - corrected Lebarhon : I put [] where it seems having mistakes  -->
+
+  <!-- barjac 18/04/2012 Commented out para relating to peripherals, as it's apparently wrong -->
+
+  <info>
+    <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+  </info>
+
+  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
+  Installer is designed to help make your installation or upgrade as easy as
+  possible.</para>
+
+  <!-- <para>If you have peripherals like printers or scanners, it is [best] to
+  connect them and make sure they are powered up during installation. These
+  will be automatically detected and configured.</para> -->
+
+  <para>The initial menu screen has various options, however the default one
+  will start the installer, which will normally be all that you will
+  need.</para>
+
+  <figure xml:id="dx-welcome">
+    <info>
+      <title xml:id="installer-ti2">Installation Welcome Screen</title>
+    </info>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata revision="1" fileref="../dx-welcome.png" align="center" width="100%"
+         format="PNG" depth="600" xml:id="BId-drakx-intro-im1">
+        </imagedata>
+      </imageobject>
+    </mediaobject>
+  </figure>
+
+  <para>If there are problems during install, then it may be necessary to use
+  special installation options, see <xref linkend="installationOptions"></xref>.</para>
+
+  <section xml:id="installationSteps">
+    <info>
+      <title xml:id="installationSteps-ti1">The installation steps</title>
+    </info>
+
+    <para>The install process is divided into a number of steps, which can be
+    followed on the side panel of the screen.</para>
+
+    <para>Each step has one or more screens which may also have
+    <guibutton>Advanced</guibutton> buttons with extra, less commonly
+    required, options.</para>
+
+    <para>Most screens have <guibutton>Help</guibutton> buttons which give
+    further explanations about the current step.</para>
+
+    <note>
+      <para>If somewhere during install you decide to stop the installation,
+      it is possible to reboot, but please think twice before you do this.
+      Once a partition has been formatted or updates have started to be
+      installed, your computer is no longer in the same state and rebooting it
+      could very well leave you with an unusable system. If in spite of this
+      you are very sure rebooting is what you want, go to a text terminal by
+      pressing the three keys <guibutton>Alt Ctrl F2</guibutton> at the same
+      time. After that, press <guibutton>Alt Ctrl Delete</guibutton>
+      simultaneously to reboot.</para>
+    </note>
+  </section>
+
+  <section xml:id="installationOptions">
+    <info>
+      <title xml:id="installationOptions-ti1">Installation options</title>
+    </info>
+
+    <para>If the installation fails then it may be necessary to try again by
+    using one of the extra options available by hitting the <guibutton>F1
+    (Help)</guibutton> key see <xref linkend="dx-welcome"></xref></para>
+
+    <para>This will open the following text based help.</para>
+
+    <figure xml:id="dx-help">
+      <info>
+        <title xml:id="installationOptions-ti2">Installation Help
+        Screen</title>
+      </info>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata revision="1" fileref="../dx-help.png" align="center" width="100%"
+           format="PNG" depth="600" xml:id="installer-im2"></imagedata>
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <section xml:id="installationProblems">
+      <info>
+        <title xml:id="installationProblems-ti1">Installation Problems and
+        Possible Solutions</title>
+      </info>
+
+      <section xml:id="noX">
+        <info>
+          <title xml:id="noX-ti2">No Graphical Interface</title>
+        </info>
+
+        <itemizedlist>
+          <listitem>
+            <para>After the initial screen you did not reach the language
+            selection screen. This can happen with some graphic cards and
+            older systems. Try using low resolution by typing
+            <code>vgalo</code> at the prompt.</para>
+          </listitem>
+
+          <listitem>
+            <para revision="2">If the hardware is very old, a graphical installation may
+            not be possible. In this case it is worth trying a text mode
+            installation. To use this hit ESC at the first welcome screen and
+            confirm with ENTER. You will be presented with a black screen with
+            the word "boot:". Type "text" and hit ENTER. Now continue with the
+            installation in text mode.<emphasis></emphasis></para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section xml:id="installFreezes">
+        <info>
+          <title xml:id="installFreezes-ti1">The Install Freezes</title>
+        </info>
+
+        <para>If the system appeared to freeze during the installation, this
+        may be a problem with hardware detection. In this case the automatic
+        detection of hardware may be bypassed and dealt with later. To try
+        this, type <code>noauto</code> at the prompt. This option may also be
+        combined with other options as necessary.</para>
+      </section>
+
+      <section xml:id="kernelOptions">
+        <info>
+          <title xml:id="kernelOptions-ti1">Kernel Options</title>
+        </info>
+
+        <para>These will rarely be needed, but in some cases the hardware may
+        report the available RAM incorrectly. To specify this manually, you
+        can use the <code>mem=xxxM</code> parameter, where xxx is the correct
+        amount of RAM. e.g. <code>mem=256M</code> would specify 256MB of
+        RAM.</para>
+      </section>
+    </section>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/keyboarddrake.xml b/docs/installer/en/keyboarddrake.xml
new file mode 100644
index 00000000..3ffa896b
--- /dev/null
+++ b/docs/installer/en/keyboarddrake.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="keyboarddrake"
+         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">
+  <info>
+    <title xml:id="keyboarddrake-ti1">Set up the Keyboard Layout</title>
+
+    <!-- 2012-09-02 marja changed the title to "Set up the Keyboard Layout", so it is the same as the title in MCC -->
+
+    <subtitle>keyboarddrake</subtitle>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata align="center" depth="437" fileref="keyboarddrake.png"
+                 format="PNG" revision="1" width="616"
+                 xml:id="keyboarddrake-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <section>
+    <title>Introduction</title>
+
+    <para>The keyboarddrake tool helps you configure the basic layout for the
+    keyboard that you wish to use on Mageia. It affects the keyboard layout
+    for all users on the system.  It can be found in the Hardware section of the
+    Mageia Control Center (MCC) labelled "Configure mouse and keyboard". You can
+    also start this tool from the command line, by typing <emphasis role="bold">keyboarddrake</emphasis> as
+    root.</para>
+  </section>
+
+  <section>
+    <title>Keyboard Layout</title>
+
+    <para>Here you can select which keyboard layout you wish to use. The names
+    (listed in alphabetical order) describe the language, country, and/or
+    ethnicity each layout should be used for.</para>
+  </section>
+
+  <section>
+    <title>Keyboard Type</title>
+
+    <para>This menu lets you select the type of keyboard you are using. If you
+    are unsure of which to choose, it is best to leave it as the default
+    type.</para>
+  </section>
+</section>
diff --git a/docs/installer/en/media_selection.xml b/docs/installer/en/media_selection.xml
new file mode 100644
index 00000000..768daca2
--- /dev/null
+++ b/docs/installer/en/media_selection.xml
@@ -0,0 +1,46 @@
+<?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="media_selection" version="5.0" xml:lang="en">
+  <info>
+    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+  </info>
+
+  <!-- papoteur 2013-04-11  - created -->
+  <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
+  <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
+  <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+
+<mediaobject>
+    <imageobject>
+      <imagedata align="center" depth="600" fileref="dx2-media_selection.png"
+                 format="PNG" revision="1" width="800" xml:id="media_selection-im1"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>Here you have the list of available repositories. Not all repositories
+  are available, according to which media you use for installing. The
+  repositories selection determines which packages will be available for
+  selection during the next steps.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>The <emphasis>Core</emphasis> repository cannot be disabled as it
+      contains the base of the distribution.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <emphasis>Non-free</emphasis> repository includes packages
+      that are free-of-charge, i.e. Mageia may redistribute them, but they
+      contain closed-source software (hence the name - Nonfree). For example
+      this repository includes nVidia and ATI graphics card proprietary
+      drivers, firmware for various WiFi cards, etc.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <emphasis>Tainted</emphasis> repository includes packages
+      released under a free license. The main criteria for placing packages in
+      this repository is that they may infringe patents and copyright laws
+      in some countries, e.g. Multimedia codecs needed to play various
+      audio/video files; packages needed to play commercial video DVD,
+      etc.</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/minimal-install.xml b/docs/installer/en/minimal-install.xml
new file mode 100644
index 00000000..f6bec3be
--- /dev/null
+++ b/docs/installer/en/minimal-install.xml
@@ -0,0 +1,17 @@
+<?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="minimal-install">
+    <info>
+      <title xml:id="minimal-install-ti1">Minimal Install</title>
+    </info>
+
+    <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+
+    <para>You can choose a Minimal Installation by de-selecting everything in the Package Group Selection screen, see <xref linkend="choosePackageGroups"></xref>.</para>
+    <para>Minimal Installation is intended for those with specific uses in mind for their
+    <application>Mageia</application>, such as a server or a specialised
+    workstation. You will probably use this option combined with Manual
+    Package Selection, see <xref linkend="choosePackagesTree"></xref>.</para>
+    <para>If you choose this installation class, then the next
+    screen will offer you a few useful extras to install, such as
+    documentation and X.</para>
+  </section>
+
diff --git a/docs/installer/en/misc-params.xml b/docs/installer/en/misc-params.xml
new file mode 100644
index 00000000..369e8cd8
--- /dev/null
+++ b/docs/installer/en/misc-params.xml
@@ -0,0 +1,241 @@
+<?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="misc-params" version="5.0">
+
+ <info>
+      <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+ </info>
+
+
+  <!-- Started by marja on 2012 03 31 -->
+
+  <!-- NEEDS TO BE WRITTEN AND REVIEWED! -->
+
+  <!--marja - 2012 04 15 added some text, not much, unfortunately :( -->
+
+  <!--marja 2012-04-24 added screenshots -->
+
+  <!--JohnR 2012-04-25 Added text as requested by Psec :-)-->
+
+  <!--marja 2012-04-24 added 2 links to other help pages -->
+
+  <!--marja 2012-04-24 added some text in the drakxid-configureServices and 
+      the drakxid-miscellaneous section -->
+
+  <!--marja 2012-04-24 corrected "Magaia" in the last paragraph -->
+
+  <!--marja 2012-04-24 corrected para xml:id number in the last paragraph -->
+
+  <!-- 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. -->
+
+  <!-- 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" -->
+  <!--2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files-->
+
+
+
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-summary.png" width="800" align="center" 
+        format="PNG" depth="600" xml:id="summary-im1"></imagedata>
+      </imageobject>
+   </mediaobject>
+
+  <para revision="1" xml:id="misc-params-pa1">DrakX made smart choices for the
+  configuration of your system depending on the choices you made and on the
+  hardware DrakX detected. You can check the settings here and change them if
+  you want after pressing <guibutton>Configure</guibutton>.</para>
+
+  <section xml:id="misc-params-system">
+    <info>
+      <title xml:id="misc-params-system-ti2">System parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa2"><guilabel>Timezone</guilabel></para>
+
+        <para revision="1" xml:id="misc-params-system-pa2a">DrakX selected a
+        time zone for you, depending on your preferred language. You can
+        change it if needed. See also <xref linkend="configureTimezoneUTC"></xref></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country /
+        Region</guilabel></para>
+
+        <para revision="1" xml:id="misc-params-system-pa3a">If you are not in
+        the selected country, it is very important that you correct the
+        setting. See <xref linkend="selectCountry"></xref></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+
+        <para revision="2" xml:id="misc-params-system-pa4a">DrakX has made
+        good choices for the bootloader setting.</para>
+
+        <para revision="2" xml:id="misc-params-system-pa4b">Do not change
+        anything, unless you know how to configure Grub and/or Lilo</para>
+
+        <para revision="2" xml:id="misc-params-system-pa4c">For more
+        information, see <xref linkend="setupBootloader"></xref></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa5"><guilabel>User
+        management</guilabel></para>
+
+        <para revision="2" xml:id="misc-params-system-pa5a">You can add extra
+        users here. They will each get their own <literal>/home</literal>
+        directories and will not be able to look in your or each other's
+        documents, mails, pictures and other files.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa6"><guilabel>Services</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-system-pa6a">System services
+        refer to those small programs which run the background (daemons). This
+        tool allows you to enable or disable certain tasks.</para>
+
+        <para revision="1" xml:id="misc-params-system-pa6b">You should check
+        carefully before changing anything here - a mistake may prevent your
+	computer from operating correctly.</para> 
+<para>For more information, see <xref linkend="configureServices"></xref></para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="misc-params-hardware">
+
+    <info>
+      <title xml:id="misc-params-hardware-ti3">Hardware parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="misc-params-hardware-pa1"><guilabel>Keyboard</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-hardware-pa1a">This is where
+        you setup or change your keyboard layout which will depend on your
+        location, language or type of keyboard.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-hardware-pa2"><guilabel>Mouse</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-hardware-pa2a">Here you can add
+        or configure other pointing devices, tablets, trackballs etc.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-hardware-pa3"><guilabel>Sound
+        card</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-hardware-pa3a">This section
+        allows you to fine tune your sound card. In most cases the options
+        selected will work with your computer.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-hardware-pa4"><guilabel>Graphical
+        interface</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-hardware-pa4a">This section
+        allows you to configure your graphic card(s) and displays.</para>
+
+        <para revision="1" xml:id="misc-params-hardware-pa4b">For more
+        information, see <xref linkend="configureX_chooser"></xref>.</para>
+      </listitem>
+    </itemizedlist>
+
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-summaryBottom.png" align="center" width="800" 
+        format="PNG" depth="600" xml:id="summaryBottom-im1">
+      </imagedata>
+    </imageobject>
+   </mediaobject>
+  </section>
+
+  <section xml:id="misc-params-network">
+    <info>
+      <title xml:id="misc-params-network-ti4">Network and Internet
+      parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="misc-params-network-pa1"><guilabel>Network</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-network-pa2">You can configure
+        your network here, but for network cards with non-free drivers it is
+        better to do that after reboot, in the <application>Mageia Control
+        Center</application>, after having enabled the non-free media
+        repositories.</para>
+
+        <warning>
+          <para revision="1" xml:id="misc-params-network-pa3">When you add a
+          network card, do not forget to set your firewall to watch that
+          interface as well.</para>
+        </warning>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-network-pa4"><guilabel>Proxies</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-network-pa4a">A Proxy Server
+        acts as an intermediary between your computer and the wider internet.
+        This section allows you to configure your computer to utilize a proxy
+        service.</para>
+
+        <para revision="1" xml:id="misc-params-network-pa4b">You may need to
+        consult your systems administrator to get the parameters you need to
+        enter here</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="misc-params-security">
+    <info>
+      <title xml:id="misc-params-security-ti5">Security</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security
+        Level</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-security-pa1a">Here you set the
+        Security level for your computer, in most cases the default setting
+        (Standard) is adequate for general use.</para>
+
+        <para revision="1" xml:id="misc-params-security-pa1b">Check the option
+        which best suits your usage.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-security-pa2"><guilabel>Firewall</guilabel>:</para>
+
+        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is
+        intended to be a barrier between your important data and the rascals
+        out there on the internet who would compromise or steal it.</para>
+
+        <para revision="1" xml:id="misc-params-security-pa2b">Select the
+        services that you wish to have access to your system. Your selections
+        will depend on what you use your computer for.</para>
+
+        <warning>
+          <para revision="1" xml:id="misc-params-security-pa2c">Bear in mind
+          that allowing everything (no firewall) may be very risky.</para>
+        </warning>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+</section>
diff --git a/docs/installer/en/resizeFATChoose.xml b/docs/installer/en/resizeFATChoose.xml
new file mode 100644
index 00000000..439bf0e2
--- /dev/null
+++ b/docs/installer/en/resizeFATChoose.xml
@@ -0,0 +1,30 @@
+<?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="resizeFATChoose">
+   
+  <!-- Made by marja on 2012 03 31 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+  
+  <!-- marja 2012-04-24 commented the empty paragraphs out-->
+
+  <info>
+    <title xml:id="resizeFATChoose-ti1">Resize
+    <application>Windows<superscript>®</superscript></application> partition</title>
+  </info>
+
+  <para revision="1" xml:id="resizeFATChoose-pa1">You have more than one
+  <application>Windows<superscript>®</superscript></application> partition.
+  Choose which one should be made smaller to make space for installing
+  <application>Mageia</application>.</para>
+
+  <!--<para revision="1" xml:id="resizeFATChoose-pa2">.......</para>
+
+ <para revision="1" xml:id="resizeFATChoose-pa3">........</para>-->
+   
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/securityLevel.xml b/docs/installer/en/securityLevel.xml
new file mode 100644
index 00000000..6bb3d487
--- /dev/null
+++ b/docs/installer/en/securityLevel.xml
@@ -0,0 +1,27 @@
+<?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="securityLevel" version="5.0">
+
+
+    <info>
+      <title xml:id="securityLevel-ti1">Security Level</title>
+    </info>
+
+ <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
+
+    <para revision="1" xml:id="securityLevel-pa1">You can adjust your
+    security level here.</para>
+
+    <para revision="1" xml:id="securityLevel-pa2">Leave the default
+    settings as they are, if you don't know what to choose.</para>
+
+    <para revision="2" xml:id="securityLevel-pa3">After install, it
+    will always be possible to adjust your security settings in the
+    <guilabel>Security</guilabel> part of the Mageia Control Center.</para>
+  </section>
+
diff --git a/docs/installer/en/selectCountry.xml b/docs/installer/en/selectCountry.xml
new file mode 100644
index 00000000..1f6a7209
--- /dev/null
+++ b/docs/installer/en/selectCountry.xml
@@ -0,0 +1,60 @@
+<?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="selectCountry" version="5.0">
+
+
+
+    <info>
+      <title xml:id="selectCountry-ti1">Select your Country /
+      Region</title>
+    </info>
+
+    <!-- 2012-12-25 marja - moved this section out of misc-params -->
+
+    <para revision="2" xml:id="selectCountry-pa1">Select your country
+    or region. This is important for all kinds of settings, like the currency
+    and wireless regulatory domain. Setting the wrong country can lead to not
+    being able to use a Wireless network.</para>
+
+    <para revision="1" xml:id="selectCountry-pa2">If your country
+    isn't in the list, click the <guilabel>Other Countries</guilabel> button
+    and choose your country / region there.</para>
+
+    <note>
+      <para revision="1" xml:id="selectCountry-pa3">If your country is
+      only in the <guilabel>Other Countries</guilabel> list, after clicking
+      <guibutton>OK</guibutton> it may seem a country from the first list was
+      chosen. Please ignore this, DrakX will follow your real choice.</para>
+    </note>
+
+    <section xml:id="inputMethod">
+
+      <info>
+        <title xml:id="inputMethod-ti7">Input method</title>
+      </info>
+
+      <para revision="1" xml:id="selectCountry-pa4">In the
+      <guilabel>Other Countries</guilabel> screen you can also select an input
+      method (at the bottom of the list). Input methods allow users to input
+      multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+      default input method in Mageia DVDs, Africa/India and Asia/no-India
+      Live-CDs. For Asian and African locales, IBus will be set as default
+      input method so users should not need to configure it manually. Other
+      input methods(SCIM, GCIN, HIME, etc) also provide similar functions and
+      can be installed if you added HTTP/FTP media before package
+      selection.</para>
+
+      <note>
+        <para revision="1" xml:id="selectCountry-pa5">If you missed
+        the input method setup during installation, you can access it after
+        you boot your installed system via "Configure your Computer" -&gt;
+        "System", or by running localedrake as root.</para>
+      </note>
+    </section>
+  </section>
+
diff --git a/docs/installer/en/selectInstallClass.xml b/docs/installer/en/selectInstallClass.xml
new file mode 100644
index 00000000..e4cf6c75
--- /dev/null
+++ b/docs/installer/en/selectInstallClass.xml
@@ -0,0 +1,65 @@
+<?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/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook"
+ version="5.0" xml:id="selectInstallClass">
+
+  <!-- Made by marja on 2012 03 18 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- 20120405 updated JohnR -->
+
+  <!-- enhanced xml code for screenshot, removed para xml:id's, changed "you'll" to
+      "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
+
+  <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
+
+  <info>
+    <title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="dx2-selectinstallClass.png" align="center" width="100%" format="PNG"
+       depth="600"></imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Install</para>
+
+      <para>Use this option for a fresh <application>Mageia</application>
+      installation.</para>
+    </listitem>
+
+    <listitem>
+      <para>Upgrade</para>
+
+      <para>If you have one or more <application>Mageia 2</application> installations on your
+      system, the installer will allow you to upgrade one of them to the latest release.</para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>If during install you decide to stop the installation, it is
+    possible to reboot, but please think twice before you do this. Once a
+    partition has been formatted or updates have started to be installed, your
+    computer isn't in the same state anymore and rebooting it could very well
+    leave you with an unusable system. If in spite of that you are very sure
+    rebooting is what you want, go to a text terminal by pressing the three
+    keys <guilabel>Alt Ctrl F2</guilabel> at the same time. After that, press
+    <guilabel>Alt Ctrl Delete</guilabel> simultaneously to reboot.</para>
+  </note>
+
+  <tip>
+    <para>If you have discovered that you forgot to select an additional
+    language, you can return from the "Install or Upgrade" screen to the
+    language choice screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do
+    <emphasis>not</emphasis> do this later in the install.</para>
+  </tip>
+</section>
diff --git a/docs/installer/en/selectKeyboard.xml b/docs/installer/en/selectKeyboard.xml
new file mode 100644
index 00000000..b0d74ef4
--- /dev/null
+++ b/docs/installer/en/selectKeyboard.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="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">
+  <!-- Started by marja on 2012 03 31 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <info>
+    <title xml:id="selectKeyboard-ti1">Keyboard</title>
+  </info>
+
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate
+  keyboard for your language. If no suitable keyboard is found it will default
+  to a US keyboard layout.</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata align="center" depth="600" fileref="dx2-selectKeyboard.png"
+                 width="800"/>
+    </imageobject>
+  </mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the
+      selection is correct or choose another keyboard layout. If you don't
+      know which layout your keyboard has, look in the specifications that
+      came with your system, or ask the computer vendor. There may even be a
+      label on the keyboard that identifies the layout. You can also look
+      here: <link
+      xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in
+      the list shown, click on <guibutton>More</guibutton> to get a full list,
+      and select your keyboard there.</para>
+
+      <para revision="1"><warning>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a
+          keyboard from the <guibutton>More</guibutton> dialog, you'll return
+          to the first keyboard choice dialog and it will seem as though a
+          keyboard from that screen was chosen. You can safely ignore this
+          anomaly and continue the installation: Your keyboard is the one you
+          chose from the full list.</para>
+        </warning></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard
+      based on non-Latin characters, you will see an extra dialog screen
+      asking how you would prefer to switch between the Latin and non-Latin
+      keyboard layouts</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/installer/en/selectLanguage.xml b/docs/installer/en/selectLanguage.xml
new file mode 100644
index 00000000..3a7eeaa1
--- /dev/null
+++ b/docs/installer/en/selectLanguage.xml
@@ -0,0 +1,69 @@
+<?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">
+
+  <!-- Made by marja on 2012 04 01, using barjac's text -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- SimonNZG 2012-04-03 has had a look -->
+
+  <!-- removed para id's, corrected duplicate id's for segments, corrected wrong
+       code in figure, marja, 20120409 -->
+
+  <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
+       up mess made of this header by xxe -->
+
+  <info>
+    <title xml:id="selectLanguage-ti1">Please choose a language to use</title>
+  </info>
+
+  <para>Select your preferred language, by first expanding the list for your
+  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>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="dx2-selectLanguage.png" align="center" width="100%" 
+        format="PNG" depth="600">
+      </imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <warning>
+    <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>
+      <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>
+    </listitem>
+
+    <listitem>
+      <para>You can change the language of your system after installation in
+      the Mageia Control Center -&gt; System -&gt; Manage localization for
+      your system.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/installer/en/selectMouse.xml b/docs/installer/en/selectMouse.xml
new file mode 100644
index 00000000..c6b3f41a
--- /dev/null
+++ b/docs/installer/en/selectMouse.xml
@@ -0,0 +1,28 @@
+<?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="selectMouse" version="5.0">
+
+  <info>
+    <title xml:id="selectMouse-ti1">Select mouse</title>
+  </info>
+
+  <!-- Made by marja on 2012 04 11 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+  
+  <!-- adding some "real" text now that we know the page shows up in the right place-->
+  
+  <!-- marja 2012-04-24 adding screenshot -->
+  
+   <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-selectMouse.png" align="center" format="PNG" width="100%"
+          depth="600">
+        </imagedata>
+      </imageobject>
+    </mediaobject>
+
+  <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a different one here.</para>
+
+ <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</guilabel> is a good choice.</para>
+
+  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to configure the buttons that do not work on a mouse with six or more buttons.</para>
+</section>
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
new file mode 100644
index 00000000..32cc8cf5
--- /dev/null
+++ b/docs/installer/en/setupBootloader.xml
@@ -0,0 +1,101 @@
+<?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">
+  <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 width="100%" revision="1" align="center" fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1" format="PNG" depth="600"/>
+    </imageobject>
+  </mediaobject>
+
+  <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>
+
+    <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>
\ No newline at end of file
diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml
new file mode 100644
index 00000000..35453f01
--- /dev/null
+++ b/docs/installer/en/setupBootloaderAddEntry.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+
+
+<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="setupBootloaderAddEntry"><info><title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title></info>
+
+	
+
+ <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-bootloaderConfiguration.png" width="800" depth="600" format="PNG" align="center"   xml:id="bootloaderConfiguration-im1"></imagedata>
+    </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>
+
+  
+ <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-setupBootloaderAddEntry.png" width="800" depth="600" format="PNG" align="center"   xml:id="setupBootloaderAddEntry-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
+  
+  <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>
diff --git a/docs/installer/en/setupBootloaderBeginner.xml b/docs/installer/en/setupBootloaderBeginner.xml
new file mode 100644
index 00000000..2d57c65a
--- /dev/null
+++ b/docs/installer/en/setupBootloaderBeginner.xml
@@ -0,0 +1,47 @@
+<?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="setupBootloaderBeginner" version="5.0">
+
+  <info>
+    <title xml:id="setupBootloaderBeginner-ti1">Bootloader main
+    options (old page)</title>
+  </info>
+
+  <!-- Made by marja on 2012 04 01 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- SimonNZG 2012-04-03: Needs to return to this one -->
+
+  <!-- 20120421 imported barjac's text (a lot!!, thx barjac) - marja -->
+
+  <!-- 2012-04-22 thanks marja - nice job - I changed the section heading back to 'existing
+       bootloader', as this applies to any O.S. not just Linux 
+       - maybe the xml:ids need changing? -->
+
+  <!-- 2012-04-22 changed xml:id's accordingly, removed a few words I had wrongly added
+       to barjac's text-->
+
+  <!-- marja 2012-04-22 moved the expert part of this page to setupBootloaderExpert.xml
+       and added tip about doing df in tty2-->
+
+  <!-- marja 2012-04-24 added screenshot, adjusted warning -->
+
+  <!--barjac 2012-04-24 adjusted warning after IRC last night -->
+
+  <!--barjac 2012-04-25 changed all 'boot loader' instances to 'bootloader' - removed 
+      ref to Dra*X - corrected ref to Configure button-->
+
+<!-- 2012-08-09 moved this page to setupBootloader.xml, because setupBootloader is the needed filename for in installer help, deleted all text in this file to avoid having conflicting xml:id's -->
+
+    <warning>
+      <para>This page was moved to
+      <xref linkend="setupBootloader"></xref> because that page has the filename the help button in the '''Bootloader main options''' screen in installer links to.</para>
+    </warning>
+  </section>
+
diff --git a/docs/installer/en/setupBootloaderExpert.xml b/docs/installer/en/setupBootloaderExpert.xml
new file mode 100644
index 00000000..9ca54642
--- /dev/null
+++ b/docs/installer/en/setupBootloaderExpert.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="setupBootloaderExpert"
+         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">
+
+  <info>
+    <title xml:id="setupBootloaderExpert-ti1">Bootloader expert use</title>
+  </info>
+
+  <!-- Made by marja on 2012 04 01 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- SimonNZG 2012-04-03: Needs to return to this one -->
+
+  <!-- 20120421 imported barjac's text (a lot!!, thx barjac) - marja -->
+
+  <!-- 2012-04-22 thanks marja - nice job - I changed the section heading back to 
+      'existing bootloader', as this applies to any O.S. not just Linux - maybe the
+       xml:ids need changing? -->
+
+  <!-- 2012-04-22 changed xml:id's accordingly, removed a few words I had wrongly 
+       added to barjac's text-->
+
+  <!-- 2012-04-22 Exported the complicated part of setupBootloaderBeginner.xml to 
+       this new file, the original file should be linked to this one.-->
+
+  <!-- barjac 2012-04-25 removed listitem as it seems that there is *always* a copy
+       of core.img in the /boot/... dir - I was not aware that was the case until I
+       checked with upstream tonight -->
+
+  <!-- barjac 2012-04-25 Added handling of /boot on a separate partiton and simplified
+       checking of / and /boot - I hope no translators are on this section - if so sorry
+       - I'm happy with it now!-->
+
+  <!-- barjac 2012-04-25 Corrected case of grub -> GRUB2 and minor punctuation edits. -->
+  
+  <!-- barjac 2012-04-25 Improved some wording thanks to grenoya -->
+  
+  <!-- barjac 2012-05-09 Added para pa52 due to new os-prober release with bug fix.
+       Removed link in pa50 as in the installer help a link is useless -->
+<!-- marja replaced link to setupBootloaderBeginner by link to setupBootloader -->
+
+  <para revision="1" xml:id="setupBootloaderExpert-pa1">If you haven't done so
+  yet, please read <xref linkend="setupBootloader"/> first.</para>
+
+  <section xml:id="addingGRUB2system">
+
+    <info>
+      <title xml:id="addingGRUB2system-ti3">Adding a GRUB2 based system
+      manually</title>
+    </info>
+
+    <para revision="2" xml:id="setupBootloaderExpert-pa7">A GRUB2 based system
+    may be added to the Mageia boot menu as follows:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="4" xml:id="setupBootloaderExpert-pa8">Boot into the
+        system in question. In order to determine the GRUB2 version run the
+        following command in a terminal:</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa9"><literal>sudo
+        grub-install --version</literal></para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa10">or if that
+        fails try:</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa11"><literal>sudo
+        grub2-install --version</literal></para>
+      </listitem>
+
+      <listitem>
+        <para revision="2" xml:id="setupBootloaderExpert-pa12">If this returns
+        "GNU GRUB version 0.97" (possibly with a custom suffix), then it is
+        using GRUB (otherwise called GRUB legacy) not GRUB2 and your system
+        should be correctly identified by Mageia during installation and added
+        automatically to the menu.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa15">If this returns
+        (GRUB) 1.98 or 1.99 or 2.xx, then you are using GRUB2.</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa16">Make a note of
+        the version and enter this command to identify the root
+        partition:</para>
+
+        <para revision="2" xml:id="setupBootloaderExpert-pa17"><literal>df -h
+        / |(read; awk '{print $1; exit}')</literal></para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa18">This will
+        output something like :</para>
+
+        <!--        <para revision="1"
+        xml:id="setupBootloaderExpert-pa19"><literal>Filesystem Size Used
+	  Avail Use% Mounted on</literal></para> -->
+
+        <para revision="2"
+        xml:id="setupBootloaderExpert-pa20"><literal>/dev/sdb11</literal></para>
+
+        <para revision="2" xml:id="setupBootloaderExpert-pa21">sdb11 is the
+        root partition - make a note of it.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="2" xml:id="setupBootloaderExpert-pa22">Now check that
+        the /boot folder is in the same partition by entering the following
+        command:</para>
+
+        <para revision="2" xml:id="setupBootloaderExpert-pa23"><literal>df -h
+        /boot |(read; awk '{print $1; exit}')</literal></para>
+
+        <!--        <para revision="1" xml:id="setupBootloaderExpert-pa24">or:</para> -->
+
+        <para revision="2" xml:id="setupBootloaderExpert-pa25">If the /boot
+        partition is different to the root partition then make a note and use
+        the /boot partition in the "root" line when editing menu.lst
+        below.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="2" xml:id="setupBootloaderExpert-pa26">You can now
+        shut down the system and install Mageia.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa27">In your new
+        running Mageia system, open a terminal and as root edit the file
+        /boot/grub/menu.lst as follows:</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa28">To become root
+        use:</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa29"><literal>su
+        -</literal></para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa30">(enter root
+        password)</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa31">To open the
+        file in an editor use:</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa32"><literal>kwrite
+        /boot/grub/menu.lst</literal></para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa33">(replace
+        "kwrite" with "gedit" if you are using Gnome)</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa34">Add the
+        following entry for your (e.g. Ubuntu) system, possibly as the second
+        stanza. The position the item appears in the menu will depend on its
+        position in the file:</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa35"><literal>title
+        Ubuntu</literal></para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa36"><literal>root
+        (hd1,10)</literal></para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa37"><literal>kernel
+        /boot/grub/core.img</literal></para>
+      </listitem>
+
+      <listitem>
+        <note>
+          <para revision="3" xml:id="setupBootloaderExpert-pa42">In the second
+          line, "hd1" means the second hard drive, the "10" indicates the 11th
+          partition. Drives and partitions in Mageia's legacy GRUB count from
+          zero.</para>
+
+          <para revision="2"
+          xml:id="setupBootloaderExpert-pa43">Therefore:</para>
+
+          <para revision="1"
+          xml:id="setupBootloaderExpert-pa44"><literal>sdb11 =
+          (hd1,10)</literal></para>
+
+          <para revision="1" xml:id="setupBootloaderExpert-pa45"><literal>sda1
+          = (hd0,0)</literal></para>
+        </note>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa38">If the GRUB2
+        version is 2.xx then change the last line to :</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa39"><literal>kernel
+        /boot/grub/i386-pc/core.img</literal></para>
+
+        <para revision="2" xml:id="setupBootloaderExpert-pa40">If you needed
+        to use "grub2-install" earlier then change <literal>"grub"</literal>
+        to <literal>"grub2"</literal> in the last line.</para>
+
+        <para revision="1" xml:id="setupBootloaderExpert-pa40a">If /boot was
+        on a separate partition, then remove <literal>"/boot"</literal> from
+        the last line.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="setupBootloaderExpert-pa41">Save the file
+        and re-boot. You should now see your "Ubuntu" entry in the menu and be
+        able to boot from it.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="usingExistingBootloaderGRUB2">
+    <info>
+      <title revision="1" xml:id="usingExistingBootloaderGRUB2-ti4">Using an
+      existing GRUB2 bootloader</title>
+    </info>
+
+    <para revision="1" xml:id="setupBootloaderExpert-pa49a">If you didn't read
+    the general part about using an existing bootloader yet, do so now. See
+    <xref linkend="usingExistingBootloader"/></para>
+
+    <note>
+      <para revision="5" xml:id="setupBootloaderExpert-pa50">There is a known
+      bug in OS-prober used during GRUB2 installation in some versions
+      of Debian/Ubuntu that incorrectly creates grub.cfg when adding Mageia
+      (or Mandriva) systems. This is simple to work around and details of a
+      fix can be found in the Mageia forum. Search for "prober", the topic is 
+      "grub problem", post #9 has the information.</para>
+
+      <para revision="1" xml:id="setupBootloaderExpert-pa51">To make the fix
+      permanent so that it will survive an Ubuntu kernel update, the Mageia
+      entry should be added to <literal>/etc/grub.d/40_custom</literal></para>
+      
+      <para revision="1" xml:id="setupBootloaderExpert-pa52">Stop Press: The bug 
+      is fixed in os-prober-1.53 released on 8th May 2012. So now, upgrading to 
+      the new version in your GRUB2 installation is the preferred solution.</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/installer/en/setupSCSI.xml b/docs/installer/en/setupSCSI.xml
new file mode 100644
index 00000000..9c1d950c
--- /dev/null
+++ b/docs/installer/en/setupSCSI.xml
@@ -0,0 +1,41 @@
+<?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="setupSCSI" version="5.0">
+
+  <info>
+    <title xml:id="setupSCSI-ti1">Setup SCSI</title>
+  </info>
+
+  <!-- Made by marja on 2012 04 02 -->
+  <!-- NEEDS TO BE REVIEWED! -->
+  <!-- JohnR - edited 2012-03-03 -->
+  <!-- SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) -->
+  <!-- barjac has re-reviewed and made some minor tweaks. Revisions incremented. --> 
+  
+  <!-- marja 2012-04-24 added screenshot -->
+  
+  <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
+       Mdv doc instead of on our setupSCSI file -->
+  
+   <mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-setupSCSI.png" width="100%" depth="600"
+       format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
+
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX usually detects hard disks correctly. With some
+    older SCSI controllers it may be unable to determine the correct drivers to use and subsequently
+    fail to recognise the drive.</para>
+
+  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to
+  manually tell Drakx which SCSI drive(s) you have.</para>
+
+  <para revision="3" xml:id="setupSCSI-pa3">DrakX should then be able
+  to configure the drive(s) correctly.</para>
+</section>
diff --git a/docs/installer/en/setupX.xml b/docs/installer/en/setupX.xml
new file mode 100644
index 00000000..35556db6
--- /dev/null
+++ b/docs/installer/en/setupX.xml
@@ -0,0 +1,27 @@
+<?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="setupX" version="5.0">
+
+  <info>
+    <title xml:id="setupX-ti1">Set up X, graphic card and monitor
+    configuration (old page)</title>
+  </info>
+
+  <!-- Made by marja on 2012 04 02 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+
+  <!--removed para xml:id's, marja, 20120409 -->
+
+  <!-- marja 2012-04-24, added para xml:id's, added screenshot -->
+
+  <!-- JohnR 2012-04-25, Reviewed minor changes  -->
+  <!-- Marja 2012-04-29, changed X-Windows into X Window System, thx papoteur for seeing this-->
+
+  <!-- Marja 2012-08-10, copied this page to configureX_chooser.xml, because the help button for this page links to that file, replaced the text and screenshot in this file by a warning that the page is moved and why -->
+
+  <warning>
+	        <para>This page was moved to
+			      <xref linkend="configureX_chooser"></xref> because that page has the filename the help button in the '''Graphic Card and Monitor Configuration''' screen in installer links to.</para>
+		          </warning>
+			    </section>
diff --git a/docs/installer/en/system-config-printer.xml b/docs/installer/en/system-config-printer.xml
new file mode 100644
index 00000000..98dd9040
--- /dev/null
+++ b/docs/installer/en/system-config-printer.xml
@@ -0,0 +1,338 @@
+<?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="system-config-printer">
+  <!--  Language proof JohnR 2012/08/28 -->
+
+  <!-- 2012-09-03 marja: made the link to Complete the installation process work (I hope) 
+ Lebarhon : added All in one devices in the chapter "Hewlett-Packard printers" 12/13-->
+
+  <info>
+    <title xml:id="system-config-printer-ti1">Install and configure a
+    printer</title>
+
+    <subtitle>system-config-printer</subtitle>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata revision="1" align="center" xml:id="system-config-printer-im1" format="PNG" fileref="system-config-printer.png" width="616" depth="600"/>
+    </imageobject>
+  </mediaobject>
+
+  <section xml:id="introduction">
+    <title xml:id="introduction-ti1">Introduction</title>
+
+    <para>Printing is managed on Mageia by a server named CUPS. It has its own
+    <link ns2:title="CUPS" ns2:href="http://localhost:631">configuration
+    interface</link> which is accessible via an Internet browser, but Mageia
+    offers its own tool for installing printers called system-config-printer
+    which is shared with other distributions such as Fedora, Mandriva, Ubuntu
+    and openSUSE.</para>
+
+    <para>You should enable the non-free repository before proceeding with the
+    installation, because some drivers may only be available in this
+    way.</para>
+
+    <para>Printer installation is carried out in the
+    <guilabel>Hardware</guilabel> section of the Mageia Control Centre. Select
+    the <guilabel>Configure printing and scanning</guilabel> tool<footnote>
+        <para>You can start this tool from the command line, by typing
+        <emphasis>system-config-printer</emphasis>. The root password will be
+        asked for.</para>
+      </footnote>.</para>
+
+    <para>MCC will ask for the installation two packages:</para>
+
+    <blockquote>
+      <para>task-printing-server</para>
+
+      <para>task-printing-hp</para>
+    </blockquote>
+
+    <para>It is necessary to accept this installation to continue. Up to 230MB
+    of dependencies are needed.</para>
+
+    <para>To add a printer, choose the "Add" printer button. The system will
+    try to detect any printers and the ports available. The screenshot
+    displays a printer connected to a parallel port. If a printer is detected,
+    such as a printer on a USB port, it will be displayed on the first line.
+    The window will also attempt to configure a network printer.</para>
+  </section>
+
+  <section xml:id="automatic">
+    <title>Automatically detected printer</title>
+
+    <para>This usually refers to USB printers. The utility automatically finds
+    the name of the printer and displays it. Select the printer and then click
+    "Next". If there is a known driver associated for the printer, it will be
+    automatically installed. If there is more than one driver or no known
+    drivers, a window will ask you to select or furnish one, as explained in
+    the next paragraph. Continue with <xref linkend="terminate"/></para>
+  </section>
+
+  <section xml:id="non_automatic">
+    <title>No automatically detected printer</title>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="printer3.png" width="600"/>
+      </imageobject>
+    </mediaobject>
+
+    <para>When you select a port, the system loads a driver list and displays
+    a window to select a driver. The choice can be made through one of the
+    following options.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Select printer from database</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <listitem>
+        <para>provide PPD file</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <listitem>
+        <para>search for a driver to download</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>By selecting from the database, the window suggests a printer
+    manufacturer first, and then a device and a driver associated with it. If
+    more than one driver is suggested, select one which is recommended, unless
+    you have encountered some problems with that one before, in this case
+    select the one which know to work.</para>
+  </section>
+
+  <section xml:id="terminate">
+    <title>Complete the installation process</title>
+
+    <para>After the driver selection, a window requests some information which
+    will allow the system to designate and discover the printer. The first
+    line is the name under which the device will appear in applications in the
+    list of available printers. The installer then suggests printing a test
+    page. After this step, the printer is added and appears in the list of
+    available printers.</para>
+  </section>
+
+  <section xml:id="network_printer">
+    <title>Network printer</title>
+
+    <para>Network printers are printers that are attached directly to a wired
+    or wireless network, that are attached to a printserver or that are
+    attached to another workstation that serves as printserver.</para>
+
+    <note>
+      <para>Often, it is better to configure the DHCP server to always
+      associate a fixed IP address with the printer's MAC-address. Of course
+      that should be the same as the IP address the printer of printserver is
+      set to, if it has a fixed one.</para>
+    </note>
+
+    <para>The printer's Mac-address is a serial number given to the printer or
+    printserver or computer it is attached to, that can be obtained from a
+    configuration page printed by the printer or which may be written on a
+    label on the printer or printserver. If your shared printer is attached to
+    a Mageia system, you can run <emphasis><code>ifconfig</code></emphasis> on
+    it as root to find the MAC-address. It is the sequence of numbers and
+    letters after "HWaddr".</para>
+
+    <para>You can add your network printer by choosing the protocol it uses to
+    talk to your computer over the network. If you don't know which protocol
+    to choose, you can try the <guilabel>Network Printer</guilabel> -
+    <guilabel>Find Network Printer</guilabel> option in the
+    <guilabel>Devices</guilabel> menu and give the IP address of the printer
+    in the box on the right, where it says "host".</para>
+
+    <para>If the tool recognises your printer or printserver, it will propose
+    a protocol and a queue, but you can choose a more appropriate one from the
+    list below it or give the correct queue name if it isn't in the
+    list.</para>
+
+    <para>Look in the documentation that came with your printer or printserver
+    to find which protocol(s) it supports and for possible specific queue
+    names.</para>
+  </section>
+
+  <section xml:id="network_printing_protocols">
+    <title>Network printing protocols</title>
+
+    <para>One current technique is one developed by Hewlett-Packard and known
+    as JetDirect. It allows access to a printer directly connected to the
+    network via an Ethernet port. You must know the IP-address at which the
+    printer is known on the network. This technique is also used inside some
+    ADSL-routers which contain an USB port to connect the printer. In this
+    case, the IP-address is that of the router. Note that the tool "Hp Device
+    manager" can manage dynamically configured IP-adress, setting an URI like
+    <emphasis>hp:/net/&lt;name-of-the-printer></emphasis> . In this case,
+    fixed IP-adress is not required.</para>
+
+    <para>Choose the option <guilabel>AppSocket/HP JetDirect</guilabel> as the
+    protocol and set the address in <guilabel>Host:</guilabel>, do not change
+    the <guilabel>Port Number</guilabel>, unless you know that it needs to be
+    changed. After the selection of the protocol, the selection of the driver
+    is the same as above.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="printer5.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <para>The other protocols are:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Internet Printing Protocol (ipp)</emphasis>: a printer
+        which can be accessed on a TCP/IP network via the IPP protocol, for
+        example a printer connected to a station using CUPS. This protocol may
+        also be used also by some ADSL-routers.</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Internet Printing Protocol (https): </emphasis>the
+        same as ipp, but using http transport and with TLS secured protocol.
+        The port has to be defined. By default, the port 631 is used.</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Internet Printing Protocol (ipps): </emphasis>the same
+        as ipp, but with TLS secured protocol.</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>LPD/LPR host or Printer</emphasis>: a printer which
+        can be accessed on a TCP/IP network via the LPD protocol, for example
+        a printer connected to a station using LPD.</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Windows printer via SAMBA</emphasis>: a printer
+        connected to a station running Windows or a SMB server and
+        shared.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The URI can also be added directly. Here are some examples on how to
+    form the URI:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Appsocket</para>
+
+        <para><uri>socket://ip-address-or-hostname:port </uri></para>
+      </listitem>
+
+      <listitem>
+        <para>Internet Printing Protocol (IPP)</para>
+
+        <para><uri>ipp://ip-address-or-hostname:port-number/resource</uri></para>
+
+        <para><uri>http://ip-address-or-hostname:port-number/resource</uri></para>
+      </listitem>
+
+      <listitem>
+        <para>Line Printer Daemon (LPD) Protocol</para>
+
+        <para><uri>lpd://username@ip-address-or-hostname/queue</uri></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Additional information can be found in the <link ns2:href="http://www.cups.org/documentation.php/doc-1.5/network.html">CUPS
+    documentation.</link></para>
+  </section>
+
+  <section xml:id="properties">
+    <title>Device Properties</title>
+
+    <para>You can access the properties of the device. The menu allows access
+    to parameters for the CUPS server. By default a CUPS server is launched on
+    your system, but you can specify a different one with the
+    <guimenu>Server</guimenu> | <guimenuitem>Connect...</guimenuitem> menu,
+    another window which gives access to the tuning of other specific
+    parameters of the server, following <guimenu>Server</guimenu> |
+    <guimenuitem>Settings.</guimenuitem></para>
+  </section>
+
+  <section>
+    <title xml:id="troubleshoot">Troubleshoot</title>
+
+    <para>You can find some information on occurring errors during printing by
+    inspecting <filename>/var/log/cups/error_log</filename></para>
+
+    <para>You can also access to a tool to diagnose problems using the
+    <guimenu>Help</guimenu> | <guilabel>Troubleshoot</guilabel> menu.</para>
+  </section>
+
+  <section xml:id="specificities">
+    <title>Specifics</title>
+
+    <para>It is possible that some drivers for specific printers are not
+    available in Mageia or are not functional. In this case, have a look at
+    the <link ns2:href="http://openprinting.org/printers/">openprinting</link>
+    site to check if a driver for your device is available. If yes, check if
+    the package is already present in Mageia and in this case install it
+    manually. Then, redo the installation process to configure the printer. In
+    all cases, report the problem in bugzilla or on the forum if you are
+    comfortable with this tool and furnish the model and driver information
+    and whether the printer works or not after installation. Here are some
+    sources to find other up-to-date drivers or for more recent
+    devices.</para>
+
+    <para><emphasis role="bold">Brother printers</emphasis></para>
+
+    <para><link ns2:href="http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html">This
+    page</link> give a list of drivers provided by Brother. Search the driver
+    for your device, download the rpm(s) and install.</para>
+
+    <para>You should install Brother drivers before running the configuration
+    utility.</para>
+
+    <para><emphasis role="bold">Hewlett-Packard printers and All in one
+    devices</emphasis></para>
+
+    <para>These devices use the hplip tool. It is installed automatically
+    after the detection or the selection of the printer. You can find other
+    information <link ns2:href="http://hplipopensource.com/hplip-web/index.html">here</link>.
+    The tool "HP Device Manager" is available in the
+    <guilabel>System</guilabel> menu. Also view <link ns2:href="http://hplipopensource.com/hplip-web/install/manual/hp_setup.html">configuration</link>
+    for the management of the printer.</para>
+
+    <para>A HP All in one device must be installed as a printer and the
+    scanner features will be added. Note that sometimes, the Xsane interface
+    doesn't allow to scan films or slides (the lighting slid can't operate).
+    In this case, it is possible to scan, using the standalone mode, and save
+    the picture on a memory card or USB stick inserted in the device.
+    Afterwards, open your favourite imaging software and load your picture
+    from the memory card which is appeared in the /media folder.</para>
+
+    <para><emphasis role="bold">Samsung colour printer</emphasis></para>
+
+    <para>For specific Samsung and Xerox colour printers, <link ns2:href="http://foo2qpdl.rkkda.com/">this site provides drivers</link>
+    for the QPDL protocol.</para>
+
+    <para><emphasis role="bold">Epson printers and scanners</emphasis></para>
+
+    <para>Drivers for Epson printers are available from <link ns2:href="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX">this
+    search page</link>. For the scanner part, you must install the
+    "iscan-data" package first, then "iscan" (in this order). It is possible
+    that the iscan package will generate a warning about a conflict with sane.
+    Users have reported that this warning can be ignored.</para>
+
+    <para><emphasis role="bold">Canon printers</emphasis></para>
+
+    <para>For Canon printers, it may be advisable to install a tool named
+    turboprint <link ns2:href="http://www.turboprint.info/">available here
+    </link>.</para>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/takeOverHdChoose.xml b/docs/installer/en/takeOverHdChoose.xml
new file mode 100644
index 00000000..f35e716b
--- /dev/null
+++ b/docs/installer/en/takeOverHdChoose.xml
@@ -0,0 +1,19 @@
+<?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/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="takeOverHdChoose">
+  <!-- Made by marja on 2012 04 02 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <info>
+    <title xml:id="takeOverHdChoose-ti1">Choose hard disk to erase for
+    <application>Mageia</application></title>
+  </info>
+
+  <para revision="1" xml:id="takeOverHdChoose-pa1">Select the hard disk that
+  should be formatted to install <application>Mageia</application>.</para>
+
+  <warning>
+    <para revision="1" xml:id="takeOverHdChoose-pa2">Be sure to select the
+    correct hard disk. All data on the selected disk will be lost. This step
+    can not be undone.</para>
+  </warning>
+</section>
\ No newline at end of file
diff --git a/docs/installer/en/takeOverHdConfirm.xml b/docs/installer/en/takeOverHdConfirm.xml
new file mode 100644
index 00000000..e0d22c47
--- /dev/null
+++ b/docs/installer/en/takeOverHdConfirm.xml
@@ -0,0 +1,24 @@
+<?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="takeOverHdConfirm">
+
+  <info>
+    <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be
+    formatted</title>
+  </info>
+
+  <!-- Made by marja on 2012 04 03 -->
+
+  <!-- NEEDS TO BE REVIEWED! -->
+
+  <!-- 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 -->
+
+  <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on
+  <guibutton>Previous</guibutton> if you are not sure about your choice.</para>
+
+  <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on
+  <guibutton>Next</guibutton> if you are sure and want to erase every
+  partition, every operating system and all data on that hard disk.</para>
+</section>
diff --git a/docs/installer/en/template.xml b/docs/installer/en/template.xml
new file mode 100644
index 00000000..56ad40df
--- /dev/null
+++ b/docs/installer/en/template.xml
@@ -0,0 +1,20 @@
+<?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="template" version="5.0">
+  <info>
+    <title xml:id="template-ti1">Please put the title of the tool screen (when you open it in MCC) here</title><subtitle>template</subtitle>
+  </info>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata depth="600" xml:id="template-im1" revision="1" align="center" format="PNG" width="800" fileref="template.png"/>
+    </imageobject>
+  </mediaobject>
+
+  <para> This file is just a template for making helptexts for draktools. Please give your helptext the name of the command you use (with exactly the same case for each character as when you use it on the command line) and add <emphasis>.xml</emphasis> to it</para> 
+  <para> Replace <emphasis>template</emphasis> in the code of this file by the real command. Please don't forget to adjust the depth and width of the screenshot, if needed.</para>
+
+  <para>Replace this sentence and the sentences above by an explanation of how the draktool you write about works.</para>
+
+  <para>You can start this tool from the
+  command line, by typing <emphasis role="bold">template</emphasis> as
+  root.</para>
+</section>