summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-12-25 00:26:46 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-12-25 00:26:46 +0100
commitb70498d675bbd96849b466cdd45c1c189f227444 (patch)
tree70041d65c7fd478e7df1296e6ef7e4b33847e01c /docs
parentad769efa85e0296033572315025fed9fa9aefade (diff)
downloaddjango-b70498d675bbd96849b466cdd45c1c189f227444.tar.gz
Updated installation FAQ entry on Python versions.
The 1.7 line is a reasonnable forecast, not a final decision.
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index a92c9d87ea..5a4cab94cf 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -68,8 +68,10 @@ Django version Python versions
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* and *3.2.3, 3.3 (experimental)*
+1.4 2.5, 2.6, 2.7
+1.5 2.6.5, 2.7 and 3.2.3, 3.3 (experimental)
+**1.6** **2.6.5, 2.7** and **3.2.3, 3.3**
+*1.7 (future)* *2.7, 3.3 (to be confirmed)*
============== ===============
Can I use Django with Python 3?