From e483c4fed686d7e3c7787d2e3eaa5ec4665399ff Mon Sep 17 00:00:00 2001
From: Ryan Kaskel
Date: Fri, 7 Jun 2013 10:07:42 +0100
Subject: Remove pass statement before docstring.

---
 docs/api-guide/viewsets.md | 2 --
 1 file changed, 2 deletions(-)

(limited to 'docs/api-guide/viewsets.md')

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 2783da98..79257e2a 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -209,8 +209,6 @@ To create a base viewset class that provides `create`, `list` and `retrieve` ope
                                     mixins.ListMixin,
                                     mixins.RetrieveMixin,
                                     viewsets.GenericViewSet):
-        pass
-
         """
         A viewset that provides `retrieve`, `update`, and `list` actions.
         
-- 
cgit v1.2.3


From f3529f1f4a3b01c2821278da3bafbc04c1c00553 Mon Sep 17 00:00:00 2001
From: Philip Douglas
Date: Fri, 21 Jun 2013 16:26:28 +0100
Subject: Correct docs' incorrect usage of action decorator

If you don't call it, it doesn't work.
---
 docs/api-guide/viewsets.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docs/api-guide/viewsets.md')

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 79257e2a..25d11bfb 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -27,7 +27,7 @@ Let's define a simple viewset that can be used to list or retrieve all the users
             queryset = User.objects.all()
             serializer = UserSerializer(queryset, many=True)
             return Response(serializer.data)
-            
+
         def retrieve(self, request, pk=None):
             queryset = User.objects.all()
             user = get_object_or_404(queryset, pk=pk)
@@ -69,7 +69,7 @@ The default routers included with REST framework will provide routes for a stand
         """
         Example empty viewset demonstrating the standard
         actions that will be handled by a router class.
-        
+
         If you're using format suffixes, make sure to also include
         the `format=None` keyword argument for each action.
         """
@@ -103,12 +103,12 @@ For example:
 
     class UserViewSet(viewsets.ModelViewSet):
         """
-        A viewset that provides the standard actions 
+        A viewset that provides the standard actions
         """
         queryset = User.objects.all()
         serializer_class = UserSerializer
-        
-        @action
+
+        @action()
         def set_password(self, request, pk=None):
             user = self.get_object()
             serializer = PasswordSerializer(data=request.DATA)
@@ -197,7 +197,7 @@ As with `ModelViewSet`, you'll normally need to provide at least the `queryset`
 
 Again, as with `ModelViewSet`, you can use any of the standard attributes and method overrides available to `GenericAPIView`.
 
-# Custom ViewSet base classes 
+# Custom ViewSet base classes
 
 You may need to provide custom `ViewSet` classes that do not have the full set of `ModelViewSet` actions, or that customize the behavior in some other way.
 
@@ -211,7 +211,7 @@ To create a base viewset class that provides `create`, `list` and `retrieve` ope
                                     viewsets.GenericViewSet):
         """
         A viewset that provides `retrieve`, `update`, and `list` actions.
-        
+
         To use it, override the class and set the `.queryset` and
         `.serializer_class` attributes.
         """
-- 
cgit v1.2.3


From a68f473dd8438c7d7b0f8ec4b4dc74aa0544143d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 21 Jun 2013 23:25:14 +0200
Subject: Brackets not required on decorator without arguments

---
 docs/api-guide/viewsets.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/api-guide/viewsets.md')

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 25d11bfb..ad961636 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -108,7 +108,7 @@ For example:
         queryset = User.objects.all()
         serializer_class = UserSerializer
 
-        @action()
+        @action
         def set_password(self, request, pk=None):
             user = self.get_object()
             serializer = PasswordSerializer(data=request.DATA)
-- 
cgit v1.2.3


From 8d83ff8e6c8513d0a88d6b1fecb34ed86f1e2085 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 21 Jun 2013 23:12:16 +0100
Subject: Add decorator brackets back. Refs #941

---
 docs/api-guide/viewsets.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/api-guide/viewsets.md')

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index ad961636..25d11bfb 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -108,7 +108,7 @@ For example:
         queryset = User.objects.all()
         serializer_class = UserSerializer
 
-        @action
+        @action()
         def set_password(self, request, pk=None):
             user = self.get_object()
             serializer = PasswordSerializer(data=request.DATA)
-- 
cgit v1.2.3