summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2023-10-09 09:55:52 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-10-09 09:57:35 +0200
commit0bd53ab86a8280b71ebc6cb5680515c36c9be4ac (patch)
treebe740b41de884d513691f014933f78786928b02f
parent99dcba90b4d36272d6c2e0fd96eec1ee5883db4c (diff)
[4.2.x] Added backticks to setuptools in docs.
Backport of 54b23b1835a8044c35754525dfcf2c3027d79aa8 from main
-rw-r--r--docs/intro/reusable-apps.txt8
-rw-r--r--docs/releases/1.9.txt18
2 files changed, 13 insertions, 13 deletions
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index d1530522d1..4ae51896e1 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 f901f249c3..a692065abb 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
-------------