summaryrefslogtreecommitdiff
path: root/docs/howto/jython.txt
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-10-16 09:02:12 +0200
committerClaude Paroz <claude@2xlibre.net>2012-10-16 09:04:12 +0200
commit8f94d282232db238e4fca9aece6aae5acd6d7d1c (patch)
tree23d0559ad3c1881b438a56703c4e1681529303bd /docs/howto/jython.txt
parent9190d89829c4e0b9b0f36e1c717ea451a1a13efd (diff)
Fixed #19128 -- Reworded admonition about Jython and Django 1.5
Thanks adam@hopelessgeek.com for the report.
Diffstat (limited to 'docs/howto/jython.txt')
-rw-r--r--docs/howto/jython.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/howto/jython.txt b/docs/howto/jython.txt
index 762250212a..461a5d3804 100644
--- a/docs/howto/jython.txt
+++ b/docs/howto/jython.txt
@@ -6,9 +6,10 @@ Running Django on Jython
.. admonition:: Python 2.6 support
- Django 1.5 has dropped support for Python 2.5. Until Jython provides a new
- version that supports 2.6, Django 1.5 is no more compatible with Jython.
- Please use Django 1.4 if you want to use Django over Jython.
+ Django 1.5 has dropped support for Python 2.5. Therefore, you have to use
+ a Jython 2.7 alpha release if you want to use Django 1.5 with Jython.
+ Please use Django 1.4 if you want to keep using Django on a stable Jython
+ version.
Jython_ is an implementation of Python that runs on the Java platform (JVM).
Django runs cleanly on Jython version 2.5 or later, which means you can deploy