Browse Source

Refs #25584 -- Corrected note about source of SyntaxErrors when installing Django 1.9.

Tim Graham 9 years ago
parent
commit
f5af68ba68
2 changed files with 10 additions and 9 deletions
  1. 7 6
      docs/releases/1.9.txt
  2. 3 3
      docs/topics/install.txt

+ 7 - 6
docs/releases/1.9.txt

@@ -1012,12 +1012,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
@@ -1031,9 +1031,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
 ~~~~~~~~~~~~~

+ 3 - 3
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