diff options
| author | Tom Christie | 2015-02-03 13:51:03 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-02-03 13:51:03 +0000 |
| commit | 33cfc2e486fb70595d84f3c7a06f09c62fc68535 (patch) | |
| tree | 4dae7d279a61840ca3f09b3b3991f51f55b88d71 | |
| parent | 67933d658e52c19f20c536a58c16c5f90c119a31 (diff) | |
| parent | f6765696610a0de3cf7d9986a2dfab40ca37e88b (diff) | |
| download | django-rest-framework-33cfc2e486fb70595d84f3c7a06f09c62fc68535.tar.bz2 | |
Merge pull request #2509 from jamescooke/doc-fixes
Small documentation fixes
| -rw-r--r-- | docs/api-guide/routers.md | 2 | ||||
| -rw-r--r-- | docs/api-guide/viewsets.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 592f7d66..222b6cd2 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -304,7 +304,7 @@ The [wq.db package][wq.db] provides an advanced [Router][wq.db-router] class (an The [`DRF-extensions` package][drf-extensions] provides [routers][drf-extensions-routers] for creating [nested viewsets][drf-extensions-nested-viewsets], [collection level controllers][drf-extensions-collection-level-controllers] with [customizable endpoint names][drf-extensions-customizable-endpoint-names]. [cite]: http://guides.rubyonrails.org/routing.html -[route-decorators]: viewsets.html#marking-extra-actions-for-routing +[route-decorators]: viewsets.md#marking-extra-actions-for-routing [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [wq.db]: http://wq.io/wq.db [wq.db-router]: http://wq.io/docs/app.py diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index b09dfc9e..bbf92c6c 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -201,7 +201,7 @@ Note that you can use any of the standard attributes or method overrides provide def get_queryset(self): return self.request.user.accounts.all() -Note however that upon removal of the `queryset` property from your `ViewSet`, any associated [router][routers] will be unable to derive the base_name of your Model automatically, and so you you will have to specify the `base_name` kwarg as part of your [router registration][routers]. +Note however that upon removal of the `queryset` property from your `ViewSet`, any associated [router][routers] will be unable to derive the base_name of your Model automatically, and so you will have to specify the `base_name` kwarg as part of your [router registration][routers]. Also note that although this class provides the complete set of create/list/retrieve/update/destroy actions by default, you can restrict the available operations by using the standard permission classes. |