From 3c587a150c7a5b6776557f4e9da803138871718c Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 08:11:51 +0200
Subject: Update English files

---
 index.html | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'index.html')

diff --git a/index.html b/index.html
index 23b5f5a..c816941 100644
--- a/index.html
+++ b/index.html
@@ -28,16 +28,18 @@
                   <dl>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introduction</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Downloading and Checking Media</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Burn or dump the ISO</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Downloading and Checking Media</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Burn or dump the ISO</a></span></dt>
                   </dl>
                </dd>
-               <dt><span class="section"><a href="installer.html">DrakX, the Mageia Installer</a></span></dt>
+               <dt><span class="section"><a href="installer.html">DrakX, the Mageia
+                            Installer</a></span></dt>
                <dd>
                   <dl>
-                     <dt><span class="section"><a href="installer.html#installationSteps">The installation steps</a></span></dt>
-                     <dt><span class="section"><a href="installer.html#installationProblems">Installation Problems and
-                                    Possible Solutions</a></span></dt>
+                     <dt><span class="section"><a href="installer.html#d5e219">Installation Welcome Screen</a></span></dt>
+                     <dt><span class="section"><a href="installer.html#d5e295">The installation steps</a></span></dt>
+                     <dt><span class="section"><a href="installer.html#d5e306">Installation Problems and Possible Solutions</a></span></dt>
+                     <dt><span class="section"><a href="installer.html#d5e329"></a></span></dt>
                   </dl>
                </dd>
                <dt><span class="section"><a href="selectLanguage.html">Please choose a language to use</a></span></dt>
@@ -82,18 +84,15 @@
                <dt><span class="section"><a href="setupBootloader.html">Bootloader main options</a></span></dt>
                <dd>
                   <dl>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e899">With a Bios system</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e936">With an UEFI system</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e872">Bootloader interface</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e896">Using a Mageia bootloader</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e910">Using an existing bootloader</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e913">Using chain loading</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e927">Options</a></span></dt>
                   </dl>
                </dd>
                <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu
                             Entry</a></span></dt>
-               <dd>
-                  <dl>
-                     <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e951">With a Bios system</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e968">With an UEFI system</a></span></dt>
-                  </dl>
-               </dd>
                <dt><span class="section"><a href="misc-params.html">Summary of miscellaneous
                             parameters</a></span></dt>
                <dd>
@@ -106,8 +105,7 @@
                   </dl>
                </dd>
                <dt><span class="section"><a href="configureTimezoneUTC.html">Configure your Timezone</a></span></dt>
-               <dt><span class="section"><a href="selectCountry.html">Select your Country /
-                              Region</a></span></dt>
+               <dt><span class="section"><a href="selectCountry.html">Select your Country / Region</a></span></dt>
                <dd>
                   <dl>
                      <dt><span class="section"><a href="selectCountry.html#inputMethod">Input method</a></span></dt>
@@ -129,7 +127,11 @@
                <dt><span class="section"><a href="uninstall-Mageia.html">Uninstalling Mageia</a></span></dt>
                <dd>
                   <dl>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1267">Howto</a></span></dt>
+=======
                      <dt><span class="section"><a href="uninstall-Mageia.html#d5e1252">Howto</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
             </dl>
-- 
cgit v1.2.1