diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-07-01 11:52:00 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-07-01 11:52:37 +0200 |
| commit | 3fd8eb1a276fa452293112562463898de7351139 (patch) | |
| tree | d963c1705df851fe26db3c94cb3fc5a591aad4d7 /docs | |
| parent | 8b8b2f2fc7a4a79a7a18305c77d287809004c59e (diff) | |
Stopped branding Python 3 support as experimental.
Forward-port of 0de21a6 from stable/1.6.x.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/intro/install.txt | 5 | ||||
| -rw-r--r-- | docs/topics/install.txt | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/docs/intro/install.txt b/docs/intro/install.txt index 3cbc8d88ab..40375e5eca 100644 --- a/docs/intro/install.txt +++ b/docs/intro/install.txt @@ -9,9 +9,8 @@ that'll work while you walk through the introduction. Install Python -------------- -Being a Python Web framework, Django requires Python. It works with any Python -version from 2.6.5 to 2.7. It also features experimental support for versions -3.2 and 3.3. All these versions of Python include a lightweight database +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. .. _sqlite: http://sqlite.org/ diff --git a/docs/topics/install.txt b/docs/topics/install.txt index 1c99dc5d5a..505d51a846 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -7,10 +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 any Python version from 2.6.5 to 2.7. It also features -experimental support for versions from 3.2.3 to 3.3. +Being a Python Web framework, Django requires Python. It works with Python 2.6, +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. |