Update for bootloader docs

2 files changed, 56 insertions, 35 deletions

diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml
index 8104db11..5fe3a41d 100644
--- a/docs/installer/en/setupBootloaderAddEntry.xml
+++ b/docs/installer/en/setupBootloaderAddEntry.xml
@@ -1,31 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0">
+  <info>
+    <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu
+    Entry</title>
+  </info>
 
-
-
-<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>
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-bootloaderConfiguration.png"   format="PNG" align="center"   xml:id="bootloaderConfiguration-im1"></imagedata>
+      <imagedata revision="1" fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG" xml:id="bootloaderConfiguration-im1"/>
     </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>
+  <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>
+
+  <note>
+    <para>If you have chosen <code>Grub 2</code> as your bootloader, you
+    cannot use this tool to edit entries at this step, press 'Next'. You need
+    to manually edit <code>/boot/grub2/custom.cfg</code> or use
+    <code>grub-customizer</code> instead.</para>
+  </note>
+
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-setupBootloaderAddEntry.png"   format="PNG" align="center"   xml:id="setupBootloaderAddEntry-im1"></imagedata>
+      <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1" align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
     </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>
+  <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>
\ No newline at end of file
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index 284b2168..e56d14c5 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-08-03 21:10+0300\n"
+"POT-Creation-Date: 2014-09-30 20:36+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2802,55 +2802,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:3
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#: en/setupBootloaderAddEntry.xml:8
 msgid ""
 "<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" "
-"xml:id=\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
+"fileref=\"dx2-bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" "
+"xml:id=\"bootloaderConfiguration-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:17
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "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."
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/setupBootloaderAddEntry.xml:18
+msgid ""
+"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+"this tool to edit entries at this step, press 'Next'. You need to manually "
+"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
+"instead."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloaderAddEntry.xml:25
 msgid ""
 "<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" "
-"xml:id=\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
+"xml:id=\"setupBootloaderAddEntry-im1\" align=\"center\" format=\"PNG\" "
+"fileref=\"dx2-setupBootloaderAddEntry.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:26
+#: en/setupBootloaderAddEntry.xml:30
 msgid ""
 "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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:27
+#: en/setupBootloaderAddEntry.xml:33
 msgid "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:28
+#: en/setupBootloaderAddEntry.xml:36
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:29
+#: en/setupBootloaderAddEntry.xml:40
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."