Skip to content

Commit

Permalink
Corrected a few typos
Browse files Browse the repository at this point in the history
  • Loading branch information
lemonad committed Feb 14, 2013
1 parent 3ef5eaf commit 5ae29b6
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions docs/cookbook.txt
Expand Up @@ -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.

2 changes: 1 addition & 1 deletion docs/development.txt
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions docs/logic.txt
Expand Up @@ -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.

Expand Down Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion docs/make.bat
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/usage.txt
Expand Up @@ -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>`.

::

Expand Down
2 changes: 1 addition & 1 deletion pip/baseparser.py
Expand Up @@ -162,7 +162,7 @@ def update_defaults(self, defaults):
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
Expand Down
4 changes: 2 additions & 2 deletions pip/req.py
Expand Up @@ -305,7 +305,7 @@ def egg_info_path(self, filename):
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
Expand Down Expand Up @@ -849,7 +849,7 @@ def add_requirement(self, install_req):
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. -?
Expand Down

0 comments on commit 5ae29b6

Please sign in to comment.