aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2013-03-12 16:46:38 +0000
committerRomain d'Alverny <rda@mageia.org>2013-03-12 16:46:38 +0000
commit1818550dc48777cfcfea2779d57a249dfe8d0e4f (patch)
tree8baf8c1f29b9ccecb439cce2d989bc95af28c6cd /en
parent69c8e2ead4f5a887d0ced3578fd653314823c5f4 (diff)
downloadwww-1818550dc48777cfcfea2779d57a249dfe8d0e4f.tar
www-1818550dc48777cfcfea2779d57a249dfe8d0e4f.tar.gz
www-1818550dc48777cfcfea2779d57a249dfe8d0e4f.tar.bz2
www-1818550dc48777cfcfea2779d57a249dfe8d0e4f.tar.xz
www-1818550dc48777cfcfea2779d57a249dfe8d0e4f.zip
add installer dvd
Diffstat (limited to 'en')
-rw-r--r--en/3/index.php4
-rw-r--r--en/downloads/get/definitions.ini20
2 files changed, 21 insertions, 3 deletions
diff --git a/en/3/index.php b/en/3/index.php
index 920a73871..2b25e4e0c 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -50,12 +50,10 @@ _lang_load($locale, '3');
polski, dansk, Русский
<?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>
-<?php /*
<li><?php
_e('Installer DVD and CD ISOs now contains Free Software and some proprietary drivers.');
_e('You will be asked of which kind of Software you want to install.');
?></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>
<li><?php _e('Enjoy! And <a href="%s">please report bugs</a> if you find some.', array('https://bugs.mageia.org/'))?></li>
@@ -72,7 +70,6 @@ _lang_load($locale, '3');
</tr>
</thead>
<tbody>
-<?php /*
<tr>
<th class="name"><?php _e('Installer DVD')?><br>
<span class="dlinfo"><?php _e('Free Software and some proprietary drivers')?></span></th>
@@ -82,6 +79,7 @@ _lang_load($locale, '3');
<td><a rel="nofollow" href="?q=Mageia-3-beta3-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
<a rel="nofollow" href="?q=Mageia-3-beta3-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
</tr>
+<?php /*
<tr>
<th class="name"><?php _e('Installer CD')?><br>
<span class="dlinfo"><?php _e('100% Free Software')?></span></th>
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 5b97fd053..7501dec56 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -582,3 +582,23 @@ torrent = "iso/cauldron/torrents/Mageia-3-beta3-LiveDVD-KDE4-x86_64-DVD.torrent"
name = "Mageia 3 beta3 LiveDVD KDE4 64bit DVD"
size = "1.4 GB"
+;
+[Mageia-3-beta3-i586-DVD.iso]
+file = "Mageia-3-beta3-i586-DVD.iso"
+md5 = "abb8f9ed08814ae1f8afccfc8d79db5d"
+sha1 = "1ff02fc947a5e6aa18fc9d5f60026ffa770627fc"
+path = "iso/cauldron/Mageia-3-beta3-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta3-i586-DVD.torrent"
+name = "Mageia 3 beta3 32bit DVD"
+size = "3.7 GB"
+
+;
+[Mageia-3-beta3-x86_64-DVD.iso]
+file = "Mageia-3-beta3-x86_64-DVD.iso"
+md5 = "36ff3dfaa8812e597ec32ff1b7d98e4f"
+sha1 = "5562b86cf6f3f68228f697749001eae6ea510b14"
+path = "iso/cauldron/Mageia-3-beta3-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta3-x86_64-DVD.torrent"
+name = "Mageia 3 beta3 64bit DVD"
+size = "3.8 GB"
+