From ffa25009fd06b053e99c14960643f4c5f2c5092a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 10:11:44 +0100 Subject: [PATCH] 2.4 release --- api-guide/authentication.html | 1 + api-guide/content-negotiation.html | 1 + api-guide/exceptions.html | 1 + api-guide/fields.html | 1 + api-guide/filtering.html | 1 + api-guide/format-suffixes.html | 1 + api-guide/generic-views.html | 9 ++-- api-guide/pagination.html | 1 + api-guide/parsers.html | 1 + api-guide/permissions.html | 9 +++- api-guide/relations.html | 1 + api-guide/renderers.html | 1 + api-guide/requests.html | 1 + api-guide/responses.html | 1 + api-guide/reverse.html | 1 + api-guide/routers.html | 5 ++- api-guide/serializers.html | 1 + api-guide/settings.html | 4 +- api-guide/status-codes.html | 1 + api-guide/testing.html | 1 + api-guide/throttling.html | 1 + api-guide/views.html | 1 + api-guide/viewsets.html | 1 + index.html | 37 ++++++++--------- topics/2.2-announcement.html | 1 + topics/2.3-announcement.html | 3 +- topics/2.4-accouncement.html | 8 ++++ topics/ajax-csrf-cors.html | 1 + topics/browsable-api.html | 1 + topics/browser-enhancements.html | 1 + topics/contributing.html | 1 + topics/credits.html | 1 + topics/documenting-your-api.html | 1 + topics/kickstarter-announcement.html | 1 + topics/release-notes.html | 5 ++- topics/rest-framework-2-announcement.html | 1 + topics/rest-hypermedia-hateoas.html | 1 + topics/writable-nested-serializers.html | 1 + tutorial/1-serialization.html | 1 + tutorial/2-requests-and-responses.html | 1 + tutorial/3-class-based-views.html | 1 + .../4-authentication-and-permissions.html | 1 + .../5-relationships-and-hyperlinked-apis.html | 1 + tutorial/6-viewsets-and-routers.html | 1 + tutorial/quickstart.html | 41 ++++++++----------- 45 files changed, 100 insertions(+), 57 deletions(-) diff --git a/api-guide/authentication.html b/api-guide/authentication.html index 9b11fbe5b..c05b60aa9 100644 --- a/api-guide/authentication.html +++ b/api-guide/authentication.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/api-guide/content-negotiation.html b/api-guide/content-negotiation.html index de57feffb..863c0720f 100644 --- a/api-guide/content-negotiation.html +++ b/api-guide/content-negotiation.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/api-guide/exceptions.html b/api-guide/exceptions.html index b06b3ebe5..0f6a1f0b8 100644 --- a/api-guide/exceptions.html +++ b/api-guide/exceptions.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/api-guide/fields.html b/api-guide/fields.html index 4ca9b1fb8..91852e005 100644 --- a/api-guide/fields.html +++ b/api-guide/fields.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/api-guide/filtering.html b/api-guide/filtering.html index 5f401df94..cef40e9ec 100644 --- a/api-guide/filtering.html +++ b/api-guide/filtering.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/api-guide/format-suffixes.html b/api-guide/format-suffixes.html index 7bbedae8b..7a5517432 100644 --- a/api-guide/format-suffixes.html +++ b/api-guide/format-suffixes.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/api-guide/generic-views.html b/api-guide/generic-views.html index be6e19f1a..9ae8efff7 100644 --- a/api-guide/generic-views.html +++ b/api-guide/generic-views.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • @@ -279,10 +280,6 @@ class UserList(generics.ListCreateAPIView):
  • lookup_field - The model field that should be used to for performing object lookup of individual model instances. Defaults to 'pk'. Note that when using hyperlinked APIs you'll need to ensure that both the API views and the serializer classes set the lookup fields if you need to use a custom value.
  • lookup_url_kwarg - The URL keyword argument that should be used for object lookup. The URL conf should include a keyword argument corresponding to this value. If unset this defaults to using the same value as lookup_field.
    • -

    Shortcuts:

    -

    Pagination:

    The following attributes are used to control pagination when used with list views.