Merge pull request mattmakai#40 from monop/gh-pages

mattmakai · mattmakai · commit 3b19d2fd34c8 · 2014-10-12T10:48:42.000-04:00
Fix some errata
diff --git a/source/content/pages/02-web-frameworks/0202-django.markdown b/source/content/pages/02-web-frameworks/0202-django.markdown
@@ -67,8 +67,8 @@ syntax and language semantics first before diving into web development.
 
 
 ## Django tutorials
-* [Tango with Django](http://www.tangowithdjango.com/book/) are a extensive 
-  free introductions to using the most popular Python web framework. Several
+* [Tango with Django](http://www.tangowithdjango.com/book/) is an extensive 
+  set of free introductions to using the most popular Python web framework. Several
   current developers said this book really helped them get over the initial
   framework learning curve.
 
@@ -110,7 +110,7 @@ syntax and language semantics first before diving into web development.
 * [django-awesome](https://github.com/rosarior/awesome-django) is a curated
   list of Django libraries and resources.
 
-* [Starting a Django Project](https://realpython.com/learn/start-django/) answers the question, “How do I setup a Django (1.5, 1.6, or 1.7) Project from scratch?”
+* [Starting a Django Project](https://realpython.com/learn/start-django/) answers the question, “How do I set up a Django (1.5, 1.6, or 1.7) project from scratch?”
 
 
 ## Django videos
@@ -152,7 +152,7 @@ syntax and language semantics first before diving into web development.
   Django 1.7 migrations as well as how you use them.
 
 * Andrew Pinkham's "Upgrading to Django 1.7" series is great learning
-  material for understanding what's changed in this major released and
+  material for understanding what's changed in this major release and
   how to adapt your Django project.
   [Part 1](http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/),
   [part 2](http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/) and
diff --git a/source/content/pages/11-misc/1101-best-python-resources.markdown b/source/content/pages/11-misc/1101-best-python-resources.markdown
@@ -18,11 +18,11 @@ choice4text:
 
 # Best Python Resources
 The Python community is amazing at sharing detailed resources and helping
-beginners learn to program with the language. There's so many resources
+beginners learn to program with the language. There are so many resources
 out there though that it can be difficult to know how to find them. 
 
 This page aggregates the best Python resources with a brief description of
-its one's learning purpose.
+how it fits one's learning purpose.
 
 
 ## New to programming
@@ -82,7 +82,7 @@ should skip down to the next section for "experienced developers".
 
 * Kenneth Reitz's 
   [The Hitchhiker’s Guide to Python](http://docs.python-guide.org/en/latest/)
-  contains a wealth of information both on the Python programming and the community.
+  contains a wealth of information both on the Python programming language and the community.
 
 * [Google's Python Class](https://developers.google.com/edu/python/) contains
   lecture videos and exercises for learning Python.
