summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-06-07 17:52:53 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-06-07 17:52:53 +0000
commita61b34b048d84b2a8af78a42a4e635371252bd3f (patch)
tree6c0733ffe75a10b95719ac7b99bcd9b9abc6b578 /docs/ref/contrib/admin
parent9d3e6668d91af5ef442d07192b5508707d7e0a2a (diff)
[soc2010/query-refactor] Merged up to trunk r13328.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 7fee903715..f7aefa457d 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1189,7 +1189,7 @@ your admin page for managing the relation.
In all other respects, the ``InlineModelAdmin`` is exactly the same as any
other. You can customize the appearance using any of the normal
-``InlineModelAdmin`` properties.
+``ModelAdmin`` properties.
Working with Many-to-Many Intermediary Models
----------------------------------------------