[1.0.X] Fixed #9347 -- Added an entry in the field reference for the …

…verbose_name option. Thanks to marcoberi for the suggestion, and timo for the eventual patch.

Merge of r9865 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9875 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/ref/models/fields.txt

@@ -270,6 +270,15 @@ respect to the month.
 
 Like :attr:`~Field.unique_for_date` and :attr:`~Field.unique_for_month`.
 
+``verbose_name``
+-------------------
+
+.. attribute:: Field.verbose_name
+
+A human-readable name for the field. If the verbose name isn't given, Django
+will automatically create it using the field's attribute name, converting
+underscores to spaces. See :ref:`Verbose field names <verbose-field-names>`.
+
 .. _model-field-types:
 
 Field types

docs/topics/db/models.txt

@@ -218,6 +218,8 @@ sees you've explicitly set :attr:`Field.primary_key`, it won't add the automatic
 Each model requires exactly one field to have :attr:`primary_key=True
 <Field.primary_key>`.
 
+.. _verbose-field-names:
+
 Verbose field names
 -------------------