Merge 3f758c1bf1 into 879652ec2e

docs/index.md

@@ -171,32 +171,32 @@ There is a live example API of the finished tutorial API for testing purposes, [
 
 The API guide is your complete reference manual to all the functionality provided by REST framework.
 
+* [Authentication][authentication]
+* [Content negotiation][contentnegotiation]
+* [Exceptions][exceptions]
+* [Filtering][filtering]
+* [Format suffixes][formatsuffixes]
+* [Generic views][generic-views]
+* [Metadata][metadata]
+* [Pagination][pagination]
+* [Parsers][parsers]
+* [Permissions][permissions]
+* [Renderers][renderers]
 * [Requests][request]
 * [Responses][response]
-* [Views][views]
+* [Returning URLs][reverse]
-* [Generic views][generic-views]
-* [Viewsets][viewsets]
 * [Routers][routers]
-* [Parsers][parsers]
-* [Renderers][renderers]
-* [Serializers][serializers]
 * [Serializer fields][fields]
 * [Serializer relations][relations]
-* [Validators][validators]
+* [Serializers][serializers]
-* [Authentication][authentication]
+* [Settings][settings]
-* [Permissions][permissions]
-* [Throttling][throttling]
-* [Filtering][filtering]
-* [Pagination][pagination]
-* [Versioning][versioning]
-* [Content negotiation][contentnegotiation]
-* [Metadata][metadata]
-* [Format suffixes][formatsuffixes]
-* [Returning URLs][reverse]
-* [Exceptions][exceptions]
 * [Status codes][status]
 * [Testing][testing]
-* [Settings][settings]
+* [Throttling][throttling]
+* [Validators][validators]
+* [Versioning][versioning]
+* [Views][views]
+* [Viewsets][viewsets]
 
 ## Topics
 

mkdocs.yml

@@ -21,32 +21,32 @@ pages:
     - '5 - Relationships and hyperlinked APIs': 'tutorial/5-relationships-and-hyperlinked-apis.md'
     - '6 - Viewsets and routers': 'tutorial/6-viewsets-and-routers.md'
  - API Guide:
+    - 'Authentication': 'api-guide/authentication.md'
+    - 'Content negotiation': 'api-guide/content-negotiation.md'
+    - 'Exceptions': 'api-guide/exceptions.md'
+    - 'Filtering': 'api-guide/filtering.md'
+    - 'Format suffixes': 'api-guide/format-suffixes.md'
+    - 'Generic views': 'api-guide/generic-views.md'
+    - 'Metadata': 'api-guide/metadata.md'
+    - 'Pagination': 'api-guide/pagination.md'
+    - 'Parsers': 'api-guide/parsers.md'
+    - 'Permissions': 'api-guide/permissions.md'
+    - 'Renderers': 'api-guide/renderers.md'
     - 'Requests': 'api-guide/requests.md'
     - 'Responses': 'api-guide/responses.md'
-    - 'Views': 'api-guide/views.md'
+    - 'Returning URLs': 'api-guide/reverse.md'
-    - 'Generic views': 'api-guide/generic-views.md'
-    - 'Viewsets': 'api-guide/viewsets.md'
     - 'Routers': 'api-guide/routers.md'
-    - 'Parsers': 'api-guide/parsers.md'
-    - 'Renderers': 'api-guide/renderers.md'
-    - 'Serializers': 'api-guide/serializers.md'
     - 'Serializer fields': 'api-guide/fields.md'
     - 'Serializer relations': 'api-guide/relations.md'
-    - 'Validators': 'api-guide/validators.md'
+    - 'Serializers': 'api-guide/serializers.md'
-    - 'Authentication': 'api-guide/authentication.md'
+    - 'Settings': 'api-guide/settings.md'
-    - 'Permissions': 'api-guide/permissions.md'
-    - 'Throttling': 'api-guide/throttling.md'
-    - 'Filtering': 'api-guide/filtering.md'
-    - 'Pagination': 'api-guide/pagination.md'
-    - 'Versioning': 'api-guide/versioning.md'
-    - 'Content negotiation': 'api-guide/content-negotiation.md'
-    - 'Metadata': 'api-guide/metadata.md'
-    - 'Format suffixes': 'api-guide/format-suffixes.md'
-    - 'Returning URLs': 'api-guide/reverse.md'
-    - 'Exceptions': 'api-guide/exceptions.md'
     - 'Status codes': 'api-guide/status-codes.md'
     - 'Testing': 'api-guide/testing.md'
-    - 'Settings': 'api-guide/settings.md'
+    - 'Throttling': 'api-guide/throttling.md'
+    - 'Validators': 'api-guide/validators.md'
+    - 'Versioning': 'api-guide/versioning.md'
+    - 'Views': 'api-guide/views.md'
+    - 'Viewsets': 'api-guide/viewsets.md'
  - Topics:
      - 'Documenting your API': 'topics/documenting-your-api.md'
      - 'Internationalization': 'topics/internationalization.md'