From d2dfe3ae81b7a0ea4db0d177d3c316c7c99a4a4b Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Fri, 14 Aug 2015 08:21:36 -0400
Subject: [PATCH] [1.8.x] Fixed #25268 -- Tweaked wording in
 docs/ref/forms/api.txt

Backport of 5b5a27942b2fa113df4d6eb3d77a33c85f58634f from master
---
 docs/ref/forms/api.txt | 6 +++---
 1 file 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