Skip to content

Commit

Permalink
merge lxml-3.3 branch into master
Browse files Browse the repository at this point in the history
  • Loading branch information
scoder committed Apr 18, 2014
2 parents 970fe3f + 32337d2 commit 9d6c48c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Expand Up @@ -29,7 +29,7 @@ Other changes
use lxml 3.3.x with older versions. use lxml 3.3.x with older versions.




3.3.5 (???) 3.3.5 (2014-04-18)
================== ==================


Bugs fixed Bugs fixed
Expand Down
10 changes: 7 additions & 3 deletions doc/main.txt
Expand Up @@ -157,8 +157,8 @@ Index <http://pypi.python.org/pypi/lxml/>`_ (PyPI). It has the source
that compiles on various platforms. The source distribution is signed that compiles on various platforms. The source distribution is signed
with `this key <pubkey.asc>`_. with `this key <pubkey.asc>`_.


The latest version is `lxml 3.3.4`_, released 2014-04-03 The latest version is `lxml 3.3.5`_, released 2014-04-18
(`changes for 3.3.4`_). `Older versions <#old-versions>`_ (`changes for 3.3.5`_). `Older versions <#old-versions>`_
are listed below. are listed below.


Please take a look at the Please take a look at the
Expand Down Expand Up @@ -240,7 +240,9 @@ See the web sites of lxml
`3.2 <http://lxml.de/3.2/>`_ `3.2 <http://lxml.de/3.2/>`_
and the `latest in-development version <http://lxml.de/dev/>`_. and the `latest in-development version <http://lxml.de/dev/>`_.


.. _`PDF documentation`: lxmldoc-3.3.4.pdf .. _`PDF documentation`: lxmldoc-3.3.5.pdf

* `lxml 3.3.5`_, released 2014-04-18 (`changes for 3.3.5`_)


* `lxml 3.3.4`_, released 2014-04-03 (`changes for 3.3.4`_) * `lxml 3.3.4`_, released 2014-04-03 (`changes for 3.3.4`_)


Expand Down Expand Up @@ -288,6 +290,7 @@ and the `latest in-development version <http://lxml.de/dev/>`_.


* `older releases <http://lxml.de/3.0/#old-versions>`_ * `older releases <http://lxml.de/3.0/#old-versions>`_


.. _`lxml 3.3.5`: /files/lxml-3.3.5.tgz
.. _`lxml 3.3.4`: /files/lxml-3.3.4.tgz .. _`lxml 3.3.4`: /files/lxml-3.3.4.tgz
.. _`lxml 3.3.3`: /files/lxml-3.3.3.tgz .. _`lxml 3.3.3`: /files/lxml-3.3.3.tgz
.. _`lxml 3.3.2`: /files/lxml-3.3.2.tgz .. _`lxml 3.3.2`: /files/lxml-3.3.2.tgz
Expand All @@ -311,6 +314,7 @@ and the `latest in-development version <http://lxml.de/dev/>`_.
.. _`lxml 3.0.1`: /files/lxml-3.0.1.tgz .. _`lxml 3.0.1`: /files/lxml-3.0.1.tgz
.. _`lxml 3.0`: /files/lxml-3.0.tgz .. _`lxml 3.0`: /files/lxml-3.0.tgz


.. _`changes for 3.3.5`: /changes-3.3.5.html
.. _`changes for 3.3.4`: /changes-3.3.4.html .. _`changes for 3.3.4`: /changes-3.3.4.html
.. _`changes for 3.3.3`: /changes-3.3.3.html .. _`changes for 3.3.3`: /changes-3.3.3.html
.. _`changes for 3.3.2`: /changes-3.3.2.html .. _`changes for 3.3.2`: /changes-3.3.2.html
Expand Down

0 comments on commit 9d6c48c

Please sign in to comment.