summaryrefslogtreecommitdiff
path: root/docs/faq/install.txt
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-03-16 18:41:31 +0000
committerClaude Paroz <claude@2xlibre.net>2012-03-16 18:41:31 +0000
commit232c99cee12be011c37d55ebdc36c8669b5ca0f7 (patch)
tree102071d6fb1b22ab9487567d204274256c03b878 /docs/faq/install.txt
parent49e7f4a229d8acf5920560987d6cd843c15df534 (diff)
Added Django-Python version matching table in FAQ.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/faq/install.txt')
-rw-r--r--docs/faq/install.txt22
1 files changed, 12 insertions, 10 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index c3aa1a1d01..c5847d3145 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -62,17 +62,19 @@ improvements and optimizations to the Python language since version 2.5, and
will help ease the process of dropping support for older Python versions on
the road to Python 3.
-Can I use Django with Python 2.4?
----------------------------------
+What Python version can I use with Django?
+------------------------------------------
-As of Django 1.4, no.
-
-Django 1.3 and earlier supported Python 2.4. Django 1.4 (the current development
-version, which hasn't been officially released) and newer version require
-Python 2.5 or greater (but not 3.x; see the next question.)
-
-We highly recommend you upgrade Python if possible, but Django 1.3.x will
-continue to support Python 2.4.
+============== ===============
+Django version Python versions
+============== ===============
+1.0 2.3, 2.4, 2.5, 2.6
+1.1 2.3, 2.4, 2.5, 2.6
+1.2 2.4, 2.5, 2.6, 2.7
+1.3 2.4, 2.5, 2.6, 2.7
+**1.4** **2.5, 2.6, 2.7**
+*1.5 (future)* *2.6, 2.7, 3.x (experimental)*
+============== ===============
Can I use Django with Python 3?
-------------------------------