diff options
| author | Thijs van Dien <thijs@vandien.net> | 2015-11-07 15:50:43 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-07 21:58:45 +0100 |
| commit | 1679472165e840aef4c8c9ece2fbf4620b87beab (patch) | |
| tree | af36f96b3d27757ddc9bf5d1b910818e1b029128 /docs | |
| parent | 917100eed7ba2f0aca2c1a5b64821c8ba5cc1bcc (diff) | |
Fixed #25473 -- Changed underscores in url() names to dashes in docs.
To improve consistency, sample URL names that had underscores
in them now use dashes instead. That excludes URL names that
have some relation to the code, such as those generated by
the admin.
Thanks guettli for reporting this.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/urlresolvers.txt | 4 | ||||
| -rw-r--r-- | docs/topics/class-based-views/generic-editing.txt | 6 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docs/ref/urlresolvers.txt b/docs/ref/urlresolvers.txt index 116aa4fcd0..c9a1cf3af3 100644 --- a/docs/ref/urlresolvers.txt +++ b/docs/ref/urlresolvers.txt @@ -17,12 +17,12 @@ callable view object. For example, given the following ``url``:: from news import views - url(r'^archive/$', views.archive, name='news_archive') + url(r'^archive/$', views.archive, name='news-archive') you can use any of the following to reverse the URL:: # using the named URL - reverse('news_archive') + reverse('news-archive') # passing a callable object # (This is discouraged because you can't reverse namespaced views this way.) diff --git a/docs/topics/class-based-views/generic-editing.txt b/docs/topics/class-based-views/generic-editing.txt index 7b3b5083cc..9a9c4b7052 100644 --- a/docs/topics/class-based-views/generic-editing.txt +++ b/docs/topics/class-based-views/generic-editing.txt @@ -153,9 +153,9 @@ Finally, we hook these new views into the URLconf: urlpatterns = [ # ... - url(r'author/add/$', AuthorCreate.as_view(), name='author_add'), - url(r'author/(?P<pk>[0-9]+)/$', AuthorUpdate.as_view(), name='author_update'), - url(r'author/(?P<pk>[0-9]+)/delete/$', AuthorDelete.as_view(), name='author_delete'), + url(r'author/add/$', AuthorCreate.as_view(), name='author-add'), + url(r'author/(?P<pk>[0-9]+)/$', AuthorUpdate.as_view(), name='author-update'), + url(r'author/(?P<pk>[0-9]+)/delete/$', AuthorDelete.as_view(), name='author-delete'), ] .. note:: diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 14d10aa001..9ee927b08a 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1342,7 +1342,7 @@ prepend the current active language code to all url patterns defined within from sitemap.views import sitemap urlpatterns = [ - url(r'^sitemap\.xml$', sitemap, name='sitemap_xml'), + url(r'^sitemap\.xml$', sitemap, name='sitemap-xml'), ] news_patterns = ([ @@ -1364,7 +1364,7 @@ function. Example:: from django.utils.translation import activate >>> activate('en') - >>> reverse('sitemap_xml') + >>> reverse('sitemap-xml') '/sitemap.xml' >>> reverse('news:index') '/en/news/' @@ -1400,7 +1400,7 @@ URL patterns can also be marked translatable using the from sitemaps.views import sitemap urlpatterns = [ - url(r'^sitemap\.xml$', sitemap, name='sitemap_xml'), + url(r'^sitemap\.xml$', sitemap, name='sitemap-xml'), ] news_patterns = ([ |