diff options
| author | Marcus Pennington <marcuspen@msn.com> | 2015-04-24 17:05:25 +0100 |
|---|---|---|
| committer | Marcus Pennington <marcuspen@msn.com> | 2015-04-24 17:57:29 +0100 |
| commit | 269a5dbdd37362e27b2bb3bf3a600ffd5ea2c3bb (patch) | |
| tree | 0177a0ab4a838c4bbb86bdd6148629b369190806 /docs/topics | |
| parent | 8efea1b8d5b5fb0cfef1a3244c339cebf8af36c5 (diff) | |
Fixed #24700 -- Added dash to slug regex in http docs
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/http/urls.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index f4cf4b6029..2fd52b69f3 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -320,10 +320,10 @@ prefix is used repeatedly. For example, consider this URLconf:: from . import views urlpatterns = [ - url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/history/$', views.history), - url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/edit/$', views.edit), - url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/discuss/$', views.discuss), - url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/permissions/$', views.permissions), + url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/history/$', views.history), + url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/edit/$', views.edit), + url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/discuss/$', views.discuss), + url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/permissions/$', views.permissions), ] We can improve this by stating the common path prefix only once and grouping @@ -333,7 +333,7 @@ the suffixes that differ:: from . import views urlpatterns = [ - url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/', include([ + url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/', include([ url(r'^history/$', views.history), url(r'^edit/$', views.edit), url(r'^discuss/$', views.discuss), |