Update documentation

ebab87c6 · Xavier Ordoquy · 8a0f235e · ebab87c6 · ebab87c6 · ebab87c6
Commit ebab87c6 authored Jun 04, 2015 by Xavier Ordoquy
72 changed files
--- a/404.html
+++ b/404.html
--- a/api-guide/authentication/index.html
+++ b/api-guide/authentication/index.html
--- a/api-guide/content-negotiation/index.html
+++ b/api-guide/content-negotiation/index.html
--- a/api-guide/exceptions/index.html
+++ b/api-guide/exceptions/index.html
--- a/api-guide/fields/index.html
+++ b/api-guide/fields/index.html
--- a/api-guide/filtering/index.html
+++ b/api-guide/filtering/index.html
--- a/api-guide/format-suffixes/index.html
+++ b/api-guide/format-suffixes/index.html
--- a/api-guide/generic-views/index.html
+++ b/api-guide/generic-views/index.html
--- a/api-guide/metadata/index.html
+++ b/api-guide/metadata/index.html
--- a/api-guide/pagination/index.html
+++ b/api-guide/pagination/index.html
--- a/api-guide/parsers/index.html
+++ b/api-guide/parsers/index.html
--- a/api-guide/permissions/index.html
+++ b/api-guide/permissions/index.html
--- a/api-guide/relations/index.html
+++ b/api-guide/relations/index.html
--- a/api-guide/renderers/index.html
+++ b/api-guide/renderers/index.html
--- a/api-guide/requests/index.html
+++ b/api-guide/requests/index.html
--- a/api-guide/responses/index.html
+++ b/api-guide/responses/index.html
--- a/api-guide/reverse/index.html
+++ b/api-guide/reverse/index.html
--- a/api-guide/routers/index.html
+++ b/api-guide/routers/index.html
--- a/api-guide/serializers/index.html
+++ b/api-guide/serializers/index.html
--- a/api-guide/settings/index.html
+++ b/api-guide/settings/index.html
--- a/api-guide/status-codes/index.html
+++ b/api-guide/status-codes/index.html
--- a/api-guide/testing/index.html
+++ b/api-guide/testing/index.html
--- a/api-guide/throttling/index.html
+++ b/api-guide/throttling/index.html
--- a/api-guide/validators/index.html
+++ b/api-guide/validators/index.html
--- a/api-guide/versioning/index.html
+++ b/api-guide/versioning/index.html
--- a/api-guide/views/index.html
+++ b/api-guide/views/index.html
--- a/api-guide/viewsets/index.html
+++ b/api-guide/viewsets/index.html
--- a/css/base.css
+++ b/css/base.css
-body {
-    padding-top: 70px;
-    background: url(../img/grid.png) repeat-x;
-    background-attachment: fixed;
-    background-color: #f8f8f8;
-}
-body > div.container {
-    min-height: 400px;
-}
-ul.nav li.main {
-    font-weight: bold;
-}
-div.col-md-3 {
-    padding-left: 0;
-}
-div.source-links {
-    float: right;
-}
-div.col-md-9 img {
-    max-width: 100%;
-    display: block;
-    padding: 4px;
-    line-height: 1.428571429;
-    background-color: #fff;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    margin: 20px auto 30px auto;
-}
-h1, h2, h3 {
-    color: #444;
-}
-h1 {
-    font-weight: 400;
-    font-size: 42px;
-}
-h2, h3, h4, h5, h6 {
-    font-weight: 300;
-}
-hr {
-    border-top: 1px solid #aaa;
-}
-pre, .rst-content tt {
-    max-width: 100%;
-    background: #fff;
-    border: solid 1px #e1e4e5;
-    color: #e74c3c;
-    overflow-x: auto;
-}
-code.code-large, .rst-content tt.code-large {
-    font-size: 90%;
-}
-code {
-    padding: 2px 5px;
-    color: #c7254e;
-    background-color: #f9f2f4;
-    font-size: 75%;
-}
-code, kbd, pre, samp  {
-    font-family: monospace,serif;
-    font-size: 12px !important;
-}
-footer {
-    margin-top: 30px;
-    margin-bottom: 10px;
-    text-align: center;
-    font-weight: 200;
-}
-.modal-dialog {
-    margin-top: 60px;
-}
-/*
- * Side navigation
- *
- * Scrollspy and affixed enhanced navigation to highlight sections and secondary
- * sections of docs content.
- */
-/* By default it's not affixed in mobile views, so undo that */
-.bs-sidebar.affix {
-    position: static;
-}
-.bs-sidebar.well {
-    padding: 0;
-}
-/* First level of nav */
-.bs-sidenav {
-    padding-top:    10px;
-    padding-bottom: 10px;
-    border-radius: 5px;
-}
-/* All levels of nav */
-.bs-sidebar .nav > li > a {
-    display: block;
-    padding: 5px 20px;
-}
-.bs-sidebar .nav > li > a:hover,
-.bs-sidebar .nav > li > a:focus {
-    text-decoration: none;
-    border-right: 1px solid;
-}
-.bs-sidebar .nav > .active > a,
-.bs-sidebar .nav > .active:hover > a,
-.bs-sidebar .nav > .active:focus > a {
-    font-weight: bold;
-    background-color: transparent;
-    border-right: 1px solid;
-}
-/* Nav: second level (shown on .active) */
-.bs-sidebar .nav .nav {
-    display: none; /* Hide by default, but at >768px, show it */
-    margin-bottom: 8px;
-}
-.bs-sidebar .nav .nav > li > a {
-    padding-top:    3px;
-    padding-bottom: 3px;
-    padding-left: 30px;
-    font-size: 90%;
-}
-/* Show and affix the side nav when space allows it */
-@media (min-width: 992px) {
-    .bs-sidebar .nav > .active > ul {
-        display: block;
-    }
-    /* Widen the fixed sidebar */
-    .bs-sidebar.affix,
-    .bs-sidebar.affix-bottom {
-        width: 213px;
-    }
-    .bs-sidebar.affix {
-        position: fixed; /* Undo the static from mobile first approach */
-        top: 80px;
-    }
-    .bs-sidebar.affix-bottom {
-        position: absolute; /* Undo the static from mobile first approach */
-    }
-    .bs-sidebar.affix-bottom .bs-sidenav,
-    .bs-sidebar.affix .bs-sidenav {
-        margin-top: 0;
-        margin-bottom: 0;
-    }
-}
-@media (min-width: 1200px) {
-    /* Widen the fixed sidebar again */
-    .bs-sidebar.affix-bottom,
-    .bs-sidebar.affix {
-        width: 263px;
-    }
-}
\ No newline at end of file
--- a/css/bootstrap-custom.min.css
+++ b/css/bootstrap-custom.min.css
--- a/css/default.css
+++ b/css/default.css
@@ -415,3 +415,7 @@ ul.sponsor {
    list-style: none;
    display: block;
 }
+#mkdocs_search_modal article p{
+  word-wrap: break-word;
+}
--- a/css/font-awesome-4.0.3.css
+++ b/css/font-awesome-4.0.3.css
--- a/css/highlight.css
+++ b/css/highlight.css
-/*
-This is the GitHub theme for highlight.js
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-*/
-.hljs {
-  display: block; padding: 0.5em;
-  color: #333;
-}
-.hljs-comment,
-.hljs-template_comment,
-.diff .hljs-header,
-.hljs-javadoc {
-  color: #998;
-  font-style: italic
-}
-.hljs-keyword,
-.css .rule .hljs-keyword,
-.hljs-winutils,
-.javascript .hljs-title,
-.nginx .hljs-title,
-.hljs-subst,
-.hljs-request,
-.hljs-status {
-  color: #333;
-  font-weight: bold
-}
-.hljs-number,
-.hljs-hexcolor,
-.ruby .hljs-constant {
-  color: #099;
-}
-.hljs-string,
-.hljs-tag .hljs-value,
-.hljs-phpdoc,
-.tex .hljs-formula {
-  color: #d14
-}
-.hljs-title,
-.hljs-id,
-.coffeescript .hljs-params,
-.scss .hljs-preprocessor {
-  color: #900;
-  font-weight: bold
-}
-.javascript .hljs-title,
-.lisp .hljs-title,
-.clojure .hljs-title,
-.hljs-subst {
-  font-weight: normal
-}
-.hljs-class .hljs-title,
-.haskell .hljs-type,
-.vhdl .hljs-literal,
-.tex .hljs-command {
-  color: #458;
-  font-weight: bold
-}
-.hljs-tag,
-.hljs-tag .hljs-title,
-.hljs-rules .hljs-property,
-.django .hljs-tag .hljs-keyword {
-  color: #000080;
-  font-weight: normal
-}
-.hljs-attribute,
-.hljs-variable,
-.lisp .hljs-body {
-  color: #008080
-}
-.hljs-regexp {
-  color: #009926
-}
-.hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.lisp .hljs-keyword,
-.tex .hljs-special,
-.hljs-prompt {
-  color: #990073
-}
-.hljs-built_in,
-.lisp .hljs-title,
-.clojure .hljs-built_in {
-  color: #0086b3
-}
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-pi,
-.hljs-doctype,
-.hljs-shebang,
-.hljs-cdata {
-  color: #999;
-  font-weight: bold
-}
-.hljs-deletion {
-  background: #fdd
-}
-.hljs-addition {
-  background: #dfd
-}
-.diff .hljs-change {
-  background: #0086b3
-}
-.hljs-chunk {
-  color: #aaa
-}
--- a/css/prettify-1.0.css
+++ b/css/prettify-1.0.css
-.com { color: #93a1a1; }
-.lit { color: #195f91; }
-.pun, .opn, .clo { color: #93a1a1; }
-.fun { color: #dc322f; }
-.str, .atv { color: #D14; }
-.kwd, .prettyprint .tag { color: #1e347b; }
-.typ, .atn, .dec, .var { color: teal; }
-.pln { color: #48484c; }
-.prettyprint {
-    padding: 8px;
-}
-.prettyprint.linenums {
-  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-}
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums {
-  margin: 0 0 0 33px; /* IE indents via margin-left */
-}
-ol.linenums li {
-  padding-left: 12px;
-  color: #bebec5;
-  line-height: 20px;
-  text-shadow: 0 1px 0 #fff;
-}
--- a/fonts/fontawesome-webfont.eot
+++ b/fonts/fontawesome-webfont.eot
--- a/fonts/fontawesome-webfont.svg
+++ b/fonts/fontawesome-webfont.svg
--- a/fonts/fontawesome-webfont.ttf
+++ b/fonts/fontawesome-webfont.ttf
--- a/fonts/fontawesome-webfont.woff
+++ b/fonts/fontawesome-webfont.woff
--- a/index.html
+++ b/index.html
@@ -68,7 +68,7 @@
          <a class="repo-link btn btn-inverse btn-small disabled" rel="next" >
            <i class="icon-arrow-left icon-white"></i> Previous
          </a>
-          <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
+          <a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
            <span class="icon-bar"></span>
            <span class="icon-bar"></span>
@@ -79,8 +79,11 @@
            <!-- Main navigation -->
            <ul class="nav navbar-nav">
-              <li class="active"><a href="/">Home</a></li>
+              <li class="active" >
+                <a href=".">Home</a>
+              </li>
              <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>
                <ul class="dropdown-menu">
@@ -244,7 +247,7 @@
                  </li>
                  <li >
-                    <a href="topics/browser-enhancements/">Browser enhancements</a>
+                    <a href="topics/browser-enhancements/">Browser Enhancements</a>
                  </li>
                  <li >
@@ -300,27 +303,19 @@
      <div class="container-fluid">
        <!-- Search Modal -->
-        <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div id="mkdocs_search_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
          <div class="modal-header">
            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
            <h3 id="myModalLabel">Documentation search</h3>
          </div>
          <div class="modal-body">
-            <!-- Custom google search -->
+            <form role="form">
-            <script>
+              <div class="form-group">
-              (function() {
+                <input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query">
-                var cx = '015016005043623903336:rxraeohqk6w';
+              </div>
-                var gcse = document.createElement('script');
+            </form>
-                gcse.type = 'text/javascript';
+            <div id="mkdocs-search-results"></div>
-                gcse.async = true;
-                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-                  '//www.google.com/cse/cse.js?cx=' + cx;
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(gcse, s);
-              })();
-            </script>
-            <gcse:search></gcse:search>
          </div>
          <div class="modal-footer">
@@ -449,9 +444,12 @@
          </div>
          <div id="main-content" class="span9">
-            <p class="badges" height=20px>
+              <p class="badges" height=20px>
 <iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
 <a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://www.django-rest-framework.org" data-count="none"></a>
@@ -474,7 +472,7 @@
    clip: rect(0,0,0,0);
    border: 0;">Django REST Framework</h1>
-<img alt="Django REST Framework" title="Logo by Jake 'Sid' Smith" src="./img/logo.png" width="600px" style="display: block; margin: 0 auto 0 auto">
+<img alt="Django REST Framework" title="Logo by Jake 'Sid' Smith" src="img/logo.png" width="600px" style="display: block; margin: 0 auto 0 auto">
 </p>
 <p>Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs.</p>
@@ -659,6 +657,8 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
          </div>
          <!--/span-->
        </div>
@@ -682,6 +682,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
  <script src="./js/jquery-1.8.1-min.js"></script>
  <script src="./js/prettify-1.0.js"></script>
  <script src="./js/bootstrap-2.1.1-min.js"></script>
+  <script>var base_url = '.';</script>
+  <script src="./mkdocs/js/require.js"></script>
  <script src="./js/theme.js"></script>
  <script>

--- a/js/base.js
+++ b/js/base.js
-/* Highlight */
-$( document ).ready(function() {
-    hljs.initHighlightingOnLoad();
-    $('table').addClass('table');
-});
-/* Scrollspy */
-var navHeight = $('.navbar').outerHeight(true) + 10
-$('body').scrollspy({
-    target: '.bs-sidebar',
-    offset: navHeight
-})
-/* Prevent disabled links from causing a page reload */
-$("li.disabled a").click(function() {
-    event.preventDefault();
-});
-/* Adjust the scroll height of anchors to compensate for the fixed navbar */
-window.disableShift = false;
-var shiftWindow = function() {
-    if (window.disableShift) {
-        window.disableShift = false;
-    } else {
-        /* If we're at the bottom of the page, don't erronously scroll up */
-        var scrolledToBottomOfPage = (
-            (window.innerHeight + window.scrollY) >= document.body.offsetHeight
-        );
-        if (!scrolledToBottomOfPage) {
-            scrollBy(0, -60);
-        };
-    };
-};
-if (location.hash) {shiftWindow();}
-window.addEventListener("hashchange", shiftWindow);
-/* Deal with clicks on nav links that do not change the current anchor link. */
-$("ul.nav a" ).click(function() {
-    var href = this.href;
-    var suffix = location.hash;
-    var matchesCurrentHash = (href.indexOf(suffix, href.length - suffix.length) !== -1);
-    if (location.hash && matchesCurrentHash) {
-        /* Force a single 'hashchange' event to occur after the click event */
-        window.disableShift = true;
-        location.hash='';
-    };
-});
--- a/js/bootstrap-3.0.3.min.js
+++ b/js/bootstrap-3.0.3.min.js
--- a/js/highlight.pack.js
+++ b/js/highlight.pack.js
--- a/js/prettify-1.0.min.js
+++ b/js/prettify-1.0.min.js
--- a/js/theme.js
+++ b/js/theme.js
-$(function(){
+function getSearchTerm()
+{
+    var sPageURL = window.location.search.substring(1);
+    var sURLVariables = sPageURL.split('&');
+    for (var i = 0; i < sURLVariables.length; i++)
+    {
+        var sParameterName = sURLVariables[i].split('=');
+        if (sParameterName[0] == 'q')
+        {
+            return sParameterName[1];
+        }
+    }
+}
+$(function() {
+    var initialise_search = function(){
+        require.config({"baseUrl":"/mkdocs/js"});
+        require(["search",]);
+    }
+    var search_term = getSearchTerm();
+    if(search_term){
+        $('#mkdocs_search_modal').modal();
+    }
    $('pre code').parent().addClass('prettyprint well');
+    $(document).on("submit", "#mkdocs_search_modal form", function (e) {
+        $("#mkdocs-search-results").html("Searching...");
+        initialise_search();
+        return false;
+    });
 });
--- a/license/highlight.js/LICENSE
+++ b/license/highlight.js/LICENSE
-Copyright (c) 2006, Ivan Sagalaev
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of highlight.js nor the names of its contributors 
-      may be used to endorse or promote products derived from this software 
-      without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/mkdocs/js/lunr-0.5.7.min.js
+++ b/mkdocs/js/lunr-0.5.7.min.js
--- a/mkdocs/js/mustache.min.js
+++ b/mkdocs/js/mustache.min.js
+(function(global,factory){if(typeof exports==="object"&&exports){factory(exports)}else if(typeof define==="function"&&define.amd){define(["exports"],factory)}else{factory(global.Mustache={})}})(this,function(mustache){var Object_toString=Object.prototype.toString;var isArray=Array.isArray||function(object){return Object_toString.call(object)==="[object Array]"};function isFunction(object){return typeof object==="function"}function escapeRegExp(string){return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var RegExp_test=RegExp.prototype.test;function testRegExp(re,string){return RegExp_test.call(re,string)}var nonSpaceRe=/\S/;function isWhitespace(string){return!testRegExp(nonSpaceRe,string)}var entityMap={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;"};function escapeHtml(string){return String(string).replace(/[&<>"'\/]/g,function(s){return entityMap[s]})}var whiteRe=/\s*/;var spaceRe=/\s+/;var equalsRe=/\s*=/;var curlyRe=/\s*\}/;var tagRe=/#|\^|\/|>|\{|&|=|!/;function parseTemplate(template,tags){if(!template)return[];var sections=[];var tokens=[];var spaces=[];var hasTag=false;var nonSpace=false;function stripSpace(){if(hasTag&&!nonSpace){while(spaces.length)delete tokens[spaces.pop()]}else{spaces=[]}hasTag=false;nonSpace=false}var openingTagRe,closingTagRe,closingCurlyRe;function compileTags(tags){if(typeof tags==="string")tags=tags.split(spaceRe,2);if(!isArray(tags)||tags.length!==2)throw new Error("Invalid tags: "+tags);openingTagRe=new RegExp(escapeRegExp(tags[0])+"\\s*");closingTagRe=new RegExp("\\s*"+escapeRegExp(tags[1]));closingCurlyRe=new RegExp("\\s*"+escapeRegExp("}"+tags[1]))}compileTags(tags||mustache.tags);var scanner=new Scanner(template);var start,type,value,chr,token,openSection;while(!scanner.eos()){start=scanner.pos;value=scanner.scanUntil(openingTagRe);if(value){for(var i=0,valueLength=value.length;i<valueLength;++i){chr=value.charAt(i);if(isWhitespace(chr)){spaces.push(tokens.length)}else{nonSpace=true}tokens.push(["text",chr,start,start+1]);start+=1;if(chr==="\n")stripSpace()}}if(!scanner.scan(openingTagRe))break;hasTag=true;type=scanner.scan(tagRe)||"name";scanner.scan(whiteRe);if(type==="="){value=scanner.scanUntil(equalsRe);scanner.scan(equalsRe);scanner.scanUntil(closingTagRe)}else if(type==="{"){value=scanner.scanUntil(closingCurlyRe);scanner.scan(curlyRe);scanner.scanUntil(closingTagRe);type="&"}else{value=scanner.scanUntil(closingTagRe)}if(!scanner.scan(closingTagRe))throw new Error("Unclosed tag at "+scanner.pos);token=[type,value,start,scanner.pos];tokens.push(token);if(type==="#"||type==="^"){sections.push(token)}else if(type==="/"){openSection=sections.pop();if(!openSection)throw new Error('Unopened section "'+value+'" at '+start);if(openSection[1]!==value)throw new Error('Unclosed section "'+openSection[1]+'" at '+start)}else if(type==="name"||type==="{"||type==="&"){nonSpace=true}else if(type==="="){compileTags(value)}}openSection=sections.pop();if(openSection)throw new Error('Unclosed section "'+openSection[1]+'" at '+scanner.pos);return nestTokens(squashTokens(tokens))}function squashTokens(tokens){var squashedTokens=[];var token,lastToken;for(var i=0,numTokens=tokens.length;i<numTokens;++i){token=tokens[i];if(token){if(token[0]==="text"&&lastToken&&lastToken[0]==="text"){lastToken[1]+=token[1];lastToken[3]=token[3]}else{squashedTokens.push(token);lastToken=token}}}return squashedTokens}function nestTokens(tokens){var nestedTokens=[];var collector=nestedTokens;var sections=[];var token,section;for(var i=0,numTokens=tokens.length;i<numTokens;++i){token=tokens[i];switch(token[0]){case"#":case"^":collector.push(token);sections.push(token);collector=token[4]=[];break;case"/":section=sections.pop();section[5]=token[2];collector=sections.length>0?sections[sections.length-1][4]:nestedTokens;break;default:collector.push(token)}}return nestedTokens}function Scanner(string){this.string=string;this.tail=string;this.pos=0}Scanner.prototype.eos=function(){return this.tail===""};Scanner.prototype.scan=function(re){var match=this.tail.match(re);if(!match||match.index!==0)return"";var string=match[0];this.tail=this.tail.substring(string.length);this.pos+=string.length;return string};Scanner.prototype.scanUntil=function(re){var index=this.tail.search(re),match;switch(index){case-1:match=this.tail;this.tail="";break;case 0:match="";break;default:match=this.tail.substring(0,index);this.tail=this.tail.substring(index)}this.pos+=match.length;return match};function Context(view,parentContext){this.view=view;this.cache={".":this.view};this.parent=parentContext}Context.prototype.push=function(view){return new Context(view,this)};Context.prototype.lookup=function(name){var cache=this.cache;var value;if(name in cache){value=cache[name]}else{var context=this,names,index,lookupHit=false;while(context){if(name.indexOf(".")>0){value=context.view;names=name.split(".");index=0;while(value!=null&&index<names.length){if(index===names.length-1&&value!=null)lookupHit=typeof value==="object"&&value.hasOwnProperty(names[index]);value=value[names[index++]]}}else if(context.view!=null&&typeof context.view==="object"){value=context.view[name];lookupHit=context.view.hasOwnProperty(name)}if(lookupHit)break;context=context.parent}cache[name]=value}if(isFunction(value))value=value.call(this.view);return value};function Writer(){this.cache={}}Writer.prototype.clearCache=function(){this.cache={}};Writer.prototype.parse=function(template,tags){var cache=this.cache;var tokens=cache[template];if(tokens==null)tokens=cache[template]=parseTemplate(template,tags);return tokens};Writer.prototype.render=function(template,view,partials){var tokens=this.parse(template);var context=view instanceof Context?view:new Context(view);return this.renderTokens(tokens,context,partials,template)};Writer.prototype.renderTokens=function(tokens,context,partials,originalTemplate){var buffer="";var token,symbol,value;for(var i=0,numTokens=tokens.length;i<numTokens;++i){value=undefined;token=tokens[i];symbol=token[0];if(symbol==="#")value=this._renderSection(token,context,partials,originalTemplate);else if(symbol==="^")value=this._renderInverted(token,context,partials,originalTemplate);else if(symbol===">")value=this._renderPartial(token,context,partials,originalTemplate);else if(symbol==="&")value=this._unescapedValue(token,context);else if(symbol==="name")value=this._escapedValue(token,context);else if(symbol==="text")value=this._rawValue(token);if(value!==undefined)buffer+=value}return buffer};Writer.prototype._renderSection=function(token,context,partials,originalTemplate){var self=this;var buffer="";var value=context.lookup(token[1]);function subRender(template){return self.render(template,context,partials)}if(!value)return;if(isArray(value)){for(var j=0,valueLength=value.length;j<valueLength;++j){buffer+=this.renderTokens(token[4],context.push(value[j]),partials,originalTemplate)}}else if(typeof value==="object"||typeof value==="string"||typeof value==="number"){buffer+=this.renderTokens(token[4],context.push(value),partials,originalTemplate)}else if(isFunction(value)){if(typeof originalTemplate!=="string")throw new Error("Cannot use higher-order sections without the original template");value=value.call(context.view,originalTemplate.slice(token[3],token[5]),subRender);if(value!=null)buffer+=value}else{buffer+=this.renderTokens(token[4],context,partials,originalTemplate)}return buffer};Writer.prototype._renderInverted=function(token,context,partials,originalTemplate){var value=context.lookup(token[1]);if(!value||isArray(value)&&value.length===0)return this.renderTokens(token[4],context,partials,originalTemplate)};Writer.prototype._renderPartial=function(token,context,partials){if(!partials)return;var value=isFunction(partials)?partials(token[1]):partials[token[1]];if(value!=null)return this.renderTokens(this.parse(value),context,partials,value)};Writer.prototype._unescapedValue=function(token,context){var value=context.lookup(token[1]);if(value!=null)return value};Writer.prototype._escapedValue=function(token,context){var value=context.lookup(token[1]);if(value!=null)return mustache.escape(value)};Writer.prototype._rawValue=function(token){return token[1]};mustache.name="mustache.js";mustache.version="2.0.0";mustache.tags=["{{","}}"];var defaultWriter=new Writer;mustache.clearCache=function(){return defaultWriter.clearCache()};mustache.parse=function(template,tags){return defaultWriter.parse(template,tags)};mustache.render=function(template,view,partials){return defaultWriter.render(template,view,partials)};mustache.to_html=function(template,view,partials,send){var result=mustache.render(template,view,partials);if(isFunction(send)){send(result)}else{return result}};mustache.escape=escapeHtml;mustache.Scanner=Scanner;mustache.Context=Context;mustache.Writer=Writer});
\ No newline at end of file
--- a/mkdocs/js/require.js
+++ b/mkdocs/js/require.js
--- a/mkdocs/js/search-results-template.mustache
+++ b/mkdocs/js/search-results-template.mustache
+<article>
+  <h3><a href="{{location}}">{{title}}</a></h3>
+  <p>{{summary}}</p>
+</article>
--- a/mkdocs/js/search.js
+++ b/mkdocs/js/search.js
+require([
+    base_url + '/mkdocs/js/mustache.min.js',
+    base_url + '/mkdocs/js/lunr-0.5.7.min.js',
+    'text!search-results-template.mustache',
+    'text!../search_index.json',
+], function (Mustache, lunr, results_template, data) {
+   "use strict";
+    function getSearchTerm()
+    {
+        var sPageURL = window.location.search.substring(1);
+        var sURLVariables = sPageURL.split('&');
+        for (var i = 0; i < sURLVariables.length; i++)
+        {
+            var sParameterName = sURLVariables[i].split('=');
+            if (sParameterName[0] == 'q')
+            {
+                return sParameterName[1];
+            }
+        }
+    }
+    var index = lunr(function () {
+        this.field('title', {boost: 10});
+        this.field('text');
+        this.ref('location');
+    });
+    data = JSON.parse(data);
+    var documents = {};
+    for (var i=0; i < data.docs.length; i++){
+        var doc = data.docs[i];
+        doc.location = base_url + doc.location;
+        index.add(doc);
+        documents[doc.location] = doc;
+    }
+    var search = function(){
+        var query = document.getElementById('mkdocs-search-query').value;
+        var search_results = document.getElementById("mkdocs-search-results");
+        while (search_results.firstChild) {
+            search_results.removeChild(search_results.firstChild);
+        }
+        if(query === ''){
+            return;
+        }
+        var results = index.search(query);
+        if (results.length > 0){
+            for (var i=0; i < results.length; i++){
+                var result = results[i];
+                doc = documents[result.ref];
+                doc.base_url = base_url;
+                doc.summary = doc.text.substring(0, 200);
+                var html = Mustache.to_html(results_template, doc);
+                search_results.insertAdjacentHTML('beforeend', html);
+            }
+        } else {
+            search_results.insertAdjacentHTML('beforeend', "<p>No results found</p>");
+        }
+        if(jQuery){
+            /*
+             * We currently only automatically hide bootstrap models. This
+             * requires jQuery to work.
+             */
+            jQuery('#mkdocs_search_modal a').click(function(){
+                jQuery('#mkdocs_search_modal').modal('hide');
+            })
+        }
+    };
+    var search_input = document.getElementById('mkdocs-search-query');
+    var term = getSearchTerm();
+    if (term){
+        search_input.value = term;
+        search();
+    }
+    search_input.addEventListener("keyup", search);
+});
--- a/mkdocs/js/text.js
+++ b/mkdocs/js/text.js
--- a/mkdocs/search_index.json
+++ b/mkdocs/search_index.json
--- a/sitemap.xml
+++ b/sitemap.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    <url>
+     <loc>http://www.django-rest-framework.org//</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/quickstart/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/1-serialization/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/2-requests-and-responses/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/3-class-based-views/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/4-authentication-and-permissions/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/5-relationships-and-hyperlinked-apis/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//tutorial/6-viewsets-and-routers/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/requests/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/responses/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/views/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/generic-views/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/viewsets/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/routers/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/parsers/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/renderers/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/serializers/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/fields/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/relations/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/validators/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/authentication/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/permissions/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/throttling/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/filtering/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/pagination/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/versioning/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/content-negotiation/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/metadata/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/format-suffixes/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/reverse/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/exceptions/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/status-codes/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/testing/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//api-guide/settings/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/documenting-your-api/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/internationalization/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/ajax-csrf-cors/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/browser-enhancements/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/browsable-api/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/rest-hypermedia-hateoas/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/third-party-resources/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/contributing/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/project-management/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/3.0-announcement/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/3.1-announcement/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/kickstarter-announcement/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+    <url>
+     <loc>http://www.django-rest-framework.org//topics/release-notes/</loc>
+     <lastmod>2015-06-04</lastmod>
+     <changefreq>daily</changefreq>
+    </url>
+</urlset>
\ No newline at end of file
--- a/topics/3.0-announcement/index.html
+++ b/topics/3.0-announcement/index.html
--- a/topics/3.1-announcement/index.html
+++ b/topics/3.1-announcement/index.html
--- a/topics/ajax-csrf-cors/index.html
+++ b/topics/ajax-csrf-cors/index.html
--- a/topics/browsable-api/index.html
+++ b/topics/browsable-api/index.html
--- a/topics/browser-enhancements/index.html
+++ b/topics/browser-enhancements/index.html
--- a/topics/contributing/index.html
+++ b/topics/contributing/index.html
--- a/topics/documenting-your-api/index.html
+++ b/topics/documenting-your-api/index.html
--- a/topics/internationalization/index.html
+++ b/topics/internationalization/index.html
--- a/topics/kickstarter-announcement/index.html
+++ b/topics/kickstarter-announcement/index.html
--- a/topics/project-management/index.html
+++ b/topics/project-management/index.html
--- a/topics/release-notes/index.html
+++ b/topics/release-notes/index.html
--- a/topics/rest-hypermedia-hateoas/index.html
+++ b/topics/rest-hypermedia-hateoas/index.html
--- a/topics/third-party-resources/index.html
+++ b/topics/third-party-resources/index.html
--- a/tutorial/1-serialization/index.html
+++ b/tutorial/1-serialization/index.html
--- a/tutorial/2-requests-and-responses/index.html
+++ b/tutorial/2-requests-and-responses/index.html
--- a/tutorial/3-class-based-views/index.html
+++ b/tutorial/3-class-based-views/index.html
--- a/tutorial/4-authentication-and-permissions/index.html
+++ b/tutorial/4-authentication-and-permissions/index.html
--- a/tutorial/5-relationships-and-hyperlinked-apis/index.html
+++ b/tutorial/5-relationships-and-hyperlinked-apis/index.html
--- a/tutorial/6-viewsets-and-routers/index.html
+++ b/tutorial/6-viewsets-and-routers/index.html
--- a/tutorial/quickstart/index.html
+++ b/tutorial/quickstart/index.html