Index: django/forms/forms.py =================================================================== --- django/forms/forms.py (revision 11855) +++ django/forms/forms.py (working copy) @@ -212,7 +212,7 @@ normal_row = u'%(label)s%(errors)s%(field)s%(help_text)s', error_row = u'%s', row_ender = u'', - help_text_html = u'
%s', + help_text_html = u'
%s', errors_on_separate_row = False) def as_ul(self): @@ -221,7 +221,7 @@ normal_row = u'%(errors)s%(label)s %(field)s%(help_text)s', error_row = u'
  • %s
    • ', row_ender = '', - help_text_html = u' %s', + help_text_html = u' %s', errors_on_separate_row = False) def as_p(self): @@ -230,7 +230,7 @@ normal_row = u'%(label)s %(field)s%(help_text)s

    ', error_row = u'%s', row_ender = '

    ', - help_text_html = u' %s', + help_text_html = u' %s', errors_on_separate_row = True) def non_field_errors(self): Index: tests/modeltests/model_forms/models.py =================================================================== --- tests/modeltests/model_forms/models.py (revision 11855) +++ tests/modeltests/model_forms/models.py (working copy) @@ -498,7 +498,7 @@ -
    Hold down "Control", or "Command" on a Mac, to select more than one. +
    Hold down "Control", or "Command" on a Mac, to select more than one. You can restrict a form to a subset of the complete list of fields by providing a 'fields' argument. If you try to save a @@ -523,7 +523,7 @@ ... model = Writer >>> f = RoykoForm(auto_id=False, instance=w) >>> print f -Name:
    Use both first and last names. +Name:
    Use both first and last names. >>> art = Article(headline='Test article', slug='test-article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.') >>> art.save() @@ -553,7 +553,7 @@ - Hold down "Control", or "Command" on a Mac, to select more than one. + Hold down "Control", or "Command" on a Mac, to select more than one. >>> f = TestArticleForm({'headline': u'Test headline', 'slug': 'test-headline', 'pub_date': u'1984-02-06', 'writer': u'1', 'article': 'Hello.'}, instance=art) >>> f.is_valid() True @@ -614,7 +614,7 @@ - Hold down "Control", or "Command" on a Mac, to select more than one. + Hold down "Control", or "Command" on a Mac, to select more than one. Initial values can be provided for model forms >>> f = TestArticleForm(auto_id=False, initial={'headline': 'Your headline here', 'categories': ['1','2']}) @@ -638,7 +638,7 @@ - Hold down "Control", or "Command" on a Mac, to select more than one. + Hold down "Control", or "Command" on a Mac, to select more than one. >>> f = TestArticleForm({'headline': u'New headline', 'slug': u'new-headline', 'pub_date': u'1988-01-04', ... 'writer': u'1', 'article': u'Hello.', 'categories': [u'1', u'2']}, instance=new_art) @@ -754,7 +754,7 @@ - Hold down "Control", or "Command" on a Mac, to select more than one. + Hold down "Control", or "Command" on a Mac, to select more than one. >>> Category.objects.create(name='Fourth', url='4th') >>> Writer.objects.create(name='Carl Bernstein') @@ -781,7 +781,7 @@ - Hold down "Control", or "Command" on a Mac, to select more than one. + Hold down "Control", or "Command" on a Mac, to select more than one. # ModelChoiceField ############################################################ Index: tests/regressiontests/model_forms_regress/tests.py =================================================================== --- tests/regressiontests/model_forms_regress/tests.py (revision 11855) +++ tests/regressiontests/model_forms_regress/tests.py (working copy) @@ -87,7 +87,7 @@ - Hold down "Control", or "Command" on a Mac, to select more than one.""") + Hold down "Control", or "Command" on a Mac, to select more than one.""") class CFFForm(forms.ModelForm): class Meta: Index: tests/regressiontests/forms/forms.py =================================================================== --- tests/regressiontests/forms/forms.py (revision 11855) +++ tests/regressiontests/forms/forms.py (working copy) @@ -1243,20 +1243,20 @@ ... password = CharField(widget=PasswordInput, help_text='Choose wisely.') >>> p = UserRegistration(auto_id=False) >>> print p.as_ul() -
  • Username: e.g., user@example.com
    • -
  • Password: Choose wisely.
    • +
  • Username: e.g., user@example.com
    • +
  • Password: Choose wisely.
    • >>> print p.as_p() -

    Username: e.g., user@example.com

    -

    Password: Choose wisely.

    +

    Username: e.g., user@example.com

    +

    Password: Choose wisely.

    >>> print p.as_table() -Username:
    e.g., user@example.com -Password:
    Choose wisely. +Username:
    e.g., user@example.com +Password:
    Choose wisely. The help text is displayed whether or not data is provided for the form. >>> p = UserRegistration({'username': u'foo'}, auto_id=False) >>> print p.as_ul() -
  • Username: e.g., user@example.com
    • -
    • This field is required.
    Password: Choose wisely.
    • +
  • Username: e.g., user@example.com
    • +
    • This field is required.
    Password: Choose wisely.
    • help_text is not displayed for hidden fields. It can be used for documentation purposes, though. @@ -1266,7 +1266,7 @@ ... next = CharField(widget=HiddenInput, initial='/', help_text='Redirect destination') >>> p = UserRegistration(auto_id=False) >>> print p.as_ul() -
  • Username: e.g., user@example.com
    • +
  • Username: e.g., user@example.com
  • Password:
    • Help text can include arbitrary Unicode characters. @@ -1274,7 +1274,7 @@ ... username = CharField(max_length=10, help_text='ŠĐĆŽćžšđ') >>> p = UserRegistration(auto_id=False) >>> p.as_ul() -u'
  • Username: \u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111
    • ' +u'
  • Username: \u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111
    • ' # Subclassing forms ###########################################################