Merge pull request #1059 from KristianOellegaard/patch-1

More information on how actions are mapped to URLs in viewsets

docs/api-guide/viewsets.md

@@ -142,6 +142,10 @@ The `@action` decorator will route `POST` requests by default, but may also acce
         @action(methods=['POST', 'DELETE'])
         def unset_password(self, request, pk=None):
            ...
+           
+The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$`
+
+
 ---
 
 # API Reference