summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-09-16 18:06:42 +0000
committerCarl Meyer <carl@oddbird.net>2011-09-16 18:06:42 +0000
commit00678334aa7fb96d2f5fca3704e61e23317217a7 (patch)
tree80bdf76a8fdbf0681dce5d3829da7cadee44ca67 /docs/ref/contrib/admin
parentd1d6109229b4c103da682d4aa8bcac930c07da0b (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/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/index.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index bdbe61505d..2da6774d44 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1895,12 +1895,13 @@ a new view to your admin site, extend the base
a pattern for your new view.
.. note::
+
Any view you render that uses the admin templates, or extends the base
admin template, should provide the ``current_app`` argument to
- :class:`~django.template.RequestContext` or :class:`~django.template.Context`
- when rendering the template. It should be set to either ``self.name`` if
- your view is on an ``AdminSite`` or ``self.admin_site.name`` if your view
- is on a ``ModelAdmin``.
+ :class:`~django.template.RequestContext` or
+ :class:`~django.template.Context` when rendering the template. It should
+ be set to either ``self.name`` if your view is on an ``AdminSite`` or
+ ``self.admin_site.name`` if your view is on a ``ModelAdmin``.
.. _admin-reverse-urls: