LAtest docs build

2 files changed, 10 insertions, 1 deletions

diff --git a/api-guide/authentication.html b/api-guide/authentication.html
index e6147e7b..f99b8a2c 100644
--- a/api-guide/authentication.html
+++ b/api-guide/authentication.html
@@ -185,6 +185,7 @@
 <li><a href="#digest-authentication">Digest Authentication</a></li>
 <li><a href="#django-oauth-toolkit">Django OAuth Toolkit</a></li>
 <li><a href="#django-oauth2-consumer">Django OAuth2 Consumer</a></li>
+<li><a href="#json-web-token-authentication">JSON Web Token Authentication</a></li>
 
               <div>
 
@@ -478,6 +479,8 @@ class ExampleAuthentication(authentication.BaseAuthentication):
 <p>The <a href="https://github.com/evonove/django-oauth-toolkit">Django OAuth Toolkit</a> package provides OAuth 2.0 support, and works with Python 2.7 and Python 3.3+.  The package is maintained by <a href="https://github.com/evonove/">Evonove</a> and uses the excelllent <a href="https://github.com/idan/oauthlib">OAuthLib</a>.  The package is well documented, and comes as a recommended alternative for OAuth 2.0 support.</p>
 <h2 id="django-oauth2-consumer">Django OAuth2 Consumer</h2>
 <p>The <a href="https://github.com/Rediker-Software/doac">Django OAuth2 Consumer</a> library from <a href="https://github.com/Rediker-Software">Rediker Software</a> is another package that provides <a href="https://github.com/Rediker-Software/doac/blob/master/docs/integrations.md#">OAuth 2.0 support for REST framework</a>.  The package includes token scoping permissions on tokens, which allows finer-grained access to your API.</p>
+<h2 id="json-web-token-authentication">JSON Web Token Authentication</h2>
+<p>JSON Web Token is a fairly new standard which can be used for token-based authentication. Unlike the built-in TokenAuthentication scheme, JWT Authentication doesn't need to use a database to validate a token. <a href="https://github.com/GetBlimp">Blimp</a> maintains the <a href="https://github.com/GetBlimp/django-rest-framework-jwt">djangorestframework-jwt</a> package which provides a JWT Authentication class as well as a mechanism for clients to obtain a JWT given the username and password.</p>
           </div><!--/span-->
         </div><!--/row-->
       </div><!--/.fluid-container-->
diff --git a/api-guide/generic-views.html b/api-guide/generic-views.html
index 9e856491..284ecf4e 100644
--- a/api-guide/generic-views.html
+++ b/api-guide/generic-views.html
@@ -6,7 +6,7 @@
     <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="description" content="Django, API, REST, Generic views, API Reference, Mixins, Concrete View Classes, Customizing the generic views, Third party packages">
     <meta name="author" content="Tom Christie">
 
     <!-- Le styles -->
@@ -191,6 +191,8 @@
 <li class="main"><a href="#customizing-the-generic-views">Customizing the generic views</a></li>
 <li><a href="#creating-custom-mixins">Creating custom mixins</a></li>
 <li><a href="#creating-custom-base-classes">Creating custom base classes</a></li>
+<li class="main"><a href="#third-party-packages">Third party packages</a></li>
+<li><a href="#django-rest-framework-bulk">Django REST Framework bulk</a></li>
 
               <div>
 
@@ -451,6 +453,10 @@ class BaseRetrieveUpdateDestroyView(MultipleFieldLookupMixin,
     pass
 </code></pre>
 <p>Using custom base classes is a good option if you have custom behavior that consistently needs to be repeated across a large number of views throughout your project.</p>
+<h1 id="third-party-packages">Third party packages</h1>
+<p>The following third party packages provide additional generic view implementations.</p>
+<h2 id="django-rest-framework-bulk">Django REST Framework bulk</h2>
+<p>The <a href="https://github.com/miki725/django-rest-framework-bulk">django-rest-framework-bulk package</a> implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests.</p>
           </div><!--/span-->
         </div><!--/row-->
       </div><!--/.fluid-container-->