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

---
 docs/ref/forms/api.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index 34f8adbaeca..16e8443361d 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -1022,7 +1022,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::
@@ -1043,7 +1043,7 @@ classes::
     <li>Haircut type: <input type="text" name="haircut_type" /></li>
 
 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::
+by setting the name of the field to ``None`` on the subclass. For example::
 
     >>> from django import forms