diff options
Diffstat (limited to 'api-guide')
| -rw-r--r-- | api-guide/authentication.html | 104 | ||||
| -rw-r--r-- | api-guide/content-negotiation.html | 104 | ||||
| -rw-r--r-- | api-guide/exceptions.html | 104 | ||||
| -rw-r--r-- | api-guide/fields.html | 104 | ||||
| -rw-r--r-- | api-guide/filtering.html | 104 | ||||
| -rw-r--r-- | api-guide/format-suffixes.html | 104 | ||||
| -rw-r--r-- | api-guide/generic-views.html | 104 | ||||
| -rw-r--r-- | api-guide/pagination.html | 104 | ||||
| -rw-r--r-- | api-guide/parsers.html | 104 | ||||
| -rw-r--r-- | api-guide/permissions.html | 104 | ||||
| -rw-r--r-- | api-guide/relations.html | 108 | ||||
| -rw-r--r-- | api-guide/renderers.html | 104 | ||||
| -rw-r--r-- | api-guide/requests.html | 104 | ||||
| -rw-r--r-- | api-guide/responses.html | 104 | ||||
| -rw-r--r-- | api-guide/reverse.html | 104 | ||||
| -rw-r--r-- | api-guide/routers.html | 104 | ||||
| -rw-r--r-- | api-guide/serializers.html | 104 | ||||
| -rw-r--r-- | api-guide/settings.html | 104 | ||||
| -rw-r--r-- | api-guide/status-codes.html | 104 | ||||
| -rw-r--r-- | api-guide/testing.html | 104 | ||||
| -rw-r--r-- | api-guide/throttling.html | 104 | ||||
| -rw-r--r-- | api-guide/views.html | 104 | ||||
| -rw-r--r-- | api-guide/viewsets.html | 104 | 
23 files changed, 1198 insertions, 1198 deletions
| diff --git a/api-guide/authentication.html b/api-guide/authentication.html index 2a838b2a..e6147e7b 100644 --- a/api-guide/authentication.html +++ b/api-guide/authentication.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Authentication - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/authentication"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/authentication"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Authentication, API Reference, Custom authentication, Third party packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -493,9 +493,9 @@ class ExampleAuthentication(authentication.BaseAuthentication):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/content-negotiation.html b/api-guide/content-negotiation.html index 183c250b..c9b21cbe 100644 --- a/api-guide/content-negotiation.html +++ b/api-guide/content-negotiation.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Content negotiation - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/content-negotiation"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/content-negotiation"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Content negotiation, Custom content negotiation">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -273,9 +273,9 @@ class NoNegotiationView(APIView):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/exceptions.html b/api-guide/exceptions.html index c3e58973..e765c654 100644 --- a/api-guide/exceptions.html +++ b/api-guide/exceptions.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Exceptions - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/exceptions"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/exceptions"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Exceptions, API Reference">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -310,9 +310,9 @@ class ServiceUnavailable(APIException):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/fields.html b/api-guide/fields.html index 8f50657e..c9a61c21 100644 --- a/api-guide/fields.html +++ b/api-guide/fields.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Serializer fields - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/fields"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/fields"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Serializer fields, Generic Fields, Typed Fields, Custom fields">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -445,9 +445,9 @@ class ColourField(serializers.WritableField):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/filtering.html b/api-guide/filtering.html index c0e660a7..d2803cb6 100644 --- a/api-guide/filtering.html +++ b/api-guide/filtering.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Filtering - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/filtering"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/filtering"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Filtering, Generic Filtering, API Guide, Custom generic filtering, Third party packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -497,9 +497,9 @@ class ProductFilter(django_filters.FilterSet):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/format-suffixes.html b/api-guide/format-suffixes.html index 5c1ba33c..8e256e4a 100644 --- a/api-guide/format-suffixes.html +++ b/api-guide/format-suffixes.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Format suffixes - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/format-suffixes"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/format-suffixes"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Format suffixes">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -248,9 +248,9 @@ def comment_list(request, format=None):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/generic-views.html b/api-guide/generic-views.html index 33d13e65..9e856491 100644 --- a/api-guide/generic-views.html +++ b/api-guide/generic-views.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Generic views - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/generic-views"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/generic-views"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Generic views, API Reference, Mixins, Concrete View Classes, Customizing the generic views">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -466,9 +466,9 @@ class BaseRetrieveUpdateDestroyView(MultipleFieldLookupMixin,      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/pagination.html b/api-guide/pagination.html index 44c5c47a..e85ecf44 100644 --- a/api-guide/pagination.html +++ b/api-guide/pagination.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Pagination - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/pagination"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/pagination"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Pagination, Custom pagination serializers">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -324,9 +324,9 @@ class CustomPaginationSerializer(pagination.BasePaginationSerializer):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/parsers.html b/api-guide/parsers.html index bef38ff0..c171eff9 100644 --- a/api-guide/parsers.html +++ b/api-guide/parsers.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Parsers - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/parsers"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/parsers"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Parsers, API Reference, Custom parsers, Third party packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -337,9 +337,9 @@ def parse(self, stream, media_type=None, parser_context=None):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/permissions.html b/api-guide/permissions.html index 3c30e87c..a42b9e3c 100644 --- a/api-guide/permissions.html +++ b/api-guide/permissions.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Permissions - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/permissions"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/permissions"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Permissions, API Reference, Custom permissions, Third party packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -380,9 +380,9 @@ class BlacklistPermission(permissions.BasePermission):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/relations.html b/api-guide/relations.html index cc474c34..35a7854d 100644 --- a/api-guide/relations.html +++ b/api-guide/relations.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Serializer relations - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/relations"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/relations"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Serializer relations, API Reference, Nested relationships, Custom relational fields, Further notes, Third Party Packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -311,7 +311,7 @@ class Track(models.Model):  <p>By default this field is read-write, although you can change this behavior using the <code>read_only</code> flag.</p>  <p><strong>Arguments</strong>:</p>  <ul> -<li><code>view_name</code> - The view name that should be used as the target of the relationship.  If you're using <a href="http://django-rest-framework.org/api-guide/routers#defaultrouter">the standard router classes</a> this wil be a string with the format <code><modelname>-detail</code>. <strong>required</strong>.</li> +<li><code>view_name</code> - The view name that should be used as the target of the relationship.  If you're using <a href="http://www.django-rest-framework.org/api-guide/routers#defaultrouter">the standard router classes</a> this wil be a string with the format <code><modelname>-detail</code>. <strong>required</strong>.</li>  <li><code>many</code> - If applied to a to-many relationship, you should set this argument to <code>True</code>.</li>  <li><code>required</code> - If set to <code>False</code>, the field will accept values of <code>None</code> or the empty-string for nullable relationships.</li>  <li><code>queryset</code> - By default <code>ModelSerializer</code> classes will use the default queryset for the relationship.  <code>Serializer</code> classes must either set a queryset explicitly, or set <code>read_only=True</code>.</li> @@ -369,7 +369,7 @@ class Track(models.Model):  <p>This field is always read-only.</p>  <p><strong>Arguments</strong>:</p>  <ul> -<li><code>view_name</code> - The view name that should be used as the target of the relationship.  If you're using <a href="http://django-rest-framework.org/api-guide/routers#defaultrouter">the standard router classes</a> this wil be a string with the format <code><model_name>-detail</code>.  <strong>required</strong>.</li> +<li><code>view_name</code> - The view name that should be used as the target of the relationship.  If you're using <a href="http://www.django-rest-framework.org/api-guide/routers#defaultrouter">the standard router classes</a> this wil be a string with the format <code><model_name>-detail</code>.  <strong>required</strong>.</li>  <li><code>lookup_field</code> - The field on the target that should be used for the lookup.  Should correspond to a URL keyword argument on the referenced view.  Default is <code>'pk'</code>.</li>  <li><code>format</code> - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the <code>format</code> argument.</li>  </ul> @@ -581,9 +581,9 @@ In the 2.4 release, these parts of the API will be removed entirely.</p>      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/renderers.html b/api-guide/renderers.html index 944677ef..80dd5fe6 100644 --- a/api-guide/renderers.html +++ b/api-guide/renderers.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Renderers - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/renderers"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/renderers"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Renderers, API Reference, Custom renderers, Advanced renderer usage, Third party packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -507,9 +507,9 @@ In this case you can underspecify the media types it should respond to, by using      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/requests.html b/api-guide/requests.html index 8399935c..0bff2635 100644 --- a/api-guide/requests.html +++ b/api-guide/requests.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Requests - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/requests"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/requests"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Requests, Request parsing, Authentication, Browser enhancements, Standard HttpRequest attributes">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -279,9 +279,9 @@      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/responses.html b/api-guide/responses.html index 4577d70c..8aa50d53 100644 --- a/api-guide/responses.html +++ b/api-guide/responses.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Responses - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/responses"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/responses"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Responses, Creating responses, Attributes, Standard HttpResponse attributes">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -262,9 +262,9 @@ response['Cache-Control'] = 'no-cache'      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/reverse.html b/api-guide/reverse.html index 49757314..8e0e287d 100644 --- a/api-guide/reverse.html +++ b/api-guide/reverse.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Returning URLs - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/reverse"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/reverse"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Returning URLs">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -237,9 +237,9 @@ class APIRootView(APIView):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/routers.html b/api-guide/routers.html index 90866bf4..3c95362f 100644 --- a/api-guide/routers.html +++ b/api-guide/routers.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Routers - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/routers"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/routers"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Routers, API Guide, Custom Routers, Third Party Packages">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -348,9 +348,9 @@ app.router.register_model(MyModel)      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/serializers.html b/api-guide/serializers.html index 84a9759a..a2794bd6 100644 --- a/api-guide/serializers.html +++ b/api-guide/serializers.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Serializers - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/serializers"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/serializers"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Serializers, ModelSerializer, HyperlinkedModelSerializer, Advanced serializer usage">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -626,9 +626,9 @@ The <code>ModelSerializer</code> class lets you automatically create a Serialize      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/settings.html b/api-guide/settings.html index 944537c9..5a669f43 100644 --- a/api-guide/settings.html +++ b/api-guide/settings.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Settings - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/settings"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/settings"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Settings, API Reference">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -426,9 +426,9 @@ If set to <code>None</code> then generic filtering is disabled.</p>      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/status-codes.html b/api-guide/status-codes.html index c2135da1..eb584f89 100644 --- a/api-guide/status-codes.html +++ b/api-guide/status-codes.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Status Codes - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/status-codes"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/status-codes"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Status Codes">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -297,9 +297,9 @@ is_server_error()   # 5xx      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/testing.html b/api-guide/testing.html index f67267e7..c40bc2f6 100644 --- a/api-guide/testing.html +++ b/api-guide/testing.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Testing - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/testing"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/testing"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Testing, APIRequestFactory, APIClient, Test cases, Testing responses, Configuration">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -409,9 +409,9 @@ self.assertEqual(response.content, '{"username": "lauren", "id": 4}')      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/throttling.html b/api-guide/throttling.html index 5a47e4ef..cc02e6c4 100644 --- a/api-guide/throttling.html +++ b/api-guide/throttling.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Throttling - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/throttling"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/throttling"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Throttling, API Reference, Custom throttles">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -341,9 +341,9 @@ class UploadView(APIView):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/views.html b/api-guide/views.html index f0a1e4e9..c8519b84 100644 --- a/api-guide/views.html +++ b/api-guide/views.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>Class Based Views - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/views"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/views"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, Class Based Views, Function Based Views">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -318,9 +318,9 @@ def view(request):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; diff --git a/api-guide/viewsets.html b/api-guide/viewsets.html index 60e4e3ed..cf46842e 100644 --- a/api-guide/viewsets.html +++ b/api-guide/viewsets.html @@ -3,17 +3,17 @@  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">      <meta charset="utf-8">      <title>ViewSets - Django REST framework</title> -    <link href="http://django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> -    <link rel="canonical" href="http://django-rest-framework.org/api-guide/viewsets"/> +    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon"> +    <link rel="canonical" href="http://www.django-rest-framework.org/api-guide/viewsets"/>      <meta name="viewport" content="width=device-width, initial-scale=1.0">      <meta name="description" content="Django, API, REST, ViewSets, API Reference, Custom ViewSet base classes">      <meta name="author" content="Tom Christie">      <!-- Le styles --> -    <link href="http://django-rest-framework.org/css/prettify.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> -    <link href="http://django-rest-framework.org/css/default.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet"> +    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">      <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->      <!--[if lt IE 9]> @@ -50,64 +50,64 @@              <span class="icon-bar"></span>              <span class="icon-bar"></span>            </a> -          <a class="brand" href="http://django-rest-framework.org">Django REST framework</a> +          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>            <div class="nav-collapse collapse">              <ul class="nav"> -              <li><a href="http://django-rest-framework.org">Home</a></li> +              <li><a href="http://www.django-rest-framework.org">Home</a></li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="http://django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li> +                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/api-guide/requests">Requests</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/responses">Responses</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/views">Views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/generic-views">Generic views</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/routers">Routers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/parsers">Parsers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/renderers">Renderers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/serializers">Serializers</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/fields">Serializer fields</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/relations">Serializer relations</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/authentication">Authentication</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/permissions">Permissions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/throttling">Throttling</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/filtering">Filtering</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/pagination">Pagination</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/status-codes">Status codes</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/testing">Testing</a></li> -                  <li><a href="http://django-rest-framework.org/api-guide/settings">Settings</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li> +                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>                  </ul>                </li>                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>                  <ul class="dropdown-menu"> -                  <li><a href="http://django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> -                  <li><a href="http://django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> -                  <li><a href="http://django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> -                  <li><a href="http://django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> -                  <li><a href="http://django-rest-framework.org/topics/release-notes">Release Notes</a></li> -                  <li><a href="http://django-rest-framework.org/topics/credits">Credits</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/contributing">Contributing to REST framework</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li> +                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>                  </ul>                </li>              </ul> @@ -395,9 +395,9 @@ class UserViewSet(viewsets.ModelViewSet):      <!-- Le javascript      ================================================== -->      <!-- Placed at the end of the document so the pages load faster --> -    <script src="http://django-rest-framework.org/js/jquery-1.8.1-min.js"></script> -    <script src="http://django-rest-framework.org/js/prettify-1.0.js"></script> -    <script src="http://django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script> +    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script> +    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>      <script>        //$('.side-nav').scrollspy()        var shiftWindow = function() { scrollBy(0, -50) }; | 
