Branch: refs/heads/stable/1.6.x
  Home:   https://github.com/django/django
  Commit: 8222a48253e61f4d3c1d30156a5f9e0d59a7c56c
      
https://github.com/django/django/commit/8222a48253e61f4d3c1d30156a5f9e0d59a7c56c
  Author: Loic Bistuer <loic.bist...@sixmedia.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M docs/topics/forms/modelforms.txt

  Log Message:
  -----------
  [1.6.x] Clarfied the ModelForm docs with respect to generated vs. declared 
fields.

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; therefore we suggested
that something defined in a base class override something from a subclass.

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

Refs #8620, #19617.

Thanks @mjtamlyn and @timgraham for the review.

Backport of 54cd930baf from master



-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to django-updates+unsubscr...@googlegroups.com.
To post to this group, send email to django-updates@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/django-updates/525c0602217d3_49ab77d4863395%40hookshot-fe4-pe1-prd.aws.github.net.mail.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to