aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/en
diff options
context:
space:
mode:
authorMarja van Waes <marja@mageia.org>2013-10-08 22:45:35 +0200
committerMarja van Waes <marja@mageia.org>2013-10-08 22:45:35 +0200
commit867cf10bebeb813eff4c021f923c6444e0fb262c (patch)
treea0e114b556ed472bd319133203e3c70018bb6628 /docs/installer/en
parent192f8f6d40425e386cb1aec667595c7af68b2cc8 (diff)
downloadtools-867cf10bebeb813eff4c021f923c6444e0fb262c.tar
tools-867cf10bebeb813eff4c021f923c6444e0fb262c.tar.gz
tools-867cf10bebeb813eff4c021f923c6444e0fb262c.tar.bz2
tools-867cf10bebeb813eff4c021f923c6444e0fb262c.tar.xz
tools-867cf10bebeb813eff4c021f923c6444e0fb262c.zip
Updated files from Calenco
Diffstat (limited to 'docs/installer/en')
-rw-r--r--docs/installer/en/add_supplemental_media.xml4
-rw-r--r--docs/installer/en/configureX_card_list.xml4
-rw-r--r--docs/installer/en/media_selection.xml2
-rw-r--r--docs/installer/en/misc-params.xml2
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/installer/en/add_supplemental_media.xml b/docs/installer/en/add_supplemental_media.xml
index 38af2793..8e70d74b 100644
--- a/docs/installer/en/add_supplemental_media.xml
+++ b/docs/installer/en/add_supplemental_media.xml
@@ -36,8 +36,8 @@
<listitem>
<para>Selecting a mirror or specifying a URL (very first entry). By
selecting a mirror, you have access to the selection of all repositories
- managed by Mageia, like the non-free , the tainted repositories and the
- updates. With the URL, you can designate a specific repository or your
+ managed by Mageia, like the Nonfree , the Tainted repositories and the
+ Updates. With the URL, you can designate a specific repository or your
own NFS installation.</para>
</listitem>
</orderedlist>
diff --git a/docs/installer/en/configureX_card_list.xml b/docs/installer/en/configureX_card_list.xml
index 0c9bae07..ffc88130 100644
--- a/docs/installer/en/configureX_card_list.xml
+++ b/docs/installer/en/configureX_card_list.xml
@@ -6,7 +6,7 @@
<!-- tproof -->
<!-- lproof -->
-
+ <!-- Done corrections accordind to tmb remarks. Papoteur -->
<info>
<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
your Graphic Card)</title>
@@ -52,7 +52,7 @@
which may only be available in the Nonfree repository and in some cases only
from the card manufacturers' websites.</para>
- <para>The Nonfree repository need to be explicitly enabled to access them.
+ <para>The Nonfree repository needs to be explicitly enabled to access them.
If you didn't select it previously, you should do this after your first
reboot.</para>
</section> \ No newline at end of file
diff --git a/docs/installer/en/media_selection.xml b/docs/installer/en/media_selection.xml
index da8cbc95..a4d943aa 100644
--- a/docs/installer/en/media_selection.xml
+++ b/docs/installer/en/media_selection.xml
@@ -27,7 +27,7 @@
</listitem>
<listitem>
- <para>The <emphasis>Non-free</emphasis> repository includes packages
+ <para>The <emphasis>Nonfree</emphasis> repository includes packages
that are free-of-charge, i.e. Mageia may redistribute them, but they
contain closed-source software (hence the name - Nonfree). For example
this repository includes nVidia and ATI graphics card proprietary
diff --git a/docs/installer/en/misc-params.xml b/docs/installer/en/misc-params.xml
index 26044374..d2033bba 100644
--- a/docs/installer/en/misc-params.xml
+++ b/docs/installer/en/misc-params.xml
@@ -163,7 +163,7 @@
<para xml:id="misc-params-network-pa2" revision="1">You can configure
your network here, but for network cards with non-free drivers it is
better to do that after reboot, in the <application>Mageia Control
- Center</application>, if you have not yet enabled the non-free media
+ Center</application>, if you have not yet enabled the Nonfree media
repositories.</para>
<warning>