aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2012-12-20 16:29:05 +0000
committerRomain d'Alverny <rda@mageia.org>2012-12-20 16:29:05 +0000
commitc13474347e0d3f108ef29439e5e26e2b80db6368 (patch)
tree15bbb48324a884f4b61ad8459428f54a91a152bd /en
parent3026bf3426f1e59102c06e9def054230a0769be3 (diff)
downloadwww-c13474347e0d3f108ef29439e5e26e2b80db6368.tar
www-c13474347e0d3f108ef29439e5e26e2b80db6368.tar.gz
www-c13474347e0d3f108ef29439e5e26e2b80db6368.tar.bz2
www-c13474347e0d3f108ef29439e5e26e2b80db6368.tar.xz
www-c13474347e0d3f108ef29439e5e26e2b80db6368.zip
fix captions on M3b1 download page
Diffstat (limited to 'en')
-rw-r--r--en/3/index.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/en/3/index.php b/en/3/index.php
index cb7e1246b..849e4cfa0 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -51,10 +51,8 @@ _lang_load($locale, '3');
<?php _e('and so much more!'); ?>
<a href="https://wiki.mageia.org/en/Mageia_2_supported_locales" hreflang="en"><?php _e('See the comprehensive list')?></a>.</li>
<li><?php
- _e('Installer DVD and CD ISOs are made of Free Software exclusively.');
- _e('As a consequence, <span class="warn">proprietary Wi-Fi and video drivers are not included.');
- _e('If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs or LiveDVDs instead.</span>');
- _e('You may, if you will, add nonfree software repository <em>after</em> the installation.');
+ _e('Installer DVD and CD ISOs contains now Free and Nonfree Software.');
+ _e('You will be asked of which kind of Software you want to intsall.');
?></li>
<li><?php _e('Use LiveCDs or LiveDVDs for fresh new installs ONLY, NOT FOR UPGRADE.')?></li>
<li><?php _e('If you are looking for a stable version of Mageia, <a href="%s" rel="nofollow">go here</a>.', array('/downloads/'))?></li>
@@ -74,7 +72,7 @@ _lang_load($locale, '3');
<tbody>
<tr>
<th class="name"><?php _e('Installer DVD')?><br>
- <span class="dlinfo"><?php _e('100% Free Software')?></span></th>
+ <span class="dlinfo"><?php _e('100% Free Software and NonFree drivers')?></span></th>
<td class="size">3.6GB</td>
<td><a rel="nofollow" href="?q=Mageia-3-beta1-i586-DVD.iso"><?php _e('32bit');?></a><br>
<a rel="nofollow" href="?q=Mageia-3-beta1-x86_64-DVD.iso"><?php _e('64bit');?></a></td>