django/django — pull request #1738 by loic (2013-10-14 12:53:16+00:00)
Title: Reworked the ModelForm docs.

The ModelForm docs suggested that fields defined declaratively override
default fields generated from the form Meta.

This is conceptually wrong, especially with inheritance in mind. Meta is
usually defined on the topmost ModelForm subclass, while fields can come
from anywhere in the MRO, especially base classes; so we suggested that
something defined in a base class override something defined on a subclass.

This patch rephrases the docs around the idea that Meta is used to generate
*missing* fields.