Ticket #8544: 8544.diff

File 8544.diff, 4.7 KB (added by Thejaswi Puthraya, 16 years ago)

git-patch against the latest trunk checkout

  • docs/ref/forms/fields.txt

    diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
    index 161c550..8ea4b23 100644
    a b For each field, we describe the default widget used if you don't specify  
    324324instead of ``None`` in the development version.
    325325
    326326.. note::
     327
    327328    Since all ``Field`` subclasses have ``required=True`` by default, the
    328329    validation condition here is important. If you want to include a checkbox
    329330    in your form that can be either checked or unchecked, you must remember to
    Has two optional arguments for validation:  
    345346
    346347.. attribute:: CharField.max_length
    347348.. attribute:: CharField.min_length
     349
    348350    If provided, these arguments ensure that the string is at most or at least
    349351    the given length.
    350352
    Has two optional arguments for validation:  
    362364Takes one extra required argument:
    363365
    364366.. attribute:: ChoiceField.choices
     367
    365368    An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
    366369    field.
    367370
    Takes one extra required argument:  
    380383Takes one optional argument:
    381384
    382385.. attribute:: DateField.input_formats
     386
    383387    A list of formats used to attempt to convert a string to a valid
    384388    ``datetime.date`` object.
    385389
    If no ``input_formats`` argument is provided, the default input formats are::  
    406410Takes one optional argument:
    407411
    408412.. attribute:: DateTimeField.input_formats
     413
    409414    A list of formats used to attempt to convert a string to a valid
    410415    ``datetime.datetime`` object.
    411416
    Takes four optional arguments:  
    444449
    445450.. attribute:: DecimalField.max_value
    446451.. attribute:: DecimalField.min_value
     452
    447453    These attributes define the limits for the fields value.
    448454
    449455.. attribute:: DecimalField.max_digits
     456
    450457    The maximum number of digits (those before the decimal point plus those
    451458    after the decimal point, with leading zeros stripped) permitted in the
    452459    value.
    453460   
    454461.. attribute:: DecimalField.decimal_places
     462
    455463    The maximum number of decimal places permitted.
    456464
    457465``EmailField``
    The field allows choosing from files inside a certain directory. It takes three  
    507515extra arguments; only ``path`` is required:
    508516
    509517.. attribute:: FilePathField.path
     518
    510519    The absolute path to the directory whose contents you want listed. This
    511520    directory must exist.
    512521
    513522.. attribute:: FilePathField.recursive
     523
    514524    If ``False`` (the default) only the direct contents of ``path`` will be
    515525    offered as choices. If ``True``, the directory will be descended into
    516526    recursively and all descendants will be listed as choices.
    517527
    518528.. attribute:: FilePathField.match
     529
    519530    A regular expression pattern; only files with names matching this expression
    520531    will be allowed as choices.
    521532
    Takes two optional arguments for validation:  
    573584
    574585.. attribute:: IntegerField.max_value
    575586.. attribute:: IntegerField.min_value
     587
    576588    These control the range of values permitted in the field.
    577589
    578590``IPAddressField``
    Takes one extra argument, ``choices``, as for ``ChoiceField``.  
    625637
    626638Takes one required argument:
    627639
    628 .. attribute:: RegexField.regex``
     640.. attribute:: RegexField.regex
     641
    629642    A regular expression specified either as a string or a compiled regular
    630643    expression object.
    631644
    and the error message as the value.  
    652665Takes one optional argument:
    653666
    654667.. attribute:: TimeField.input_formats
     668
    655669    A list of formats used to attempt to convert a string to a valid
    656670    ``datetime.time`` object.
    657671
    Takes the following optional arguments:  
    676690
    677691.. attribute:: URLField.max_length
    678692.. attribute:: URLField.min_length
     693
    679694    Same as ``CharField.max_length`` and ``CharField.min_length``.
    680695
    681696.. attribute:: URLField.verify_exists
     697
    682698    If ``True``, the validator will attempt to load the given URL, raising
    683699    ``ValidationError`` if the page gives a 404. Defaults to ``False``.
    684700
    685701.. attribute:: URLField.validator_user_agent
     702
    686703    String used as the user-agent used when checking for a URL's existence.
    687704    Defaults to the value of the ``URL_VALIDATOR_USER_AGENT`` setting.
    688705
    dictionary of forms in which they're used. Both of these fields have an  
    711728additional required argument:
    712729
    713730.. attribute:: ModelChoiceField.queryset
     731
    714732    A ``QuerySet`` of model objects from which the choices for the
    715733    field will be derived, and which will be used to validate the
    716734    user's selection.
  • docs/ref/settings.txt

    diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
    index 72bd97c..86ef804 100644
    a b See :ref:`topics-templates`..  
    999999TEMPLATE_LOADERS
    10001000----------------
    10011001
    1002 Default:
     1002Default::
    10031003
    10041004     ('django.template.loaders.filesystem.load_template_source',
    10051005      'django.template.loaders.app_directories.load_template_source')
Back to Top