summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-10-08 08:19:11 -0400
committerTim Graham <timograham@gmail.com>2014-10-08 08:19:33 -0400
commitb2f7b517e52b9b6b08e47e783f8b6a949b690dbb (patch)
treed2e12eb8d8d17320d769376f10cc98a1415d1d62
parentfa4b6482df08d308fe88044b8c8bf981c6225fb8 (diff)
[1.7.x] Fixed #23587 -- Clarified admin template overriding in tutorial 2.
Thanks Petrus van Bork for the report. Backport of e949f4435f from master
-rw-r--r--docs/intro/tutorial02.txt17
1 files changed, 12 insertions, 5 deletions
diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index 42e895513a..e67c3863b5 100644
--- a/docs/intro/tutorial02.txt
+++ b/docs/intro/tutorial02.txt
@@ -512,11 +512,18 @@ template directory in the source code of Django itself
print(django.__path__)"
Then, just edit the file and replace
-``{{ site_header|default:_('Django administration') }}`` with your own site's
-name as you see fit, e.g. ``{{ _('Polls administration') }}``. We use this
-approach to teach you how to override templates. In an actual project, you
-would probably use the :attr:`django.contrib.admin.AdminSite.site_header`
-attribute to more easily make this particular customization.
+``{{ site_header|default:_('Django administration') }}`` (including the curly
+braces) with your own site's name as you see fit. You should end up with
+a line like:
+
+.. code-block:: html+django
+
+ <h1 id="site-name"><a href="{% url 'admin:index' %}">Polls Administration</a></h1>
+
+We use this approach to teach you how to override templates. In an actual
+project, you would probably use
+the :attr:`django.contrib.admin.AdminSite.site_header` attribute to more easily
+make this particular customization.
This template file contains lots of text like ``{% block branding %}``
and ``{{ title }}``. The ``{%`` and ``{{`` tags are part of Django's