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
|
324 | 324 | instead of ``None`` in the development version. |
325 | 325 | |
326 | 326 | .. note:: |
| 327 | |
327 | 328 | Since all ``Field`` subclasses have ``required=True`` by default, the |
328 | 329 | validation condition here is important. If you want to include a checkbox |
329 | 330 | in your form that can be either checked or unchecked, you must remember to |
… |
… |
Has two optional arguments for validation:
|
345 | 346 | |
346 | 347 | .. attribute:: CharField.max_length |
347 | 348 | .. attribute:: CharField.min_length |
| 349 | |
348 | 350 | If provided, these arguments ensure that the string is at most or at least |
349 | 351 | the given length. |
350 | 352 | |
… |
… |
Has two optional arguments for validation:
|
362 | 364 | Takes one extra required argument: |
363 | 365 | |
364 | 366 | .. attribute:: ChoiceField.choices |
| 367 | |
365 | 368 | An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this |
366 | 369 | field. |
367 | 370 | |
… |
… |
Takes one extra required argument:
|
380 | 383 | Takes one optional argument: |
381 | 384 | |
382 | 385 | .. attribute:: DateField.input_formats |
| 386 | |
383 | 387 | A list of formats used to attempt to convert a string to a valid |
384 | 388 | ``datetime.date`` object. |
385 | 389 | |
… |
… |
If no ``input_formats`` argument is provided, the default input formats are::
|
406 | 410 | Takes one optional argument: |
407 | 411 | |
408 | 412 | .. attribute:: DateTimeField.input_formats |
| 413 | |
409 | 414 | A list of formats used to attempt to convert a string to a valid |
410 | 415 | ``datetime.datetime`` object. |
411 | 416 | |
… |
… |
Takes four optional arguments:
|
444 | 449 | |
445 | 450 | .. attribute:: DecimalField.max_value |
446 | 451 | .. attribute:: DecimalField.min_value |
| 452 | |
447 | 453 | These attributes define the limits for the fields value. |
448 | 454 | |
449 | 455 | .. attribute:: DecimalField.max_digits |
| 456 | |
450 | 457 | The maximum number of digits (those before the decimal point plus those |
451 | 458 | after the decimal point, with leading zeros stripped) permitted in the |
452 | 459 | value. |
453 | 460 | |
454 | 461 | .. attribute:: DecimalField.decimal_places |
| 462 | |
455 | 463 | The maximum number of decimal places permitted. |
456 | 464 | |
457 | 465 | ``EmailField`` |
… |
… |
The field allows choosing from files inside a certain directory. It takes three
|
507 | 515 | extra arguments; only ``path`` is required: |
508 | 516 | |
509 | 517 | .. attribute:: FilePathField.path |
| 518 | |
510 | 519 | The absolute path to the directory whose contents you want listed. This |
511 | 520 | directory must exist. |
512 | 521 | |
513 | 522 | .. attribute:: FilePathField.recursive |
| 523 | |
514 | 524 | If ``False`` (the default) only the direct contents of ``path`` will be |
515 | 525 | offered as choices. If ``True``, the directory will be descended into |
516 | 526 | recursively and all descendants will be listed as choices. |
517 | 527 | |
518 | 528 | .. attribute:: FilePathField.match |
| 529 | |
519 | 530 | A regular expression pattern; only files with names matching this expression |
520 | 531 | will be allowed as choices. |
521 | 532 | |
… |
… |
Takes two optional arguments for validation:
|
573 | 584 | |
574 | 585 | .. attribute:: IntegerField.max_value |
575 | 586 | .. attribute:: IntegerField.min_value |
| 587 | |
576 | 588 | These control the range of values permitted in the field. |
577 | 589 | |
578 | 590 | ``IPAddressField`` |
… |
… |
Takes one extra argument, ``choices``, as for ``ChoiceField``.
|
625 | 637 | |
626 | 638 | Takes one required argument: |
627 | 639 | |
628 | | .. attribute:: RegexField.regex`` |
| 640 | .. attribute:: RegexField.regex |
| 641 | |
629 | 642 | A regular expression specified either as a string or a compiled regular |
630 | 643 | expression object. |
631 | 644 | |
… |
… |
and the error message as the value.
|
652 | 665 | Takes one optional argument: |
653 | 666 | |
654 | 667 | .. attribute:: TimeField.input_formats |
| 668 | |
655 | 669 | A list of formats used to attempt to convert a string to a valid |
656 | 670 | ``datetime.time`` object. |
657 | 671 | |
… |
… |
Takes the following optional arguments:
|
676 | 690 | |
677 | 691 | .. attribute:: URLField.max_length |
678 | 692 | .. attribute:: URLField.min_length |
| 693 | |
679 | 694 | Same as ``CharField.max_length`` and ``CharField.min_length``. |
680 | 695 | |
681 | 696 | .. attribute:: URLField.verify_exists |
| 697 | |
682 | 698 | If ``True``, the validator will attempt to load the given URL, raising |
683 | 699 | ``ValidationError`` if the page gives a 404. Defaults to ``False``. |
684 | 700 | |
685 | 701 | .. attribute:: URLField.validator_user_agent |
| 702 | |
686 | 703 | String used as the user-agent used when checking for a URL's existence. |
687 | 704 | Defaults to the value of the ``URL_VALIDATOR_USER_AGENT`` setting. |
688 | 705 | |
… |
… |
dictionary of forms in which they're used. Both of these fields have an
|
711 | 728 | additional required argument: |
712 | 729 | |
713 | 730 | .. attribute:: ModelChoiceField.queryset |
| 731 | |
714 | 732 | A ``QuerySet`` of model objects from which the choices for the |
715 | 733 | field will be derived, and which will be used to validate the |
716 | 734 | user's selection. |
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 72bd97c..86ef804 100644
a
|
b
|
See :ref:`topics-templates`..
|
999 | 999 | TEMPLATE_LOADERS |
1000 | 1000 | ---------------- |
1001 | 1001 | |
1002 | | Default: |
| 1002 | Default:: |
1003 | 1003 | |
1004 | 1004 | ('django.template.loaders.filesystem.load_template_source', |
1005 | 1005 | 'django.template.loaders.app_directories.load_template_source') |