tweaks based on @raiderrobert PR #111. thank you

all.html

@@ -2887,7 +2887,7 @@ <h2>Django books and tutorials</h2>
   focuses on web development using Django and JavaScript. This book uses 
   the development of a website using the Django web framework as a real
   world example of how to perform test-driven development (TDD). There is
-  also coverage of NoSQL, websockets and asynchronous responses. The book can
+  also coverage of NoSQL, WebSockets and asynchronous responses. The book can
   be read online for free or purchased in hard copy via O'Reilly.</p>
 </li>
 <li>
@@ -3014,10 +3014,10 @@ <h2>Django migrations</h2>
 </li>
 </ul>
 <h2>Channels in 1.9+</h2>
-<p>Channels are a new mechanism in Django 1.9 (as a standalone app, later
-for incorporation into the core framework in 1.10) for real-time 
-full-duplex communication between the browser and the server based on 
-<a href="/websockets.html">WebSockets</a>. </p>
+<p>Channels are a new mechanism in Django 1.9 provided as a standalone app. 
+They may be incorporated into the core framework in 2.0+. Channels provide 
+"real-time" full-duplex communication between the browser and the server 
+based on <a href="/websockets.html">WebSockets</a>. </p>
 <ul>
 <li>
 <p>This 
@@ -3107,6 +3107,11 @@ <h2>Static and media files</h2>
 to handle these files properly.</p>
 <ul>
 <li>
+<p><a href="https://worthwhile.com/blog/2016/07/11/django-page-load-speed/">How to Optimize Images for Page Load Speed in Django</a>
+  reviews good practices for improving page speed performance when media 
+  images make up a significant percentage of webpage download size.</p>
+</li>
+<li>
 <p><a href="http://www.caktusgroup.com/blog/2014/11/10/Using-Amazon-S3-to-store-your-Django-sites-static-and-media-files/">Using Amazon S3 to Store your Django Site's Static and Media Files</a>
   is a well written guide to a question commonly asked about static and
   media file serving.</p>

django.html

@@ -95,7 +95,7 @@ <h2>Django books and tutorials</h2>
   focuses on web development using Django and JavaScript. This book uses 
   the development of a website using the Django web framework as a real
   world example of how to perform test-driven development (TDD). There is
-  also coverage of NoSQL, websockets and asynchronous responses. The book can
+  also coverage of NoSQL, WebSockets and asynchronous responses. The book can
   be read online for free or purchased in hard copy via O'Reilly.</p>
 </li>
 <li>
@@ -222,10 +222,10 @@ <h2>Django migrations</h2>
 </li>
 </ul>
 <h2>Channels in 1.9+</h2>
-<p>Channels are a new mechanism in Django 1.9 (as a standalone app, later
-for incorporation into the core framework in 1.10) for real-time 
-full-duplex communication between the browser and the server based on 
-<a href="/websockets.html">WebSockets</a>. </p>
+<p>Channels are a new mechanism in Django 1.9 provided as a standalone app. 
+They may be incorporated into the core framework in 2.0+. Channels provide 
+"real-time" full-duplex communication between the browser and the server 
+based on <a href="/websockets.html">WebSockets</a>. </p>
 <ul>
 <li>
 <p>This 
@@ -315,6 +315,11 @@ <h2>Static and media files</h2>
 to handle these files properly.</p>
 <ul>
 <li>
+<p><a href="https://worthwhile.com/blog/2016/07/11/django-page-load-speed/">How to Optimize Images for Page Load Speed in Django</a>
+  reviews good practices for improving page speed performance when media 
+  images make up a significant percentage of webpage download size.</p>
+</li>
+<li>
 <p><a href="http://www.caktusgroup.com/blog/2014/11/10/Using-Amazon-S3-to-store-your-Django-sites-static-and-media-files/">Using Amazon S3 to Store your Django Site's Static and Media Files</a>
   is a well written guide to a question commonly asked about static and
   media file serving.</p>

source/content/pages/07-web-development/03-django.markdown

@@ -70,7 +70,7 @@ as of Django 1.8, 1.9.
   focuses on web development using Django and JavaScript. This book uses 
   the development of a website using the Django web framework as a real
   world example of how to perform test-driven development (TDD). There is
-  also coverage of NoSQL, websockets and asynchronous responses. The book can
+  also coverage of NoSQL, WebSockets and asynchronous responses. The book can
   be read online for free or purchased in hard copy via O'Reilly.
 
 * [Tango with Django](http://www.tangowithdjango.com/book17/) is an extensive 
@@ -176,10 +176,10 @@ for Django and web development on the [best Python videos](/best-python-videos.h
 
 
 ## Channels in 1.9+
-Channels are a new mechanism in Django 1.9 (as a standalone app, later
-for incorporation into the core framework in 1.10) for real-time 
-full-duplex communication between the browser and the server based on 
-[WebSockets](/websockets.html). 
+Channels are a new mechanism in Django 1.9 provided as a standalone app. 
+They may be incorporated into the core framework in 2.0+. Channels provide 
+"real-time" full-duplex communication between the browser and the server 
+based on [WebSockets](/websockets.html). 
 
 * This 
   [tutorial shows how to get started with Django Channels in your project](https://blog.heroku.com/archives/2016/3/17/in_deep_with_django_channels_the_future_of_real_time_apps_in_django).
@@ -256,6 +256,10 @@ Django developers. These resources along with the
 [static content](/static-content.html) page are useful for figuring out how 
 to handle these files properly.
 
+* [How to Optimize Images for Page Load Speed in Django](https://worthwhile.com/blog/2016/07/11/django-page-load-speed/)
+  reviews good practices for improving page speed performance when media 
+  images make up a significant percentage of webpage download size.
+
 * [Using Amazon S3 to Store your Django Site's Static and Media Files](http://www.caktusgroup.com/blog/2014/11/10/Using-Amazon-S3-to-store-your-Django-sites-static-and-media-files/)
   is a well written guide to a question commonly asked about static and
   media file serving.