diff options
author | Yuri Chornoivan <yurchor@ukr.net> | 2016-07-17 11:22:52 +0300 |
---|---|---|
committer | Yuri Chornoivan <yurchor@ukr.net> | 2016-07-17 11:22:52 +0300 |
commit | 66e1291af57f4ce33c149bc8419ea38417ee03c8 (patch) | |
tree | 0026ec7f3fe5ff20ba144089cf3011918b6f4d69 /docs/installer/en/setupBootloader.xml | |
parent | c3fa62cad9f18bcb6a88f8590aeb0b00823779c5 (diff) | |
download | tools-66e1291af57f4ce33c149bc8419ea38417ee03c8.tar tools-66e1291af57f4ce33c149bc8419ea38417ee03c8.tar.gz tools-66e1291af57f4ce33c149bc8419ea38417ee03c8.tar.bz2 tools-66e1291af57f4ce33c149bc8419ea38417ee03c8.tar.xz tools-66e1291af57f4ce33c149bc8419ea38417ee03c8.zip |
Update en XML files from Calenco
Diffstat (limited to 'docs/installer/en/setupBootloader.xml')
-rw-r--r-- | docs/installer/en/setupBootloader.xml | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml index a2b8fe03..938d2618 100644 --- a/docs/installer/en/setupBootloader.xml +++ b/docs/installer/en/setupBootloader.xml @@ -8,8 +8,11 @@ </info> <mediaobject> - <imageobject> - <imagedata revision="1" align="center" fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1" format="PNG"/> + <imageobject condition="classical"> + <imagedata xml:id="setupBootloader-im1" format="PNG" fileref="dx2-setupBootloader.png" align="center" revision="1"/> + </imageobject> + <imageobject condition="live"> + <imagedata xml:id="setupBootloader-im1" format="PNG" align="center" revision="1" fileref="live-setupBootloader.png"/> </imageobject> </mediaobject> @@ -35,7 +38,7 @@ bootloader</title> </info> - <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia + <para xml:id="setupBootloader-pa4" revision="3">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 @@ -45,7 +48,7 @@ bootloader in addition to GRUB legacy and Lilo.</para> <warning> - <para revision="3" xml:id="setupBootloader-pa6">Linux systems which + <para xml:id="setupBootloader-pa6" revision="3">Linux systems which use the GRUB2 bootloader are not currently supported by GRUB (legacy) and will not be recognized if the default GRUB bootloader is used.</para> @@ -58,17 +61,17 @@ <section xml:id="usingExistingBootloader"> <info> - <title revision="2" xml:id="usingExistingBootloader-ti4">Using an + <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader</title> </info> - <para revision="3" xml:id="setupBootloader-pa46">If you decide to use an + <para xml:id="setupBootloader-pa46" revision="3">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 + <para xml:id="setupBootloader-pa47" revision="1">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> @@ -83,7 +86,7 @@ to the installer screen.</para> </tip> - <para revision="2" xml:id="setupBootloader-pa49">The exact procedure for + <para xml:id="setupBootloader-pa49" revision="2">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 @@ -93,11 +96,11 @@ <section xml:id="advancedOptionBootloader"> <info> - <title revision="2" xml:id="advancedOptionBootloader-ti5">Bootloader + <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader advanced option</title> </info> - <para revision="3" xml:id="setupBootloader-pa52">If you have very + <para xml:id="setupBootloader-pa52" revision="3">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 @@ -112,9 +115,12 @@ cannot choose the boot loader since only Grub2-efi is available. </para> <mediaobject> - <imageobject> + <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject> + <imageobject condition="live"> + <imagedata fileref="live-setupBootloader2.png"/> + </imageobject> </mediaobject> <para>If Mageia is the first system installed on your computer, the |