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

5 files changed, 0 insertions, 79 deletions

diff --git a/examples/permissionsexample/__init__.py b/examples/permissionsexample/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/examples/permissionsexample/__init__.py
+++ /dev/null
diff --git a/examples/permissionsexample/fixtures/initial_data.json b/examples/permissionsexample/fixtures/initial_data.json
deleted file mode 100644
index 153de8e8..00000000
--- a/examples/permissionsexample/fixtures/initial_data.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-     {
-        "pk": 2,
-        "model": "auth.user",
-        "fields": {
-            "username": "test",
-            "first_name": "",
-            "last_name": "",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "groups": [],
-            "user_permissions": [],
-            "password": "sha1$b3dff$671b4ab97f2714446da32670d27576614e176758",
-            "email": ""
-        }
-    }
-]
diff --git a/examples/permissionsexample/models.py b/examples/permissionsexample/models.py
deleted file mode 100644
index 790bbaf8..00000000
--- a/examples/permissionsexample/models.py
+++ /dev/null
@@ -1 +0,0 @@
-#for fixture loading
diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py
deleted file mode 100644
index 33cb9b5f..00000000
--- a/examples/permissionsexample/urls.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.conf.urls.defaults import patterns, url
-from permissionsexample.views import PermissionsExampleView, ThrottlingExampleView, LoggedInExampleView
-
-urlpatterns = patterns('',
-    url(r'^$', PermissionsExampleView.as_view(), name='permissions-example'),
-    url(r'^throttling$', ThrottlingExampleView.as_view(), name='throttled-resource'),
-    url(r'^loggedin$', LoggedInExampleView.as_view(), name='loggedin-resource'),
-)
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'