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 | |
| 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')
| -rw-r--r-- | docs/api-guide/routers.md | 6 | ||||
| -rw-r--r-- | docs/tutorial/1-serialization.md | 2 |
2 files changed, 4 insertions, 4 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')) ] diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 41ff4d07..80e869ea 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -198,7 +198,7 @@ Open the file `snippets/serializers.py` again, and replace the `SnippetSerialize model = Snippet fields = ('id', 'title', 'code', 'linenos', 'language', 'style') -One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manage.py shell`, then try the following: +One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing its representation. Open the Django shell with `python manage.py shell`, then try the following: >>> from snippets.serializers import SnippetSerializer >>> serializer = SnippetSerializer() |