diff options
Diffstat (limited to 'en/2')
| -rw-r--r-- | en/2/index.php | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/en/2/index.php b/en/2/index.php index d3e4599f5..62d9e9331 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 beta1</em>'); -$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2 beta1'); +$_t['page_h1'] = sprintf($_t['page_h1'], '<em class="tag">Mageia 2 beta2</em>'); +$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2 beta2'); 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">beta1</em></span></h1></div> + <span class="subh">2 <em class="tag">beta2</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 beta1</h2> - <p>You can check the <a href="https://wiki.mageia.org/en/Mageia_2_beta1">release notes on the wiki</a>: + <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>: 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> @@ -63,10 +63,10 @@ require '../downloads/lib.php'; <div class="para"> <h3>Full, exclusively Free Software DVDs</h3> <ul> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-i586-DVD.iso">Mageia 2 beta1 32bit DVD</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-i586-DVD.iso&torrent=1">torrent</a></li> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-x86_64-DVD.iso">Mageia 2 beta1 64bit DVD</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-x86_64-DVD.iso&torrent=1">torrent</a></li> + <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&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&torrent=1">torrent</a></li> </ul> <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. @@ -80,29 +80,29 @@ 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-beta1-Boot-i586-CD.iso">32bit</a></li> - <li><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-Boot-x86_64-CD.iso">64bit</a></li> + <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> </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>beta1 LiveCDs still have blocking issues; will be available later.</p> + <p>beta2 LiveCDs still have blocking issues; will be available later.</p> <?php /* <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-beta1-LiveCD-GNOME-Europe1-Americas-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Europe1-Americas-i586-CD.iso&torrent=1">torrent</a><br> - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso">64bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Europe1-Americas-x86_64-CD.iso&torrent=1">torrent</a></td> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Europe1-Americas-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Europe1-Americas-i586-CD.iso&torrent=1">torrent</a><br> - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso">64bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso&torrent=1">torrent</a></td> + <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&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&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&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&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -111,10 +111,10 @@ require '../downloads/lib.php'; </tr> <tr> <th>Europe 2</th> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Europe2-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Europe2-i586-CD.iso&torrent=1">torrent</a></td> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Europe2-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Europe2-i586-CD.iso&torrent=1">torrent</a></td> + <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&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&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -123,10 +123,10 @@ require '../downloads/lib.php'; </tr> <tr> <th>Africa, India</th> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Africa-India-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Africa-India-i586-CD.iso&torrent=1">torrent</a></td> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Africa-India-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Africa-India-i586-CD.iso&torrent=1">torrent</a></td> + <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&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&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -134,10 +134,10 @@ require '../downloads/lib.php'; </tr> <tr> <th>Asia</th> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Asia-Noindia-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-GNOME-Asia-Noindia-i586-CD.iso&torrent=1">torrent</a></td> - <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Asia-Noindia-i586-CD.iso">32bit</a>, - <a rel="nofollow" href="../downloads/get/?q=Mageia-2-beta1-LiveCD-KDE4-Asia-Noindia-i586-CD.iso&torrent=1">torrent</a></td> + <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&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&torrent=1">torrent</a></td> </tr> <tr> <td colspan="3"><p class="dlinfo">Included locales: @@ -152,8 +152,8 @@ require '../downloads/lib.php'; </div> <div class="yui-u"> <div class="para"> - <h3><a href="https://wiki.mageia.org/en/Mageia_2_beta1">Release notes</a></h3> - <p>are <a href="https://wiki.mageia.org/en/Mageia_2_beta1">on the wiki</a>!</p> + <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> </div> <div class="para"> <h3>Release calendar</h3> @@ -164,8 +164,7 @@ require '../downloads/lib.php'; .relcal li.now { background: #eee; color: #333; } </style> <ul class="relcal"> - <li class="now">beta1: February 21<sup>st</sup></li> - <li>beta2: March 15<sup>th</sup></li> + <li class="now">beta2: March 15<sup>th</sup></li> <li><abbr title="release candidate">rc</abbr>: April 10<sup>th</sup></li> <li>final: May 3<sup>rd</sup></li> </ul> |