aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarja van Waes <marja@mageia.org>2015-05-23 16:15:24 +0200
committerMarja van Waes <marja@mageia.org>2015-05-23 16:15:24 +0200
commit654cb5f350742133c9339954515b0263d72b4f90 (patch)
tree7f829d5e72cd84c929793493b22b71d35758697d
parent287ee0516093653db4040a5675f540f4ddc48e8e (diff)
downloaddrakx-installer-help-654cb5f350742133c9339954515b0263d72b4f90.tar
drakx-installer-help-654cb5f350742133c9339954515b0263d72b4f90.tar.gz
drakx-installer-help-654cb5f350742133c9339954515b0263d72b4f90.tar.bz2
drakx-installer-help-654cb5f350742133c9339954515b0263d72b4f90.tar.xz
drakx-installer-help-654cb5f350742133c9339954515b0263d72b4f90.zip
update English files
-rw-r--r--diskdrake.html76
-rw-r--r--index.html2
-rw-r--r--setupBootloader.html22
-rw-r--r--setupBootloaderAddEntry.html9
-rw-r--r--uninstall-Mageia.html2
5 files changed, 80 insertions, 31 deletions
diff --git a/diskdrake.html b/diskdrake.html
index 5db0158..ebb4ad1 100644
--- a/diskdrake.html
+++ b/diskdrake.html
@@ -30,11 +30,6 @@
-
-
-
-
-
@@ -42,8 +37,11 @@
+
+
+
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -54,9 +52,10 @@
<td align="left" valign="top">
<p><a name="diskdrake-pa1"></a>If you wish to use encryption on
- your <code class="literal">/</code> partition you must ensure that you have a separate <code class="literal">/boot</code>
- partition. The encryption option for the <code class="literal">/boot</code> partition must NOT be set,
- otherwise your system will be unbootable.
+ your <code class="literal">/</code> partition you must ensure that you have a
+ separate <code class="literal">/boot</code> partition. The encryption option for the
+ <code class="literal">/boot</code> partition must NOT be set, otherwise your system
+ will be unbootable.
</p>
</td>
@@ -65,33 +64,62 @@
</div>
- <p><a name="diskdrake-pa3"></a>Adjust the layout of your disk(s) here. You can remove or create partitions, change the filesystem of a partition or change
- its size and even view what is in them before you start.
-
+ <p><a name="diskdrake-pa3"></a>Adjust the layout of your disk(s)
+ here. You can remove or create partitions, change the filesystem of a
+ partition or change its size and even view what is in them before you
+ start.
</p>
+
-
- <p><a name="diskdrake-pa4"></a>There is a tab for every detected hard disk or other storage device, like an USB key. For example sda, sdb and sdc if there
- are three of them.
-
+ <p><a name="diskdrake-pa4"></a>There is a tab for every detected
+ hard disk or other storage device, like an USB key. For example sda, sdb and
+ sdc if there are three of them.
</p>
+
-
- <p><a name="diskdrake-pa5"></a>Push <span class="guibutton">Clear all</span> to wipe all partitions on the selected storage device
+ <p><a name="diskdrake-pa5"></a>Push <span class="guibutton">Clear
+ all</span> to wipe all partitions on the selected storage device
</p>
+
-
- <p><a name="diskdrake-pa6"></a>For all other actions: click on the desired partition first. Then view it, or choose a filesystem and a mount point, resize
- it or wipe it.
+ <p><a name="diskdrake-pa6"></a>For all other actions: click on
+ the desired partition first. Then view it, or choose a filesystem and a
+ mount point, resize it or wipe it.
</p>
+
-
- <p><a name="diskdrake-pa6a"></a>Continue until you adjusted everything to your wishes.
+ <p><a name="diskdrake-pa6a"></a>Continue until you adjusted
+ everything to your wishes.
</p>
+
+ <p><a name="diskdrake-pa7"></a>Click <span class="guibutton">Done</span>
+ when you're ready.
+ </p>
+
- <p><a name="diskdrake-pa7"></a>Click <span class="guibutton">Done</span> when you're ready.
- </p>
+ <div class="note" title="Note" 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="[Note]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>If you are installing Mageia on an UEFI system, check that an ESP
+ (EFI System Partition) is present and correctly mounted on /boot/EFI (see
+ above)
+ </p>
+
+
+ <p></p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
</div>
</body>
</html>
diff --git a/index.html b/index.html
index 1c03496..de8f3a8 100644
--- a/index.html
+++ b/index.html
@@ -128,7 +128,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Uninstalling Mageia</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1132">Howto</a></span></dt>
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1141">Howto</a></span></dt>
</dl>
</dd>
</dl>
diff --git a/setupBootloader.html b/setupBootloader.html
index 5d113b5..5a4ab03 100644
--- a/setupBootloader.html
+++ b/setupBootloader.html
@@ -29,8 +29,28 @@
+ <div class="note" title="Note" 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="[Note]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>With an UEFI system, the user interface is slightly different as
+ you cannot choose the boot loader (first drop down list) since only one
+ is available
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
<p><a name="setupBootloader-pa1"></a>If you prefer different
- bootloader settings to those chosen automatically by the installer, you can
+ bootloader settings to those chosen automatically by the installer, you can
change them here.
</p>
diff --git a/setupBootloaderAddEntry.html b/setupBootloaderAddEntry.html
index cc61ae2..c79b72b 100644
--- a/setupBootloaderAddEntry.html
+++ b/setupBootloaderAddEntry.html
@@ -43,10 +43,11 @@
<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>If you have chosen <code class="code">Grub 2</code> as your bootloader, or
+ Grub2-efi for UEFI systems, 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>
diff --git a/uninstall-Mageia.html b/uninstall-Mageia.html
index b8feb1e..5b1e2e1 100644
--- a/uninstall-Mageia.html
+++ b/uninstall-Mageia.html
@@ -30,7 +30,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e1132"></a>Howto
+ <h3 class="title"><a name="d5e1141"></a>Howto
</h3>
</div>
</div>