Merge pull request #941 from FreakyDug/master

Fixed a couple of small problems I found when using the action decorator.

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)

rest_framework/routers.py

@@ -136,6 +136,7 @@ class SimpleRouter(BaseRouter):
             attr = getattr(viewset, methodname)
             httpmethods = getattr(attr, 'bind_to_methods', None)
             if httpmethods:
+                httpmethods = [method.lower() for method in httpmethods]
                 dynamic_routes.append((httpmethods, methodname))
 
         ret = []