[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 1679472165 from master
This commit is contained in:
Thijs van Dien 2015-11-07 15:50:43 +01:00 committed by Tim Graham
parent bd55e80635
commit 78a28cca20
4 changed files with 9 additions and 8 deletions

View File

@ -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>

View File

@ -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.)

View File

@ -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::

View File

@ -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 = [