[Libreoffice-commits] .: Branch 'tdf-website' - download/index.php template.php

[Thorsten Behrens]

 download/index.php |   23 ++++++++++++-----------
 template.php       |    2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit cb670672f93a43669332581f3c823936d4f26629
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Dec 22 23:40:32 2010 +0100

    Switched download to 3.3.0 RC2

diff --git a/download/index.php b/download/index.php
index 73a2373..19864da 100644
--- a/download/index.php
+++ b/download/index.php
@@ -36,17 +36,17 @@ This release candidate is not intended for production use!
 
 <div id="download-nav">
     <ul id="dlnav">
-       <li class="dlnav-win32"><a href="$urlbase/3.3.0-rc1/win/x86/LibO_3.3.0rc1_Win_x86_install_multi.exe">Download and install this for the International version to be used on Microsoft Windows.</a></li>
-       <li class="dlnav-linux32"><a href="$urlbase/3.3.0-rc1/rpm/x86/LibO_3.3.0rc1_Linux_x86_install-rpm_en-US.tar.gz">Download and install this for the English version to be used on various GNU/Linux 32-bit distributions.</a></li>
-       <li class="dlnav-linux64"><a href="$urlbase/3.3.0-rc1/rpm/x86_64/LibO_3.3.0rc1_Linux_x86-64_install-rpm_en-US.tar.gz">Download and install this for the English version to be used on various GNU/Linux 64-bit distributions.</a></li>
-       <li class="dlnav-mac"><a href="$urlbase/3.3.0-rc1/mac/x86/LibO_3.3.0rc1_MacOS_x86_install_en-US.dmg">Download and install this for the English version to be used on Apple MacOS X.</a></li>
+       <li class="dlnav-win32"><a href="$urlbase/3.3.0-rc2/win/x86/LibO_3.3.0rc2_Win_x86_install_multi.exe">Download and install this for the International version to be used on Microsoft Windows.</a></li>
+       <li class="dlnav-linux32"><a href="$urlbase/3.3.0-rc2/rpm/x86/LibO_3.3.0rc2_Linux_x86_install-rpm_en-US.tar.gz">Download and install this for the English version to be used on various GNU/Linux 32-bit distributions.</a></li>
+       <li class="dlnav-linux64"><a href="$urlbase/3.3.0-rc2/rpm/x86_64/LibO_3.3.0rc2_Linux_x86-64_install-rpm_en-US.tar.gz">Download and install this for the English version to be used on various GNU/Linux 64-bit distributions.</a></li>
+       <li class="dlnav-mac"><a href="$urlbase/3.3.0-rc2/mac/x86/LibO_3.3.0rc2_MacOS_x86_install_en-US.dmg">Download and install this for the English version to be used on Apple MacOS X.</a></li>
        <li class="dlnav-source"><a href="$download_source">Click here to download the tarball containing the source code.</a></li>
     </ul>
 
     <p>You can also <a href="http://tracker.documentfoundation.org:6969">download using BitTorrent</a>,
-    or <a href="$urlbase/3.3.0-rc1">browse all the RC1 installation packages</a> to get unofficial
-       Debian packages (<a href="$urlbase/3.3.0-rc1/deb/x86/LibO_3.3.0rc1_Linux_x86_install-deb_en-US.tar.gz">32-bit .debs</a> 
-    or <a href="$urlbase/3.3.0-rc1/deb/x86_64/LibO_3.3.0rc1_Linux_x86-64_install-deb_en-US.tar.gz">64-bit .debs</a>), or language packs.</p>
+    or <a href="$urlbase/3.3.0-rc2">browse all the RC2 installation packages</a> to get unofficial
+       Debian packages (<a href="$urlbase/3.3.0-rc2/deb/x86/LibO_3.3.0rc2_Linux_x86_install-deb_en-US.tar.gz">32-bit .debs</a> 
+    or <a href="$urlbase/3.3.0-rc2/deb/x86_64/LibO_3.3.0rc2_Linux_x86-64_install-deb_en-US.tar.gz">64-bit .debs</a>), or language packs.</p>
 </div>
 
 <h3 id="release-notes">Release Notes</h3>
@@ -54,16 +54,17 @@ This release candidate is not intended for production use!
 <p>There are a number of known issues being worked on:</p>
 <ul class="list-libreoffice">
 <li>The Windows build is an International build - you can choose the user interface language that 
-    is suitable for you. The help content is not included. We are working on the online version. 
-    Alternatively, it will be possible to install it separately.</li>
+    is suitable for you. The help content is not included, but using an online version. 
+    Alternatively, there are separate helppacks available. Please browse <a href="$urlbase/3.3.0-rc2">the archives</a> 
+    to get the helppack pack you need for your platform.</li>
 <li>The Linux and MacOSX builds are English builds with the possibility to install language packs.
-    Please browse <a href="$urlbase/3.3.0-rc1">the archives</a> to get the language pack you need 
+    Please browse <a href="$urlbase/3.3.0-rc2">the archives</a> to get the language pack you need 
     for your platform.</li>
 <li>The LibreOffice branding and renaming is new and work in progress. You may still see old graphics, 
     icons or websites. So please bear with us. This also applies to
     the BrOffice.org branding - applicable in Brazil.</li>
 <li>Filters for the legacy StarOffice binary formats may be missing.</li>
-+<li>More detailed release notes are <a href="http://wiki.documentfoundation.org/Releases/3.3/RC1">available in our wiki.</a>
++<li>More detailed release notes are <a href="http://wiki.documentfoundation.org/Releases/3.3/RC2">available in our wiki.</a>
 </ul>
 
 <h3>Keeping Up With the Progress</h3>
diff --git a/template.php b/template.php
index eff489f..01bb4e0 100644
--- a/template.php
+++ b/template.php
@@ -138,7 +138,7 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
 $freedesktop_name="libreoffice";
 $freedesktop_cgit="http://cgit.freedesktop.org/$freedesktop_name";
 $download_binaries="http://download.documentfoundation.org/libreoffice/testing";
-$download_source="http://download.documentfoundation.org/libreoffice/src/libreoffice-build-3.3.0.1.tar.gz";
+$download_source="http://download.documentfoundation.org/libreoffice/src/libreoffice-build-3.3.0.2.tar.gz";
 
 $rightnavigation = <<<EOT