diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt index 1c827bb13990..967c3c697d35 100644 --- a/docs/intro/reusable-apps.txt +++ b/docs/intro/reusable-apps.txt @@ -240,10 +240,10 @@ this. For a small app like polls, this process isn't too difficult. #. Only Python modules and packages are included in the package by default. To include additional files, we'll need to create a ``MANIFEST.in`` file. The - setuptools docs referred to in the previous step discuss this file in more - detail. To include the templates, the ``README.rst`` and our ``LICENSE`` - file, create a file ``django-polls/MANIFEST.in`` with the following - contents: + ``setuptools`` docs referred to in the previous step discuss this file in + more detail. To include the templates, the ``README.rst`` and our + ``LICENSE`` file, create a file ``django-polls/MANIFEST.in`` with the + following contents: .. code-block:: text :caption: ``django-polls/MANIFEST.in`` diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt index f901f249c3ea..a692065abb0e 100644 --- a/docs/releases/1.9.txt +++ b/docs/releases/1.9.txt @@ -741,9 +741,9 @@ lists and tuples. All settings that were formerly tuples are now lists. Django template loaders previously required an ``is_usable`` attribute to be defined. If a loader was configured in the template settings and this attribute was ``False``, the loader would be silently ignored. In practice, this was only -used by the egg loader to detect if setuptools was installed. The ``is_usable`` -attribute is now removed and the egg loader instead fails at runtime if -setuptools is not installed. +used by the egg loader to detect if ``setuptools`` was installed. The +``is_usable`` attribute is now removed and the egg loader instead fails at +runtime if ``setuptools`` is not installed. Related set direct assignment ----------------------------- @@ -1028,10 +1028,10 @@ a Django application with this structure: .. _syntax-error-old-setuptools-django-19: -``SyntaxError`` when installing Django setuptools 5.5.x -------------------------------------------------------- +``SyntaxError`` when installing Django ``setuptools`` 5.5.x +----------------------------------------------------------- -When installing Django 1.9 or 1.9.1 with setuptools 5.5.x, you'll see: +When installing Django 1.9 or 1.9.1 with ``setuptools`` 5.5.x, you'll see: .. code-block:: shell @@ -1048,10 +1048,10 @@ When installing Django 1.9 or 1.9.1 with setuptools 5.5.x, you'll see: SyntaxError: invalid syntax 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 +can avoid them by upgrading ``setuptools`` to a more recent version. If you're using pip, you can upgrade pip using ``python -m pip install -U pip`` which -will also upgrade setuptools. This is resolved in later versions of Django as -described in the :doc:`/releases/1.9.2`. +will also upgrade ``setuptools``. This is resolved in later versions of Django +as described in the :doc:`/releases/1.9.2`. Miscellaneous -------------