Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 0 insertions, 52 deletions

diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py
deleted file mode 100644
index 5aeae7eb..00000000
--- a/examples/permissionsexample/views.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from djangorestframework.views import View
-from djangorestframework.permissions import PerUserThrottling, IsAuthenticated
-from djangorestframework.reverse import reverse
-
-
-class PermissionsExampleView(View):
-    """
-    A container view for permissions examples.
-    """
-
-    def get(self, request):
-        return [
-            {
-                'name': 'Throttling Example',
-                'url': reverse('throttled-resource', request=request)
-            },
-            {
-                'name': 'Logged in example',
-                'url': reverse('loggedin-resource', request=request)
-            },
-        ]
-
-
-class ThrottlingExampleView(View):
-    """
-    A basic read-only View that has a **per-user throttle** of 10 requests per minute.
-
-    If a user exceeds the 10 requests limit within a period of one minute, the
-    throttle will be applied until 60 seconds have passed since the first request.
-    """
-
-    permissions = (PerUserThrottling,)
-    throttle = '10/min'
-
-    def get(self, request):
-        """
-        Handle GET requests.
-        """
-        return "Successful response to GET request because throttle is not yet active."
-
-
-class LoggedInExampleView(View):
-    """
-    You can login with **'test', 'test'.** or use curl:
-
-    `curl -X GET -H 'Accept: application/json' -u test:test http://localhost:8000/permissions-example`
-    """
-
-    permissions = (IsAuthenticated, )
-
-    def get(self, request):
-        return 'You have permission to view this resource'