summaryrefslogtreecommitdiff
path: root/docs/ref/templates
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2009-02-21 08:54:32 +0000
committerAdrian Holovaty <adrian@holovaty.com>2009-02-21 08:54:32 +0000
commit267122978fb4cdb00a303b816487f0e6f803d3c1 (patch)
tree33281fc61147761975f54bdcb5822ce25ece83e3 /docs/ref/templates
parentd9b5a414ca2823bcbb8008c8d19efd8ad16f0c35 (diff)
[1.0.X] Merged trunk changes [9850], [9851], [9852], [9853]
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/templates')
-rw-r--r--docs/ref/templates/builtins.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index a14f50adf0..ed94f3de9d 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1155,7 +1155,7 @@ For example::
{{ value|linebreaks }}
-If ``value`` is ``Joel\nis a slug``, the output will be ``<p>Joel<br>is a
+If ``value`` is ``Joel\nis a slug``, the output will be ``<p>Joel<br />is a
slug</p>``.
.. templatefilter:: linebreaksbr