aboutsummaryrefslogtreecommitdiffstats
path: root/sl
diff options
context:
space:
mode:
authorMarja van Waes <marja@mageia.org>2015-06-14 22:09:33 +0200
committerMarja van Waes <marja@mageia.org>2015-06-14 22:09:33 +0200
commit837f954981afc8113d3d1d880bfcdf1664afc0d3 (patch)
tree0408db304532f2e445563238be1dd8214db15254 /sl
parentd8904c7f89c5d911ed956e43e62842b2b748a1ad (diff)
downloaddrakx-installer-help-837f954981afc8113d3d1d880bfcdf1664afc0d3.tar
drakx-installer-help-837f954981afc8113d3d1d880bfcdf1664afc0d3.tar.gz
drakx-installer-help-837f954981afc8113d3d1d880bfcdf1664afc0d3.tar.bz2
drakx-installer-help-837f954981afc8113d3d1d880bfcdf1664afc0d3.tar.xz
drakx-installer-help-837f954981afc8113d3d1d880bfcdf1664afc0d3.zip
update sl files
Diffstat (limited to 'sl')
-rw-r--r--sl/add_supplemental_media.html24
-rw-r--r--sl/choosePackageGroups.html2
-rw-r--r--sl/diskdrake.html53
-rw-r--r--sl/doPartitionDisks.html11
-rw-r--r--sl/index.html2
-rw-r--r--sl/installer.html63
-rw-r--r--sl/minimal-install.html34
-rw-r--r--sl/setupBootloader.html19
-rw-r--r--sl/setupBootloaderAddEntry.html8
-rw-r--r--sl/uninstall-Mageia.html2
10 files changed, 157 insertions, 61 deletions
diff --git a/sl/add_supplemental_media.html b/sl/add_supplemental_media.html
index 7eecfb4..5366752 100644
--- a/sl/add_supplemental_media.html
+++ b/sl/add_supplemental_media.html
@@ -61,6 +61,30 @@
</ol>
</div>
+
+ <div class="note" title="Opomba" 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="[Opomba]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>If you are updating a 64 bit installation which may contain some 32 bit
+ packages, it is advised to use this screen to add an online mirror by
+ ticking one of the Network protocols here. The 64 bit DVD iso only contains
+ 64 bit and noarch packages, it will not be able to update the 32 bit
+ packages. However, after adding an online mirror, installer will find the
+ needed 32 bit packages there.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
</div>
</body>
</html>
diff --git a/sl/choosePackageGroups.html b/sl/choosePackageGroups.html
index 9d5e2a7..7ccdaca 100644
--- a/sl/choosePackageGroups.html
+++ b/sl/choosePackageGroups.html
@@ -65,7 +65,7 @@
</div>
<p>Read <a class="xref" href="minimal-install.html" title="Minimalna namestitev">&#8220;Minimalna namestitev&#8221;</a> for instructions on how to do a
- minimal install.
+ minimal install (without or with X &amp; IceWM).
</p>
</div>
diff --git a/sl/diskdrake.html b/sl/diskdrake.html
index 56d7f3f..d855995 100644
--- a/sl/diskdrake.html
+++ b/sl/diskdrake.html
@@ -29,11 +29,6 @@
-
-
-
-
-
@@ -41,8 +36,11 @@
+
+
+
<div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -64,35 +62,56 @@
</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>
-
+
<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>
+
-
- <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>
+
+
+ <div class="note" title="Opomba" 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="[Opomba]" 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/sl/doPartitionDisks.html b/sl/doPartitionDisks.html
index 7a3c124..a6c6ae9 100644
--- a/sl/doPartitionDisks.html
+++ b/sl/doPartitionDisks.html
@@ -39,7 +39,7 @@
-
+
@@ -107,6 +107,15 @@
moved out of the area that is about to be used. It is highly recommended to
back up your personal files.
</p>
+
+
+ <p>With this option, the installer displays the remaining Windows partition in
+ light blue and the future Mageia partition in dark blue with their intended
+ sizes just under. You have the possibility to adapt these sizes by clicking
+ and draging the gap between both partitions. See the screen-shot below.
+ </p>
+
+
</li>
</ul>
diff --git a/sl/index.html b/sl/index.html
index 1dc2925..498f225 100644
--- a/sl/index.html
+++ b/sl/index.html
@@ -111,7 +111,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#d5e1119">Howto</a></span></dt>
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1146">Howto</a></span></dt>
</dl>
</dd>
</dl>
diff --git a/sl/installer.html b/sl/installer.html
index e1b85db..4bd57d7 100644
--- a/sl/installer.html
+++ b/sl/installer.html
@@ -53,6 +53,8 @@
+
+
<p>From this first screen, it is possible to set some personal preferences:</p>
@@ -61,7 +63,7 @@
<li class="listitem">
<p>The language (for the installation only, may be different that the chosen
- language for the system) by pressing the key F2
+ language for the system) by pressing the key F2 (Legacy mode only)
</p>
@@ -90,14 +92,17 @@
</li>
<li class="listitem">
- <p>Change the screen resolution by pressing the F3 key.</p>
+ <p>Change the screen resolution by pressing the F3 key (Legacy mode only).</p>
</li>
<li class="listitem">
- <p>Add some kernel options by pressing the F6 key.</p>
+ <p>Add some kernel options by pressing the <span class="bold"><strong>F6</strong></span>
+ key for the legacy mode or the <span class="bold"><strong>e</strong></span> key for
+ the UEFI mode.
+ </p>
<p>If the installation fails, then it may be necessary to try again using one
@@ -153,7 +158,7 @@
</li>
<li class="listitem">
- <p>Add more kernel options by pressing the key F1</p>
+ <p>Add more kernel options by pressing the key F1 (Legacy mode only).</p>
<p>Pressing F1 opens a new window with more available options. Select one with
@@ -203,6 +208,10 @@
</div>
+ <p>For more information about kernel options on legacy and UEFI systems, see:
+ <a class="ulink" href="https://wiki.mageia.org/en/How_to_set_up_kernel_options" target="_top">https://wiki.mageia.org/en/How_to_set_up_kernel_options</a></p>
+
+
<p>Here is the default welcome screen when using a Wired Network-based
Installation CD (Boot.iso or Boot-Nonfree.iso images):
</p>
@@ -287,7 +296,7 @@
</div>
-
+
<div class="section" title="Installation Problems and Possible Solutions">
<div class="titlepage">
<div>
@@ -297,9 +306,9 @@
</div>
</div>
</div>
-
+
-
+
<div class="section" title="No Graphical Interface">
<div class="titlepage">
<div>
@@ -309,35 +318,35 @@
</div>
</div>
</div>
-
+
-
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-
+
<p>After the initial screen you did not reach the language selection
screen. This can happen with some graphic cards and older systems. Try using
low resolution by typing <code class="code">vgalo</code> at the prompt.
</p>
-
+
</li>
<li class="listitem">
-
+
<p>If the hardware is very old, a graphical installation may not be
possible. In this case it is worth trying a text mode installation. To use
this hit ESC at the first welcome screen and confirm with ENTER. You will be
presented with a black screen with the word "boot:". Type "text" and hit
ENTER. Now continue with the installation in text mode.
</p>
-
+
</li>
</ul>
</div>
-
+
</div>
-
+
<div class="section" title="The Install Freezes">
<div class="titlepage">
<div>
@@ -347,19 +356,19 @@
</div>
</div>
</div>
-
+
-
+
<p>If the system appeared to freeze during the installation, this may be a
problem with hardware detection. In this case the automatic detection of
hardware may be bypassed and dealt with later. To try this, type
<code class="code">noauto</code> at the prompt. This option may also be combined with
other options as necessary.
</p>
-
+
</div>
-
+
<div class="section" title="RAM problem">
<div class="titlepage">
<div>
@@ -369,18 +378,18 @@
</div>
</div>
</div>
-
+
-
+
<p>These will rarely be needed, but in some cases the hardware may report the
available RAM incorrectly. To specify this manually, you can use the
<code class="code">mem=xxxM</code> parameter, where xxx is the correct amount of
RAM. e.g. <code class="code">mem=256M</code> would specify 256MB of RAM.
</p>
-
+
</div>
-
+
<div class="section" title="Dynamic partitions">
<div class="titlepage">
<div>
@@ -390,17 +399,17 @@
</div>
</div>
</div>
-
+
-
+
<p>If you converted your hard disk from "basic" format to "dynamic" format on
Microsoft Windows, you must know that it is impossible to install Mageia on
this disc. To go back to a basic disk, see the Microsoft documentation:
<a class="ulink" href="http://msdn.microsoft.com/en-us/library/cc776315.aspx" target="_top">http://msdn.microsoft.com/en-us/library/cc776315.aspx</a>.
</p>
-
+
</div>
-
+
</div>
</div>
diff --git a/sl/minimal-install.html b/sl/minimal-install.html
index e260abb..801e798 100644
--- a/sl/minimal-install.html
+++ b/sl/minimal-install.html
@@ -22,29 +22,45 @@
</div>
</div>
</div>
-
+
+
-
-
+
+
-
+
<p>You can choose a Minimal Installation by de-selecting everything in the
Package Group Selection screen, see <a class="xref" href="choosePackageGroups.html" title="Izbira skupin paketov">&#8220;Izbira skupin paketov&#8221;</a>.
</p>
-
+
+ <p>If desired, you can additionally tick the "Individual package selection"
+ option in the same screen.
+ </p>
+
<p>Minimal Installation is intended for those with specific uses in mind for
their <span class="application">Mageia</span>, such as a server or a specialised
- workstation. You will probably use this option combined with Manual Package
- Selection, see <a class="xref" href="choosePackagesTree.html" title="Izbira posami&#269;nih paketov">&#8220;Izbira posami&#269;nih paketov&#8221;</a>.
+ workstation. You will probably use this option combined with the "Individual
+ package selection" option mentioned above, to fine-tune your installation,
+ see <a class="xref" href="choosePackagesTree.html" title="Izbira posami&#269;nih paketov">&#8220;Izbira posami&#269;nih paketov&#8221;</a>.
</p>
-
+
<p>If you choose this installation class, then the related screen will offer
you a few useful extras to install, such as documentation and X.
</p>
+
+ <p>If selected, "With X" will also include IceWM as lightweight desktop
+ environment.
+ </p>
+
+ <p>The basic documentation is provided in the form of man and info pages. It
+ contains the man pages from the <a class="ulink" href="http://www.tldp.org/manpages/man.html" target="_top">Linux Documentation
+ Project</a> and the <a class="ulink" href="http://www.gnu.org/software/coreutils/manual/" target="_top">GNU
+ coreutils</a> info pages.
+ </p>
-
+
</div>
diff --git a/sl/setupBootloader.html b/sl/setupBootloader.html
index a0512b1..aead40f 100644
--- a/sl/setupBootloader.html
+++ b/sl/setupBootloader.html
@@ -29,6 +29,25 @@
+ <div class="note" title="Opomba" 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="[Opomba]" 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 change them here.
</p>
diff --git a/sl/setupBootloaderAddEntry.html b/sl/setupBootloaderAddEntry.html
index 05081d7..8c555d9 100644
--- a/sl/setupBootloaderAddEntry.html
+++ b/sl/setupBootloaderAddEntry.html
@@ -42,10 +42,10 @@
<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/sl/uninstall-Mageia.html b/sl/uninstall-Mageia.html
index 7294d78..59e0d34 100644
--- a/sl/uninstall-Mageia.html
+++ b/sl/uninstall-Mageia.html
@@ -31,7 +31,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e1119"></a>Howto
+ <h3 class="title"><a name="d5e1146"></a>Howto
</h3>
</div>
</div>