From e38cc3a7b0a7096c94353a2ba29421493a0ea461 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Dec 2011 11:21:24 +0100
Subject: [PATCH] Mark release 2.2

---
 doc/compress.html     |  1 +
 doc/oldrelease.html   | 19 ++++++++++++++++++
 doc/upgrade_v2.2.html |  5 ++---
 index.html            | 46 ++++++++++++++++++++++---------------------
 4 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 618c3c439e..cd48c3ba54 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -27,6 +27,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.2;f=">2.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.18;f=">2.18</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.16;f=">2.16</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.15;f=">2.15</option>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index 8f99f73c03..fa0d8506bb 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -15,6 +15,25 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 <img src="baboon.png" class="logo" alt="logo"/>/* Old release history */
 
 </pre>
+  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.1.zip">Version 2.1</a>:</p>
+  <p class="rel-note">Add
+  a <a href="manual.html#option_theme">theme</a> system
+  (<a href="../demo/theme.html">demo</a>). Note that this is not
+  backwards-compatible—you'll have to update your styles and
+  modes!</p>
+
+  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p>
+  <ul class="rel-note">
+    <li>Add a <a href="../mode/lua/index.html">Lua mode</a>.</li>
+    <li>Fix reverse-searching for a regexp.</li>
+    <li>Empty lines can no longer break highlighting.</li>
+    <li>Rework scrolling model (the outer wrapper no longer does the scrolling).</li>
+    <li>Solve horizontal jittering on long lines.</li>
+    <li>Add <a href="../demo/runmode.html">runmode.js</a>.</li>
+    <li>Immediately re-highlight text when typing.</li>
+    <li>Fix problem with 'sticking' horizontal scrollbar.</li>
+  </ul>
+
   <p class="rel">26-05-2011: <a href="http://codemirror.net/codemirror-2.01.zip">Version 2.01</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/smalltalk/index.html">Smalltalk mode</a>.</li>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index c34e513829..e8db693dfb 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -17,9 +17,8 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 
 <div class="left">
 
-<p>There are a few things in the current HEAD (which will be released
-as 2.2 somewhere in December), that require some care when
-upgrading.</p>
+<p>There are a few things in the 2.2 release that require some care
+when upgrading.</p>
 
 <h2>No more default.css</h2>
 
diff --git a/index.html b/index.html
index 9c0ae96cdf..aa8856b038 100644
--- a/index.html
+++ b/index.html
@@ -199,12 +199,12 @@ <h2 id="commercial">Commercial support</h2>
   <h2>Support CodeMirror</h2>
 
   <ul>
-    <li><strong>Donate</strong>
+    <li>Donate
     (<span onclick="document.getElementById('paypal').submit();"
     class="quasilink">Paypal</span>
     or <span onclick="document.getElementById('bankinfo').style.display = 'block';"
              class="quasilink">bank</span>)</li>
-    <li>Purchase <strong><a href="#commercial">commercial support</a></strong></li>
+    <li>Purchase <a href="#commercial">commercial support</a></li>
   </ul>
 
   <p id="bankinfo" style="display: none;">
@@ -218,7 +218,28 @@ <h2>Support CodeMirror</h2>
 
   <h2>Releases:</h2>
 
-  <p class="rel"><strong>Note:</strong> <a href="doc/upgrade_v2.2.html">incompatible changes</a> in HEAD</p>
+  <p class="rel">20-12-2011: <a href="http://codemirror.net/codemirror-2.2.zip">Version 2.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Slightly incompatible API changes. Read <a href="doc/upgrade_v2.2.html">this</a>.</li>
+    <li>New approach
+    to <a href="doc/manual.html#option_extraKeys">binding</a> keys,
+    support for <a href="doc/manual.html#option_keyMap">custom
+    bindings</a>.</li>
+    <li>Support for overwrite (insert).</li>
+    <li><a href="doc/manual.html#option_tabSize">Custom-width</a>
+    and <a href="demo/visibletabs.html">stylable</a> tabs.</li>
+    <li>Moved more code into <a href="doc/manual.html#addons">add-on scripts</a>.</li>
+    <li>Support for sane vertical cursor movement in wrapped lines.</li>
+    <li>More reliable handling of
+    editing <a href="doc/manual.html#markText">marked text</a>.</li>
+    <li>Add minimal <a href="demo/emacs.html">emacs</a>
+    and <a href="demo/vim.html">vim</a> bindings.</li>
+    <li>Rename <code>coordsFromIndex</code>
+    to <a href="doc/manual.html#posFromIndex"><code>posFromIndex</code></a>,
+    add <a href="doc/manual.html#indexFromPos"><code>indexFromPos</code></a>
+    method.</li>
+  </ul>
 
   <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
   <p class="rel-note">Fixes <code>TextMarker.clear</code>, which is broken in 2.17.</p>
@@ -306,25 +327,6 @@ <h2>Releases:</h2>
     <li>Add <a href="demo/fullscreen.html">full-screen editing</a> and <a href="demo/changemode.html">mode-changing</a> demos.</li>
   </ul>
 
-  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.1.zip">Version 2.1</a>:</p>
-  <p class="rel-note">Add
-  a <a href="doc/manual.html#option_theme">theme</a> system
-  (<a href="demo/theme.html">demo</a>). Note that this is not
-  backwards-compatible—you'll have to update your styles and
-  modes!</p>
-
-  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p>
-  <ul class="rel-note">
-    <li>Add a <a href="mode/lua/index.html">Lua mode</a>.</li>
-    <li>Fix reverse-searching for a regexp.</li>
-    <li>Empty lines can no longer break highlighting.</li>
-    <li>Rework scrolling model (the outer wrapper no longer does the scrolling).</li>
-    <li>Solve horizontal jittering on long lines.</li>
-    <li>Add <a href="demo/runmode.html">runmode.js</a>.</li>
-    <li>Immediately re-highlight text when typing.</li>
-    <li>Fix problem with 'sticking' horizontal scrollbar.</li>
-  </ul>
-
   <p><a href="doc/oldrelease.html">Older releases...</a></p>
 
 </div></div>