test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #23169 - Misc docs fixes. 

Backport of e4dd8b5dde from master
This commit is contained in:
areski 2014-08-04 13:29:59 +02:00 committed by Tim Graham
parent d723da383d
commit a582431b41
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/ref/forms/fields.txt
View File

@ -279,7 +279,7 @@ as the rendered output.
See the :ref:`format localization <format-localization>` documentation for See the :ref:`format localization <format-localization>` documentation for
more information. more information.
.. _built-in fields: .. _built-in-fields:
Built-in ``Field`` classes Built-in ``Field`` classes
-------------------------- --------------------------
@ -407,7 +407,7 @@ For each field, we describe the default widget used if you don't specify
If no ``input_formats`` argument is provided, the default input formats are:: If no ``input_formats`` argument is provided, the default input formats are::
['%Y-%m-%d', # '2006-10-25' ['%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006' '%m/%d/%Y', # '10/25/2006'
'%m/%d/%y'] # '10/25/06' '%m/%d/%y'] # '10/25/06'
@ -930,12 +930,12 @@ Slightly complex built-in ``Field`` classes
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# Define one message for all fields. # Define one message for all fields.
error_messages = { error_messages = {
'incomplete': 'Enter a country code and phone number.', 'incomplete': 'Enter a country calling code and a phone number.',
} }
# Or define a different message for each field. # Or define a different message for each field.
fields = ( fields = (
CharField(error_messages={'incomplete': 'Enter a country code.'}, CharField(error_messages={'incomplete': 'Enter a country calling code.'},
validators=[RegexValidator(r'^\d+$', 'Enter a valid country code.')]), validators=[RegexValidator(r'^\d+$', 'Enter a valid country calling code.')]),
CharField(error_messages={'incomplete': 'Enter a phone number.'}, CharField(error_messages={'incomplete': 'Enter a phone number.'},
validators=[RegexValidator(r'^\d+$', 'Enter a valid phone number.')]), validators=[RegexValidator(r'^\d+$', 'Enter a valid phone number.')]),
CharField(validators=[RegexValidator(r'^\d+$', 'Enter a valid extension.')], CharField(validators=[RegexValidator(r'^\d+$', 'Enter a valid extension.')],

2
docs/ref/forms/widgets.txt
View File

@ -27,7 +27,7 @@ Specifying widgets
Whenever you specify a field on a form, Django will use a default widget Whenever you specify a field on a form, Django will use a default widget
that is appropriate to the type of data that is to be displayed. To find that is appropriate to the type of data that is to be displayed. To find
which widget is used on which field, see the documentation about which widget is used on which field, see the documentation about
:ref:`built-in fields`. :ref:`built-in-fields`.
However, if you want to use a different widget for a field, you can However, if you want to use a different widget for a field, you can
just use the :attr:`~Field.widget` argument on the field definition. For just use the :attr:`~Field.widget` argument on the field definition. For

2
docs/topics/http/file-uploads.txt
View File

@ -26,7 +26,7 @@ Consider a simple form containing a :class:`~django.forms.FileField`::
class UploadFileForm(forms.Form): class UploadFileForm(forms.Form):
title = forms.CharField(max_length=50) title = forms.CharField(max_length=50)
file = forms.FileField() file = forms.FileField()
A view handling this form will receive the file data in A view handling this form will receive the file data in
:attr:`request.FILES <django.http.HttpRequest.FILES>`, which is a dictionary :attr:`request.FILES <django.http.HttpRequest.FILES>`, which is a dictionary