Index: django/contrib/admin/templates/admin_doc/view_detail.html
===================================================================
--- django/contrib/admin/templates/admin_doc/view_detail.html	(revision 4697)
+++ django/contrib/admin/templates/admin_doc/view_detail.html	(working copy)
@@ -6,11 +6,11 @@
 
 {% block content %}
 
-<h1>{{ name }}</h1>
+<h1>{{ name|escape }}</h1>
 
-<h2 class="subhead">{{ summary }}</h2>
+<h2 class="subhead">{{ summary|removetags:"p" }}</h2>
 
-<p>{{ body }}</p>
+{{ body }}
 
 {% if meta.Context %}
 <h3>Context:</h3>
Index: django/contrib/admin/templates/admin_doc/template_tag_index.html
===================================================================
--- django/contrib/admin/templates/admin_doc/template_tag_index.html	(revision 4697)
+++ django/contrib/admin/templates/admin_doc/template_tag_index.html	(working copy)
@@ -14,11 +14,11 @@
 {% for library in tag_libraries %}
 <div class="module">
     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}</h2>
-    {% 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 %}
+    {% 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="{{ tag.name }}">{{ tag.name }}</h3>
-    <h4>{{ tag.title }}</h4>
-    <p>{{ tag.body }}</p>
+    <h3 id="{{ tag.name|escape }}">{{ tag.name|escape }}</h3>
+    <h4>{{ tag.title|removetags:"p" }}</h4>
+    {{ tag.body }}
     {% if not forloop.last %}<hr />{% endif %}
     {% endfor %}
 </div>
Index: django/contrib/admin/templates/admin_doc/view_index.html
===================================================================
--- django/contrib/admin/templates/admin_doc/view_index.html	(revision 4697)
+++ django/contrib/admin/templates/admin_doc/view_index.html	(working copy)
@@ -16,7 +16,7 @@
 <h2>Jump to site</h2>
 <ul>
     {% for site_views in views_by_site %}
-    <li><a href="#site{{ site_views.grouper.id }}">{{ site_views.grouper.name }}</a></li>
+    <li><a href="#site{{ site_views.grouper.id }}">{{ site_views.grouper.name|escape }}</a></li>
     {% endfor %}
 </ul>
 </div>
@@ -26,14 +26,14 @@
 
 {% for site_views in views_by_site %}
 <div class="module">
-<h2 id="site{{ site_views.grouper.id }}">Views by URL on {{ site_views.grouper.name }}</h2>
+<h2 id="site{{ site_views.grouper.id }}">Views by URL on {{ site_views.grouper.name|escape }}</h2>
 
 {% for view in site_views.list|dictsort:"url" %}
 {% ifchanged %}
-<h3><a href="{{ view.module }}.{{ view.name }}/"/>{{ view.url|escape }}</a></h3>
-<p class="small quiet">View function: {{ view.module }}.{{ view.name }}</p>
-<p>{{ view.title }}</p>
-<hr>
+<h3><a href="{{ view.module|escape }}.{{ view.name|escape }}/">{{ view.url|escape }}</a></h3>
+<p class="small quiet">View function: {{ view.module|escape }}.{{ view.name|escape }}</p>
+<p>{{ view.title|escape }}</p>
+<hr />
 {% endifchanged %}
 {% endfor %}
 </div>
Index: django/contrib/admin/templates/admin_doc/template_filter_index.html
===================================================================
--- django/contrib/admin/templates/admin_doc/template_filter_index.html	(revision 4697)
+++ django/contrib/admin/templates/admin_doc/template_filter_index.html	(working copy)
@@ -14,11 +14,11 @@
 {% for library in filter_libraries %}
 <div class="module">
     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2>
-    {% 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 %}
+    {% 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="{{ filter.name }}">{{ filter.name }}</h3>
-    <p>{{ filter.title }}</p>
-    <p>{{ filter.body }}</p>
+    <h3 id="{{ filter.name }}">{{ filter.name|escape }}</h3>
+    {{ filter.title }}
+    {{ filter.body }}
     {% if not forloop.last %}<hr />{% endif %}
     {% endfor %}
 </div>
@@ -37,7 +37,7 @@
     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2>
     <ul>
     {% for filter in library.list|dictsort:"name" %}
-        <li><a href="#{{ filter.name }}">{{ filter.name }}</a></li>
+        <li><a href="#{{ filter.name }}">{{ filter.name|escape }}</a></li>
     {% endfor %}
     </ul>
 </div>