From c6b171b6711591c68737a21d8b91050dc18b44b7 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Mon, 29 Sep 2014 14:44:22 -0700
Subject: [PATCH] Document Django 1.7 admin installation changes.

Closes #74.
---
 djrill/__init__.py    |  5 +++++
 docs/installation.rst | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/djrill/__init__.py b/djrill/__init__.py
index b8acf10..98022ae 100644
--- a/djrill/__init__.py
+++ b/djrill/__init__.py
@@ -11,7 +11,12 @@ from ._version import *
 MANDRILL_API_URL = getattr(settings, "MANDRILL_API_URL",
     "http://mandrillapp.com/api/1.0")
 
+
 class DjrillAdminSite(AdminSite):
+    # This was originally adapted from https://github.com/jsocol/django-adminplus.
+    # If new versions of Django break DjrillAdminSite, it's worth checking to see
+    # whether django-adminplus has dealt with something similar.
+
     index_template = "djrill/index.html"
     custom_views = []
     custom_urls = []
diff --git a/docs/installation.rst b/docs/installation.rst
index 7f2db83..59b82cc 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -88,3 +88,19 @@ If you want to enable the Djrill admin interface, edit your base :file:`urls.py`
             ...
             url(r'^admin/', include(admin.site.urls)),
         )
+
+If you are on **Django 1.7 or later,** you will also need to change the config used
+by the django.contrib.admin app in your :file:`settings.py`:
+
+    .. code-block:: python
+        :emphasize-lines: 4
+
+        ...
+        INSTALLED_APPS = (
+            # For Django 1.7+, use SimpleAdminConfig because we'll call autodiscover...
+            'django.contrib.admin.apps.SimpleAdminConfig',  # instead of 'django.contrib.admin'
+            ...
+            'djrill',
+            ...
+        )
+        ...