updated and 2 new English files from Calenco

1 files changed, 40 insertions, 54 deletions

diff --git a/setupBootloader.html b/setupBootloader.html
index 3f3ed49..5d113b5 100644
--- a/setupBootloader.html
+++ b/setupBootloader.html
@@ -17,13 +17,11 @@
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="setupBootloader"></a>Bootloader main
-                         options
+                  <h2 class="title"><a name="setupBootloader"></a>Bootloader main options
                   </h2>
                </div>
             </div>
          </div>
-         
            
          
            
@@ -31,16 +29,16 @@
            
          
            
-         <p><a name="setupBootloader-pa1"></a>If you prefer
-            different bootloader settings to those chosen automatically by the
-              installer, you can change them here.
+         <p><a name="setupBootloader-pa1"></a>If you prefer different
+            bootloader settings to those chosen automatically by the installer, you can
+              change them here.
          </p>
          
            
-         <p><a name="setupBootloader-pa2"></a>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.
+         <p><a name="setupBootloader-pa2"></a>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.
          </p>
          
            
@@ -53,8 +51,8 @@
                <tr>
                   <td align="left" valign="top">
                          
-                     <p><a name="setupBootloader-pa3"></a>The Mageia
-                            graphical menu is nice :)
+                     <p><a name="setupBootloader-pa3"></a>The Mageia graphical menus
+                            are nice :)
                      </p>
                        
                   </td>
@@ -63,11 +61,11 @@
          </div>
          
            
-         <div class="section" title="Using the Mageia bootloader">
+         <div class="section" title="Using a Mageia bootloader">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="usingMageiaBootloader"></a>Using the Mageia
+                     <h3 class="title"><a name="usingMageiaBootloader"></a>Using a Mageia
                               bootloader
                      </h3>
                   </div>
@@ -76,17 +74,15 @@
                 
             
                 
-            <p><a name="setupBootloader-pa4"></a>By default Mageia
-                   writes a new GRUB bootloader into the MBR (Master Boot Record) of your
+            <p><a name="setupBootloader-pa4"></a>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.
             </p>
             
                 
-            <p><a name="setupBootloader-pa5"></a>This works
-                   correctly in the majority of cases for Linux and
-                   <span class="application">Windows<sup>&reg;</sup></span>
-                   systems.
+            <p>Mageia now also offers GRUB2 as an optional bootloader
+                   in addition to GRUB legacy and Lilo.
             </p>
             
                 
@@ -99,24 +95,14 @@
                   <tr>
                      <td align="left" valign="top">
                               
-                        <p><a name="setupBootloader-pa6"></a>Linux systems
-                                 which use the GRUB2 bootloader (e.g. more recent Debian/Ubuntu
-                                 derivatives) are not currently supported and will not be recognised. One
-                                 possible solution for this is to follow the steps explained here <a class="xref" href="setupBootloaderExpert.html#addingGRUB2system" title="Adding a GRUB2 based system manually">the section called &#8220;Adding a GRUB2 based system
-                                    manually&#8221;</a> before installing Mageia next to such a
-                                 system, however there is no guarantee.
+                        <p><a name="setupBootloader-pa6"></a>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.
                         </p>
                         
                               
-                        <p><a name="setupBootloader-pa6a"></a>If you are
-                                 already installing Mageia without having taken those steps, (and do not
-                                 already know the GRUB2 version and/or it's root partition) then install
-                                 the Mageia bootloader in the root partition for now (see next section),
-                                 and inspect your GRUB2 based system after rebooting at the end of the
-                                 installation. Note that you will not yet be able to boot Mageia, however
-                                 you will be able to use the Mageia install DVD to perform a quick
-                                 "upgrade install" at a later date to correctly install the bootloader to
-                                 the MBR.
+                        <p>The best solution here is to use the GRUB2 bootloader
+                                 which is available at the Summary page during installation.
                         </p>
                             
                      </td>
@@ -140,23 +126,23 @@
                 
             
                 
-            <p><a name="setupBootloader-pa46"></a>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
+            <p><a name="setupBootloader-pa46"></a>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
                    <span class="guibutton">Configure</span> button, which will allow you to change
                    the bootloader install location.
             </p>
             
                 
-            <p><a name="setupBootloader-pa47"></a>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.
+            <p><a name="setupBootloader-pa47"></a>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.
             </p>
             
                 
-            <p><a name="setupBootloader-pa48"></a>To be clear, sda
-                   is a device, sda7 is a partition.
+            <p><a name="setupBootloader-pa48"></a>To be clear, sda is a
+                   device, sda7 is a partition on that device.
             </p>
             
                 
@@ -169,8 +155,8 @@
                   <tr>
                      <td align="left" valign="top">
                               
-                        <p><a name="setupBootloader-pa48a"></a>Go to tty2
-                                 with Ctrl+Alt+F2 and type <code class="literal">df</code> to check where your
+                        <p><a name="setupBootloader-pa48a"></a>Go to tty2 with
+                                 Ctrl+Alt+F2 and type <code class="literal">df</code> to check where your
                                  <code class="literal">/</code> (root) partition is. Ctrl+Alt+F7 takes you back to
                                  the installer screen.
                         </p>
@@ -181,12 +167,12 @@
             </div>
             
                 
-            <p><a name="setupBootloader-pa49"></a>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.
+            <p><a name="setupBootloader-pa49"></a>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.
             </p>
               
          </div>
@@ -205,8 +191,8 @@
                 
             
                 
-            <p><a name="setupBootloader-pa52"></a>If you have very
-                   limited disk space for the <code class="literal">/</code> partition that contains
+            <p><a name="setupBootloader-pa52"></a>If you have very limited
+                   disk space for the <code class="literal">/</code> partition that contains
                    <code class="literal">/tmp</code>, click on <span class="guibutton">Advanced</span> and
                    check the box for <span class="guilabel">Clean /tmp at each boot</span>. This helps
                    to maintain some free space.