# HG changeset patch
# User jh@junetz.de
# Date 1315846344 0
#      Mon Sep 12 16:52:24 2011 +0000
# Node ID a45ab178a802d919b8e07b2839c5286c8dd339d4
# Parent  86059518520edd68b173472c9725cabe9e987cab
Bug 686174 - Update SeaMonkey website for 2.4 Beta 2 release

diff --git a/lib/config.tmpl b/lib/config.tmpl
--- a/lib/config.tmpl
+++ b/lib/config.tmpl
@@ -26,7 +26,7 @@
 [% download_mac_mb = 34 %]
 
 [% betabaseversion = '2.4' %]
-[% betabetaversion = '1' %]
+[% betabetaversion = '2' %]
 [% betaversion = "${betabaseversion}b${betabetaversion}" %]
 [% betaname = "SeaMonkey ${betabaseversion} Beta ${betabetaversion}" %]
 
diff --git a/lib/sitemap.xml b/lib/sitemap.xml
--- a/lib/sitemap.xml
+++ b/lib/sitemap.xml
@@ -13,11 +13,12 @@
   <page url="news" title="News" id="news" />
 
   <page url="releases/" title="Download &amp;amp; Releases" id="releases">
-    <page url="releases/2.4b1" title="2.4 Beta 1" id="2.4b1" hide="false">
+    <page url="releases/2.4b2" title="2.4 Beta 2" id="2.4b2" hide="false">
       <page url="releases/seamonkey2.4/" title="Release Notes" id="seamonkey2.4">
         <page url="releases/seamonkey2.4/changes" title="What's New" id="seamonkey2.4-changes" />
       </page>
     </page>
+    <page url="releases/2.4b1" title="2.4 Beta 1" id="2.4b1" hide="true" />
     <page url="releases/2.3.3" title="2.3.3" id="2.3.3" hide="false">
       <page url="releases/seamonkey2.3/" title="Release Notes" id="seamonkey2.3">
         <page url="releases/seamonkey2.3/changes" title="What's New" id="seamonkey2.3-changes" />
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-09-07" showfront="true">
+  <entry id="2011-09-12" showfront="true">
+    <headline>SeaMonkey 2.4 Beta 2</headline>
+    <content type="html" xml:lang="en">
+<![CDATA[<p>
+SeaMonkey 2.4 Beta 2 is
+<a href="http://www.seamonkey-project.org/releases/2.4b2">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-09-07" showfront="false">
     <headline>SeaMonkey 2.4 Beta 1</headline>
     <content type="html" xml:lang="en">
 <![CDATA[<p>
diff --git a/src/releases/2.4b1.en.html b/src/releases/2.4b1.en.html
--- a/src/releases/2.4b1.en.html
+++ b/src/releases/2.4b1.en.html
@@ -19,7 +19,7 @@
 </head>
 <body>
 <h1><a name="[% smversion %]">SeaMonkey [% prettyversion %]</a></h1>
-<p class="release-date">Released September 6, 2011</p>
+<p class="release-date">Released September 7, 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
@@ -427,6 +427,8 @@
 <div class="para" id="old">
   <p>Previously released versions of SeaMonkey:</p>
   <ul class="snav">
+    <li><a href="2.4b1">2.4 Beta 1</a></li>
+    <!--<li><a href="2.3.3">2.3.3</a></li>-->
     <li><a href="2.3.2">2.3.2</a></li>
     <li><a href="2.3.1">2.3.1</a></li>
     <li><a href="2.3">2.3</a></li>
diff --git a/src/releases/seamonkey2.4/changes.en.html b/src/releases/seamonkey2.4/changes.en.html
--- a/src/releases/seamonkey2.4/changes.en.html
+++ b/src/releases/seamonkey2.4/changes.en.html
@@ -28,6 +28,7 @@
   <li><a href="#new">New Features and Fixes</a>
     <ul>
       <li><a href="#major">Major Changes</a></li>
+      <li><a href="#fixesB2">Fixes in Beta 2</a></li>
       <li><a href="#fixesB1">Fixes in Beta 1</a></li>
     </ul>
   </li>
@@ -44,6 +45,18 @@
 </div>
 
 <div class="fieldset">
+<span class="legend" id="fixesB2">Fixes in Beta 2</span>
+<ul>
+  <li>An Ampersand (&amp;) on the URL broke Translate Page (<a
+    href="https://bugzilla.mozilla.org/show_bug.cgi?id=683422">bug 683422</a>).</li>
+  <li>'news:' URIs could not be opened in a new tab/window (<a
+    href="https://bugzilla.mozilla.org/show_bug.cgi?id=219821">bug 219821</a>).</li>
+  <li>Tags were lost with condstore servers (<a
+    href="https://bugzilla.mozilla.org/show_bug.cgi?id=678148">bug 678148</a>).</li>
+</ul>
+</div>
+
+<div class="fieldset">
 <span class="legend" id="fixesB1">Fixes in Beta 1</span>
 <ul>
   <li>Some parts of Sync setup and preferences (e.g. Change Password and My