aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Rytarowski <kamil@mageia.org>2012-04-25 08:25:05 +0000
committerKamil Rytarowski <kamil@mageia.org>2012-04-25 08:25:05 +0000
commit3cf598bf83d504e8a3ddf6ff6cf3e76fe3d7832f (patch)
tree585f622442b201bfcbb781f9407c1689a032b2f7
parent8ad546904988e36701401fb15b04d585fbea985e (diff)
downloaddrakx-installer-help-3cf598bf83d504e8a3ddf6ff6cf3e76fe3d7832f.tar
drakx-installer-help-3cf598bf83d504e8a3ddf6ff6cf3e76fe3d7832f.tar.gz
drakx-installer-help-3cf598bf83d504e8a3ddf6ff6cf3e76fe3d7832f.tar.bz2
drakx-installer-help-3cf598bf83d504e8a3ddf6ff6cf3e76fe3d7832f.tar.xz
drakx-installer-help-3cf598bf83d504e8a3ddf6ff6cf3e76fe3d7832f.zip
- new version (2012-04-25)
-rw-r--r--acceptLicense.html10
-rw-r--r--addUser.html52
-rw-r--r--ask_mntpoint_s.html14
-rw-r--r--doPartitionDisks.html66
-rw-r--r--exitInstall.html28
-rw-r--r--formatPartitions.html14
-rw-r--r--index.html23
-rw-r--r--installUpdates.html4
-rw-r--r--misc-params.html262
-rw-r--r--resizeFATChoose.html10
-rw-r--r--selectMouse.html21
-rw-r--r--setupBootloaderBeginner.html195
-rw-r--r--setupBootloaderExpert.html314
-rw-r--r--setupSCSI.html23
-rw-r--r--setupX.html15
-rw-r--r--takeOverHdChoose.html4
-rw-r--r--takeOverHdConfirm.html5
17 files changed, 888 insertions, 172 deletions
diff --git a/acceptLicense.html b/acceptLicense.html
index 8f5f960..7a0908e 100644
--- a/acceptLicense.html
+++ b/acceptLicense.html
@@ -22,15 +22,23 @@
</div>
</div>
</div>
+
+
+
+
+
+
+
+
-
+
diff --git a/addUser.html b/addUser.html
index 83d1a4f..9762bd8 100644
--- a/addUser.html
+++ b/addUser.html
@@ -32,6 +32,12 @@
+
+
+
+
+
+
<div class="section" title="Set Administrator (root) Password:">
@@ -50,7 +56,7 @@
<p>It is advisable for all <span class="application">Mageia</span>
installations to set a superuser or administrator's password, usually
called the <span class="emphasis"><em>root password</em></span> in Linux. As you type a
- password into the top box the shield in its colour will change from red to
+ password into the top box the colour of its shield will change from red to
yellow to green depending on the strength of the password. A green shield
shows you are using a strong password. You need to repeat the same
password in the box just below the first password box, this checks that
@@ -93,10 +99,9 @@
- <p>Add a user here. A user has less rights than the superuser (root),
- but by default enough to surf the internet, use office applications or
- play games and anything else the average user does with his
- computer
+ <p>Add a user here. A user has fewer rights than the superuser (root),
+ but enough to surf the internet, use office applications or play games and
+ anything else the average user does with his computer
</p>
@@ -111,31 +116,31 @@
</li>
<li class="listitem">
- <p><span class="guilabel">Real Name</span>: Insert a users real name into
+ <p><span class="guilabel">Real Name</span>: Insert the users real name into
this text box.
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">Login Name</span>: Here you can type in a log in
- name or drakx will use a version of the users real name. <span class="emphasis"><em>The
- log in name is case sensitive.</em></span></p>
+ <p><span class="guilabel">Login Name</span>: Here you enter the user login
+ name or let drakx use a version of the users real name. <span class="emphasis"><em>The
+ login name is case sensitive.</em></span></p>
</li>
<li class="listitem">
<p><span class="guilabel">Password</span>: In this text box you should type
- in a users pass word. Again it has a shield in the corner of the text
- box that indicates the strength of the users password. (See also <a class="xref" href="addUser.html#givePassword" title="Note">Note</a>)
+ in the user password. There is a shield at the end of the text box
+ that indicates the strength of the password. (See also <a class="xref" href="addUser.html#givePassword" title="Note">Note</a>)
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">Password (again)</span>: Retype the users password
+ <p><span class="guilabel">Password (again)</span>: Retype the user password
into this text box and drakx will check you have the same password in
- each of the users password text boxes.
+ each of the user password text boxes.
</p>
</li>
@@ -157,10 +162,9 @@
- <p>If the <span class="guibutton">advanced</span> button is clicked then you
- are offered this screen that allows you to edit the settings for the user
- you are adding. Additionally, you can disable or enable a guest account.
-
+ <p>If the <span class="guibutton">advanced</span> button is clicked you are
+ offered a screen that allows you to edit the settings for the user you are
+ adding. Additionally, you can disable or enable a guest account.
</p>
@@ -174,8 +178,8 @@
<td align="left" valign="top">
<p>Anything a guest with a default <span class="emphasis"><em>rbash</em></span> guest
- account saves to his /home directory will be erased. The guest should
- save his important files to a USB key.
+ account saves to his /home directory will be erased when he logs out.
+ The guest should save his important files to a USB key.
</p>
</td>
@@ -189,8 +193,9 @@
<li class="listitem">
<p><span class="guilabel">Enable guest account</span>: Here you can enable
- or disable a guest account. The guest account allows a guest to log into
- and use the PC, but he has more restricted access than normal users.
+ or disable a guest account. The guest account allows a guest to log
+ into and use the PC, but he has more restricted access than normal
+ users.
</p>
</li>
@@ -206,14 +211,15 @@
<p><span class="guilabel">User ID</span>: Here you can set the user ID for
the user you are adding in the previous screen. This is a number.
- Don't enter anything here if you don't know what it should be.
+ Leave it blank unless you know what you are doing.
</p>
</li>
<li class="listitem">
<p><span class="guilabel">Group ID</span>: This lets you set the group ID.
- Also a number, usually the same one as for the user.
+ Also a number, usually the same one as for the user. Leave it blank
+ unless you know what you are doing.
</p>
</li>
diff --git a/ask_mntpoint_s.html b/ask_mntpoint_s.html
index 7492b39..a78ade2 100644
--- a/ask_mntpoint_s.html
+++ b/ask_mntpoint_s.html
@@ -22,22 +22,22 @@
</div>
</div>
</div>
-
-
-
-
-
+
+
+
+
+
<p>Here you see the Linux partitions that have been found on your
- computer. If you don't agree with the suggestions of
- <span class="application">DrakX</span>, you can change the mount points.
+ computer. If you don't agree with the <span class="application">DrakX</span>
+ suggestions, you can change the mount points.
</p>
diff --git a/doPartitionDisks.html b/doPartitionDisks.html
index c0a1a76..c21edda 100644
--- a/doPartitionDisks.html
+++ b/doPartitionDisks.html
@@ -22,38 +22,43 @@
</div>
</div>
</div>
-
-
-
+
+
+
+
+
+
+
<p><a name="doPartitionDisks-pa1"></a>In this screen you can see
the content of your hard drive(s) and see the solutions the DrakX
- partitioning wizard found for where to install
+ partitioning wizard found for where to install
<span class="application">Mageia</span>.
</p>
- <p>The options available from the list below will vary
+ <p><a name="doPartitionDisks-pa2"></a>The options available from the list below will vary
depending on your particular hard drive(s) layout and content.
</p>
- <p></p>
+ <p><a name="doPartitionDisks-pa3"></a></p>
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Use Existing Partitions</p>
+ <p><a name="doPartitionDisks-pa4"></a>Use Existing Partitions
+ </p>
- <p>If this option is available, then existing Linux compatible
+ <p><a name="doPartitionDisks-pa5"></a>If this option is available, then existing Linux compatible
partitions have been found and may be used for the
installation.
</p>
@@ -61,33 +66,36 @@
</li>
<li class="listitem">
- <p>Use Free Space</p>
+ <p><a name="doPartitionDisks-pa6"></a>Use Free Space
+ </p>
- <p>If you have unused space on your hard drive then this option
+ <p><a name="doPartitionDisks-pa7"></a>If you have unused space on your hard drive then this option
will use it for your new Mageia installation.
</p>
</li>
<li class="listitem">
- <p>Use Free Space on a Windows Partition</p>
+ <p><a name="doPartitionDisks-pa8"></a>Use Free Space on a Windows Partition
+ </p>
- <p>If you have unused space on an existing Windows partition, the
+ <p><a name="doPartitionDisks-pa9"></a>If you have unused space on an existing Windows partition, the
installer may offer to use it.
</p>
- <p>This can be a useful way of making room for your new Mageia
- installation.
+ <p><a name="doPartitionDisks-pa10"></a>This can be a useful way of making room for your new Mageia
+ installation, but is a risky operation and should be a last resort!
</p>
- <p>Note that this involves shrinking the size of the Windows
+ <p><a name="doPartitionDisks-pa11"></a>Note that this involves shrinking the size of the Windows
partition, which is not without some risk. The partition must be
- "clean" meaning that Windows must have closed down correctly the last
- time it was used.
+ "clean", meaning that Windows must have closed down correctly the last
+ time it was used. It must also have been defragmented, although this is not a guarantee that all files in the partition
+ have been moved out of the area that is about to be used. You should check this carefully before proceeding.
</p>
</li>
@@ -97,18 +105,20 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Erase and use Entire Disk.</p>
+ <p><a name="doPartitionDisks-pa12"></a>Erase and use Entire Disk.
+ </p>
- <p>This option will use the complete drive for Mageia.</p>
+ <p><a name="doPartitionDisks-pa13"></a>This option will use the complete drive for Mageia.
+ </p>
- <p>Note! This will erase ALL data on the selected hard drive. Take
+ <p><a name="doPartitionDisks-pa14"></a>Note! This will erase ALL data on the selected hard drive. Take
care!
</p>
- <p>If you intend to use part of the disk for something else, or you
+ <p><a name="doPartitionDisks-pa15"></a>If you intend to use part of the disk for something else, or you
already have data on the drive that you are not prepared to lose, then
do not use this option.
</p>
@@ -120,20 +130,14 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Custom</p>
-
-
- <p>This gives you complete control over the placing of the
- installation on your hard drive(s). It allows for the use of a
- separate partition for the /home folder (which is recommended) and
- many more options. [saying that means that the other options don't
- allow a separate partition for /home]
+ <p><a name="doPartitionDisks-pa16"></a>Custom
</p>
- <p>For users new to Linux the /home folder is where all your
- personal files and settings are stored.
+ <p><a name="doPartitionDisks-pa17"></a>This gives you complete control over the placing of the
+ installation on your hard drive(s).
</p>
+
</li>
</ul>
diff --git a/exitInstall.html b/exitInstall.html
index bcb4f0a..578e971 100644
--- a/exitInstall.html
+++ b/exitInstall.html
@@ -26,22 +26,36 @@
+
+
+
+
+
- <p><a name="exitInstall-pa1"></a>You have now finished installing
- and configuring <span class="application">Mageia</span> and it's now safe to
- reboot your computer
+ <p><a name="exitInstall-pa1"></a>You have finished installing
+ and configuring <span class="application">Mageia</span> and it is now safe to remove the installation medium and
+ reboot your computer.
</p>
- <p><a name="exitInstall-pa2"></a><span class="emphasis"><em>ADD SOME
- TEXT</em></span>.
+ <p><a name="exitInstall-pa2"></a>After reboot, in the bootloader screen, you can choose between the operating systems on your computer (if you have more than
+ one).
</p>
- <p><a name="exitInstall-pa3"></a><span class="emphasis"><em>ADD SOME
- TEXT</em></span>.
+ <p><a name="exitInstall-pa3"></a>If you didn't adjust the settings for the bootloader, your Mageia install will be automatically selected and started.
+ </p>
+
+
+ <p><a name="exitInstall-pa4"></a>Enjoy!
+ </p>
+
+
+ <p><a name="exitInstall-pa5"></a>Visit www.mageia.org if you have any questions or want to contribute to Mageia
</p>
+
+
</div>
</body>
diff --git a/formatPartitions.html b/formatPartitions.html
index 222a28b..2aa128b 100644
--- a/formatPartitions.html
+++ b/formatPartitions.html
@@ -22,15 +22,23 @@
</div>
</div>
</div>
-
-
+
+
+
+
+
+
+
+
+
+
<p><a name="formatPartitions-pa1"></a>Here you can choose which
- partition(s) you wish to format. Any data on partitions not marked for
+ partition(s) you wish to format. Any data on partitions <span class="emphasis"><em>not</em></span> marked for
formatting will be saved.
</p>
diff --git a/index.html b/index.html
index e8afa58..6ba6d05 100644
--- a/index.html
+++ b/index.html
@@ -76,6 +76,25 @@
configuration</a></span></dt>
<dt><span class="section"><a href="setupBootloaderBeginner.html">Bootloader main
options</a></span></dt>
+ <dd>
+ <dl>
+ <dt><span class="section"><a href="setupBootloaderBeginner.html#usingMageiaBootloader">Using the Mageia boot
+ loader</a></span></dt>
+ <dt><span class="section"><a href="setupBootloaderBeginner.html#usingExistingBootloader">Using an
+ existing boot loader</a></span></dt>
+ <dt><span class="section"><a href="setupBootloaderBeginner.html#advancedOptionBootloader">Boot loader advanced
+ option</a></span></dt>
+ </dl>
+ </dd>
+ <dt><span class="section"><a href="setupBootloaderExpert.html">Bootloader expert use</a></span></dt>
+ <dd>
+ <dl>
+ <dt><span class="section"><a href="setupBootloaderExpert.html#addingGRUB2system">Adding a GRUB2 based system
+ manually</a></span></dt>
+ <dt><span class="section"><a href="setupBootloaderExpert.html#usingExistingBootloaderGRUB2">Using an
+ existing GRUB2 boot loader</a></span></dt>
+ </dl>
+ </dd>
<dt><span class="section"><a href="misc-params.html">Summary of miscellaneous
parameters</a></span></dt>
<dd>
@@ -91,7 +110,7 @@
Region</a></span></dt>
<dt><span class="section"><a href="misc-params.html#drakxid-configureServices">Configure your
Services</a></span></dt>
- <dt><span class="section"><a href="misc-params.html#draxid-miscellaneous">drakxid-miscellaneous</a></span></dt>
+ <dt><span class="section"><a href="misc-params.html#draxid-miscellaneous">Security Level</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="selectMouse.html">Select mouse</a></span></dt>
@@ -134,6 +153,8 @@
+
+
diff --git a/installUpdates.html b/installUpdates.html
index b6c7171..369786e 100644
--- a/installUpdates.html
+++ b/installUpdates.html
@@ -27,8 +27,10 @@
+
+
-
+
<p><a name="installUpdates-pa1"></a>Since this version of
diff --git a/misc-params.html b/misc-params.html
index de5ff14..2f5cd96 100644
--- a/misc-params.html
+++ b/misc-params.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Installation with DrakX">
<link rel="up" href="index.html" title="Installation with DrakX">
- <link rel="prev" href="setupBootloaderBeginner.html" title="Bootloader main options">
+ <link rel="prev" href="setupBootloaderExpert.html" title="Bootloader expert use">
<link rel="next" href="selectMouse.html" title="Select mouse"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
@@ -23,19 +23,33 @@
</div>
</div>
</div>
+
+
+
+
+
+
+
+
+
+
- <p><a name="misc-params-pa1"></a>DrakX made a smart choice for
- the configuration of your system, depending on the choices you made before
- and on the hardware DrakX detected. You can check the settings here and
- change them if you want after pressing <span class="guibutton">Configure</span>.
+
+
+
+
+ <p><a name="misc-params-pa1"></a>DrakX made smart choices for the
+ configuration of your system depending on the choices you made and on the
+ hardware DrakX detected. You can check the settings here and change them if
+ you want after pressing <span class="guibutton">Configure</span>.
</p>
@@ -56,38 +70,55 @@
<li class="listitem">
<p><a name="misc-params-system-pa2"></a><span class="guilabel">Timezone</span></p>
-
- <p><a name="misc-params-system-pa2a"></a>DrakX selected a time zone for you, depending on your preferred language. You can change it if needed. See also <a class="xref" href="misc-params.html#drakxid-configureTimezoneGMT" title="Configure your Timezone">the section called &#8220;Configure your
+
+
+ <p><a name="misc-params-system-pa2a"></a>DrakX selected a
+ time zone for you, depending on your preferred language. You can
+ change it if needed. See also <a class="xref" href="misc-params.html#drakxid-configureTimezoneGMT" title="Configure your Timezone">the section called &#8220;Configure your
Timezone&#8221;</a></p>
-
</li>
<li class="listitem">
<p><a name="misc-params-system-pa3"></a><span class="guilabel">Country /
Region</span></p>
-
- <p><a name="misc-params-system-pa3a"></a>If you are not in the selected country, it is very important that you correct the setting. See <a class="xref" href="misc-params.html#drakxid-selectCountry" title="Select your Country / Region">the section called &#8220;Select your Country /
+
+
+ <p><a name="misc-params-system-pa3a"></a>If you are not in
+ the selected country, it is very important that you correct the
+ setting. See <a class="xref" href="misc-params.html#drakxid-selectCountry" title="Select your Country / Region">the section called &#8220;Select your Country /
Region&#8221;</a></p>
</li>
<li class="listitem">
<p><a name="misc-params-system-pa4"></a><span class="guilabel">Bootloader</span></p>
-
- <p><a name="misc-params-system-pa4a"></a>DrakX made a good choice for the settings of the bootloader.
+
+
+ <p><a name="misc-params-system-pa4a"></a>DrakX has made
+ good choices for the bootloader setting.
</p>
-
- <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know a lot about grub and/or lilo
+
+
+ <p><a name="misc-params-system-pa4b"></a>Do not change
+ anything, unless you know how to configure Grub and/or Lilo
</p>
+
+
+ <p><a name="misc-params-system-pa4c"></a>For more information, see <a class="xref" href="setupBootloaderBeginner.html" title="Bootloader main options">the section called &#8220;Bootloader main
+ options&#8221;</a></p>
</li>
<li class="listitem">
<p><a name="misc-params-system-pa5"></a><span class="guilabel">User
management</span></p>
-
- <p><a name="misc-params-system-pa5a"></a>You can add extra users here. They will get their own <code class="literal">/home</code> directories and will not be able to look in your or each other's documents, mails, pictures and other files.
+
+
+ <p><a name="misc-params-system-pa5a"></a>You can add extra
+ users here. They will each get their own <code class="literal">/home</code>
+ directories and will not be able to look in your or each other's
+ documents, mails, pictures and other files.
</p>
</li>
@@ -95,6 +126,18 @@
<p><a name="misc-params-system-pa6"></a><span class="guilabel">Services</span>:
</p>
+
+
+ <p><a name="misc-params-system-pa6a"></a>System services
+ refer to those small programs which run the background (daemons). This
+ tool allows you to enable or disable certain tasks.
+ </p>
+
+
+ <p><a name="misc-params-system-pa6b"></a>You should check
+ carefully before changing anything here - a mistake may prevent your
+ computer from operating correctly.
+ </p>
</li>
</ul>
@@ -121,12 +164,23 @@
<p><a name="misc-params-hardware-pa1"></a><span class="guilabel">Keyboard</span>:
</p>
+
+
+ <p><a name="misc-params-hardware-pa1a"></a>This is where
+ you setup or change your keyboard layout which will depend on your
+ location, language or type of keyboard.
+ </p>
</li>
<li class="listitem">
<p><a name="misc-params-hardware-pa2"></a><span class="guilabel">Mouse</span>:
</p>
+
+
+ <p><a name="misc-params-hardware-pa2a"></a>Here you can add
+ or configure other pointing devices, tablets, trackballs etc.
+ </p>
</li>
<li class="listitem">
@@ -134,6 +188,12 @@
<p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Sound
card</span>:
</p>
+
+
+ <p><a name="misc-params-hardware-pa3a"></a>This section
+ allows you to fine tune your sound card. In most cases the options
+ selected will work with your computer.
+ </p>
</li>
<li class="listitem">
@@ -141,6 +201,18 @@
<p><a name="misc-params-hardware-pa4"></a><span class="guilabel">Graphical
interface</span>:
</p>
+
+
+ <p><a name="misc-params-hardware-pa4a"></a>This section
+ allows you to configure your graphic card(s) and displays.
+ </p>
+
+
+
+ <p><a name="misc-params-hardware-pa4b"></a>For more information, see <a class="xref" href="setupX.html" title="Set up X, graphic card and monitor configuration">the section called &#8220;Set up X, graphic card and monitor
+ configuration&#8221;</a>.
+ </p>
+
</li>
</ul>
@@ -149,6 +221,8 @@
</div>
+
+
<div class="section" title="Network and Internet parameters">
<div class="titlepage">
<div>
@@ -168,11 +242,16 @@
<p><a name="misc-params-network-pa1"></a><span class="guilabel">Network</span>:
</p>
-
- <p><a name="misc-params-network-pa2"></a>You can configure your network here, but for network cards with non-free drivers it is better to do that after reboot, in
- the <span class="application">Mageia Control Center</span>, after having enabled the non-free repositories.
+
+
+ <p><a name="misc-params-network-pa2"></a>You can configure
+ your network here, but for network cards with non-free drivers it is
+ better to do that after reboot, in the <span class="application">Mageia Control
+ Center</span>, after having enabled the non-free media
+ repositories.
</p>
-
+
+
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -181,26 +260,42 @@
</tr>
<tr>
<td align="left" valign="top">
- <p><a name="misc-params-network-pa3"></a>When you add a network card, do not forget to set your firewall to watch that interface (too).
+
+ <p><a name="misc-params-network-pa3"></a>When you add a
+ network card, do not forget to set your firewall to watch that
+ interface as well.
</p>
+
</td>
</tr>
</table>
</div>
-
</li>
<li class="listitem">
<p><a name="misc-params-network-pa4"></a><span class="guilabel">Proxies</span>:
</p>
+
+
+ <p><a name="misc-params-network-pa4a"></a>A Proxy Server
+ acts as an intermediary between your computer and the wider internet.
+ This section allows you to configure your computer to utilize a proxy
+ service.
+ </p>
+
+
+ <p><a name="misc-params-network-pa4b"></a>You may need to
+ consult your systems administrator to get the parameters you need to
+ enter here
+ </p>
</li>
</ul>
</div>
</div>
-
+
<div class="section" title="Security">
<div class="titlepage">
@@ -218,7 +313,19 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="misc-params-security-pa1"></a><span class="guilabel">Security Level</span>:
+ <p><a name="misc-params-security-pa1"></a><span class="guilabel">Security
+ Level</span>:
+ </p>
+
+
+ <p><a name="misc-params-security-pa1a"></a>Here you set the
+ Security level for your computer, in most cases the default setting
+ (Standard) is adequate for general use.
+ </p>
+
+
+ <p><a name="misc-params-security-pa1b"></a>Check the option
+ which best suits your usage.
</p>
</li>
@@ -226,6 +333,37 @@
<p><a name="misc-params-security-pa2"></a><span class="guilabel">Firewall</span>:
</p>
+
+
+ <p><a name="misc-params-security-pa2a"></a>A firewall is
+ intended to be a barrier between your important data and the rascals
+ out there on the internet who would compromise or steal it.
+ </p>
+
+
+ <p><a name="misc-params-security-pa2b"></a>Select the
+ services that you wish to have access to your system. You selections
+ will depend on what you use your computer for.
+ </p>
+
+
+ <div class="warning" title="Warning" 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="[Warning]" src="warning.png"></td>
+ <th align="left">Warning</th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="misc-params-security-pa2c"></a>Bear in mind
+ that allowing everything (no firewall) may be very risky.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
</li>
</ul>
@@ -247,13 +385,18 @@
- <p><a name="drakxid-configureTimezoneGMT-pa1"></a>Choose your time zone
- by choosing your country or a city close to you in the same time zone.
+ <p><a name="drakxid-configureTimezoneGMT-pa1"></a>Choose your
+ time zone by choosing your country or a city close to you in the same time
+ zone.
</p>
-
- <p><a name="drakxid-configureTimezoneGMT-pa2"></a>In next screen you can choose to set your hardware clock to local time or to GMT, also known as UTC.
+
+
+ <p><a name="drakxid-configureTimezoneGMT-pa2"></a>In next
+ screen you can choose to set your hardware clock to local time or to GMT,
+ also known as UTC.
</p>
-
+
+
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -262,13 +405,16 @@
</tr>
<tr>
<td align="left" valign="top">
- <p><a name="drakxid-configureTimezoneGMT-pa3"></a>If you have more than one operating system on your computer, make sure they are all set to local time, or all to UTC/GMT.
+
+ <p><a name="drakxid-configureTimezoneGMT-pa3"></a>If you have
+ more than one operating system on your computer, make sure they are all
+ set to local time, or all to UTC/GMT.
</p>
+
</td>
</tr>
</table>
</div>
-
</div>
@@ -286,12 +432,18 @@
- <p><a name="drakxid-selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, like the currency and wireless regulatory domain.
- Setting the wrong country can lead to not being able to use WLAN
+ <p><a name="drakxid-selectCountry-pa1"></a>Select your country
+ or region. This is important for all kinds of settings, like the currency
+ and wireless regulatory domain. Setting the wrong country can lead to not
+ being able to use a Wireless network.
</p>
+
- <p><a name="drakxid-selectCountry-pa2"></a>If your country isn't in the list, click the <span class="guilabel">Other Countries</span> button and choose your country / region there.
+ <p><a name="drakxid-selectCountry-pa2"></a>If your country
+ isn't in the list, click the <span class="guilabel">Other Countries</span> button
+ and choose your country / region there.
</p>
+
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -301,8 +453,13 @@
</tr>
<tr>
<td align="left" valign="top">
- <p><a name="drakxid-selectCountry-pa3"></a>If your country is only in the <span class="guilabel">Other Countries</span> list, after clicking <span class="guibutton">OK</span> it may seem a country from the first list was chosen. Please ignore this, DrakX will follow your real choice.
+
+ <p><a name="drakxid-selectCountry-pa3"></a>If your country is
+ only in the <span class="guilabel">Other Countries</span> list, after clicking
+ <span class="guibutton">OK</span> it may seem a country from the first list was
+ chosen. Please ignore this, DrakX will follow your real choice.
</p>
+
</td>
</tr>
</table>
@@ -324,26 +481,51 @@
- <p><a name="drakxid-configureServices-pa1"></a>...........
+ <p><a name="drakxid-configureServices-pa1"></a>Here you can set which services should (not) start when you boot your system.
+ </p>
+
+
+ <p><a name="drakxid-configureServices-pa2"></a>There are four groups, click on the triangle before a group to expand it and see all services in it.
+ </p>
+
+
+ <p><a name="drakxid-configureServices-pa3"></a>The setting DrakX chose are usually good.
+ </p>
+
+
+ <p><a name="drakxid-configureServices-pa4"></a>If you highlight a service, some information about it is shown in the info box below.
+ </p>
+
+
+ <p><a name="drakxid-configureServices-pa5"></a>Only change things when you know very well what you are doing.
</p>
+
+
</div>
- <div class="section" title="drakxid-miscellaneous">
+ <div class="section" title="Security Level">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="draxid-miscellaneous"></a>drakxid-miscellaneous
+ <h3 class="title"><a name="draxid-miscellaneous"></a>Security Level
</h3>
</div>
</div>
</div>
-
- <p><a name="draxid-miscellaneous-pa1"></a>This section seems to show up in the <span class="guilabel">Security Level</span> screen in the Summary step of the configuration after installation.
+
+ <p><a name="draxid-miscellaneous-pa1"></a>You can adjust your security level here.
+ </p>
+
+ <p><a name="draxid-miscellaneous-pa2"></a>Leave the default settings as they are, if you don't know what to choose.
</p>
+
+ <p><a name="draxid-miscellaneous-pa3"></a>After install, it will always be possible to adjust your security settings in the <span class="guilabel">Security</span> part of the Mageia Control Center.
+ </p>
+
</div>
diff --git a/resizeFATChoose.html b/resizeFATChoose.html
index 9c55b1e..57efc33 100644
--- a/resizeFATChoose.html
+++ b/resizeFATChoose.html
@@ -30,6 +30,8 @@
+
+
@@ -47,14 +49,6 @@
- <p><a name="resizeFATChoose-pa2"></a>.......
- </p>
-
-
-
-
- <p><a name="resizeFATChoose-pa3"></a>........
- </p>
diff --git a/selectMouse.html b/selectMouse.html
index 66abe6c..81082fa 100644
--- a/selectMouse.html
+++ b/selectMouse.html
@@ -22,25 +22,28 @@
</div>
</div>
</div>
-
-
+
+
+
+
+
+
+
+
- <p><a name="selectMouse-pa1"></a>If you select "Mouse" in the
- hardware parameter screen, you get another screen with a help button
+ <p><a name="selectMouse-pa1"></a>If you are not happy with how your mouse responds, you can select a different one here.
</p>
-
- <p><a name="selectMouse-pa2"></a>Maybe that button links to this
- page
+
+ <p><a name="selectMouse-pa2"></a>Usually, <span class="guilabel">Universal</span> - <span class="guilabel">Any PS/2 and USB mice</span> is a good choice.
</p>
- <p><a name="selectMouse-pa3"></a>If so, we'll write a help text
- for that screen
+ <p><a name="selectMouse-pa3"></a>Select <span class="guilabel">Universal</span> - <span class="guilabel">Force evdev</span> to configure the buttons that do not work on a mouse with six or more buttons.
</p>
</div>
diff --git a/setupBootloaderBeginner.html b/setupBootloaderBeginner.html
index 9088209..ffb22ef 100644
--- a/setupBootloaderBeginner.html
+++ b/setupBootloaderBeginner.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="Installation with DrakX">
<link rel="up" href="index.html" title="Installation with DrakX">
<link rel="prev" href="setupX.html" title="Set up X, graphic card and monitor configuration">
- <link rel="next" href="misc-params.html" title="Summary of miscellaneous parameters"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="next" href="setupBootloaderExpert.html" title="Bootloader expert use"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
@@ -32,30 +32,44 @@
- <p><a name="setupBootloaderBeginner-pa1"></a>If you don't like
- the bootloader settings chosen by DrakX, you can change them here.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p><a name="setupBootloaderBeginner-pa1"></a>If you prefer
+ different bootloader settings to those chosen automatically by DrakX, you
+ can change them here.
</p>
- <p><a name="setupBootloaderBeginner-pa2"></a>For instance if you
- have several Linux installs on your system and don't want to squeeze all of
- their bootloaders into the MBR (Master Boot Record), you can choose to put
- the bootloader at the beginning of your new <code class="literal">/</code> partition
- and chainload into it from the bootloader of another Linux install
+ <p><a name="setupBootloaderBeginner-pa2"></a>You may already have
+ another Linux operating system on your machine, in which case you need to
+ decide whether to add Mageia to your existing boot loader, or allow Mageia
+ to create a new one.
</p>
- <div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Warning">
+ <div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
- <th align="left">Warning</th>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
+ <th align="left">Tip</th>
</tr>
<tr>
<td align="left" valign="top">
- <p><a name="setupBootloaderBeginner-pa3"></a>WRITE TIP OR
- WARNING ABOUT CHAINLOADING AND GRUB 2
+ <p><a name="setupBootloaderBeginner-pa3"></a>The Mageia
+ graphical menu is nice :)
</p>
</td>
@@ -64,11 +78,154 @@
</div>
- <p><a name="setupBootloaderBeginner-pa4"></a>If you have very
- limited disk space, it may be helpful if you click on
- <span class="guibutton">Advanced</span> and check the box for <span class="guilabel">Clean /tmp
- at each boot</span>. This may help you maintain some free space.
- </p>
+ <div class="section" title="Using the Mageia boot loader">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="usingMageiaBootloader"></a>Using the Mageia boot
+ loader
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p><a name="setupBootloaderBeginner-pa4"></a>By default Mageia
+ writes a new GRUB boot loader 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 menu.
+ </p>
+
+
+ <p><a name="setupBootloaderBeginner-pa5"></a>This works
+ correctly in the majority of cases for Linux and Windows systems.
+ </p>
+
+
+ <div class="warning" title="Warning" 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="[Warning]" src="warning.png"></td>
+ <th align="left">Warning</th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="setupBootloaderBeginner-pa6"></a>Linux systems
+ which use the GRUB2 boot loader (predominately more recent Debian/Ubuntu
+ derivatives) are not currently supported and will not be recognised. One
+ possible solution for this is to follow the steps explained here <a class="xref" href="setupBootloaderExpert.html#addingGRUB2system" title="Adding a GRUB2 based system manually">the section called &#8220;Adding a GRUB2 based system
+ manually&#8221;</a> before installing Mageia next to such a
+ system, however there is no guarantee.
+ </p>
+
+
+ <p><a name="setupBootloaderBeginner-pa6a"></a>If you are
+ already installing Mageia without having taken those steps, (and do not already know the GRUB2 version and/or it's partition)
+ then install
+ the Mageia bootloader in the root partition for now (see next section),
+ and inspect your GRUB2 based system after rebooting at the end of the
+ installation. Note that you will not yet be able to boot Mageia, however
+ you will be able to use the Mageia install DVD to perform a quick
+ "upgrade install" at a later date to correctly install the bootloader to
+ the MBR.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+
+ <div class="section" title="Using an existing boot loader">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="usingExistingBootloader"></a>Using an
+ existing boot loader
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p><a name="setupBootloaderBeginner-pa46"></a>If you decide to
+ use an existing boot loader then you will need to remember to STOP at the
+ summary page during the installation and click the <span class="guibutton">Boot
+ Loader</span> button, which will allow you to change the boot loader
+ install location.
+ </p>
+
+
+ <p><a name="setupBootloaderBeginner-pa47"></a>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.
+ </p>
+
+
+ <p><a name="setupBootloaderBeginner-pa48"></a>To be clear, sda
+ is a device, sda7 is a partition.
+ </p>
+
+
+ <div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Tip">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
+ <th align="left">Tip</th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="setupBootloaderBeginner-pa48a"></a>Go to tty2
+ with Ctrl+Alt+F2 and type <code class="literal">df</code> to check where your
+ <code class="literal">/</code> (root) partition is. Ctrl+Alt+F7 takes you back to
+ the installer screen.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <p><a name="setupBootloaderBeginner-pa49"></a>The exact
+ procedure for adding your Mageia system to an existing boot loader is
+ beyond the scope of this help, however in most cases it will involve
+ running the relevant boot loader installation program which should detect
+ and add it automatically. See the documentation for the operating system
+ in question.
+ </p>
+
+ </div>
+
+
+ <div class="section" title="Boot loader advanced option">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="advancedOptionBootloader"></a>Boot loader advanced
+ option
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p><a name="setupBootloaderBeginner-pa52"></a>If you have very
+ limited disk space for the <code class="literal">/</code> partition that contains
+ <code class="literal">/tmp</code>, click on <span class="guibutton">Advanced</span> and
+ check the box for <span class="guilabel">Clean /tmp at each boot</span>. This helps
+ to maintain some free space.
+ </p>
+
+ </div>
</div>
</body>
diff --git a/setupBootloaderExpert.html b/setupBootloaderExpert.html
new file mode 100644
index 0000000..43f8ba5
--- /dev/null
+++ b/setupBootloaderExpert.html
@@ -0,0 +1,314 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Bootloader expert use</title>
+ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+ <link rel="home" href="index.html" title="Installation with DrakX">
+ <link rel="up" href="index.html" title="Installation with DrakX">
+ <link rel="prev" href="setupBootloaderBeginner.html" title="Bootloader main options">
+ <link rel="next" href="misc-params.html" title="Summary of miscellaneous parameters"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <!--
+ body { font-family: sans-serif; font-size: 13px }
+ table { font-family: sans-serif; font-size: 13px }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="" class="section" title="Bootloader expert use">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="setupBootloaderExpert"></a>Bootloader expert use
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p><a name="setupBootloaderExpert-pa1"></a>If you haven't done so
+ yet, please read <a class="xref" href="setupBootloaderBeginner.html" title="Bootloader main options">the section called &#8220;Bootloader main
+ options&#8221;</a> first.
+ </p>
+
+
+ <div class="section" title="Adding a GRUB2 based system manually">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="addingGRUB2system"></a>Adding a GRUB2 based system
+ manually
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p><a name="setupBootloaderExpert-pa7"></a>A GRUB2 based system
+ may be added to the Mageia boot menu as follows:
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa8"></a>Boot into the
+ system in question and in order to determine the grub version, in a terminal run the command:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa9"></a><code class="literal">sudo
+ grub-install --version</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa10"></a>or if that
+ fails try:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa11"></a><code class="literal">sudo
+ grub2-install --version</code></p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa12"></a>If this returns
+ "GNU GRUB version 0.97" (possibly with a custom suffix), then it is
+ using GRUB (otherwise called GRUB legacy) not GRUB2 and your system
+ should be correctly identified by Mageia during installation and added
+ automatically to the menu.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa15"></a>If this returns
+ (GRUB) 1.98 or 1.99 or 2.xx, then you are using GRUB2.
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa16"></a>Make a note of
+ the version and enter this command to identify the root partition:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa17"></a><code class="literal">df /
+ </code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa18"></a>This will
+ output something like :
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa19"></a><code class="literal">Filesystem Size Used
+ Avail Use% Mounted on</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa20"></a><code class="literal">/dev/sdb11 15G 7.0G 7.0G
+ 50% /</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa21"></a>The "sdb11"
+ part is the root partition - make a note of it.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa26"></a>You can now
+ shut down the system and install Mageia.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa27"></a>In your new
+ running Mageia system, open a terminal and as root edit the file
+ /boot/grub/menu.lst. as follows:
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa28"></a>To become root
+ use:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa29"></a><code class="literal">su</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa30"></a>(enter root
+ password)
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa31"></a>To open the
+ file in an editor use:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa32"></a><code class="literal">kwrite
+ /boot/grub/menu.lst</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa33"></a>(replace
+ "kwrite" with "gedit" if you are using Gnome)
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa34"></a>Add the
+ following entry for your (e.g. Ubuntu) system possibly as the second
+ stanza:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa35"></a><code class="literal">title
+ Ubuntu</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa36"></a><code class="literal">root
+ (hd1,10)</code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa37"></a><code class="literal">kernel
+ /boot/grub/core.img</code></p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa38"></a>If the GRUB2
+ version is 2.xx then change the last line to :
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa39"></a><code class="literal">kernel
+ /boot/grub/i386-pc/core.img </code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa40"></a>If you needed
+ to use "grub2-install" earlier then change <code class="literal">/grub/</code>
+ to <code class="literal">/grub2/</code> in the last line.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="setupBootloaderExpert-pa41"></a>Save the file
+ and re-boot. You should now see your "Ubuntu" entry in the menu and be
+ able to boot from it.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <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">Note</th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="setupBootloaderExpert-pa42"></a>The "sdb"
+ indicates the second hard drive hd1, (sda would be hd0), likewise sdb11
+ indicates partition 11 which in GRUB legacy (counting from zero) is
+ partition 10.
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa43"></a>So:
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa44"></a><code class="literal">sdb11 =
+ (hd1,10) </code></p>
+
+
+ <p><a name="setupBootloaderExpert-pa45"></a><code class="literal">sda1 =
+ (hd0,0) </code></p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+
+ <div class="section" title="Using an existing GRUB2 boot loader">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="usingExistingBootloaderGRUB2"></a>Using an
+ existing GRUB2 boot loader
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p><a name="setupBootloaderExpert-pa49a"></a>If you didn't read
+ the general part about using an existing bootloader yet, do so now. See
+ <a class="xref" href="setupBootloaderBeginner.html#usingExistingBootloader" title="Using an existing boot loader">the section called &#8220;Using an
+ existing boot loader&#8221;</a></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">Note</th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="setupBootloaderExpert-pa50"></a>There is a known
+ bug in OS-prober used during GRUB2 installation in some older versions of
+ Debian/Ubuntu that incorrectly creates grub.cfg when adding Mageia (or
+ Mandriva) systems. This is simple to work around and details of a fix
+ can be found in the Mageia forum here :
+ https://forums.mageia.org/en/viewtopic.php?p=13547#p13547
+ </p>
+
+
+ <p><a name="setupBootloaderExpert-pa51"></a>To make the fix
+ permanent so that it will survive an Ubuntu kernel update, the Mageia
+ entry should be added to <code class="literal">/etc/grub.d/40_custom</code></p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/setupSCSI.html b/setupSCSI.html
index b7c5603..75fc720 100644
--- a/setupSCSI.html
+++ b/setupSCSI.html
@@ -24,31 +24,30 @@
</div>
-
-
-
+
+
+
+
+
- <p><a name="setupSCSI-pa1"></a>DrakX usually detects your hard
- disks correctly. However it may fail to detect some older SCSI drive
- controllers and thus fail to install the required drivers and the
- installation may fail.
+ <p><a name="setupSCSI-pa1"></a>DrakX usually detects hard
+ disks correctly. It may not however detect some older SCSI drive
+ controllers and therefore fail to install the required drivers.
</p>
- <p><a name="setupSCSI-pa2"></a>If this happens, you'll need to
+ <p><a name="setupSCSI-pa2"></a>If this happens, you will need to
manually tell Drakx which SCSI drive(s) you have.
</p>
- <p><a name="setupSCSI-pa3"></a>After that, DrakX should be able
- to figure out which parameters need to be set for the drive to work. You
- should only have to set them manually if DrakX doesn't manage to do
- it.
+ <p><a name="setupSCSI-pa3"></a>DrakX should then be able
+ to configure the drive(s) correctly.
</p>
</div>
diff --git a/setupX.html b/setupX.html
index f2b4b11..7bbcc0f 100644
--- a/setupX.html
+++ b/setupX.html
@@ -32,9 +32,12 @@
+
+
+
- <p>No matter which graphical environment (also known as desktop
+ <p><a name="setupX-pa1"></a>No matter which graphical environment (also known as desktop
environment) you chose for this install of
<span class="application">Mageia</span>, they are all based on a graphical user
interface system called X-Windows, or simply X. So in order for KDE, Gnome,
@@ -48,14 +51,14 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><span class="emphasis"><em><span class="guibutton">Graphic card</span></em></span>: Choose
+ <p><a name="setupX-pa2"></a><span class="emphasis"><em><span class="guibutton">Graphic card</span></em></span>: Choose
your card from the list if needed.
</p>
</li>
<li class="listitem">
- <p><span class="emphasis"><em><span class="guibutton">Monitor</span></em></span>: You can
+ <p><a name="setupX-pa3"></a><span class="emphasis"><em><span class="guibutton">Monitor</span></em></span>: You can
choose <span class="guilabel">Plug'n Play</span> when applicable, or choose your
monitor from the <span class="guilabel">Vendor</span> or
<span class="guilabel">Generic</span> list. Choose <span class="guilabel">Custom</span> if
@@ -66,14 +69,14 @@
</li>
<li class="listitem">
- <p><span class="emphasis"><em><span class="guibutton">Resolution</span></em></span>: Set the
+ <p><a name="setupX-pa4"></a><span class="emphasis"><em><span class="guibutton">Resolution</span></em></span>: Set the
desired resolution and color depth of your monitor here.
</p>
</li>
<li class="listitem">
- <p><span class="emphasis"><em><span class="guibutton">Test</span></em></span>: The test button
+ <p><a name="setupX-pa5"></a><span class="emphasis"><em><span class="guibutton">Test</span></em></span>: The test button
does not always appear during install. If the button is there, you can
control your settings by pushing it. If you see a question asking you
whether your settings are correct, you can answer "yes", and the
@@ -85,7 +88,7 @@
</li>
<li class="listitem">
- <p><span class="emphasis"><em><span class="guibutton">Options</span></em></span>: Here you can
+ <p><a name="setupX-pa6"></a><span class="emphasis"><em><span class="guibutton">Options</span></em></span>: Here you can
choose to enable or disable some options.
</p>
diff --git a/takeOverHdChoose.html b/takeOverHdChoose.html
index 54c9f43..dc4efda 100644
--- a/takeOverHdChoose.html
+++ b/takeOverHdChoose.html
@@ -44,8 +44,8 @@
<td align="left" valign="top">
<p><a name="takeOverHdChoose-pa2"></a>Be sure to select the
- correct hard disk. All data on the selected disk will be lost and this
- step can not be undone.
+ correct hard disk. All data on the selected disk will be lost. This step
+ can not be undone.
</p>
</td>
diff --git a/takeOverHdConfirm.html b/takeOverHdConfirm.html
index 09b714d..c48781c 100644
--- a/takeOverHdConfirm.html
+++ b/takeOverHdConfirm.html
@@ -30,11 +30,12 @@
+
+
<p><a name="takeOverHdConfirm-pa1"></a>Click on
- <span class="guibutton">Previous</span> if you are not sure you selected the correct
- hard disk.
+ <span class="guibutton">Previous</span> if you are not sure about your choice.
</p>