diff options
| author | Mark Aaron Shirley | 2013-05-08 22:39:48 -0700 |
|---|---|---|
| committer | Mark Aaron Shirley | 2013-05-08 22:39:48 -0700 |
| commit | e550740b3d07e9f89e89941ee6be1101c7770e9a (patch) | |
| tree | 7e26d3e76479f16302e2fade1890c35fe3c1b445 /docs/template.html | |
| parent | 7e0a93f0eefead25f0e9b6615675f394af3a4ba0 (diff) | |
| parent | 4ab7b8f257f9d3a1b35d34d0f90f0103b0cc6369 (diff) | |
| download | django-rest-framework-e550740b3d07e9f89e89941ee6be1101c7770e9a.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts:
rest_framework/tests/relations_nested.py
Diffstat (limited to 'docs/template.html')
| -rw-r--r-- | docs/template.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/template.html b/docs/template.html index 7e929762..53656e7d 100644 --- a/docs/template.html +++ b/docs/template.html @@ -62,6 +62,7 @@ <li><a href="{{ base_url }}/tutorial/3-class-based-views{{ suffix }}">3 - Class based views</a></li> <li><a href="{{ base_url }}/tutorial/4-authentication-and-permissions{{ suffix }}">4 - Authentication and permissions</a></li> <li><a href="{{ base_url }}/tutorial/5-relationships-and-hyperlinked-apis{{ suffix }}">5 - Relationships and hyperlinked APIs</a></li> + <li><a href="{{ base_url }}/tutorial/6-viewsets-and-routers{{ suffix }}">6 - Viewsets and routers</a></li> </ul> </li> <li class="dropdown"> @@ -71,6 +72,8 @@ <li><a href="{{ base_url }}/api-guide/responses{{ suffix }}">Responses</a></li> <li><a href="{{ base_url }}/api-guide/views{{ suffix }}">Views</a></li> <li><a href="{{ base_url }}/api-guide/generic-views{{ suffix }}">Generic views</a></li> + <li><a href="{{ base_url }}/api-guide/viewsets{{ suffix }}">Viewsets</a></li> + <li><a href="{{ base_url }}/api-guide/routers{{ suffix }}">Routers</a></li> <li><a href="{{ base_url }}/api-guide/parsers{{ suffix }}">Parsers</a></li> <li><a href="{{ base_url }}/api-guide/renderers{{ suffix }}">Renderers</a></li> <li><a href="{{ base_url }}/api-guide/serializers{{ suffix }}">Serializers</a></li> @@ -98,6 +101,7 @@ <li><a href="{{ base_url }}/topics/rest-hypermedia-hateoas{{ suffix }}">REST, Hypermedia & HATEOAS</a></li> <li><a href="{{ base_url }}/topics/rest-framework-2-announcement{{ suffix }}">2.0 Announcement</a></li> <li><a href="{{ base_url }}/topics/2.2-announcement{{ suffix }}">2.2 Announcement</a></li> + <li><a href="{{ base_url }}/topics/2.3-announcement{{ suffix }}">2.3 Announcement</a></li> <li><a href="{{ base_url }}/topics/release-notes{{ suffix }}">Release Notes</a></li> <li><a href="{{ base_url }}/topics/credits{{ suffix }}">Credits</a></li> </ul> |