summaryrefslogtreecommitdiff
path: root/docs/ref/templates
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2011-03-03 19:31:10 +0000
committerGabriel Hurley <gabehr@gmail.com>2011-03-03 19:31:10 +0000
commit20b940614e62c1b71c7a438c686fe6a387746f28 (patch)
tree8ea1310264cc211c65b583199e033a4b7517008f /docs/ref/templates
parentd50f59ee18f6f1241f4d14d7218b6fb64ce9c3b5 (diff)
Added crossref targets for a couple of Django exceptions and cleaned up related reST markup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/templates')
-rw-r--r--docs/ref/templates/builtins.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 298331faea..00eb509fb7 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -660,8 +660,8 @@ load
Load a custom template tag set.
-For example, the following template would load all the tags and filters registered
-in ``somelibrary`` and ``otherlibrary``::
+For example, the following template would load all the tags and filters
+registered in ``somelibrary`` and ``otherlibrary``::
{% load somelibrary otherlibrary %}
@@ -671,7 +671,8 @@ and ``bar`` will be loaded from ``somelibrary``::
{% load foo bar from somelibrary %}
-See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for more information.
+See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for
+more information.
.. templatetag:: now
@@ -968,8 +969,8 @@ refer to the name of the pattern in the ``url`` tag instead of using the
path to the view.
Note that if the URL you're reversing doesn't exist, you'll get an
-:exc:`NoReverseMatch` exception raised, which will cause your site to display an
-error page.
+:exc:`~django.core.urlresolvers.NoReverseMatch` exception raised, which will
+cause your site to display an error page.
If you'd like to retrieve a URL without displaying it, you can use a slightly
different call::