# HG changeset patch
# User jh@junetz.de
# Date 1308764651 0
#      Wed Jun 22 17:44:11 2011 +0000
# Node ID a451c70feaacf424751d705bc501cbf16e3fd904
# Parent  1b4d5facd0b004d1f14b8783f02d41117963c7cf
Bug 665684 - Update SeaMonkey website for 2.2 Beta 1 release
Part 2: Release it!

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 = 19 %]
 [% download_mac_mb = 34 %]
 
-[% betaversion = '2.1rc2' %]
-[% betaname = "SeaMonkey 2.1 Release Candidate 2" %]
+[% betaversion = '2.2b1' %]
+[% betaname = "SeaMonkey 2.2 Beta 1" %]
 
-[% develversion = '2.2a1' %]
+[% develversion = '2.4a1' %]
 [% develdownloadbase = 'http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk' %]
diff --git a/lib/sitemap.xml b/lib/sitemap.xml
--- a/lib/sitemap.xml
+++ b/lib/sitemap.xml
@@ -13,6 +13,16 @@
   <page url="news" title="News" id="news" />
 
   <page url="releases/" title="Download &amp;amp; Releases" id="releases">
+    <page url="releases/2.2b1" title="2.2 Beta 1" id="2.2b1" hide="false">
+      <page url="releases/seamonkey2.2b1/" title="Release Notes" id="seamonkey2.2b1">
+        <page url="releases/seamonkey2.2b1/changes" title="What's New" id="seamonkey2.2b1-changes" />
+      </page>
+    </page>
+    <page url="releases/2.1" title="2.1" id="2.1" hide="false">
+      <page url="releases/seamonkey2.1/" title="Release Notes" id="seamonkey2.1">
+        <page url="releases/seamonkey2.1/changes" title="What's New" id="seamonkey2.1-changes" />
+      </page>
+    </page>
     <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">
diff --git a/src/download.jst b/src/download.jst
--- a/src/download.jst
+++ b/src/download.jst
@@ -29,7 +29,7 @@
   "af":  { "za": { version: null,      betaversion: null,     name: "Afrikaans",                localName: "Afrikaans" } },
   "ast": { "es": { version: null,      betaversion: null,     name: "Asturian",                 localName: "Asturianu" } },
   "ar":  { "-":  { version: null,      betaversion: null,     name: "Arabic",                   localName: "\u0639\u0631\u0628\u064A" } },
-  "be":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Belarusian",               localName: "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u043A\u0430\u044F" } },
+  "be":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Belarusian",               localName: "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u043A\u0430\u044F" } },
   "bg":  { "-":  { version: null,      betaversion: null,     name: "Bulgarian",                localName: "\u0411\u044A\u043B\u0433\u0430\u0440\u0441\u043A\u0438" } },
   "br":  { "fr": { version: null,      betaversion: null,     name: "Breton",                   localName: "Brezhoneg" } },
   "ca":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Catalan",                  localName: "Catal\u00E0" } },
@@ -43,7 +43,7 @@
   "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" } },
-  "fi":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Finnish",                  localName: "Suomi" } },
+  "fi":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Finnish",                  localName: "Suomi" } },
   "fr":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "French",                   localName: "Fran\u00e7ais" } },
   "fy":  { "nl": { version: null,      betaversion: null,     name: "Frisian",                  localName: "Frysk" } },
   "ga":  { "ie": { version: null,      betaversion: null,     name: "Irish",                    localName: "Gaeilge" } },
@@ -63,16 +63,16 @@
   "nn":  { "no": { version: null,      betaversion: null,     name: "Norwegian (Nynorsk)",      localName: "Norsk nynorsk" } },
   "nl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Dutch",                    localName: "Nederlands" } },
   "pa":  { "in": { version: null,      betaversion: null,     name: "Punjabi",                  localName: "\u0A2A\u0A70\u0A1C\u0A3E\u0A2C\u0A40" } },
-  "pl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Polish",                   localName: "Polski" } },
+  "pl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Polish",                   localName: "Polski" } },
   "pt":  { "br": { version: null,      betaversion: null,     name: "Portuguese (Brazilian)",   localName: "Portugu\u00EAs (do Brasil)" },
-           "pt": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Portuguese (Portugal)",    localName: "Portugu\u00EAs (Europeu)" } },
+           "pt": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Portuguese (Portugal)",    localName: "Portugu\u00EAs (Europeu)" } },
   "ro":  { "-":  { version: null,      betaversion: null,     name: "Romanian",                 localName: "Rom\u00E2n\u0103" } },
   "ru":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Russian",                  localName: "\u0420\u0443\u0441\u0441\u043A\u0438\u0439" } },
   "sk":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Slovak",                   localName: "Slovensk\u00FD" } },
   "sl":  { "-":  { version: null,      betaversion: null,     name: "Slovenian",                localName: "Slovensko" } },
   "sq":  { "-":  { version: null,      betaversion: null,     name: "Albanian",                 localName: "Shqipe" } },
-  "sv":  { "se": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Swedish",                  localName: "Svenska" } },
-  "tr":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Turkish",                  localName: "T\u00FCrk\u00E7e" } },
+  "sv":  { "se": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Swedish",                  localName: "Svenska" } },
+  "tr":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Turkish",                  localName: "T\u00FCrk\u00E7e" } },
   "zh":  { "cn": { version: null,      betaversion: null,     name: "Chinese (Simplified)",     localName: "\u4E2D\u6587 (\u7B80\u4F53)" },
            "tw": { version: null,      betaversion: null,     name: "Chinese (Traditional)",    localName: "\u6b63\u9ad4\u4e2d\u6587 (\u7E41\u9AD4)" } }
 };
diff --git a/src/news.en.xml b/src/news.en.xml
--- a/src/news.en.xml
+++ b/src/news.en.xml
@@ -7,6 +7,19 @@
 -->
 
 <newsfeed title="SeaMonkey News" url="http://seamonkey-project.org/news">
+  <entry id="2011-06-22" showfront="true">
+    <headline>SeaMonkey 2.2 Beta 1</headline>
+    <content type="html" xml:lang="en">
+<![CDATA[<p>
+SeaMonkey 2.2 Beta 1 is
+<a href="http://www.seamonkey-project.org/releases/2.2b1">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-06-10" showfront="true">
     <headline>SeaMonkey 2.1</headline>
     <content type="html" xml:lang="en">
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
@@ -23,10 +23,10 @@
 <p class="release-date">Released June 6, 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.2b1.en.html b/src/releases/2.2b1.en.html
--- a/src/releases/2.2b1.en.html
+++ b/src/releases/2.2b1.en.html
@@ -18,7 +18,7 @@
 </head>
 <body>
 <h1><a name="[% smversion %]">SeaMonkey [% prettyversion %]</a></h1>
-<p class="release-date">Released June 21, 2011</p>
+<p class="release-date">Released June 22, 2011</p>
 
 <div class="important">
   <strong class="shout">Be careful!</strong> The SeaMonkey version available for
@@ -38,7 +38,7 @@
 
 <div class="key-point">
 <ul>
-  <li><a href="seamonkey[% smversion %]/">Release Notes</a> - The release notes describe
+  <li><a href="seamonkey2.2/">Release Notes</a> - The release notes describe
   new changes, system requirements, installation instructions, and known issues
   in this release - please read them carefully before using this version of
   SeaMonkey!
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
@@ -70,7 +70,7 @@
 
 <div class="key-point">
 <ul>
-  <li><a href="seamonkey[% smversion %]/">Release Notes</a> - The release notes describe
+  <li><a href="seamonkey2.2/">Release Notes</a> - The release notes describe
   new changes, system requirements, installation instructions, and known issues
   in this release - please read them carefully before using this version of
   SeaMonkey!
@@ -411,13 +411,12 @@
 </dl>
 </div>
 
-<!--
 <h2><a name="[% betaversion %]">[% betaname %]</a></h2>
-<p class="release-date">Released June 6, 2011</p>
+<p class="release-date">Released June 22, 2011</p>
 
 <div class="key-point">
 <ul>
-  <li><a href="seamonkey2.1/">Release Notes</a> - The release notes describe
+  <li><a href="seamonkey2.2/">Release Notes</a> - The release notes describe
   new changes, system requirements, installation instructions, and known issues
   in this release - please read them carefully before using this version of
   SeaMonkey!
@@ -428,7 +427,6 @@
   </li>
 </ul>
 </div>
--->
 
 <hr>
 
diff --git a/src/releases/seamonkey2.2/relnote.var b/src/releases/seamonkey2.2/relnote.var
--- a/src/releases/seamonkey2.2/relnote.var
+++ b/src/releases/seamonkey2.2/relnote.var
@@ -1,5 +1,5 @@
-[%- rnote.version = "2.2b1" -%]
-[%- rnote.name = "SeaMonkey 2.2 Beta 1" -%]
+[%- rnote.version = "2.2" -%]
+[%- rnote.name = "SeaMonkey 2.2" -%]
 [%- rnote.relativeto.version = "2.1" -%]
 [%- rnote.relativeto.name = "SeaMonkey 2.1" -%]
 [%- rnote.relativeto.stable.version = "2.1" -%]