diff options
| author | Bouke Haarsma <bouke@webatoom.nl> | 2013-11-05 10:16:27 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-12-18 19:44:04 +0100 |
| commit | a39d672ec7d53637805a61b45a51bc0e7d297a36 (patch) | |
| tree | a8d9d2e2ff79822a3fbeb01a7974ef0669912ce2 /docs/ref | |
| parent | f1b3ab9c2158f5a7da113aef4158499ce2d42ee2 (diff) | |
Fixed #21386 -- Removed admindocs dependence on sites framework
* Removed ADMIN_FOR setting and warn warning
* Group view functions by namespace instead of site
* Added a test verifying namespaces are listed
Thanks to Claude Paroz for reviewing and ideas for improvement.
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/admin/admindocs.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 19 |
2 files changed, 0 insertions, 21 deletions
diff --git a/docs/ref/contrib/admin/admindocs.txt b/docs/ref/contrib/admin/admindocs.txt index 8809502288..f903e8efff 100644 --- a/docs/ref/contrib/admin/admindocs.txt +++ b/docs/ref/contrib/admin/admindocs.txt @@ -28,8 +28,6 @@ the following: ``r'^admin/'`` entry, so that requests to ``/admin/doc/`` don't get handled by the latter entry. * Install the docutils Python module (http://docutils.sf.net/). -* **Optional:** Linking to templates requires the :setting:`ADMIN_FOR` - setting to be configured. * **Optional:** Using the admindocs bookmarklets requires ``django.contrib.admindocs.middleware.XViewMiddleware`` to be installed. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index d9cb07e9b3..3e625ace85 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2097,25 +2097,6 @@ The default value for the X-Frame-Options header used by :doc:`clickjacking protection </ref/clickjacking/>` documentation. -Admindocs -========= - -Settings for :mod:`django.contrib.admindocs`. - -.. setting:: ADMIN_FOR - -ADMIN_FOR ---------- - -Default: ``()`` (Empty tuple) - -Used for admin-site settings modules, this should be a tuple of settings -modules (in the format ``'foo.bar.baz'``) for which this site is an admin. - -The admin site uses this in its automatically-introspected documentation of -models, views and template tags. - - Auth ==== |
