Author: russellm Date: 2009-02-22 01:19:26 -0600 (Sun, 22 Feb 2009) New Revision: 9875
Modified: django/branches/releases/1.0.X/ django/branches/releases/1.0.X/docs/ref/models/fields.txt django/branches/releases/1.0.X/docs/topics/db/models.txt Log: [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. Property changes on: django/branches/releases/1.0.X ___________________________________________________________________ Name: svnmerge-integrated - /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9810,9812,9821,9847,9856-9859,9861,9863-9864 + /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9810,9812,9821,9847,9856-9859,9861,9863-9865 Modified: django/branches/releases/1.0.X/docs/ref/models/fields.txt =================================================================== --- django/branches/releases/1.0.X/docs/ref/models/fields.txt 2009-02-22 07:17:23 UTC (rev 9874) +++ django/branches/releases/1.0.X/docs/ref/models/fields.txt 2009-02-22 07:19:26 UTC (rev 9875) @@ -270,6 +270,15 @@ 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 Modified: django/branches/releases/1.0.X/docs/topics/db/models.txt =================================================================== --- django/branches/releases/1.0.X/docs/topics/db/models.txt 2009-02-22 07:17:23 UTC (rev 9874) +++ django/branches/releases/1.0.X/docs/topics/db/models.txt 2009-02-22 07:19:26 UTC (rev 9875) @@ -218,6 +218,8 @@ Each model requires exactly one field to have :attr:`primary_key=True <Field.primary_key>`. +.. _verbose-field-names: + Verbose field names ------------------- --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
