diff options
| author | Carl Meyer <carl@oddbird.net> | 2011-09-16 18:06:42 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2011-09-16 18:06:42 +0000 |
| commit | 00678334aa7fb96d2f5fca3704e61e23317217a7 (patch) | |
| tree | 80bdf76a8fdbf0681dce5d3829da7cadee44ca67 /docs/topics | |
| parent | d1d6109229b4c103da682d4aa8bcac930c07da0b (diff) | |
Fixed #16863 -- Corrected ReST markup to avoid errors building docs.
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/http/middleware.txt | 14 | ||||
| -rw-r--r-- | docs/topics/i18n/localization.txt | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt index be2a774c95..6b9ba1e76f 100644 --- a/docs/topics/http/middleware.txt +++ b/docs/topics/http/middleware.txt @@ -98,13 +98,13 @@ view; it'll return that :class:`~django.http.HttpResponse`. Response middleware is always called on every response. .. note:: - Accessing :attr:`request.POST <django.http.HttpRequest.POST>` or - :attr:`request.REQUEST <django.http.HttpRequest.REQUEST>` inside - middleware from ``process_request`` or ``process_view`` will prevent any - view running after the middleware from being able to - :ref:`modify the upload handlers for the - request <modifying_upload_handlers_on_the_fly>`, and should normally be - avoided. + + Accessing :attr:`request.POST <django.http.HttpRequest.POST>` or + :attr:`request.REQUEST <django.http.HttpRequest.REQUEST>` inside middleware + from ``process_request`` or ``process_view`` will prevent any view running + after the middleware from being able to :ref:`modify the upload handlers + for the request <modifying_upload_handlers_on_the_fly>`, and should + normally be avoided. The :class:`~django.middleware.csrf.CsrfViewMiddleware` class can be considered an exception, as it provides the diff --git a/docs/topics/i18n/localization.txt b/docs/topics/i18n/localization.txt index a24db8d463..3c50e3993b 100644 --- a/docs/topics/i18n/localization.txt +++ b/docs/topics/i18n/localization.txt @@ -260,9 +260,10 @@ Django's formatting system is disabled by default. To enable it, it's necessary to set :setting:`USE_L10N = True <USE_L10N>` in your settings file. .. note:: - The default :file:`settings.py` file created by - :djadmin:`django-admin.py startproject <startproject>` includes - :setting:`USE_L10N = True <USE_L10N>` for convenience. + + The default :file:`settings.py` file created by :djadmin:`django-admin.py + startproject <startproject>` includes :setting:`USE_L10N = True <USE_L10N>` + for convenience. When using Django's formatting system, dates and numbers on templates will be displayed using the format specified for the current locale. Two users |