From 84af6b68676eabacd12499490744ca14cff3df99 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Thu, 22 Jul 2010 22:16:13 +1000
Subject: Getting ready for 2.20.

---
 doc/ScintillaDownload.html | 10 +++++-----
 doc/ScintillaHistory.html  | 11 +++++++++++
 doc/index.html             | 11 ++++-------
 version.txt                |  2 +-
 win32/ScintRes.rc          |  8 ++++----
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 4306868ce..ec7d3d27c 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -25,9 +25,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla220.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla220.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 2.12
+       Release 2.20
     </h3>
     <h4>
        Source Code
@@ -49,8 +49,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.zip?download">zip format</a> (1160K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla212.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla220.zip?download">zip format</a> (1160K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla220.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 1c1775018..3e0e3be1d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -360,6 +360,17 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite220.zip?download">Release 2.20</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 July 2010.
+	</li>
+	<li>
+	Object lexers.
+	</li>
+    </ul>
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite212.zip?download">Release 2.12</a>
     </h3>
diff --git a/doc/index.html b/doc/index.html
index d783e33ec..dd23f9abc 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20100601" />
+    <meta name="Date.Modified" content="20100728" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 2.12<br />
-           Site last modified June 1 2010</font>
+          <font color="#FFCC99" size="3"> Release version 2.20<br />
+           Site last modified July 28 2010</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,14 +71,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 2.20 implements lexers as objects so they may maintain additional state.</li>
       <li>Version 2.12 improves drawing speed and fixes bugs.</li>
       <li>Version 2.11 fixes compatibility with the C language.</li>
       <li>Version 2.10 performs case insensitive search and upper and lower casing for non-ASCII characters.
       Support for version 1.x of GTK+ removed.</li>
-      <li>Version 2.03 fixes some problems with rectangular selection.</li>
-      <li>Version 2.02 fixes some problems with rectangular selection.</li>
-      <li>Version 2.01 fixes some problems with multiple selection.</li>
-      <li>Version 2.0 supports multiple selection and virtual space.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/version.txt b/version.txt
index 0d389107a..3d4c7bfe8 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-212
+220
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index a36ff03ec..27e34dc4c 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -9,8 +9,8 @@
 #include "PlatformRes.h"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION	2, 1, 2, 0
-PRODUCTVERSION	2, 1, 2, 0
+FILEVERSION	2, 2, 0, 0
+PRODUCTVERSION	2, 2, 0, 0
 FILEFLAGSMASK	0x3fL
 FILEFLAGS 0
 FILEOS VOS_NT_WINDOWS32
@@ -27,12 +27,12 @@ BEGIN
 		BEGIN
 			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
 			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
-			VALUE	"FileVersion",	"2.12\0"
+			VALUE	"FileVersion",	"2.20\0"
 			VALUE	"InternalName",	"Scintilla\0"
 			VALUE	"LegalCopyright",	"Copyright 1998-2010 by Neil Hodgson\0"
 			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
 			VALUE	"ProductName",	"Scintilla\0"
-			VALUE	"ProductVersion",	"2.12\0"
+			VALUE	"ProductVersion",	"2.20\0"
 		END
 	END
 END
-- 
cgit v1.2.3