[Lxml-checkins] r33905 - in lxml/trunk: . doc

[scoder at codespeak.net]

Author: scoder
Date: Mon Oct 30 16:08:20 2006
New Revision: 33905

Modified:
   lxml/trunk/CHANGES.txt
   lxml/trunk/doc/main.txt
Log:
merged in versioning from lxml-1.1 branch

Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt	(original)
+++ lxml/trunk/CHANGES.txt	Mon Oct 30 16:08:20 2006
@@ -2,8 +2,8 @@
 lxml changelog
 ==============
 
-current
-=======
+1.1.2 (2006-10-30)
+==================
 
 Features added
 --------------

Modified: lxml/trunk/doc/main.txt
==============================================================================
--- lxml/trunk/doc/main.txt	(original)
+++ lxml/trunk/doc/main.txt	Mon Oct 30 16:08:20 2006
@@ -29,6 +29,8 @@
 
 .. _`installation instructions`: installation.html
 
+* `lxml 1.1.2`_, released 2006-10-30 (`changes for 1.1.2`_)
+
 * `lxml 1.1.1`_, released 2006-09-21 (`changes for 1.1.1`_)
 
 * `lxml 1.1`_, released 2006-09-13 (`changes for 1.1`_)
@@ -59,6 +61,7 @@
 
 * `lxml 0.5`_,   released 2005-04-08
 
+.. _`lxml 1.1.2`: lxml-1.1.2.tgz
 .. _`lxml 1.1.1`: lxml-1.1.1.tgz
 .. _`lxml 1.1`: lxml-1.1.tgz
 .. _`lxml 1.0.4`: lxml-1.0.4.tgz
@@ -75,6 +78,7 @@
 .. _`lxml 0.5.1`: lxml-0.5.1.tgz
 .. _`lxml 0.5`: lxml-0.5.tgz
 
+.. _`CHANGES for 1.1.2`: changes-1.1.2.html
 .. _`CHANGES for 1.1.1`: changes-1.1.1.html
 .. _`CHANGES for 1.1`: changes-1.1.html
 .. _`CHANGES for 1.0.4`: changes-1.0.4.html