From a9b6218960c2894de56bde3a00da77bb35192ee4 Mon Sep 17 00:00:00 2001
From: John Moses <john.moses@cerner.com>
Date: Fri, 2 Oct 2015 09:56:25 -0500
Subject: [PATCH] [1.8.x] Fixed #25481 -- Added field.help_text to "Looping
 over a form's fields" docs.

Backport of ac09d22f7913ff09f98001ff51b783932290e378 from master
---
 AUTHORS                     | 1 +
 docs/topics/forms/index.txt | 3 +++
 2 files changed, 4 insertions(+)

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 %}