X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/cb6f2f10ddd3e2410f6c9cc3536ec83dd50c862d..refs/heads/django-1.7:/sommitrealweird/settings.py

diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index 95ead0a..723ff4d 100644
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -11,6 +11,11 @@ ADMINS = (
     ('Brett Parker', 'iDunno@sommitrealweird.co.uk'),
 )
 
+ALLOWED_HOSTS = [
+    "www.sommitrealweird.co.uk",
+    "www.sommitrealweird.co.uk.",
+]
+
 MANAGERS = ADMINS
 
 DATABASES = {
@@ -26,6 +31,8 @@ LANGUAGE_CODE = 'en-gb'
 
 SITE_ID = 1
 
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
@@ -58,7 +65,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
 )
 
 ROOT_URLCONF = 'urls'
@@ -73,7 +80,6 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'django.contrib.markup',
     'django.contrib.comments',
     'bpcms',
     'generic',