diff options
| author | Tom Christie | 2014-12-15 09:18:11 +0000 | 
|---|---|---|
| committer | Tom Christie | 2014-12-15 09:18:11 +0000 | 
| commit | 4778463e32550f3bf9aa350925b1260343bced99 (patch) | |
| tree | 5ea0a151d588d603e5d86b75c48692e35e6d5a02 /docs/api-guide/routers.md | |
| parent | 26131a7aea39bb517393b3b6774372d6aebd6885 (diff) | |
| parent | a72f812d80a4000e86a5ad96001f3fbf43fe310a (diff) | |
| download | django-rest-framework-4778463e32550f3bf9aa350925b1260343bced99.tar.bz2 | |
Merge branch 'master' into version-3.1
Diffstat (limited to 'docs/api-guide/routers.md')
| -rw-r--r-- | docs/api-guide/routers.md | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 080230fa..929a1710 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -41,7 +41,7 @@ The example above would generate the following URL patterns:  **Note**: The `base_name` argument is used to specify the initial part of the view name pattern.  In the example above, that's the `user` or `account` part. -Typically you won't *need* to specify the `base-name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have a `.queryset` attribute set.  If you try to register that viewset you'll see an error like this: +Typically you won't *need* to specify the `base_name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have a `.queryset` attribute set.  If you try to register that viewset you'll see an error like this:      'base_name' argument not specified, and could not automatically determine the name from the viewset, as it does not have a '.queryset' attribute. | 
