summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-01-23 09:40:18 -0500
committerTim Graham <timograham@gmail.com>2018-01-23 09:48:31 -0500
commitf02c44396ac62a0330b0d5625f1a2a302a62fa43 (patch)
tree79aa0ce72cfca5e66d80e89b371bd07bbc0fd122
parentb749c356189202541e815a78eb09575e25aafd45 (diff)
[2.0.x] Fixed "template tag" spelling in docs.
Backport of f0f383b6350c7b2f64bb2a6491a395abdd3313d6 from master
-rw-r--r--docs/ref/contrib/flatpages.txt2
-rw-r--r--docs/ref/django-admin.txt2
-rw-r--r--docs/spelling_wordlist1
3 files changed, 2 insertions, 3 deletions
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt
index 5d34ad6bea..2c1869e1df 100644
--- a/docs/ref/contrib/flatpages.txt
+++ b/docs/ref/contrib/flatpages.txt
@@ -292,7 +292,7 @@ via the :ttag:`get_flatpages` tag:
Displaying ``registration_required`` flatpages
----------------------------------------------
-By default, the :ttag:`get_flatpages` templatetag will only show
+By default, the :ttag:`get_flatpages` template tag will only show
flatpages that are marked ``registration_required = False``. If you
want to display registration-protected flatpages, you need to specify
an authenticated user using a ``for`` clause.
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 674ce67f9a..708e917d65 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1213,7 +1213,7 @@ files is:
to template rendering, it might result in an incorrect example.
To work around this problem, you can use the :ttag:`templatetag`
- templatetag to "escape" the various parts of the template syntax.
+ template tag to "escape" the various parts of the template syntax.
In addition, to allow Python template files that contain Django template
language syntax while also preventing packaging systems from trying to
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index 08b70f4ac3..3b54b929ed 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -712,7 +712,6 @@ tagline
tarball
tarballs
teardown
-templatetag
templating
testcase
testserver