Merge remote-tracking branch 'official/master'

* official/master: Update docs to mention modeladmins
matthiask · Apr 12, 2014 · a0e392a · a0e392a
2 parents 1016afc + 60758f1
commit a0e392a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/page.rst b/docs/page.rst
@@ -156,7 +156,7 @@ cluttering up the core page model for those who do not need them. The extensions
 are standard python modules with a :func:`register` method which will be called
 upon registering the extension. The :func:`register` method receives the
 :class:`~feincms.module.page.models.Page` class itself and the model admin class
-:class:`~feincms.module.page.models.PageAdmin` as arguments. The extensions can
+:class:`~feincms.module.page.modeladmins.PageAdmin` as arguments. The extensions can
 be activated as follows::
 
      Page.register_extensions('feincms.module.page.extensions.navigation',

diff --git a/docs/versioning.rst b/docs/versioning.rst
@@ -19,7 +19,8 @@ Now, you need to create your own model admin subclass inheriting from both
 FeinCMS' ``PageAdmin`` and from reversions ``VersionAdmin``::
 
     from django.contrib import admin
-    from feincms.module.page.models import Page, PageAdmin
+    from feincms.module.page.models import Page
+    from feincms.module.page.modeladmins import PageAdmin
     from reversion.admin import VersionAdmin
 
     admin.site.unregister(Page)