diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
a
|
b
|
|
122 | 122 | |
123 | 123 | .. class:: django.middleware.http.SetRemoteAddrFromForwardedFor |
124 | 124 | |
125 | | .. versionchanged: 1.1 |
| 125 | .. versionchanged:: 1.1 |
126 | 126 | |
127 | 127 | This middleware was removed in Django 1.1. See :ref:`the release notes |
128 | 128 | <removed-setremoteaddrfromforwardedfor-middleware>` for details. |
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
a
|
b
|
|
411 | 411 | Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``) |
412 | 412 | |
413 | 413 | The default formatting to use for displaying date fields in any part of the |
414 | | system. Note that if setting:`USE_L10N` is set to ``True``, then the |
| 414 | system. Note that if :setting:`USE_L10N` is set to ``True``, then the |
415 | 415 | locale-dictated format has higher precedence and will be applied instead. See |
416 | 416 | :ttag:`allowed date format strings <now>`. |
417 | 417 | |
… |
… |
|
451 | 451 | Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``) |
452 | 452 | |
453 | 453 | The default formatting to use for displaying datetime fields in any part of the |
454 | | system. Note that if setting:`USE_L10N` is set to ``True``, then the |
| 454 | system. Note that if :setting:`USE_L10N` is set to ``True``, then the |
455 | 455 | locale-dictated format has higher precedence and will be applied instead. See |
456 | 456 | :ttag:`allowed date format strings <now>`. |
457 | 457 | |
… |
… |
|
1353 | 1353 | Default: ``m/d/Y`` (e.g. ``12/31/2003``) |
1354 | 1354 | |
1355 | 1355 | An available formatting that can be used for displaying date fields on |
1356 | | templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding |
| 1356 | templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding |
1357 | 1357 | locale-dictated format has higher precedence and will be applied. See |
1358 | 1358 | :ttag:`allowed date format strings <now>`. |
1359 | 1359 | |
… |
… |
|
1369 | 1369 | Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``) |
1370 | 1370 | |
1371 | 1371 | An available formatting that can be used for displaying datetime fields on |
1372 | | templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding |
| 1372 | templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding |
1373 | 1373 | locale-dictated format has higher precedence and will be applied. See |
1374 | 1374 | :ttag:`allowed date format strings <now>`. |
1375 | 1375 | |
… |
… |
|
1509 | 1509 | Default: ``'P'`` (e.g. ``4 p.m.``) |
1510 | 1510 | |
1511 | 1511 | The default formatting to use for displaying time fields in any part of the |
1512 | | system. Note that if setting:`USE_L10N` is set to ``True``, then the |
| 1512 | system. Note that if :setting:`USE_L10N` is set to ``True``, then the |
1513 | 1513 | locale-dictated format has higher precedence and will be applied instead. See |
1514 | 1514 | :ttag:`allowed date format strings <now>`. |
1515 | 1515 | |
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
a
|
b
|
|
724 | 724 | Using an alternative template language |
725 | 725 | ====================================== |
726 | 726 | |
727 | | .. versionadded 1.2 |
| 727 | .. versionadded:: 1.2 |
728 | 728 | |
729 | 729 | The Django ``Template`` and ``Loader`` classes implement a simple API for |
730 | 730 | loading and rendering templates. By providing some simple wrapper classes that |