From e8a41322fbf96866c70ceb6b188894e02e7718f4 Mon Sep 17 00:00:00 2001
From: Yuri Prezument
Date: Tue, 27 Nov 2012 11:23:40 +0200
Subject: api-guide/views.md - add imports to code example

* It wasn't clear where `Response` should be imported from.
---
 docs/api-guide/views.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/api-guide')

diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md
index 5b072827..6cef1cd0 100644
--- a/docs/api-guide/views.md
+++ b/docs/api-guide/views.md
@@ -19,6 +19,9 @@ Using the `APIView` class is pretty much the same as using a regular `View` clas
 
 For example:
 
+    from rest_framework.views import APIView, Response
+    from rest_framework import authentication, permissions
+
     class ListUsers(APIView):
         """
         View to list all users in the system.
-- 
cgit v1.2.3


From 80be571b2e1deebff247ce5dfc4a325f2e2df9ae Mon Sep 17 00:00:00 2001
From: Yuri Prezument
Date: Tue, 27 Nov 2012 19:42:37 +0200
Subject: Import from correct place

---
 docs/api-guide/views.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/api-guide')

diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md
index 6cef1cd0..d1e42ec1 100644
--- a/docs/api-guide/views.md
+++ b/docs/api-guide/views.md
@@ -19,7 +19,8 @@ Using the `APIView` class is pretty much the same as using a regular `View` clas
 
 For example:
 
-    from rest_framework.views import APIView, Response
+    from rest_framework.views import APIView
+    from rest_framework.response import Response
     from rest_framework import authentication, permissions
 
     class ListUsers(APIView):
-- 
cgit v1.2.3


From fd383b2b5e752962242066b3587deec5820eaa2e Mon Sep 17 00:00:00 2001
From: Pavel Savchenko
Date: Wed, 28 Nov 2012 11:58:34 +0200
Subject: Fix location of obtain_auth_token view

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

(limited to 'docs/api-guide')

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index 8ed6ef31..43fc15d2 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -116,7 +116,7 @@ When using `TokenAuthentication`, you may want to provide a mechanism for client
 REST framework provides a built-in view to provide this behavior.  To use it, add the `obtain_auth_token` view to your URLconf:
 
     urlpatterns += patterns('',
-        url(r'^api-token-auth/', 'rest_framework.authtoken.obtain_auth_token')
+        url(r'^api-token-auth/', 'rest_framework.authtoken.views.obtain_auth_token')
     )
 
 Note that the URL part of the pattern can be whatever you want to use.
-- 
cgit v1.2.3


From 3868241f6acda96fbd08cc81211b09ffbc2f38b3 Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Wed, 5 Dec 2012 15:09:06 +0100
Subject: Update docs/api-guide/permissions.md

@permission_classes takes a tuple or list.---
 docs/api-guide/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/api-guide')

diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md
index 1a746fb6..fce68f6d 100644
--- a/docs/api-guide/permissions.md
+++ b/docs/api-guide/permissions.md
@@ -53,7 +53,7 @@ You can also set the authentication policy on a per-view basis, using the `APIVi
 Or, if you're using the `@api_view` decorator with function based views.
 
     @api_view('GET')
-    @permission_classes(IsAuthenticated)
+    @permission_classes((IsAuthenticated, ))
     def example_view(request, format=None):
         content = {
             'status': 'request was permitted'
-- 
cgit v1.2.3