# HG changeset patch
# User jh@junetz.de
# Date 1307393166 0
#      Mon Jun 06 20:46:06 2011 +0000
# Node ID faf1aca3da0b1266813720949f9b21a7b4afa072
# Parent  8e7980a0a741a22ae28fd37a5bcd532c28a8dcdc
Bug 658807 - Update SeaMonkey website for 2.1 RC 2 release
- releases/.htaccess merged into .htaccess
- 2.1pre -> 2.1 relnote redirect added since RC2 identifies itself as 2.1pre

diff --git a/lib/config.tmpl b/lib/config.tmpl
--- a/lib/config.tmpl
+++ b/lib/config.tmpl
@@ -24,8 +24,8 @@
 [% download_linux_mb = 13 %]
 [% download_mac_mb = 22 %]
 
-[% betaversion = '2.1rc1' %]
-[% betaname = "SeaMonkey 2.1 Release Candidate 1" %]
+[% betaversion = '2.1rc2' %]
+[% betaname = "SeaMonkey 2.1 Release Candidate 2" %]
 
 [% develversion = '2.1pre' %]
 [% develdownloadbase = 'http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-2.0' %]
diff --git a/lib/sitemap.xml b/lib/sitemap.xml
--- a/lib/sitemap.xml
+++ b/lib/sitemap.xml
@@ -13,6 +13,7 @@
   <page url="news" title="News" id="news" />
 
   <page url="releases/" title="Download &amp;amp; Releases" id="releases">
+    <page url="releases/2.1rc2" title="2.1 RC 2" id="2.1rc2" hide="true" />
     <page url="releases/2.1rc1" title="2.1 RC 1" id="2.1rc1" hide="true" />
     <page url="releases/2.1b3" title="2.1 Beta 3" id="2.1b3" hide="true">
       <page url="releases/seamonkey2.1b3/" title="Release Notes" id="seamonkey2.1b3">
diff --git a/src/.htaccess b/src/.htaccess
--- a/src/.htaccess
+++ b/src/.htaccess
@@ -21,7 +21,14 @@
 RedirectMatch permanent ^/dev/trademark http://www.seamonkey-project.org/legal/trademark
 RedirectMatch permanent ^/donate https://donate.mozilla.org/page/contribute/seamonkey
 
+# 2.1rc2 shipped as 2.1pre, redirect 2.1pre to the 2.1 relnotes
+RedirectMatch permanent ^/releases/seamonkey2.1pre/ http://www.seamonkey-project.org/releases/seamonkey2.1/
+
+# redirect relnotes of -pre versions to the get involved page
+RedirectMatch temp ^/releases/seamonkey.*pre/ http://www.seamonkey-project.org/dev/get-involved
+RedirectMatch temp ^/releases/seamonkey1.5a/ http://www.seamonkey-project.org/dev/get-involved
+
 <FilesMatch "-atom(\..+)?$">
   ForceType application/atom+xml
   #ForceType application/xml
-</FilesMatch>
\ No newline at end of file
+</FilesMatch>
diff --git a/src/download.jst b/src/download.jst
--- a/src/download.jst
+++ b/src/download.jst
@@ -39,7 +39,7 @@
   "de":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "German",                   localName: "Deutsch" } },
   "el":  { "-":  { version: null,      betaversion: null,     name: "Greek",                    localName: "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE" } },
   "en":  { "us": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "English",                  localName: "English" },
-           "gb": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "English (British)",        localName: "English (British)" } },
+           "gb": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "English (British)",        localName: "English (British)" } },
   "es":  { "ar": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Latin American)", localName: "Espa\u00F1ol (de Am\u00E9rica)" },
            "es": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Spain)",          localName: "Espa\u00F1ol (de Espa\u00F1a)" } },
   "eu":  { "-":  { version: null,      betaversion: null,     name: "Basque",                   localName: "Euskara" } },
diff --git a/src/news.en.xml b/src/news.en.xml
--- a/src/news.en.xml
+++ b/src/news.en.xml
@@ -7,7 +7,20 @@
 -->
 
 <newsfeed title="SeaMonkey News" url="http://seamonkey-project.org/news">
-  <entry id="2011-05-12" showfront="true">
+  <entry id="2011-06-06" showfront="true">
+    <headline>SeaMonkey 2.1 Release Candidate 2</headline>
+    <content type="html" xml:lang="en">
+<![CDATA[<p>
+SeaMonkey 2.1 Release Candidate 2 is
+<a href="http://www.seamonkey-project.org/releases/2.1rc2">now available
+for free download</a> on the SeaMonkey website. We encourage testers to
+<a href="http://www.seamonkey-project.org/dev/get-involved">get involved</a> in
+discussing and reporting problems as well as further improving the product.
+</p>]]>
+    </content>
+  </entry>
+
+  <entry id="2011-05-12" showfront="false">
     <headline>SeaMonkey 2.1 Release Candidate 1</headline>
     <content type="html" xml:lang="en">
 <![CDATA[<p>
diff --git a/src/releases/.htaccess b/src/releases/.htaccess
deleted file mode 100755
--- a/src/releases/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-# redirect relnotes of -pre versions to the get involved page
-RedirectMatch temp ^/releases/seamonkey.*pre/ http://www.seamonkey-project.org/dev/get-involved
-RedirectMatch temp ^/releases/seamonkey1.5a/ http://www.seamonkey-project.org/dev/get-involved
diff --git a/src/releases/2.1rc1.en.html b/src/releases/2.1rc1.en.html
--- a/src/releases/2.1rc1.en.html
+++ b/src/releases/2.1rc1.en.html
@@ -23,10 +23,10 @@
 <p class="release-date">Released May 12, 2011</p>
 
 <div class="important">
-  <strong class="shout">Be careful!</strong> The SeaMonkey version available for
-  download on this page is a testing-only preview of the next generation of our
-  Internet suite. Please test it carefully, it's not yet in a state where we can
-  encourage you to use it for daily browsing and mail operations.
+  <strong class="very-strong shout">Warning!</strong> The SeaMonkey version
+  available for download on this page is an outdated testing-only preview of
+  the next generation of our Internet suite. Please test a
+  <a href="[% betaversion %]">newer preview version</a> instead of this one.
   <br>For daily use, we strongly advise you to download the
   <a href="./">current stable release</a> instead.
 </div>
diff --git a/src/releases/2.1rc2.en.html b/src/releases/2.1rc2.en.html
--- a/src/releases/2.1rc2.en.html
+++ b/src/releases/2.1rc2.en.html
@@ -20,7 +20,7 @@
 </head>
 <body>
 <h1><a name="[% smversion %]">SeaMonkey [% prettyversion %]</a></h1>
-<p class="release-date">Released May 21, 2011</p>
+<p class="release-date">Released June 6, 2011</p>
 
 <div class="important">
   <strong class="shout">Be careful!</strong> The SeaMonkey version available for
diff --git a/src/releases/index.en.html b/src/releases/index.en.html
--- a/src/releases/index.en.html
+++ b/src/releases/index.en.html
@@ -449,7 +449,7 @@
 </div>
 
 <h2><a name="[% betaversion %]">[% betaname %]</a></h2>
-<p class="release-date">Released May 12, 2011</p>
+<p class="release-date">Released June 6, 2011</p>
 
 <div class="key-point">
 <ul>
@@ -470,6 +470,7 @@
 <div class="para" id="old">
   <p>Previously released versions of SeaMonkey:</p>
   <ul class="snav">
+    <li><a href="2.1rc1">2.1 RC 1</a></li>
     <li><a href="2.1b3">2.1 Beta 3</a></li>
     <li><a href="2.1b2">2.1 Beta 2</a></li>
     <li><a href="2.1b1">2.1 Beta 1</a></li>