summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Moses <john.moses@cerner.com>2015-10-02 09:56:25 -0500
committerTim Graham <timograham@gmail.com>2015-10-02 13:00:59 -0400
commita9b6218960c2894de56bde3a00da77bb35192ee4 (patch)
tree92a7ef884a0318cf512c4fdc05de454ef02ccf65
parent2a8988c3b04cba558e586300eb818dfcf10f76bc (diff)
[1.8.x] Fixed #25481 -- Added field.help_text to "Looping over a form's fields" docs.
Backport of ac09d22f7913ff09f98001ff51b783932290e378 from master
-rw-r--r--AUTHORS1
-rw-r--r--docs/topics/forms/index.txt3
2 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index ba80d56195..0c1b017dc6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -341,6 +341,7 @@ answer newbie questions, and generally made Django that much better:
john@calixto.net
John D'Agostino <john.dagostino@gmail.com>
John Huddleston <huddlej@wwu.edu>
+ John Moses <moses.john.r@gmail.com>
John Paulett <john@paulett.org>
John Shaffer <jshaffer2112@gmail.com>
Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt
index 8133478e82..1a3f8c6dfa 100644
--- a/docs/topics/forms/index.txt
+++ b/docs/topics/forms/index.txt
@@ -635,6 +635,9 @@ loop:
<div class="fieldWrapper">
{{ field.errors }}
{{ field.label_tag }} {{ field }}
+ {% if field.help_text %}
+ <p class="help">{{ field.help_text|safe }}</p>
+ {% endif %}
</div>
{% endfor %}