summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-14 08:21:36 -0400
committerTim Graham <timograham@gmail.com>2015-08-14 08:28:53 -0400
commitd2dfe3ae81b7a0ea4db0d177d3c316c7c99a4a4b (patch)
tree901a1928e248a3c6b4a722fc947baf533e7b0b53 /docs/ref
parent99b5649a0788fa9e816debf6c987b19157340acf (diff)
[1.8.x] Fixed #25268 -- Tweaked wording in docs/ref/forms/api.txt
Backport of 5b5a27942b2fa113df4d6eb3d77a33c85f58634f from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/forms/api.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index 10c8ff0473..9a9262e590 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -1007,7 +1007,7 @@ fields are ordered first::
<li>Cc myself: <input type="checkbox" name="cc_myself" /></li>
<li>Priority: <input type="text" name="priority" /></li>
-It's possible to subclass multiple forms, treating forms as "mix-ins." In this
+It's possible to subclass multiple forms, treating forms as mixins. In this
example, ``BeatleForm`` subclasses both ``PersonForm`` and ``InstrumentForm``
(in that order), and its field list includes the fields from the parent
classes::
@@ -1029,8 +1029,8 @@ classes::
.. versionadded:: 1.7
-* It's possible to declaratively remove a ``Field`` inherited from a parent
- class by setting the name to be ``None`` on the subclass. For example::
+It's possible to declaratively remove a ``Field`` inherited from a parent class
+by setting the name of the field to ``None`` on the subclass. For example::
>>> from django import forms