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

diff --git a/examples/pygments_api/forms.py b/examples/pygments_api/forms.py
deleted file mode 100644
index 30a59a84..00000000
--- a/examples/pygments_api/forms.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django import forms
-
-from pygments.lexers import get_all_lexers
-from pygments.styles import get_all_styles
-
-LEXER_CHOICES = sorted([(item[1][0], item[0]) for item in get_all_lexers()])
-STYLE_CHOICES = sorted((item, item) for item in list(get_all_styles()))
-
-class PygmentsForm(forms.Form):
-    """A simple form with some of the most important pygments settings.
-    The code to be highlighted can be specified either in a text field, or by URL.
-    We do some additional form validation to ensure clients see helpful error responses."""
-
-    code = forms.CharField(widget=forms.Textarea,
-                           label='Code Text',
-                           max_length=1000000,
-                           help_text='(Copy and paste the code text here.)')
-    title = forms.CharField(required=False,
-                            help_text='(Optional)',
-                            max_length=100)
-    linenos = forms.BooleanField(label='Show Line Numbers',
-                                 required=False)
-    lexer = forms.ChoiceField(choices=LEXER_CHOICES,
-                              initial='python')
-    style = forms.ChoiceField(choices=STYLE_CHOICES,
-                              initial='friendly')
-
-