innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #13072: Corrected a few markup and formatting errors in the documentation. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2010-03-11 09:41:29 +00:00
parent 4c0701a5d3
commit 5c256ddeec
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/middleware.txt
View File

@ -122,7 +122,7 @@ Reverse proxy middleware
.. class:: django.middleware.http.SetRemoteAddrFromForwardedFor
.. versionchanged: 1.1
.. versionchanged:: 1.1
This middleware was removed in Django 1.1. See :ref:`the release notes
<removed-setremoteaddrfromforwardedfor-middleware>` for details.

10
docs/ref/settings.txt
View File

@ -411,7 +411,7 @@ DATE_FORMAT
Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``)
The default formatting to use for displaying date fields in any part of the
system. Note that if setting:`USE_L10N` is set to ``True``, then the
system. Note that if setting:`USE_L10N` is set to ``True``, then the
locale-dictated format has higher precedence and will be applied instead. See
:ttag:`allowed date format strings <now>`.
@ -451,7 +451,7 @@ DATETIME_FORMAT
Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``)
The default formatting to use for displaying datetime fields in any part of the
system. Note that if setting:`USE_L10N` is set to ``True``, then the
system. Note that if setting:`USE_L10N` is set to ``True``, then the
locale-dictated format has higher precedence and will be applied instead. See
:ttag:`allowed date format strings <now>`.
@ -1353,7 +1353,7 @@ SHORT_DATE_FORMAT
Default: ``m/d/Y`` (e.g. ``12/31/2003``)
An available formatting that can be used for displaying date fields on
templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding
templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding
locale-dictated format has higher precedence and will be applied. See
:ttag:`allowed date format strings <now>`.
@ -1369,7 +1369,7 @@ SHORT_DATETIME_FORMAT
Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``)
An available formatting that can be used for displaying datetime fields on
templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding
templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding
locale-dictated format has higher precedence and will be applied. See
:ttag:`allowed date format strings <now>`.
@ -1509,7 +1509,7 @@ TIME_FORMAT
Default: ``'P'`` (e.g. ``4 p.m.``)
The default formatting to use for displaying time fields in any part of the
system. Note that if setting:`USE_L10N` is set to ``True``, then the
system. Note that if setting:`USE_L10N` is set to ``True``, then the
locale-dictated format has higher precedence and will be applied instead. See
:ttag:`allowed date format strings <now>`.

2
docs/ref/templates/api.txt
View File

@ -724,7 +724,7 @@ and :setting:`TEMPLATE_DEBUG`. All available settings are described in the
Using an alternative template language
======================================
.. versionadded 1.2
.. versionadded:: 1.2
The Django ``Template`` and ``Loader`` classes implement a simple API for
loading and rendering templates. By providing some simple wrapper classes that