Merge pull request #808 from lemonad/develop

Corrected a few typos

docs/cookbook.txt

@@ -125,7 +125,7 @@ Ensuring Repeatability
 
 Three things are required to fully guarantee a repeatable installation using requirements files.
 
-1. The requirements file was generated by ``pip freeze`` or you're sure it only contains requirements that specifiy a specific version.
+1. The requirements file was generated by ``pip freeze`` or you're sure it only contains requirements that specify a specific version.
 2. The installation is performed using :ref:`--no-deps <install_--no-deps>`.  This guarantees that only what is explicitly listed in the requirements file is installed.
-3. The installation is performed against a index or find-links location that is guaranteed to *not* allow achives to be changed and updated without a version increase.
+3. The installation is performed against an index or find-links location that is guaranteed to *not* allow archives to be changed and updated without a version increase.
 

docs/development.txt

@@ -7,7 +7,7 @@ Pull Requests
 
 Submit Pull Requests against the `develop` branch.
 
-Provide a good description of what your doing and why.
+Provide a good description of what you're doing and why.
 
 Provide tests that cover your changes and try to run the tests locally first.
 

docs/logic.txt

@@ -68,7 +68,7 @@ pip requires a working VCS command on your path: git, hg, svn, or bzr.
 
 VCS projects can be installed in :ref:`editable mode <editable-installs>` (using the :ref:`--editable <install_--editable>` option) or not.
 
-* For editable installs, the clone location by default is "<venv path>/src/SomeProject" in virtual environments, and "<cwd>/src/SomeProject" for global intalls.
+* For editable installs, the clone location by default is "<venv path>/src/SomeProject" in virtual environments, and "<cwd>/src/SomeProject" for global installs.
   The :ref:`--src <install_--src>` option can be used to modify this location.
 * For non-editable installs, the project is built locally in a temp dir and then installed normally.
 
@@ -153,8 +153,8 @@ See the :ref:`pip install Examples<pip install Examples>`.
 Hash Verification
 =================
 
-PyPI provides a md5 hash of a package by having the link to the
-package include a #md5=<hash>.
+PyPI provides an md5 hash of a package by having the link to the
+package include an #md5=<hash>.
 
 pip supports checking this, as well as any of the
 guaranteed hashlib algorithms (sha1, sha224, sha384, sha256, sha512, md5).

docs/make.bat

@@ -21,7 +21,7 @@ if "%1" == "help" (
 	echo.  singlehtml to make a single large HTML file
 	echo.  pickle     to make pickle files
 	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  htmlhelp   to make HTML files and an HTML help project
 	echo.  qthelp     to make HTML files and a qthelp project
 	echo.  devhelp    to make HTML files and a Devhelp project
 	echo.  epub       to make an epub

docs/usage.txt

@@ -72,7 +72,7 @@ Examples
   $ pip install --upgrade SomePackage
 
 
-4) Install a local project in  in "editable" mode. See the section on :ref:`Editable Installs <editable-installs>`.
+4) Install a local project in "editable" mode. See the section on :ref:`Editable Installs <editable-installs>`.
 
   ::
 

pip/baseparser.py

@@ -162,7 +162,7 @@ class ConfigOptionParser(CustomOptionParser):
                     val = option.convert_value(key, val)
                 except optparse.OptionValueError:
                     e = sys.exc_info()[1]
-                    print("An error occured during configuration: %s" % e)
+                    print("An error occurred during configuration: %s" % e)
                     sys.exit(3)
                 defaults[option.dest] = val
         return defaults

pip/req.py

@@ -305,7 +305,7 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
                 filenames = [f for f in filenames if f.endswith('.egg-info')]
 
             if not filenames:
-                raise InstallationError('No files/directores in %s (from %s)' % (base, filename))
+                raise InstallationError('No files/directories in %s (from %s)' % (base, filename))
             assert filenames, "No files/directories in %s (from %s)" % (base, filename)
 
             # if we have more than one match, we pick the toplevel one.  This can
@@ -849,7 +849,7 @@ class RequirementSet(object):
         else:
             if self.has_requirement(name):
                 raise InstallationError(
-                    'Double requirement given: %s (aready in %s, name=%r)'
+                    'Double requirement given: %s (already in %s, name=%r)'
                     % (install_req, self.get_requirement(name), name))
             self.requirements[name] = install_req
             ## FIXME: what about other normalizations?  E.g., _ vs. -?