aboutsummaryrefslogtreecommitdiffstats
path: root/hu/setupBootloaderAddEntry.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/setupBootloaderAddEntry.html')
-rw-r--r--hu/setupBootloaderAddEntry.html107
1 files changed, 0 insertions, 107 deletions
diff --git a/hu/setupBootloaderAddEntry.html b/hu/setupBootloaderAddEntry.html
index 3b0efab..9b5f6a5 100644
--- a/hu/setupBootloaderAddEntry.html
+++ b/hu/setupBootloaderAddEntry.html
@@ -27,7 +27,6 @@
-<<<<<<< HEAD
<p>To do that you need to manually edit /boot/grub2/custom.cfg or use the
software grub-customizer instead (Available in the Mageia repositories).
</p>
@@ -47,112 +46,6 @@
</td>
</tr>
</table>
-=======
-
-
- <div class="section" title="With a Bios system">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e951"></a>With a Bios system
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>You can add an entry or modify the one you select first, by pressing the
- relevant button in the <span class="emphasis"><em>Bootloader Configuration</em></span> screen
- and editing the screen that pops up on top of it.
- </p>
-
-
- <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Note">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyz&eacute;s]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>If you have chosen <code class="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 class="code">/boot/grub2/custom.cfg</code> or use <code class="code">grub-customizer</code>
- instead.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
-
- <p>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.
- </p>
-
-
- <p>You can add the proper version number of an entry, or rename it completely.</p>
-
-
- <p>The default entry is the one the systems boots into if you don't make a
- choice while booting up.
- </p>
-
-
- <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Warning">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Figyelem]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Editing other things can leave you with an unbootable system. Please don't
- just try something without knowing what you are doing.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </div>
-
-
- <div class="section" title="With an UEFI system">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e968"></a>With an UEFI system
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>In this case you are using Grub2-efi and you cannot use this tool to edit
- entries at this step. To do that you need to manually edit
- <code class="code">/boot/grub2/custom.cfg</code> or use <code class="code">grub-customizer</code>
- instead. All you can do here, is to choose the default entry in the drop
- down list.
- </p>
-
-
- <p>After a click on the <span class="guibutton">Next</span> button, another drop down
- list allows to choose the video resolution for Grub2 which is a graphical
- boot loader.
- </p>
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</div>