From c3b642187e7122f0277517815c5ffa297efc7944 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Fri, 15 Feb 2008 09:42:50 +0000
Subject: [PATCH] Trivial comment change in ModelFormMetaclass to better
 reflect what we are doing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/newforms/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/newforms/models.py b/django/newforms/models.py
index fbcf73c67a..f3809dc370 100644
--- a/django/newforms/models.py
+++ b/django/newforms/models.py
@@ -231,8 +231,8 @@ class ModelFormMetaclass(type):
             # If a model is defined, extract form fields from it.
             fields = fields_for_model(opts.model, opts.fields,
                                       opts.exclude, formfield_callback)
-            # Fields defined on the base classes override local fields and are
-            # always included.
+            # Override default model fields with any custom declared ones
+            # (plus, include all the other declared fields).
             fields.update(declared_fields)
         else:
             fields = declared_fields