summaryrefslogtreecommitdiff
path: root/wiki/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/urls.py')
-rw-r--r--wiki/urls.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/wiki/urls.py b/wiki/urls.py
index ddcddf3..07dd356 100644
--- a/wiki/urls.py
+++ b/wiki/urls.py
@@ -1,12 +1,14 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
-urlpatterns = patterns('elgarito.wiki.views',
- (r'^$', 'index'),
+urlpatterns = patterns(
+ 'wiki.views',
+
+ url(r'^$', 'index'),
- #(r'^((?:[A-Z]+[a-z]+){2,})/$', 'pagina'),
- (r'^nueva/$', 'nueva'),
- (r'^lista/$', 'lista'),
- (r'^(?P<titulo>\w+)/$', 'pagina'),
- (r'^(?P<titulo>\w+)/editar/$', 'editar'),
- #(r'^(?P<titulo>\w+)/eliminar/$', 'eliminar'),
+ #url(r'^((?:[A-Z]+[a-z]+){2,})/$', 'pagina'),
+ url(r'^nueva/$', 'nueva'),
+ url(r'^lista/$', 'lista'),
+ url(r'^(?P<titulo>\w+)/$', 'pagina'),
+ url(r'^(?P<titulo>\w+)/editar/$', 'editar'),
+ #url(r'^(?P<titulo>\w+)/eliminar/$', 'eliminar'),
)