tweaking wording

mattmakai · mattmakai · commit 3e0f9e9db4d0 · 2015-06-25T08:48:40.000-07:00
diff --git a/all.html b/all.html
@@ -1278,11 +1278,11 @@ <h2>Web frameworks learning checklist</h2>
 </li>
 </ol>
           <h1>Django</h1>
-<p><a href="http://www.djangoproject.com/">Django</a> is a widely used Python web 
+<p><a href="http://www.djangoproject.com/">Django</a> is a widely-used Python web 
 application framework with a "batteries-included" philosophy. The principle
 behind batteries-included is that the common functionality for building
 web applications should come with the framework instead of as separate
-libraries. </p>
+libraries.</p>
 <p><a href="http://www.djangoproject.com/" style="border: none;"><img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" /></a></p>
 <p>For example, 
 <a href="https://docs.djangoproject.com/en/dev/topics/auth/">authentication</a>,
@@ -1297,7 +1297,7 @@ <h1>Django</h1>
 to perform user authentication. </p>
 <p>The batteries-included and extensibility philosophies are simply two different
 ways to tackle framework building. Neither philosophy is inherently better 
-than the other.</p>
+than the other one.</p>
 <h2>Why is Django a good web framework choice?</h2>
 <p>The Django project's stability, performance and community have grown 
 tremendously over the past decade since the framework's creation. Detailed
diff --git a/django.html b/django.html
@@ -35,11 +35,11 @@
 </div><div class="row">
     <div class="col-md-8">
           <h1>Django</h1>
-<p><a href="http://www.djangoproject.com/">Django</a> is a widely used Python web 
+<p><a href="http://www.djangoproject.com/">Django</a> is a widely-used Python web 
 application framework with a "batteries-included" philosophy. The principle
 behind batteries-included is that the common functionality for building
 web applications should come with the framework instead of as separate
-libraries. </p>
+libraries.</p>
 <p><a href="http://www.djangoproject.com/" style="border: none;"><img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" /></a></p>
 <p>For example, 
 <a href="https://docs.djangoproject.com/en/dev/topics/auth/">authentication</a>,
@@ -54,7 +54,7 @@ <h1>Django</h1>
 to perform user authentication. </p>
 <p>The batteries-included and extensibility philosophies are simply two different
 ways to tackle framework building. Neither philosophy is inherently better 
-than the other.</p>
+than the other one.</p>
 <h2>Why is Django a good web framework choice?</h2>
 <p>The Django project's stability, performance and community have grown 
 tremendously over the past decade since the framework's creation. Detailed
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-24T11:55:38Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-25T08:48:36Z</updated></feed>
diff --git a/source/content/pages/04-web-development/02-django.markdown b/source/content/pages/04-web-development/02-django.markdown
@@ -6,11 +6,11 @@ meta: Django is a widely used Python web framework with a 'batteries-included' p
 
 
 # Django
-[Django](http://www.djangoproject.com/) is a widely used Python web 
+[Django](http://www.djangoproject.com/) is a widely-used Python web 
 application framework with a "batteries-included" philosophy. The principle
 behind batteries-included is that the common functionality for building
 web applications should come with the framework instead of as separate
-libraries. 
+libraries.
 
 
 <a href="http://www.djangoproject.com/" style="border: none;"><img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" /></a>
@@ -30,7 +30,7 @@ to perform user authentication.
 
 The batteries-included and extensibility philosophies are simply two different
 ways to tackle framework building. Neither philosophy is inherently better 
-than the other.
+than the other one.
 
 
 ## Why is Django a good web framework choice?

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-24T11:55:38Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-25T08:48:36Z</updated></feed>`