diff --git a/docs/custom_model_fields.txt b/docs/custom_model_fields.txt
index 86d2986ffc..6da15e7f42 100644
--- a/docs/custom_model_fields.txt
+++ b/docs/custom_model_fields.txt
@@ -538,11 +538,11 @@ serializer output in some other place, outside of Django.
     Although implementing this method is necessary to allow field
     serialization, the API might change in the future.
 
-Returns a dictionary, mapping the field's attribute name to a flattened string
-version of the data. This method has some internal uses that aren't of
-interest to use here (mostly having to do with manipulators). For our
-purposes, it's sufficient to return a one item dictionary that maps the
-attribute name to a string.
+Returns a dictionary, mapping the field's attribute name to a
+flattened string version of the data. This method has some internal
+uses that aren't of interest to use here (mostly having to do with
+formss). For our purposes, it's sufficient to return a one item
+dictionary that maps the attribute name to a string.
 
 This method is used by the serializers to convert the field into a string for
 output. You can ignore the input parameters for serialization purposes,
diff --git a/docs/generic_views.txt b/docs/generic_views.txt
index 32e31371b3..73799c6125 100644
--- a/docs/generic_views.txt
+++ b/docs/generic_views.txt
@@ -998,7 +998,8 @@ In addition to ``extra_context``, the template's context will be:
 
 A page that displays a form for editing an existing object, redisplaying the
 form with validation errors (if there are any) and saving changes to the
-object. This uses the automatic manipulators that come with Django models.
+object. This uses a form automatically generated from the object's
+model class.
 
 **Required arguments:**