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 22:02:03 +0100 |
| commit | 78a28cca200e6e03432bab9bf73856b8f778c6f0 (patch) | |
| tree | ded552a3a759fa1e9bb998cf89243745f4de177c | |
| parent | bd55e8063544e0f7990bab7d9c981a6dc22c1654 (diff) | |
[1.8.x] 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.
Backport of 1679472165e840aef4c8c9ece2fbf4620b87beab from master
| -rw-r--r-- | AUTHORS | 1 | ||||
| -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 |
4 files changed, 9 insertions, 8 deletions
@@ -657,6 +657,7 @@ answer newbie questions, and generally made Django that much better: Terry Huang <terryh.tp@gmail.com> thebjorn <bp@datakortet.no> Thejaswi Puthraya <thejaswi.puthraya@gmail.com> + Thijs van Dien <thijs@vandien.net> Thomas Chaumeny <t.chaumeny@gmail.com> Thomas Güttler <hv@tbz-pariv.de> Thomas Kerpe <thomas@kerpe.net> diff --git a/docs/ref/urlresolvers.txt b/docs/ref/urlresolvers.txt index b8d5b58f71..20f4d4ef8a 100644 --- a/docs/ref/urlresolvers.txt +++ b/docs/ref/urlresolvers.txt @@ -18,12 +18,12 @@ 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 be087d7758..863e7caf39 100644 --- a/docs/topics/class-based-views/generic-editing.txt +++ b/docs/topics/class-based-views/generic-editing.txt @@ -163,9 +163,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 c68d2e1f7e..7f6de9e384 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1251,7 +1251,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 = [ @@ -1273,7 +1273,7 @@ function. Example:: from django.utils.translation import activate >>> activate('en') - >>> reverse('sitemap_xml') + >>> reverse('sitemap-xml') '/sitemap.xml' >>> reverse('news:index') '/en/news/' @@ -1309,7 +1309,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 = [ |