Fixed #14112 -- Various Markup fixes for the docs. Thanks to ramiro for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-08-23 08:07:35 +00:00
parent 5d4c37af7c
commit a323fd3c5e
11 changed files with 74 additions and 29 deletions

View file

@ -5,8 +5,6 @@ The Django admin site
.. module:: django.contrib.admin
:synopsis: Django's admin site.
.. currentmodule:: django.contrib.admin
One of the most powerful parts of Django is the automatic admin interface. It
reads metadata in your model to provide a powerful and production-ready
interface that content producers can immediately use to start adding content to
@ -831,7 +829,7 @@ problems:
Since this is usually not what you want, Django provides a convenience wrapper
to check permissions and mark the view as non-cacheable. This wrapper is
:meth:`AdminSite.admin_view` (i.e. ``self.admin_site.admin_view`` inside a
:meth:`AdminSite.admin_view` (i.e. ``self.admin_site.admin_view`` inside a
``ModelAdmin`` instance); use it like so::
class MyModelAdmin(admin.ModelAdmin):
@ -1010,6 +1008,8 @@ information.
``InlineModelAdmin`` objects
============================
.. class:: InlineModelAdmin
The admin interface has the ability to edit models on the same page as a
parent model. These are called inlines. Suppose you have these two models::