summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-12-05 16:28:29 -0500
committerTim Graham <timograham@gmail.com>2015-12-05 16:33:10 -0500
commit6aaf6728b55c4a68e1e020a33090010fa71c52ca (patch)
treea5b5a584539b476a540c6cfc3c2cc73fa711143c /docs
parent274670a33dbb06f607f72c566be7bf9a81362233 (diff)
[1.9.x] Refs #25584 -- Corrected note about source of SyntaxErrors when installing Django 1.9.
Backport of f5af68ba68c1041d785e5582529134d54895e7c6 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.9.txt13
-rw-r--r--docs/topics/install.txt6
2 files changed, 10 insertions, 9 deletions
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 90c33f9d24..79f812579d 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -1010,12 +1010,12 @@ a Django application with this structure::
jquery.js
jquery.min.js
-.. _syntax-error-old-pip-django-19:
+.. _syntax-error-old-setuptools-django-19:
-``SyntaxError`` when installing Django with pip ≤ 1.5.6
+``SyntaxError`` when installing Django setuptools 5.5.x
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When installing Django 1.9+ with pip ≤ 1.5.6, you'll see::
+When installing Django 1.9+ with setuptools 5.5.x, you'll see::
Compiling django/conf/app_template/apps.py ...
File "django/conf/app_template/apps.py", line 4
@@ -1029,9 +1029,10 @@ When installing Django 1.9+ with pip ≤ 1.5.6, you'll see::
^
SyntaxError: invalid syntax
-It's safe to ignore these errors (Django will still install just fine), and you
-can avoid them by upgrading pip to a more recent version using
-``pip install -U pip``.
+It's safe to ignore these errors (Django will still install just fine), but you
+can avoid them by upgrading setuptools to a more recent version. If you're
+using pip, you can upgrade pip using ``pip install -U pip`` which will also
+upgrade setuptools.
Miscellaneous
~~~~~~~~~~~~~
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 02f34fe02d..e911494ceb 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -164,9 +164,9 @@ This is the recommended way to install Django.
1. Install pip_. The easiest is to use the `standalone pip installer`_. If your
distribution already has ``pip`` installed, you might need to update it if
- it's outdated. (If it's outdated, you'll know because installation won't
- work. You might see some :ref:`harmless SyntaxErrors
- <syntax-error-old-pip-django-19>` also.)
+ it's outdated. If it's outdated, you'll know because installation won't
+ work. If you're using an old version of setuptools, you might see some
+ :ref:`harmless SyntaxErrors <syntax-error-old-setuptools-django-19>` also.
2. Take a look at virtualenv_ and virtualenvwrapper_. These tools provide
isolated Python environments, which are more practical than installing