summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2013-12-22 23:50:43 -0500
committerEli Collins <elic@assurancetechnologies.com>2013-12-22 23:50:43 -0500
commitf1f5a056659522eea4b3ac67db2bae35e39f7365 (patch)
tree9f53dd9b0cc6bec29777b3ce3538ac574060bb2d
parent00fbf7362c1c8f85285188819b47c3a7668da244 (diff)
downloadpasslib-f1f5a056659522eea4b3ac67db2bae35e39f7365.tar.gz
doc tweaks
-rw-r--r--CHANGES5
-rw-r--r--docs/install.rst3
-rw-r--r--docs/lib/passlib.ext.django.rst1
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 88365d4..ee4eca4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,9 +18,10 @@ Release History
some minor API changes in Django 1.5-1.6. They should now be compatible with Django 1.2 and up.
(:issue:`50`)
- .. note::
+ .. note::
- As of Passlib 1.7, :mod:`passlib.ext.django` will require Django >= 1.4.
+ As of Passlib 1.7, :mod:`passlib.ext.django` will require Django >= 1.4.
+ Passlib 1.6.x is the last release that will support Django 1.3.x and earlier.
**1.6.1** (2012-08-02)
======================
diff --git a/docs/install.rst b/docs/install.rst
index 79a7df1..775e4d2 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -12,9 +12,10 @@ It is known to work with the following Python implementations:
* CPython 2 -- v2.5 or newer.
* CPython 3 -- all versions.
* PyPy -- v1.5 or newer.
+* PyPy3 -- v2.1 or newer.
* Jython -- v2.5 or newer.
-Passlib should work with all operating systems and enviroments,
+Passlib should work with all operating systems and environments,
as it contains builtin fallbacks
for almost all OS-dependant features.
Google App Engine is supported as well.
diff --git a/docs/lib/passlib.ext.django.rst b/docs/lib/passlib.ext.django.rst
index f9ac7a2..7667a30 100644
--- a/docs/lib/passlib.ext.django.rst
+++ b/docs/lib/passlib.ext.django.rst
@@ -11,6 +11,7 @@
.. note::
As of Passlib 1.7, :mod:`passlib.ext.django` will require Django >= 1.4.
+ Passlib 1.6.x is the last release that will support Django 1.3.x and earlier.
This module contains a `Django <http://www.djangoproject.com>`_ plugin which
overriddes all of Django's password hashing functions, replacing them