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, 56 deletions

diff --git a/docs/examples/modelviews.rst b/docs/examples/modelviews.rst
deleted file mode 100644
index 9bd27045..00000000
--- a/docs/examples/modelviews.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-Getting Started - Model Views
------------------------------
-
-.. note::
-
-    A live sandbox instance of this API is available:
-    
-    http://shielded-mountain-6732.herokuapp.com/model-resource-example/
-
-    You can browse the API using a web browser, or from the command line::
-
-        curl -X GET http://shielded-mountain-6732.herokuapp.com/resource-example/ -H 'Accept: text/plain'
-
-Often you'll want parts of your API to directly map to existing django models.  Django REST framework handles this nicely for you in a couple of ways:
-
-#. It automatically provides suitable create/read/update/delete methods for your views.
-#. Input validation occurs automatically, by using appropriate `ModelForms <http://docs.djangoproject.com/en/dev/topics/forms/modelforms/>`_.
-
-Here's the model we're working from in this example:
-
-``models.py``
-
-.. include:: ../../examples/modelresourceexample/models.py
-    :literal:
-
-To add an API for the model, first we need to create a Resource for the model.
-
-``resources.py``
-
-.. include:: ../../examples/modelresourceexample/resources.py
-    :literal:
-
-Then we simply map a couple of views to the Resource in our urlconf.
-
-``urls.py``
-
-.. include:: ../../examples/modelresourceexample/urls.py
-    :literal:
-
-And we're done.  We've now got a fully browseable API, which supports multiple input and output media types, and has all the nice automatic field validation that Django gives us for free.
-
-We can visit the API in our browser:
-
-* http://shielded-mountain-6732.herokuapp.com/model-resource-example/
-
-Or access it from the command line using curl:
-
-.. code-block:: bash
-
-    #  Demonstrates API's input validation using form input
-    bash: curl -X POST --data 'foo=true' http://shielded-mountain-6732.herokuapp.com/model-resource-example/
-    {"detail": {"bar": ["This field is required."], "baz": ["This field is required."]}}
-
-    #  Demonstrates API's input validation using JSON input
-    bash: curl -X POST -H 'Content-Type: application/json' --data-binary '{"foo":true}' http://shielded-mountain-6732.herokuapp.com/model-resource-example/
-   {"detail": {"bar": ["This field is required."], "baz": ["This field is required."]}}