diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2011-04-02 21:49:39 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2011-04-02 21:49:39 +0000 |
| commit | 09b4a41aa789bd434d6e0dea932fcd72ffb4be47 (patch) | |
| tree | de1995ed4493c5ce331afb19bc29562376c72668 | |
| parent | 21877c39b4d4af18c2f8b7809a8d2daaebb9c698 (diff) | |
Fixed a comma splice in docs/faq/install.txt from [16004]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/faq/install.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 24a6150190..f500e77a88 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -70,11 +70,14 @@ the road to Python 3. Can I use Django with Python 2.4? --------------------------------- -Django 1.3 (and earlier) supported Python 2.4. Django 1.4 (not released yet) -and newer will require Python 2.5 or greater (but no 3.x, see the next question.) +As of Django 1.4, no. -We highly recommend you upgrade Python if at all possible, but Django 1.3.x -will continue to support Python 2.4. +Django 1.3 and earlier supported Python 2.4. Django 1.4 (the current development +version, which hasn't been officially released) and newer version require +Python 2.5 or greater (but not 3.x; see the next question.) + +We highly recommend you upgrade Python if possible, but Django 1.3.x will +continue to support Python 2.4. Can I use Django with Python 3? ------------------------------- |