Some documentation examples incorrectly use \w to match against slugs in URLs

[Baptiste Mispelon]

On ​https://docs.djangoproject.com/en/dev/topics/http/urls/#including-other-urlconfs (found with git grep -IF \\w -- docs/), slugs are matched using \w+, like so:

    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),

This is incorrect, since slugs can also contain dashes (-) so [\w-]+ should be used instead.

[Marcus Pennington <marcuspen@…>]

In 269a5db:

Fixed #24700 -- Added dash to slug regex in http docs

[Tim Graham <timograham@…>]

In 2a334d79:

[1.8.x] Fixed #24700 -- Added dash to slug regex in http docs

Backport of 269a5dbdd37362e27b2bb3bf3a600ffd5ea2c3bb from master