From 3fd8eb1a276fa452293112562463898de7351139 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 1 Jul 2013 11:52:00 +0200 Subject: [PATCH] Stopped branding Python 3 support as experimental. Forward-port of 0de21a6 from stable/1.6.x. --- docs/intro/install.txt | 5 ++--- 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 3cbc8d88ab2..40375e5eca3 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 1c99dc5d5ad..505d51a846d 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.