aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2012-04-30 20:17:49 +0000
committerAnne Nicolas <ennael@mageia.org>2012-04-30 20:17:49 +0000
commit8224533f2c84a6e93183a6cb4e1371d53ff77d33 (patch)
tree36f69e45e3797ddd561909ccfdc6a74481b7928b
parent5f9107bd7f3e6e0dc637e92b6c985096cd5044b4 (diff)
downloaddrakx-installer-help-8224533f2c84a6e93183a6cb4e1371d53ff77d33.tar
drakx-installer-help-8224533f2c84a6e93183a6cb4e1371d53ff77d33.tar.gz
drakx-installer-help-8224533f2c84a6e93183a6cb4e1371d53ff77d33.tar.bz2
drakx-installer-help-8224533f2c84a6e93183a6cb4e1371d53ff77d33.tar.xz
drakx-installer-help-8224533f2c84a6e93183a6cb4e1371d53ff77d33.zip
update en files
-rw-r--r--doPartitionDisks.html74
-rw-r--r--setupBootloaderExpert.html2
-rw-r--r--setupX.html2
3 files changed, 46 insertions, 32 deletions
diff --git a/doPartitionDisks.html b/doPartitionDisks.html
index c21edda..15f691f 100644
--- a/doPartitionDisks.html
+++ b/doPartitionDisks.html
@@ -27,11 +27,13 @@
+
+
+
-
-
+
@@ -42,8 +44,9 @@
</p>
- <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><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>
@@ -54,13 +57,14 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="doPartitionDisks-pa4"></a>Use Existing Partitions
+ <p><a name="doPartitionDisks-pa4"></a>Use Existing
+ Partitions
</p>
- <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><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>
</li>
@@ -70,32 +74,39 @@
</p>
- <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><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><a name="doPartitionDisks-pa8"></a>Use Free Space on a Windows Partition
+ <p><a name="doPartitionDisks-pa8"></a>Use Free Space on a
+ Windows Partition
</p>
- <p><a name="doPartitionDisks-pa9"></a>If you have unused space on an existing Windows partition, the
- installer may offer to use it.
+ <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><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><a name="doPartitionDisks-pa10"></a>This can be a useful
+ way of making room for your new Mageia installation, but is a risky
+ operation so you should make sure you have backed up all important
+ files!
</p>
- <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. 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><a name="doPartitionDisks-pa11"></a>Note that this
+ involves shrinking the size of the Windows partition. The partition
+ must be "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. It is highly
+ recommended to back up your personal files.
</p>
</li>
@@ -105,22 +116,25 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="doPartitionDisks-pa12"></a>Erase and use Entire Disk.
+ <p><a name="doPartitionDisks-pa12"></a>Erase and use Entire
+ Disk.
</p>
- <p><a name="doPartitionDisks-pa13"></a>This option will use the complete drive for Mageia.
+ <p><a name="doPartitionDisks-pa13"></a>This option will use
+ the complete drive for Mageia.
</p>
- <p><a name="doPartitionDisks-pa14"></a>Note! This will erase ALL data on the selected hard drive. Take
- care!
+ <p><a name="doPartitionDisks-pa14"></a>Note! This will
+ erase ALL data on the selected hard drive. Take care!
</p>
- <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><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>
</li>
@@ -134,10 +148,10 @@
</p>
- <p><a name="doPartitionDisks-pa17"></a>This gives you complete control over the placing of the
- installation on your hard drive(s).
+ <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/setupBootloaderExpert.html b/setupBootloaderExpert.html
index b4f3a22..cf2bebc 100644
--- a/setupBootloaderExpert.html
+++ b/setupBootloaderExpert.html
@@ -326,7 +326,7 @@
<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
+ bug in OS-prober used during GRUB2 installation in some 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:
diff --git a/setupX.html b/setupX.html
index bd206a3..33c43e7 100644
--- a/setupX.html
+++ b/setupX.html
@@ -43,7 +43,7 @@
<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 <acronym class="acronym">X-Windows</acronym>, or simply
+ interface system called <acronym class="acronym">X Window System</acronym>, or simply
<acronym class="acronym">X</acronym>. So in order for <acronym class="acronym">KDE</acronym>,
<acronym class="acronym">Gnome</acronym>, <acronym class="acronym">LXDE</acronym> or any other graphical
environment to work well, the following <acronym class="acronym">X</acronym> settings need