diff options
| author | Tom Christie | 2012-10-30 14:32:31 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-10-30 14:32:31 +0000 |
| commit | 9b30dab4f772f67a626e176dc4fae0a3ef9c2c81 (patch) | |
| tree | ca138abf4792f58ffa28684f784f201ee1eef6d7 /docs/library | |
| parent | 7e5b1501b5cede61a9391fb1a751d2ebcdb37031 (diff) | |
| parent | 4e7805cb24d73e7f706318b5e5a27e3f9ba39d14 (diff) | |
| download | django-rest-framework-9b30dab4f772f67a626e176dc4fae0a3ef9c2c81.tar.bz2 | |
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
Diffstat (limited to 'docs/library')
| -rw-r--r-- | docs/library/authentication.rst | 5 | ||||
| -rw-r--r-- | docs/library/compat.rst | 5 | ||||
| -rw-r--r-- | docs/library/mixins.rst | 5 | ||||
| -rw-r--r-- | docs/library/parsers.rst | 5 | ||||
| -rw-r--r-- | docs/library/permissions.rst | 5 | ||||
| -rw-r--r-- | docs/library/renderers.rst | 10 | ||||
| -rw-r--r-- | docs/library/resource.rst | 5 | ||||
| -rw-r--r-- | docs/library/response.rst | 5 | ||||
| -rw-r--r-- | docs/library/reverse.rst | 5 | ||||
| -rw-r--r-- | docs/library/serializer.rst | 5 | ||||
| -rw-r--r-- | docs/library/status.rst | 5 | ||||
| -rw-r--r-- | docs/library/views.rst | 5 |
12 files changed, 0 insertions, 65 deletions
diff --git a/docs/library/authentication.rst b/docs/library/authentication.rst deleted file mode 100644 index d159f605..00000000 --- a/docs/library/authentication.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`authentication` -===================== - -.. automodule:: authentication - :members: diff --git a/docs/library/compat.rst b/docs/library/compat.rst deleted file mode 100644 index 93fb081a..00000000 --- a/docs/library/compat.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`compat`
-=====================
-
-.. automodule:: compat
- :members:
diff --git a/docs/library/mixins.rst b/docs/library/mixins.rst deleted file mode 100644 index 04bf66b0..00000000 --- a/docs/library/mixins.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`mixins`
-=====================
-
-.. automodule:: mixins
- :members:
diff --git a/docs/library/parsers.rst b/docs/library/parsers.rst deleted file mode 100644 index 48d762a5..00000000 --- a/docs/library/parsers.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`parsers` -============== - -.. automodule:: parsers - :members: diff --git a/docs/library/permissions.rst b/docs/library/permissions.rst deleted file mode 100644 index c694d639..00000000 --- a/docs/library/permissions.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`permissions`
-=====================
-
-.. automodule:: permissions
- :members:
diff --git a/docs/library/renderers.rst b/docs/library/renderers.rst deleted file mode 100644 index a9e72931..00000000 --- a/docs/library/renderers.rst +++ /dev/null @@ -1,10 +0,0 @@ -:mod:`renderers` -================ - -The renderers module provides a set of renderers that can be plugged in to a :class:`.Resource`. -A renderer is responsible for taking the output of a View and serializing it to a given media type. -A :class:`.Resource` can have a number of renderers, allow the same content to be serialized in a number -of different formats depending on the requesting client's preferences, as specified in the HTTP Request's Accept header. - -.. automodule:: renderers - :members: diff --git a/docs/library/resource.rst b/docs/library/resource.rst deleted file mode 100644 index 2a95051b..00000000 --- a/docs/library/resource.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`resource` -=============== - -.. automodule:: resources - :members: diff --git a/docs/library/response.rst b/docs/library/response.rst deleted file mode 100644 index c2fff5a7..00000000 --- a/docs/library/response.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`response` -=============== - -.. automodule:: response - :members: diff --git a/docs/library/reverse.rst b/docs/library/reverse.rst deleted file mode 100644 index a2c29c48..00000000 --- a/docs/library/reverse.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`reverse` -================ - -.. automodule:: reverse - :members: diff --git a/docs/library/serializer.rst b/docs/library/serializer.rst deleted file mode 100644 index 63dd3308..00000000 --- a/docs/library/serializer.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`serializer` -================= - -.. automodule:: serializer - :members: diff --git a/docs/library/status.rst b/docs/library/status.rst deleted file mode 100644 index 0c7596bc..00000000 --- a/docs/library/status.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`status` -=============== - -.. automodule:: status - :members: diff --git a/docs/library/views.rst b/docs/library/views.rst deleted file mode 100644 index 329b487b..00000000 --- a/docs/library/views.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`views`
-=====================
-
-.. automodule:: views
- :members:
|