summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 12:01:25 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 12:01:59 +0200
commita763915a03579868c6abdc5cdffbb4c398dc52ee (patch)
tree9b9459994fe66c1805d66a3a460ece97e4c84c3a /docs
parent3fd8eb1a276fa452293112562463898de7351139 (diff)
Bumped minimum Python version requirement to 2.7 in Django 1.7.
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt8
-rw-r--r--docs/intro/install.txt10
-rw-r--r--docs/topics/install.txt4
3 files changed, 11 insertions, 11 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index 2c7c35299b..be45012961 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -16,8 +16,8 @@ How do I get started?
What are Django's prerequisites?
--------------------------------
-Django requires Python, specifically Python 2.6.5 - 2.7.x, or 3.2.3 and above.
-No other Python libraries are required for basic Django usage.
+Django requires Python, specifically Python 2.7 or 3.2 and above. No other
+Python libraries are required for basic Django usage.
For a development environment -- if you just want to experiment with Django --
you don't need to have a separate Web server installed; Django comes with its
@@ -50,8 +50,8 @@ Django version Python versions
1.3 2.4, 2.5, 2.6, 2.7
1.4 2.5, 2.6, 2.7
1.5 2.6, 2.7 and 3.2, 3.3 (experimental)
-**1.6** **2.6, 2.7** and **3.2, 3.3**
-*1.7 (future)* *2.7* and *3.2, 3.3*
+1.6 2.6, 2.7 and 3.2, 3.3
+**1.7** **2.7** and **3.2, 3.3**
============== ===============
For a given series of Python versions, only the latest release is officially
diff --git a/docs/intro/install.txt b/docs/intro/install.txt
index 40375e5eca..3ef59dcafb 100644
--- a/docs/intro/install.txt
+++ b/docs/intro/install.txt
@@ -9,9 +9,9 @@ that'll work while you walk through the introduction.
Install Python
--------------
-Being a Python Web framework, Django requires Python. It works with Python 2.6,
-2.7, 3.2 or 3.3. All these versions of Python include a lightweight database
-called SQLite_ so you won't need to set up a database just yet.
+Being a Python Web framework, Django requires Python. It works with Python 2.7,
+3.2 or 3.3. All these versions of Python include a lightweight database called
+SQLite_ so you won't need to set up a database just yet.
.. _sqlite: http://sqlite.org/
@@ -28,8 +28,8 @@ probably already have it installed.
You can verify that Python is installed by typing ``python`` from your shell;
you should see something like::
- Python 2.6.6 (r266:84292, Dec 26 2010, 22:31:48)
- [GCC 4.4.5] on linux2
+ Python 2.7.3 (default, Jan 2 2013, 13:56:14)
+ [GCC 4.7.2] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>>
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 505d51a846..9cf02d96de 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -7,8 +7,8 @@ This document will get you up and running with Django.
Install Python
==============
-Being a Python Web framework, Django requires Python. It works with Python 2.6,
-2.7, 3.2 or 3.3.
+Being a Python Web framework, Django requires Python. It works with Python 2.7,
+3.2 or 3.3.
Get Python at http://www.python.org. If you're running Linux or Mac OS X, you
probably already have it installed.