From 136b0a825b792efb20bc810ab097e52bfee9bcc8 Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Thu, 25 May 2017 00:29:17 +0200
Subject: Mageia 6 rc is available

the xfce4 iso file was modified to Xfce
use now netinstall instead of boot for network install
---
 en/6/download_index.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'en/6')

diff --git a/en/6/download_index.php b/en/6/download_index.php
index 7e19268c1..c78fe4bad 100755
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -2,7 +2,7 @@
 
 $name = 'Mageia';
 $version = '6';
-$release = 'sta2';
+$release = 'rc';
 $torrentavailable=true;
 $classical=true;
 $live=true;
@@ -137,10 +137,10 @@ input[type="radio"], input[type="submit"]  {
     <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
         <?php include '../6/nav.php'; ?>
         <p class="unstable-release-warning"><?php
-// 		_g('Be careful! This is an alpha, unstable release.');
-		_g('Be careful! This is a beta, unstable release.');
-		_g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
-//		_g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('May 2015'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
+//		_g('Be careful! This is an alpha, unstable release.');
+//		_g('Be careful! This is a beta, unstable release.');
+//		_g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
+		_g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('June 2017'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
 
 
     <div id="doc4" class="yui-t7" style="margin-bottom: 0px;">
@@ -228,7 +228,7 @@ input[type="radio"], input[type="submit"]  {
     <label for="classical" class="ui-button classical" ><?php _g('Classic Installation')?></label><?php }?>
     <?php if($live){ ?><input type="radio" id="live" value="LiveDVD" name="format" />
     <label for="live" class="ui-button live"><?php _g('Live Media');?></label><?php }?>
-    <input type="radio" id="lan" value="Boot" name="format" />
+    <input type="radio" id="lan" value="netinstall" name="format" />
     <label for="lan" class="ui-button lan"><?php _g('Network Installation')?></label>
 </div>
 <?php if( !$live || !$classical ){?>
@@ -262,7 +262,7 @@ input[type="radio"], input[type="submit"]  {
         <label for="kde" class="ui-button kde"><?php _g('Plasma Desktop')?></label>
         <input type="radio" id="gnome" value="GNOME" name="desktop" />
         <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label>
-        <input type="radio" id="xfce" value="xfce4" name="desktop" />
+        <input type="radio" id="xfce" value="Xfce" name="desktop" />
         <label for="xfce" class="ui-button xfce"><?php _g('Xfce Desktop')?></label>        
     </div>
 </div><?php }/*live*/?>
@@ -389,13 +389,13 @@ input[type="radio"], input[type="submit"]  {
                     <tr>
                         <th class="name">LiveDVD Xfce</th>
                         <td>
-                            <?php dl_link($name,$version,$release,'LiveDVD-xfce4','i586','DVD',false);
+                            <?php dl_link($name,$version,$release,'LiveDVD-Xfce','i586','DVD',false);
                             echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-xfce4','x86_64','DVD',false);
+                            dl_link($name,$version,$release,'LiveDVD-Xfce','x86_64','DVD',false);
                             echo '</td><td>';
-                            dl_link($name,$version,$release,'LiveDVD-xfce4','i586','DVD',true,$torrentavailable);
+                            dl_link($name,$version,$release,'LiveDVD-Xfce','i586','DVD',true,$torrentavailable);
                             echo '<br>';
-                            dl_link($name,$version,$release,'LiveDVD-xfce4','x86_64','DVD',true,$torrentavailable);?>
+                            dl_link($name,$version,$release,'LiveDVD-Xfce','x86_64','DVD',true,$torrentavailable);?>
                         </td>
                     <tr>                    
 
@@ -418,16 +418,16 @@ input[type="radio"], input[type="submit"]  {
                         <tbody>
                         <tr>
                         <th><?php _g('Network installer, Free Software CD')?></th>
-                        <td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
+                        <td><?php dl_link($name,$version,$release,'Netinstall','i586','CD',false);
                             echo '<br>';
-                            dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
+                            dl_link($name,$version,$release,'netinstall','x86_64','CD',false);?>
                         </td>
                     </tr>
                     <tr>
                         <th><?php _g('Network installer + nonfree firmware CD')?><br>
-                        <td><?php dl_link($name,$version,$release,'Boot-nonfree','i586','CD',false);
+                        <td><?php dl_link($name,$version,$release,'netinstall-nonfree','i586','CD',false);
                             echo '<br>';
-                            dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?>
+                            dl_link($name,$version,$release,'netinstall-nonfree','x86_64','CD',false);?>
                         </td>
                     </tr>
                         </tbody>
-- 
cgit v1.2.1