Fix typos

CHANGES.rst

@@ -536,7 +536,7 @@ Development:
   running buildout.
   [lelit]
 
-- A new boostrap.py file is released (version 2015-07-01).
+- A new bootstrap.py file is released (version 2015-07-01).
 
 - When bootstrapping, the ``develop-eggs/`` directory is first removed. This
   prevents old left-over ``.egg-link`` files from breaking buildout's careful
@@ -565,10 +565,10 @@ Development:
 
 - Fixed: Buildout merged single-version requirements with
   version-range requirements in a way that caused it to think there
-  wasn't a single-version requirement.  IOW, buildout throught that
+  wasn't a single-version requirement.  IOW, buildout through that
   versions were being picked when they weren't.
 
-- Suppress spurios (and possibly non-spurious) version-parsing warnings.
+- Suppress spurious (and possibly non-spurious) version-parsing warnings.
 
 2.3.0 (2014-12-14)
 ==================

dev.py

@@ -13,7 +13,7 @@
 ##############################################################################
 """Bootstrap the buildout project itself.
 
-This is different from a normal boostrapping process because the
+This is different from a normal bootstrapping process because the
 buildout egg itself is installed as a develop egg.
 """
 import sys

doc/topics/bootstrapping.rst

@@ -43,7 +43,7 @@ Local bootstrapping using the ``bootstrap`` command
 ===================================================
 
 You can use the :ref:`bootstrap command <bootstrap-command>` of a
-``buildout`` script installed in your Python environment to boostrap
+``buildout`` script installed in your Python environment to bootstrap
 a new buildout in the current directory:
 
 .. code-block:: console

old-tutorial/tutorial.txt

@@ -1238,14 +1238,14 @@ Provides default buildout settings (unless -U option is used):
     [buildout]
     # Shared eggs directory:
     eggs-directory = /home/jim/.eggs
-    # Newest mode off, reenable with -n
+    # Newest mode off, re-enable with -n
     newst = false
 
     [python24]
-    executabe = /usr/local/python/2.4/bin/python
+    executable = /usr/local/python/2.4/bin/python
 
     [python25]
-    executabe = /usr/local/python/2.5/bin/python
+    executable = /usr/local/python/2.5/bin/python
 
 .. class:: handout
 
@@ -1382,7 +1382,7 @@ Example: zc.sharing (1/2)
 
    You can largely ignore the details of the Zope 3 instance  recipe.
    If you aren't a Zope user, you don't care.  If you are a Zope user,
-   you should be aware that much better recipes have been developped. 
+   you should be aware that much better recipes have been developed. 
 
    This project uses multiple source directories, the current
    directory and the zc.security directory, which is a subversion
@@ -1638,7 +1638,7 @@ be checked out and reproduced.
 
   - Run with -v
   
-  - Look for outout lines of form:
+  - Look for output lines of form:
   
     ::
 

src/zc/buildout/buildout.py

@@ -1444,7 +1444,7 @@ def _install_and_load(spec, group, entry, buildout):
         v = sys.exc_info()[1]
         buildout._logger.log(
             1,
-            "Could't load %s entry point %s\nfrom %s:\n%s.",
+            "Couldn't load %s entry point %s\nfrom %s:\n%s.",
             group, entry, spec, v)
         raise
 
@@ -1954,10 +1954,10 @@ def _update_section(in1, s2):
     s1 = copy.deepcopy(in1)
     # Base section 2 on section 1; section 1 is copied, with key-value pairs
     # in section 2 overriding those in section 1. If there are += or -=
-    # operators in section 2, process these to add or substract items (delimited
+    # operators in section 2, process these to add or subtract items (delimited
     # by newlines) from the preexisting values.
     s2 = copy.deepcopy(s2) # avoid mutating the second argument, which is unexpected
-    # Sort on key, then on the addition or substraction operator (+ comes first)
+    # Sort on key, then on the addition or subtraction operator (+ comes first)
     for k, v in sorted(s2.items(), key=lambda x: (x[0].rstrip(' +'), x[0][-1])):
         if k.endswith('+'):
             key = k.rstrip(' +')
@@ -2059,7 +2059,7 @@ Options:
   -D
 
     Debug errors.  If an error occurs, then the post-mortem debugger
-    will be started. This is especially useful for debuging recipe
+    will be started. This is especially useful for debugging recipe
     problems.
 
   -h, --help

src/zc/buildout/download.py

@@ -30,7 +30,7 @@ except ImportError:
     import urllib2
 
     def urlretrieve(url, tmp_path):
-        """Work around Python issue 24599 includig basic auth support
+        """Work around Python issue 24599 including basic auth support
         """
         scheme, netloc, path, params, query, frag = urlparse(url)
         auth, host = urllib2.splituser(netloc)

src/zc/buildout/easy_install.py

@@ -324,7 +324,7 @@ class Installer(object):
         """Return textual requirements/constraint information for debug purposes
 
         We do a very simple textual search, as that filters out most
-        extraneous information witout missing anything.
+        extraneous information without missing anything.
 
         """
         output = [

src/zc/buildout/tests/buildout.txt

@@ -1067,7 +1067,7 @@ For continuous integration, it might be useful to query the buildout config.
     first
     second
 
-As with assignments, if the section is ommitted, 'buildout' section is assumed.
+As with assignments, if the section is omitted, 'buildout' section is assumed.
 
     >>> print_(system(buildout+ ' query develop'), end='')
     .

src/zc/buildout/tests/configparser.test

@@ -19,7 +19,7 @@ First, an example that illustrates a well-formed configuration::
       # not a comment
 
   # comment
-  ; also a coment
+  ; also a comment
 
       b
 

src/zc/buildout/tests/test_all.py

@@ -660,7 +660,7 @@ the comparison with the saved value works correctly.
     Develop: '/sample-buildout/recipes'
     Installing debug.
 
-If we run the buildout again, we shoudn't get a message about
+If we run the buildout again, we shouldn't get a message about
 uninstalling anything because the configuration hasn't changed.
 
     >>> print_(system(buildout), end='')
@@ -2570,7 +2570,7 @@ We get an error if we specify anything but true or false:
 def wont_downgrade_due_to_prefer_final():
     r"""
     If we install a non-final buildout version, we don't want to
-    downgrade just bcause we prefer-final.  If a buildout version
+    downgrade just because we prefer-final.  If a buildout version
     isn't specified using a versions entry, then buildout's version
     requirement gets set to >=CURRENT_VERSION.