diff --git a/settings/base.py b/settings/base.py index 9a7e691..59a3a42 100644 --- a/settings/base.py +++ b/settings/base.py @@ -62,10 +62,10 @@ 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', + 'django.contrib.admin', + 'django.contrib.admindocs', + + 'south', ) LOGGING = { diff --git a/urls.py b/urls.py index cc49c4a..fad7ef9 100644 --- a/urls.py +++ b/urls.py @@ -1,17 +1,9 @@ from django.conf.urls.defaults import patterns, include, url +from django.contrib import admin -# Uncomment the next two lines to enable the admin: -# from django.contrib import admin -# admin.autodiscover() +admin.autodiscover() urlpatterns = patterns('', - # Examples: - # url(r'^$', 'epio_skel.views.home', name='home'), - # url(r'^epio_skel/', include('epio_skel.foo.urls')), - - # Uncomment the admin/doc line below to enable admin documentation: - # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - # url(r'^admin/', include(admin.site.urls)), + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/', include(admin.site.urls)), )