merging cacheimp -> trunk

[osqa.git] / urls.py

diff --git a/urls.py b/urls.py
index 51fa72080700056993c6f007270e51a7de9fe903..aa8bdf98d3e8051069fe9f05f873ea89c128d419 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext as _
 from django.conf import settings
 
 urlpatterns = patterns('',
-    (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
+    (r'', include('forum.urls')),
 )
 
 if 'rosetta' in settings.INSTALLED_APPS:
@@ -11,3 +11,7 @@ if 'rosetta' in settings.INSTALLED_APPS:
         url(r'^rosetta/', include('rosetta.urls')),
     )
 
+handler404 = 'forum.views.meta.page'
+handler500 = 'forum.views.meta.error_handler'
+
+