diff options
author | Romain d'Alverny <rda@mageia.org> | 2011-11-25 13:26:03 +0000 |
---|---|---|
committer | Romain d'Alverny <rda@mageia.org> | 2011-11-25 13:26:03 +0000 |
commit | ac6a9557987f89f151f8b64d81bc8b35d0f375d3 (patch) | |
tree | 7275885caf0c5af8dfbb8504e5e67796a74c6837 | |
parent | 67b1868874aaa5e9b78088b544d975e00fb9cd8e (diff) | |
download | www-ac6a9557987f89f151f8b64d81bc8b35d0f375d3.tar www-ac6a9557987f89f151f8b64d81bc8b35d0f375d3.tar.gz www-ac6a9557987f89f151f8b64d81bc8b35d0f375d3.tar.bz2 www-ac6a9557987f89f151f8b64d81bc8b35d0f375d3.tar.xz www-ac6a9557987f89f151f8b64d81bc8b35d0f375d3.zip |
nonfree repo warning fix
-rw-r--r-- | en/2/index.php | 6 | ||||
-rw-r--r-- | en/downloads/locales.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/en/2/index.php b/en/2/index.php index 8c1484f49..f5efbb302 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -91,10 +91,12 @@ require '../downloads/lib.php'; <p class="dlinfo">Download is approximately 700MB.</p> </div></div> <div class="yui-u"><div class="para"> - <h2>Full, Free Software exclusive</h2> + <h2>Full, Free Software exclusive DVDs</h2> <p class="dlinfo warn">Note that these DVD ISOs are made of Free Software exclusively. As a consequence, proprietary Wi-Fi and video drivers are not included. - If you need WiFi or specific video drivers at install time, you should go with above LiveCDs instead.</p> + If you need WiFi or specific video drivers <strong>at install time</strong>, + you should go with above LiveCDs instead. + You may, if you will, add nonfree software repository <em>after</em> the installation.</p> <p class="dlinfo">Up to 167 locales are supported: Deutsch, English, español, français, italiano, português, svenska, nederlands, polski, dansk, Русский and so much more! See the comprehensive list.</p> diff --git a/en/downloads/locales.php b/en/downloads/locales.php index c8f44e7d5..d028386d9 100644 --- a/en/downloads/locales.php +++ b/en/downloads/locales.php @@ -65,7 +65,7 @@ Note that translations are on their way.', 'popularity' => 'Popularity', 'for_full_install' => 'For a full, Free Software-only, installation:', 'warn-free' => 'Note that these DVD ISOs are made of Free Software <em>exclusively</em>. As a consequence, <em>proprietary Wi-Fi and video drivers ' - . 'are not included</em>. If you need WiFi or specific video drivers at install time, you should go with above LiveCDs instead.', + . 'are not included</em>. If you need WiFi or specific video drivers at install time, you should go with above LiveCDs instead. <em>After</em> the installation, you may add and use the nonfree software repository.', 'for_test_live' => 'For live test and install: LiveCD 32bit', 'for_network' => 'For a wired network install:', 'def-Europa set 1' => 'European set 1 of languages: Deutsch, English (several variants), Greek, Español, Français, Italiano, Dutch, Português, Português do Brasil, Turkish.', |