Merge branch 'pr/640'

sigmavirus24 · sigmavirus24 · commit 0e06a61ea562 · 2015-10-31T09:20:14.000-05:00
Closes realpython#640
diff --git a/docs/conf.py b/docs/conf.py
@@ -254,7 +254,7 @@
 # The format is a list of tuples containing the path and title.
 #epub_pre_files = []
 
-# HTML files shat should be inserted after the pages created by sphinx.
+# HTML files that should be inserted after the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
 #epub_post_files = []
 
diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst
@@ -371,7 +371,12 @@ Blueprint
 Buildout
 --------
 
-.. todo:: Write about Buildout
-
-    `Buildout Website <http://www.buildout.org>`_
+`Buildout <http://www.buildout.org>`_ is an open source software build tool.
+Buildout is created using the Python programming language. It implements a 
+principle of separation of configuration from the scripts that do the setting up.
+Buildout is primarily used to download and set up dependencies in Python eggs
+format of the software being developed or deployed. Recipes for build tasks in any
+environment can be created, and many are already available.
+
+Buidout is written in Python.
 
