prepare release of lxml 2.3.3

3 files changed, 36 insertions, 19 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index a98659d9..07f44633 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,34 @@
 lxml changelog
 ==============
 
+2.3.3 (2012-01-04)
+==================
+
+Features added
+--------------
+
+* ``lxml.html.tostring()`` gained new serialisation options
+  ``with_tail`` and ``doctype``.
+
+Bugs fixed
+----------
+
+* Fixed a crash when using ``iterparse()`` for HTML parsing and
+  requesting start events.
+
+* Fixed parsing of more selectors in cssselect.  Whitespace before
+  pseudo-elements and pseudo-classes is significant as it is a
+  descendant combinator.
+  "E :pseudo" should parse the same as "E \*:pseudo", not "E:pseudo".
+  Patch by Simon Sapin.
+
+* lxml.html.diff no longer raises an exception when hitting
+  'img' tags without 'src' attribute.
+
+Other changes
+--------------
+
+
 2.3.2 (2011-11-11)
 ==================
 
@@ -32,18 +60,6 @@ Bugs fixed
   a descendant combinator. For example, "div> .foo" was parsed the same as
   "div>* .foo" instead of "div>.foo". Patch by Simon Sapin.
 
-* Fixed a crash when using ``iterparse()`` for HTML parsing and
-  requesting start events.
-
-* Fixed parsing of more selectors in cssselect.  Whitespace before
-  pseudo-elements and pseudo-classes is significant as it is a
-  descendant combinator.
-  "E :pseudo" should parse the same as "E \*:pseudo", not "E:pseudo".
-  Patch by Simon Sapin.
-
-* lxml.html.diff no longer raises an exception when hitting
-  'img' tags without 'src' attribute.
-
 Other changes
 --------------
 
@@ -149,9 +165,6 @@ Other changes
 Features added
 --------------
 
-* ``lxml.html.tostring()`` gained new serialisation options
-  ``with_tail`` and ``doctype``.
-
 Bugs fixed
 ----------
 
diff --git a/doc/main.txt b/doc/main.txt
index 4567d556..5964476a 100644
--- a/doc/main.txt
+++ b/doc/main.txt
@@ -159,8 +159,8 @@ MS Windows usually become available through PyPI a few days after a
 source release.  If you can't wait, consider trying a less recent
 release version first.
 
-The latest version is `lxml 2.3.2`_, released 2011-11-11
-(`changes for 2.3.2`_).  `Older versions`_ are listed below.
+The latest version is `lxml 2.3.3`_, released 2011-01-04
+(`changes for 2.3.3`_).  `Older versions`_ are listed below.
 
 Please take a look at the `installation instructions`_!
 
@@ -233,7 +233,9 @@ See the web sites of lxml `1.3 <http://lxml.de/1.3/>`_, `2.0
 <http://lxml.de/2.2/>`_ and the `latest in-development version
 <http://lxml.de/dev/>`_
 
-.. _`PDF documentation`: lxmldoc-2.3.2.pdf
+.. _`PDF documentation`: lxmldoc-2.3.3.pdf
+
+* `lxml 2.3.2`_, released 2011-11-11 (`changes for 2.3.2`_)
 
 * `lxml 2.3.1`_, released 2011-09-25 (`changes for 2.3.1`_)
 
@@ -265,6 +267,7 @@ See the web sites of lxml `1.3 <http://lxml.de/1.3/>`_, `2.0
 
 * `older releases <http://lxml.de/2.2/#old-versions>`_
 
+.. _`lxml 2.3.3`: /files/lxml-2.3.3.tgz
 .. _`lxml 2.3.2`: /files/lxml-2.3.2.tgz
 .. _`lxml 2.3.1`: /files/lxml-2.3.1.tgz
 .. _`lxml 2.3`: /files/lxml-2.3.tgz
@@ -281,6 +284,7 @@ See the web sites of lxml `1.3 <http://lxml.de/1.3/>`_, `2.0
 .. _`lxml 2.2.1`: /files/lxml-2.2.1.tgz
 .. _`lxml 2.2`: /files/lxml-2.2.tgz
 
+.. _`changes for 2.3.3`: /changes-2.3.3.html
 .. _`changes for 2.3.2`: /changes-2.3.2.html
 .. _`changes for 2.3.1`: /changes-2.3.1.html
 .. _`changes for 2.3`: /changes-2.3.html
diff --git a/version.txt b/version.txt
index f90b1afc..0bee604d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.3.2
+2.3.3