summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2016-08-17 07:27:33 -0700
committerTim Graham <timograham@gmail.com>2016-08-17 10:27:46 -0400
commitf6af24fe4007d5eb52c919c2db5d493de06080d8 (patch)
treef14387984e538af9561c51ea2109e04cdead200a /docs
parent8df2da36379cfce0efc7f2da96fc076ed221dc0a (diff)
[1.10.x] Fixed incorrect doc reference to Field.initial.
Backport of 4773ed2e313c67ed9d4a77d5fe24ca7ed34172cf from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/forms/api.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index c468dc38a0..c9e627ddcc 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -231,8 +231,8 @@ it's not necessary to include every field in your form. For example::
These values are only displayed for unbound forms, and they're not used as
fallback values if a particular value isn't provided.
-Note that if a :class:`~django.forms.Field` defines :attr:`~Form.initial` *and*
-you include ``initial`` when instantiating the ``Form``, then the latter
+If a :class:`~django.forms.Field` defines :attr:`~Field.initial` *and* you
+include :attr:`~Form.initial` when instantiating the ``Form``, then the latter
``initial`` will have precedence. In this example, ``initial`` is provided both
at the field level and at the form instance level, and the latter gets
precedence::