Ticket #4991: contrib.diff

django/contrib/admin/templates/admin/field_line.html

@@ -5 +5 @@
   {% if bound_field.has_label_first %}{% field_label bound_field %}{% endif %}
   {% field_widget bound_field %}
   {% if not bound_field.has_label_first %}{% field_label bound_field %}{% endif %}
-  {% if bound_field.field.help_text %}<p class="help">{{ bound_field.field.help_text }}</p>{% endif %}
+  {% if bound_field.field.help_text %}<p class="help">{{ bound_field.field.help_text|escape }}</p>{% endif %}
 {% endfor %}
 </div>

django/contrib/admin/templates/admin_doc/model_detail.html

@@ -35 +35 @@
 <tr>
     <td>{{ field.name }}</td>
     <td>{{ field.data_type }}</td>
-    <td>{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text }}{% endif %}</td>
+    <td>{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text|escape }}{% endif %}</td>
 </tr>
 {% endfor %}
 </tbody>