From 87f218f4c52d50d9af2e1113c6a0f4c0c86a604f Mon Sep 17 00:00:00 2001
From: Oliver Burger <obgr_seneca@mageia.org>
Date: Wed, 18 Apr 2012 14:34:15 +0000
Subject: changes for beta3

---
 en/2/index.php | 87 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 41 deletions(-)

(limited to 'en/2')

diff --git a/en/2/index.php b/en/2/index.php
index 0016bd84e..1a50e0cdf 100644
--- a/en/2/index.php
+++ b/en/2/index.php
@@ -6,8 +6,8 @@ include 'locales.php';
 
 $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
 
-$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 2 beta2</em>');
-$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2 beta2');
+$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 2 beta3</em>');
+$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2 beta3');
 
 require '../downloads/lib.php';
 ?>
@@ -28,7 +28,7 @@ require '../downloads/lib.php';
     <div id="doc4" class="yui-t7">
         <?php include 'nav.php'; ?>
         <div id="hd" role="banner"><h1><a id="logo" href="/<?php echo $locale; ?>/"><span>Mageia</span></a> <span class="lsep">|</span>
-            <span class="subh">2 <em class="tag">beta2</em></span></h1></div>
+            <span class="subh">2 <em class="tag">beta3</em></span></h1></div>
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para">
@@ -40,8 +40,8 @@ require '../downloads/lib.php';
             <div class="yui-ge bb1">
                 <div class="yui-u first rb1">
                     <div class="para">
-                        <h2>Download and test Mageia 2 beta2</h2>
-                        <p>You can check the <a href="https://wiki.mageia.org/en/Mageia_2_beta2">release notes on the wiki</a>:
+                        <h2>Download and test Mageia 2 beta3</h2>
+                        <p>You can check the <a href="https://wiki.mageia.org/en/Mageia_2_beta3">release notes on the wiki</a>:
                             what's new, what to expect, what to test, how to report and contribute.</p>
                         <?php /*
                         <p>Major features planned for the final release notably include:</p>
@@ -61,18 +61,25 @@ require '../downloads/lib.php';
                         */ ?>
                     </div>
                     <div class="para">
-                        <h3>Full, exclusively Free Software DVDs</h3>
+                        <h3>Full, exclusively Free Software DVDs and dual arch CD</h3>
                         <ul>
-                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-i586-DVD.iso">Mageia 2 beta2 32bit DVD</a>,
-                              <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-i586-DVD.iso&amp;torrent=1">torrent</a></li>
-                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-x86_64-DVD.iso">Mageia 2 beta2 64bit DVD</a>,
-                              <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-x86_64-DVD.iso&amp;torrent=1">torrent</a></li>
+                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-i586-DVD.iso">Mageia 2 beta3 32bit DVD</a>,
+                              <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-i586-DVD.iso&amp;torrent=1">torrent</a></li>
+                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-x86_64-DVD.iso">Mageia 2 beta3 64bit DVD</a>,
+                              <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-x86_64-DVD.iso&amp;torrent=1">torrent</a></li>
+                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-dual-CD.iso">Mageia 2 beta3 dual CD</a>,
+                              <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-dual-CD.iso&amp;torrent=1">torrent</a></li>
                         </ul>
-                        <p class="dlinfo warn">Note that these DVD ISOs are made of Free Software exclusively.
+                        <p class="dlinfo warn">Note that these DVD and CD 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 <em>at install time</em>,
-                            you should go with above LiveCDs instead.
+                            you should go with below LiveCDs instead.
                             You may, if you will, add nonfree software repository <em>after</em> the installation.</p>
+                        <p class="dlinfo warn"><strong>Please note</strong>, there is a problem with notebooks using INTEL and AMD/ATI graphics. See
+                            <a href=https://wiki.mageia.org/en/Mageia_2_Errata#Laptop_with_both_Intel_and_ATI_graphics_hardware>the errata</a>
+                            about this.</p>
+                        <p class="dlinfo warn">Please note there is a bug about LiveCDs and NVIDIA graphic cards. A workarround can be found in
+			    <a href="https://wiki.mageia.org/en/Mageia_2_Errata#LiveCD_and_Nvidia_card">the Errata</a></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>
@@ -80,29 +87,28 @@ require '../downloads/lib.php';
                     <div class="para">
                         <h3>Wired network-based install CD</h3>
                         <ul>
-                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-Boot-i586-CD.iso">32bit</a></li>
-                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-Boot-x86_64-CD.iso">64bit</a></li>
+                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-Boot-i586-CD.iso">32bit</a></li>
+                            <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-Boot-x86_64-CD.iso">64bit</a></li>
                         </ul>
                         <p class="dlinfo">Good to download (about 40 MB) and boot quickly into install mode
                           from <em>wired</em> network or local disk.</p>
                     </div>
                     <div class="para">
                         <h3>LiveCDs, for a live test or full install</h3>
-                        <p>beta2 LiveCDs still have blocking issues; will be available later.</p>
-                        <?php /*
+                        <!--<p>beta2 LiveCDs still have blocking issues; will be available later.</p>-->
                         <table class="dlt2">
                             <thead><tr><th></th><th>GNOME</th><th>KDE</th></tr></thead>
                             <tbody>
                                 <tr>
                                     <th>Europe 1</th>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Europe1-Americas-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Europe1-Americas-i586-CD.iso&amp;torrent=1">torrent</a><br>
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso">64bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso&amp;torrent=1">torrent</a></td>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Europe1-Americas-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Europe1-Americas-i586-CD.iso&amp;torrent=1">torrent</a><br>
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso">64bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Europe1-Americas-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Europe1-Americas-i586-CD.iso&amp;torrent=1">torrent</a><br>
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso">64bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Europe1-Americas-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Europe1-Americas-i586-CD.iso&amp;torrent=1">torrent</a><br>
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso">64bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso&amp;torrent=1">torrent</a></td>
                                 </tr>
                                 <tr>
                                     <td colspan="3"><p class="dlinfo">Included locales:
@@ -111,10 +117,10 @@ require '../downloads/lib.php';
                                 </tr>
                                 <tr>
                                     <th>Europe 2</th>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Europe2-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Europe2-i586-CD.iso&amp;torrent=1">torrent</a></td>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Europe2-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Europe2-i586-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Europe2-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Europe2-i586-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Europe2-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Europe2-i586-CD.iso&amp;torrent=1">torrent</a></td>
                                 </tr>
                                 <tr>
                                     <td colspan="3"><p class="dlinfo">Included locales:
@@ -123,10 +129,10 @@ require '../downloads/lib.php';
                                 </tr>
                                 <tr>
                                     <th>Africa, India</th>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Africa-India-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Africa-India-i586-CD.iso&amp;torrent=1">torrent</a></td>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Africa-India-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Africa-India-i586-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Africa-India-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Africa-India-i586-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Africa-India-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Africa-India-i586-CD.iso&amp;torrent=1">torrent</a></td>
                                 </tr>
                                 <tr>
                                     <td colspan="3"><p class="dlinfo">Included locales:
@@ -134,10 +140,10 @@ require '../downloads/lib.php';
                                 </tr>
                                 <tr>
                                     <th>Asia</th>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Asia-Noindia-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-GNOME-Asia-Noindia-i586-CD.iso&amp;torrent=1">torrent</a></td>
-                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Asia-Noindia-i586-CD.iso">32bit</a>,
-                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta2-LiveCD-KDE4-Asia-Noindia-i586-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Asia-Noindia-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-GNOME-Asia-Noindia-i586-CD.iso&amp;torrent=1">torrent</a></td>
+                                    <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Asia-Noindia-i586-CD.iso">32bit</a>,
+                                      <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta3-LiveCD-KDE4-Asia-Noindia-i586-CD.iso&amp;torrent=1">torrent</a></td>
                                 </tr>
                                 <tr>
                                     <td colspan="3"><p class="dlinfo">Included locales:
@@ -147,13 +153,12 @@ require '../downloads/lib.php';
                             </tbody>
                         </table>
                         <p class="dlinfo">Download is approximately 700MB.</p>
-                        */ ?>
                     </div>
                 </div>
                 <div class="yui-u">
                     <div class="para">
-                        <h3><a href="https://wiki.mageia.org/en/Mageia_2_beta2">Release notes</a></h3>
-                        <p>are <a href="https://wiki.mageia.org/en/Mageia_2_beta2">on the wiki</a>!</p>
+                        <h3><a href="https://wiki.mageia.org/en/Mageia_2_beta3">Release notes</a></h3>
+                        <p>are <a href="https://wiki.mageia.org/en/Mageia_2_beta3">on the wiki</a>!</p>
                     </div>
                     <div class="para">
                         <h3>Release calendar</h3>
@@ -164,8 +169,8 @@ require '../downloads/lib.php';
                         .relcal li.now { background: #eee; color: #333; }
                         </style>
                         <ul class="relcal">
-                            <li class="now">beta2: March&nbsp;15<sup>th</sup></li>
-                            <li>beta3: April&nbsp;14<sup>th</sup></li>
+                            <!--<li class="now">beta2: March&nbsp;15<sup>th</sup></li>-->
+                            <li class="now">beta3: April&nbsp;14<sup>th</sup></li>
                             <li><abbr title="release candidate">rc</abbr>: May&nbsp;2<sup>nd</sup></li>
                             <li>final: May&nbsp;15<sup>th</sup></li>
                         </ul>
-- 
cgit v1.2.1