Fixed #2411 -- Fixed some XHTML validation errors in admindocs pages. Thanks to James Wheare for the report and to Simon Greenhill for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14920 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 7 insertions, 7 deletions

diff --git a/django/contrib/admindocs/templates/admin_doc/template_filter_index.html b/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
index 7470762775..46ccf0fd0a 100644
--- a/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
+++ b/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
@@ -16,8 +16,8 @@
     {% if library.grouper %}<p class="small quiet">To use these filters, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the filter.</p><hr />{% endif %}
     {% for filter in library.list|dictsort:"name" %}
     <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ filter.name }}">{{ filter.name }}</h3>
-    <p>{{ filter.title }}</p>
-    <p>{{ filter.body }}</p>
+    {{ filter.title }}
+    {{ filter.body }}
     {% if not forloop.last %}<hr />{% endif %}
     {% endfor %}
 </div>
diff --git a/django/contrib/admindocs/templates/admin_doc/template_tag_index.html b/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
index 774130bd70..676c025acb 100644
--- a/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
+++ b/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
@@ -16,8 +16,8 @@
     {% if library.grouper %}<p class="small quiet">To use these tags, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the tag.</p><hr />{% endif %}
     {% for tag in library.list|dictsort:"name" %}
     <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ tag.name }}">{{ tag.name }}</h3>
-    <h4>{{ tag.title }}</h4>
-    <p>{{ tag.body }}</p>
+    <h4>{{ tag.title|striptags }}</h4>
+    {{ tag.body }}
     {% if not forloop.last %}<hr />{% endif %}
     {% endfor %}
 </div>
diff --git a/django/contrib/admindocs/templates/admin_doc/view_detail.html b/django/contrib/admindocs/templates/admin_doc/view_detail.html
index d7415ab74f..c6d080c9ef 100644
--- a/django/contrib/admindocs/templates/admin_doc/view_detail.html
+++ b/django/contrib/admindocs/templates/admin_doc/view_detail.html
@@ -7,9 +7,9 @@
 
 <h1>{{ name }}</h1>
 
-<h2 class="subhead">{{ summary }}</h2>
+<h2 class="subhead">{{ summary|striptags }}</h2>
 
-<p>{{ body }}</p>
+{{ body }}
 
 {% if meta.Context %}
 <h3>Context:</h3>
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 5beab49d0a..73ecea3bd7 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -853,7 +853,7 @@ def do_if(parser, token):
         {% endif %}
 
     Comparison operators are also available, and the use of filters is also
-    allowed, for example:
+    allowed, for example::
 
         {% if articles|length >= 5 %}...{% endif %}