Merge branch 'master' into fix-reading-urls

Author: ekonstantinidis

rest_framework_docs/templates/rest_framework_docs/base.html

@@ -57,7 +57,7 @@
       {% block jumbotron %}
       <div class="jumbotron">
         <h1>DRF Docs</h1>
-        <h3>Document Web APIs made with <a href="http://www.django-rest-framework.org/" target="_blank">Django Rest Framework</a>.</h3>
+        <h3>Document Web APIs made with <a href="http://www.django-rest-framework.org/" target="_blank">Django REST Framework</a>.</h3>
       </div>
       {% endblock %}