summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-07-05 17:10:58 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-07-05 17:10:58 +0000
commita84a390c7afc8a09c081b8eff6f11a2452896420 (patch)
tree0c1d27598f441ba1a9eb621bb7ec3c3689dfb867
parentb9f085a9de946a442e594e997b1eafaf4dc6a211 (diff)
[1.2.X] Fixed #13880 - added 2.7 to list of supported versions of Python
Thanks Alex Backport of [13423] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/intro/install.txt2
-rw-r--r--docs/topics/install.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/intro/install.txt b/docs/intro/install.txt
index 901bde01c2..dcb9c8e0c4 100644
--- a/docs/intro/install.txt
+++ b/docs/intro/install.txt
@@ -12,7 +12,7 @@ Install Python
--------------
Being a Python Web framework, Django requires Python. It works with any Python
-version from 2.4 to 2.6 (due to backwards
+version from 2.4 to 2.7 (due to backwards
incompatibilities in Python 3.0, Django does not currently work with
Python 3.0; see :ref:`the Django FAQ <faq-install>` for more
information on supported Python versions and the 3.0 transition), but we recommend installing Python 2.5 or later. If you do so, you won't need to set up a database just yet: Python 2.5 or later includes a lightweight database called SQLite_.
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index d53f49de46..2147a98931 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -11,7 +11,7 @@ Install Python
Being a Python Web framework, Django requires Python.
-It works with any Python version from 2.4 to 2.6 (due to backwards
+It works with any Python version from 2.4 to 2.7 (due to backwards
incompatibilities in Python 3.0, Django does not currently work with
Python 3.0; see :ref:`the Django FAQ <faq-install>` for more
information on supported Python versions and the 3.0 transition).