From a56af9c9d33ef32da5492247d776ceeef867a408 Mon Sep 17 00:00:00 2001 From: etienne Date: Thu, 8 Apr 2010 19:38:06 +0000 Subject: Update the default settings to be correct with the documentation - Add the documentation file --- papillon/settings.py | 4 ++-- papillon/urls.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'papillon') diff --git a/papillon/settings.py b/papillon/settings.py index 85ae8c8..1307e24 100644 --- a/papillon/settings.py +++ b/papillon/settings.py @@ -6,8 +6,8 @@ DEBUG = True TEMPLATE_DEBUG = DEBUG -ROOT_PATH = '/var/local/django/papillon/' -SERVER_URL = 'http://localhost:8000/' +ROOT_PATH = '/var/local/django/papillon/papillon/' +SERVER_URL = 'http://localhost/' EXTRA_URL = 'papillon/' BASE_SITE = SERVER_URL + EXTRA_URL diff --git a/papillon/urls.py b/papillon/urls.py index 1e35a7b..e61fc66 100644 --- a/papillon/urls.py +++ b/papillon/urls.py @@ -46,7 +46,7 @@ urlpatterns = patterns('', (r'^papillon/feeds/(?P.*)$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), (r'^papillon/static/(?P.*)$', 'django.views.static.serve', - {'document_root': 'static/'}), + {'document_root': '/var/local/django/papillon/papillon/static'}), (r'^papillon/media/(?P.*)$', 'django.views.static.serve', {'document_root': 'media/'}), (r'^papillon/tinymce/', include('tinymce.urls')), -- cgit v1.2.3