diff options
| author | Tom Christie | 2015-01-21 20:29:58 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-01-21 20:29:58 +0000 | 
| commit | 5e52f0fd8c3b4dbe70f1332d1323e3a544951e66 (patch) | |
| tree | 61eab5961b51ad29072c7de0f4570bf648bc192f /docs/api-guide/routers.md | |
| parent | e5b94f7b7bbf2f6f35c5e33fb2723bdb0d33bad3 (diff) | |
| parent | 9ec08ce57889dc329506a572044438a55da61303 (diff) | |
| download | django-rest-framework-5e52f0fd8c3b4dbe70f1332d1323e3a544951e66.tar.bz2 | |
Merge branch 'version-3.1' into cursor-pagination
Diffstat (limited to 'docs/api-guide/routers.md')
| -rw-r--r-- | docs/api-guide/routers.md | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 3a8a8f6c..9c9bfb50 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -60,7 +60,7 @@ For example, you can append `router.urls` to a list of existing views…      router.register(r'accounts', AccountViewSet)      urlpatterns = [ -        url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), +        url(r'^forgot-password/$', ForgotPasswordFormView.as_view(),      ]      urlpatterns += router.urls @@ -68,14 +68,14 @@ For example, you can append `router.urls` to a list of existing views…  Alternatively you can use Django's `include` function, like so…      urlpatterns = [ -        url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), +        url(r'^forgot-password/$', ForgotPasswordFormView.as_view(),          url(r'^', include(router.urls))      ]  Router URL patterns can also be namespaces.      urlpatterns = [ -        url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), +        url(r'^forgot-password/$', ForgotPasswordFormView.as_view(),          url(r'^api/', include(router.urls, namespace='api'))      ]  | 
