diff --git a/api-guide/authentication.html b/api-guide/authentication.html index 3f1b9244f..97f240b56 100644 --- a/api-guide/authentication.html +++ b/api-guide/authentication.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -141,7 +140,7 @@ margin-top: 5px;

    Authentication

    -

    Authentication is the mechanism of associating an incoming request with a set of identifying credentials, such as the user the request came from, or the token that it was signed with. The permission and throttling policies can then use those credentials to determine if the request should be permitted.

    +

    Authentication is the mechanism of associating an incoming request with a set of identifying credentials, such as the user the request came from, or the token that it was signed with. The permission and throttling policies can then use those credentials to determine if the request should be permitted.

    REST framework provides a number of authentication policies out of the box, and also allows you to implement custom policies.

    Authentication will run the first time either the request.user or request.auth properties are accessed, and determines how those properties are initialized.

    Setting the authentication policy

    diff --git a/api-guide/contentnegotiation.html b/api-guide/contentnegotiation.html index 5e58ed8dc..40345bf60 100644 --- a/api-guide/contentnegotiation.html +++ b/api-guide/contentnegotiation.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/exceptions.html b/api-guide/exceptions.html index 8dc70117c..6c6aef3bd 100644 --- a/api-guide/exceptions.html +++ b/api-guide/exceptions.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/parsers.html b/api-guide/parsers.html index 909f3e892..9c2f75976 100644 --- a/api-guide/parsers.html +++ b/api-guide/parsers.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/permissions.html b/api-guide/permissions.html index f69d5c1a2..d7ec611f8 100644 --- a/api-guide/permissions.html +++ b/api-guide/permissions.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/renderers.html b/api-guide/renderers.html index 45e023295..091b2d07d 100644 --- a/api-guide/renderers.html +++ b/api-guide/renderers.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/requests.html b/api-guide/requests.html index a4fb3e359..a1d7b9932 100644 --- a/api-guide/requests.html +++ b/api-guide/requests.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/responses.html b/api-guide/responses.html index d5bdddf9a..8033191d6 100644 --- a/api-guide/responses.html +++ b/api-guide/responses.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/reverse.html b/api-guide/reverse.html index 057a3b94e..48cc36932 100644 --- a/api-guide/reverse.html +++ b/api-guide/reverse.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/serializers.html b/api-guide/serializers.html index 15311e513..267c40d82 100644 --- a/api-guide/serializers.html +++ b/api-guide/serializers.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/settings.html b/api-guide/settings.html index 08a709ac1..398d95560 100644 --- a/api-guide/settings.html +++ b/api-guide/settings.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/status-codes.html b/api-guide/status-codes.html index 97320e342..c7a4d53f1 100644 --- a/api-guide/status-codes.html +++ b/api-guide/status-codes.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/throttling.html b/api-guide/throttling.html index f69d5c1a2..d7ec611f8 100644 --- a/api-guide/throttling.html +++ b/api-guide/throttling.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/api-guide/views.html b/api-guide/views.html index dd7cb9c0b..6a73e3d46 100644 --- a/api-guide/views.html +++ b/api-guide/views.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/index.html b/index.html index 5fe958f6e..d834d5a33 100644 --- a/index.html +++ b/index.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -189,37 +188,37 @@ pip install -r optionals.txt

    Tutorial

    The tutorial will walk you through the building blocks that make up REST framework. It'll take a little while to get through, but it'll give you a comprehensive understanding of how everything fits together, and is highly recommended reading.

    API Guide

    The API guide is your complete reference manual to all the functionality provided by REST framework.

    Topics

    General guides to using REST framework.

    Development

    If you want to work on REST framework itself, clone the repository, then...

    diff --git a/topics/contributing.html b/topics/contributing.html index 69ea6a80c..7fa997865 100644 --- a/topics/contributing.html +++ b/topics/contributing.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/topics/credits.html b/topics/credits.html index 64b62ef67..07afd52cf 100644 --- a/topics/credits.html +++ b/topics/credits.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/topics/csrf.html b/topics/csrf.html index fe80dc9de..09dc89f1e 100644 --- a/topics/csrf.html +++ b/topics/csrf.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/topics/formoverloading.html b/topics/formoverloading.html index da9554529..fe95092d5 100644 --- a/topics/formoverloading.html +++ b/topics/formoverloading.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • diff --git a/tutorial/1-serialization.html b/tutorial/1-serialization.html index d182060e6..4cf817668 100644 --- a/tutorial/1-serialization.html +++ b/tutorial/1-serialization.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -348,7 +347,7 @@ urlpatterns = patterns('blog.views',

    Where are we now

    We're doing okay so far, we've got a serialization API that feels pretty similar to Django's Forms API, and some regular Django views.

    Our API views don't do anything particularly special at the moment, beyond serve json responses, and there's some error handling edge cases we'd still like to clean up, but it's a functioning Web API.

    -

    We'll see how we can start to improve things in part 2 of the tutorial.

    +

    We'll see how we can start to improve things in part 2 of the tutorial.

    diff --git a/tutorial/2-requests-and-responses.html b/tutorial/2-requests-and-responses.html index 80a04b157..fab275356 100644 --- a/tutorial/2-requests-and-responses.html +++ b/tutorial/2-requests-and-responses.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -243,12 +242,12 @@ urlpatterns = format_suffix_patterns(urlpatterns)

    We don't necessarily need to add these extra url patterns in, but it gives us a simple, clean way of refering to a specific format.

    How's it looking?

    -

    Go ahead and test the API from the command line, as we did in tutorial part 1. Everything is working pretty similarly, although we've got some nicer error handling if we send invalid requests.

    +

    Go ahead and test the API from the command line, as we did in tutorial part 1. Everything is working pretty similarly, although we've got some nicer error handling if we send invalid requests.

    TODO: Describe using accept headers, content-type headers, and format suffixed URLs

    Now go and open the API in a web browser, by visiting http://127.0.0.1:8000/.

    TODO: Describe browseable API awesomeness

    What's next?

    -

    In tutorial part 3, we'll start using class based views, and see how generic views reduce the amount of code we need to write.

    +

    In tutorial part 3, we'll start using class based views, and see how generic views reduce the amount of code we need to write.

    diff --git a/tutorial/3-class-based-views.html b/tutorial/3-class-based-views.html index b48dcade6..5782a36f1 100644 --- a/tutorial/3-class-based-views.html +++ b/tutorial/3-class-based-views.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -255,7 +254,7 @@ class CommentInstance(views.InstanceModelView):

    Wow, that's pretty concise. We've got a huge amount for free, and our code looks like good, clean, idomatic Django.

    -

    Next we'll move onto part 4 of the tutorial, where we'll take a look at how we can customize the behavior of our views to support a range of authentication, permissions, throttling and other aspects.

    +

    Next we'll move onto part 4 of the tutorial, where we'll take a look at how we can customize the behavior of our views to support a range of authentication, permissions, throttling and other aspects.

    diff --git a/tutorial/4-authentication-permissions-and-throttling.html b/tutorial/4-authentication-permissions-and-throttling.html index 022237d11..61bcdd2a4 100644 --- a/tutorial/4-authentication-permissions-and-throttling.html +++ b/tutorial/4-authentication-permissions-and-throttling.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -133,7 +132,7 @@ margin-top: 5px;
    -

    part 5

    +

    part 5

    diff --git a/tutorial/5-relationships-and-hyperlinked-apis.html b/tutorial/5-relationships-and-hyperlinked-apis.html index 997947639..05902eb52 100644 --- a/tutorial/5-relationships-and-hyperlinked-apis.html +++ b/tutorial/5-relationships-and-hyperlinked-apis.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling
  • @@ -139,7 +138,7 @@ margin-top: 5px;
  • Demonstrate nested relationships
  • Demonstrate and describe hyperlinked relationships
  • -

    part 6

    +

    part 6

    diff --git a/tutorial/6-resource-orientated-projects.html b/tutorial/6-resource-orientated-projects.html index 4b3ccc989..f286ee7c6 100644 --- a/tutorial/6-resource-orientated-projects.html +++ b/tutorial/6-resource-orientated-projects.html @@ -88,7 +88,6 @@ margin-top: 5px;
  • Parsers
  • Renderers
  • Serializers
  • -
  • Serializer fields
  • Authentication
  • Permissions
  • Throttling