Skip to content

Commit

Permalink
Fixed several tiny typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
pombredanne committed Mar 24, 2013
1 parent 7afe039 commit 85cbc71
Show file tree
Hide file tree
Showing 17 changed files with 65 additions and 65 deletions.
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ Feature Changes
this option.

- Adjusted the output for verbosity levels. Using a single -v option
no longer causes voluminous setuptools output. Uisng -vv and -vvv
no longer causes voluminous setuptools output. Using -vv and -vvv
now triggers extra setuptools output.

- Added a remove testing helper function that removes files or directories.
Expand All @@ -728,7 +728,7 @@ Feature Changes

- Added a *newest* keyword parameter to the
zc.buildout.easy_install.install and zc.buildout.easy_install.build
functions to control whether the newest distributions that meed
functions to control whether the newest distributions that need
given requirements should be sought. If a false value is provided
for this parameter and already installed eggs meet the given
requirements, then no attempt will be made to search for newer
Expand Down
4 changes: 2 additions & 2 deletions specifications/repeatable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ itself added an entry for the recipe that fixes the recipe version
at the version used by the buildout.

The zc.recipe.eggs recipe added the eggs option that lists the
specifoc releases that were assembled.
specific releases that were assembled.

Finally the buildout.cfg file can be modified to use the
repeatable.cfg file::
Expand All @@ -88,7 +88,7 @@ repeatable.cfg file::
eek

When the buildout is run, the options in repeatable.cfg will override
the onces in buildout.cfg, providing a repeatable buildout
the ones in buildout.cfg, providing a repeatable buildout

Python API
----------
Expand Down
2 changes: 1 addition & 1 deletion src/zc/buildout/allowhosts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Let's create a develop egg in our buildout that specifies
... ''')

Now let's configure the buildout to use the develop egg,
together with some rules that disallow any website but PyPI and
together with some rules that disallow any web site but PyPI and
local files::

>>> write(sample_buildout, 'buildout.cfg',
Expand Down
14 changes: 7 additions & 7 deletions src/zc/buildout/buildout.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def __init__(self, config_file, cloptions,
if self.offline:
raise zc.buildout.UserError(
"install-from-cache can't be used with offline mode.\n"
"Nothing is installed, even fromn cache, in offline\n"
"Nothing is installed, even from cache, in offline\n"
"mode, which might better be called 'no-install mode'.\n"
)
zc.buildout.easy_install.install_from_cache(True)
Expand Down Expand Up @@ -449,7 +449,7 @@ def install(self, install_args):
# for eggs:
sys.path.insert(0, self['buildout']['develop-eggs-directory'])

# Check for updates. This could cause the process to be rstarted
# Check for updates. This could cause the process to be restarted
self._maybe_upgrade()

# load installed data
Expand Down Expand Up @@ -649,11 +649,11 @@ def _update_installed(self, **buildout_options):
f.close()

def _uninstall_part(self, part, installed_part_options):
# ununstall part
# uninstall part
__doing__ = 'Uninstalling %s.', part
self._logger.info(*__doing__)

# run uinstall recipe
# run uuinstall recipe
recipe, entry = _recipe(installed_part_options[part])
try:
uninstaller = _install_and_load(
Expand Down Expand Up @@ -786,7 +786,7 @@ def _uninstall(self, installed):
==
realpath(f)
)
# Sigh. This is the exectable used to run the buildout
# Sigh. This is the executable used to run the buildout
# and, of course, it's in use. Leave it.
):
raise
Expand Down Expand Up @@ -1685,7 +1685,7 @@ def _error(*message):
sys.exit(1)

_internal_error_template = """
An internal error occured due to a bug in either zc.buildout or in a
An internal error occurred due to a bug in either zc.buildout or in a
recipe being used:
"""

Expand Down Expand Up @@ -1899,7 +1899,7 @@ def main(args=None):
section, option = option
options.append((section.strip(), option.strip(), value.strip()))
else:
# We've run out of command-line options and option assignnemnts
# We've run out of command-line options and option assignments
# The rest should be commands, so we'll stop here
break

Expand Down
18 changes: 9 additions & 9 deletions src/zc/buildout/buildout.txt
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ leave previously created paths in place:
While:
Installing data-dir.
<BLANKLINE>
An internal error occured due to a bug in either zc.buildout or in a
An internal error occurred due to a bug in either zc.buildout or in a
recipe being used:
Traceback (most recent call last):
... exists...
Expand Down Expand Up @@ -493,7 +493,7 @@ If we fix the typo:
While:
Installing data-dir.
<BLANKLINE>
An internal error occured due to a bug in either zc.buildout or in a
An internal error occurred due to a bug in either zc.buildout or in a
recipe being used:
Traceback (most recent call last):
... exists...
Expand Down Expand Up @@ -580,7 +580,7 @@ When we rerun the buildout:
While:
Installing data-dir.
<BLANKLINE>
An internal error occured due to a bug in either zc.buildout or in a
An internal error occurred due to a bug in either zc.buildout or in a
recipe being used:
Traceback (most recent call last):
... exists...
Expand Down Expand Up @@ -655,7 +655,7 @@ directories will be created:
While:
Installing data-dir.
<BLANKLINE>
An internal error occured due to a bug in either zc.buildout or in a
An internal error occurred due to a bug in either zc.buildout or in a
recipe being used:
Traceback (most recent call last):
... exists...
Expand Down Expand Up @@ -717,7 +717,7 @@ Option values have extra whitespace stripped. How this is done
depends on whether the value has non-whitespace characterts on the
first line. If an option value has non-whitespace characters on the
first line, then each line is stripped and blank lines are removed.
For exampe, in::
For example, in::

[foo]
bar = 1
Expand Down Expand Up @@ -768,7 +768,7 @@ Buildout configuration data are Python strings, which are bytes in
Python 2 and unicode in Python 3.

Sections and options within sections may be repeated. Multiple
occurrences of of a section are treated as if they were concantinated.
occurrences of of a section are treated as if they were concatenated.
The last option value for a given name in a section overrides previous
values.

Expand Down Expand Up @@ -971,7 +971,7 @@ Section and option names in variable substitutions are only allowed to
contain alphanumeric characters, hyphens, periods and spaces. This
restriction might be relaxed in future releases.

We can ommit the section name in a variable substitution to refer to
We can omit the section name in a variable substitution to refer to
the current section. We can also use the special option,
_buildout_section_name_ to get the current section name.

Expand Down Expand Up @@ -2833,12 +2833,12 @@ interpreter with the given requirements or paths:
extra-paths =
./src

Passing requirements or paths causes the the builout to be run as part
Passing requirements or paths causes the the buildout to be run as part
of initialization. In the example above, we got a number of
distributions installed and 2 scripts generated. The first, ``demo``,
was defined by the ``demo`` project. The second, ``py`` was defined by
the generated configuration. It's a "custom interpreter" that behaves
like a standard Python interpeter, except that includes the specified
like a standard Python interpreter, except that includes the specified
eggs and extra paths in it's Python path.

We specified a source directory that didn't exist. Buildout created it
Expand Down
6 changes: 3 additions & 3 deletions src/zc/buildout/configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# The following copied from Python 2 config parser because:
# - The py3 configparser isn't backward compatible
# - Both strip option values in undesireable ways
# - Both strip option values in undesirable ways
# - dict of dicts is a much simpler api

import re
Expand Down Expand Up @@ -82,7 +82,7 @@ def __init__(self, filename, lineno, line):
# [section_name: some Python expression] #; some comment
# This regex leverages the fact that the following is a valid Python expression:
# [some Python expression] # some comment
# and that section headers are also delimited by [brackets] taht are also [list]
# and that section headers are also delimited by [brackets] that are also [list]
# delimiters.
# So instead of doing complex parsing to balance brackets in an expression, we
# capture just enough from a header line to collect then remove the section_name
Expand Down Expand Up @@ -127,7 +127,7 @@ def parse(fp, fpname, exp_globals=dict):
Optionally the title line can have the form `[name:expression]' where
expression is an arbitrary Python expression. Sections with an expression
that evaluates to False are ignored. Semicolon `;' an hash `#' characters
mustr be string-escaped in expression literals.
must be string-escaped in expression literals.
exp_globals is a callable returning a mapping of defaults used as globals
during the evaluation of a section conditional expression.
Expand Down
2 changes: 1 addition & 1 deletion src/zc/buildout/debugging.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Buildouts can be pretty complex. When things go wrong, it isn't
always obvious why. Errors can occur due to problems in user input or
due to bugs in zc.buildout or recipes. When an error occurs, Python's
post-mortem debugger can be used to inspect the state of the buildout
or recipe code were there error occured. To enable this, use the -D
or recipe code were there error occurred. To enable this, use the -D
option to the buildout. Let's create a recipe that has a bug:

>>> mkdir(sample_buildout, 'recipes')
Expand Down
8 changes: 4 additions & 4 deletions src/zc/buildout/easy_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def _call_easy_install(self, spec, ws, dest, dist):

if exit_code:
logger.error(
"An error occured when trying to install %s. "
"An error occurred when trying to install %s. "
"Look above this message for any errors that "
"were output by easy_install.",
dist)
Expand Down Expand Up @@ -1384,7 +1384,7 @@ def _constrained_requirement_constraint(constraint, requirement):

# Simple cases:

# No specs tp merge with:
# No specs to merge with:
if not requirement.specs:
if not constraint[0] in '<=>':
constraint = '==' + constraint
Expand Down Expand Up @@ -1422,8 +1422,8 @@ def _constrained_requirement_constraint(constraint, requirement):

cop0 = cop[0]

# Normalize specs by splitting >= and <= specs. We meed tp do this
# becaise these have really weird semantics. Also cache parsed
# Normalize specs by splitting >= and <= specs. We need to do this
# because these have really weird semantics. Also cache parsed
# versions, which we'll need for comparisons:
specs = []
for op, v in requirement.specs:
Expand Down
10 changes: 5 additions & 5 deletions src/zc/buildout/extends-cache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ under any particular circumstances.
been specified by the user's default configuration, the project's root
config file must be available, be it from disk or from the net.

- Offline mode turned on by the ``-o`` command line option is honoured from
- Offline mode turned on by the ``-o`` command line option is honored from
the beginning even though command line options are applied to the
configuration last. If offline mode is not requested by the command line, it
may be switched on by either the user's or the project's config root.
Expand Down Expand Up @@ -383,12 +383,12 @@ Error: Couldn't download 'http://localhost/base.cfg' in offline mode.
While:
Installing.
Checking for upgrades.
An internal error occured ...
An internal error occurred ...
ValueError: install_from_cache set to true with no download cache

>>> rmdir('home', '.buildout')

Newest and non-newest behaviour for extends cache
Newest and non-newest behavior for extends cache
-------------------------------------------------

While offline mode forbids network access completely, 'newest' mode determines
Expand Down Expand Up @@ -467,7 +467,7 @@ used:
Unused options for buildout: 'bar' 'foo'.

(XXX We patch download utility's API to produce readable output for the test;
a better solution would utilise the logging already done by the utility.)
a better solution would re-use the logging already done by the utility.)

>>> import zc.buildout
>>> old_download = zc.buildout.download.Download.download
Expand All @@ -489,7 +489,7 @@ Unused options for buildout: 'bar' 'foo'.
The deprecated ``extended-by`` option
-------------------------------------

The ``buildout`` section used to recognise an option named ``extended-by``
The ``buildout`` section used to recognize an option named ``extended-by``
that was deprecated at some point and removed in the 1.5 line. Since ignoring
this option silently was considered harmful as a matter of principle, a
UserError is raised if that option is encountered now:
Expand Down
6 changes: 3 additions & 3 deletions src/zc/buildout/repeatable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ configuration files for a project into a version control system and
later use the checked in files to get the same buildout, subject to
changes in the environment outside the buildout.

An advantage of using Python eggs is that depenencies of eggs used are
An advantage of using Python eggs is that dependencies of eggs used are
automatically determined and used. The automatic inclusion of
depenent distributions is at odds with the goal of repeatable
dependent distributions is at odds with the goal of repeatable
buildouts.

To support repeatable buildouts, a versions section can be created
with options for each distribution name whos version is to be fixed.
with options for each distribution name who's version is to be fixed.
The section can then be specified via the buildout versions option.

To see how this works, we'll create two versions of a recipe egg:
Expand Down
4 changes: 2 additions & 2 deletions src/zc/buildout/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ number of names to the test namespace:
will be automatically removed at the end of the test. The path of
the created directory is returned.

Further, if the the normalize_path normlaizing substitution (see
Further, if the the normalize_path normalizing substitution (see
below) is used, then any paths starting with this path will be
normalized to::

Expand Down Expand Up @@ -111,7 +111,7 @@ number of names to the test namespace:
``sdist(setup, dest)``
Create a source distribution by running the given setup file and
placing the result in the given destination directory. If the
setup argument is a directory, the thge setup.py file in that
setup argument is a directory, the setup.py file in that
directory is used.

``bdist_egg(setup, dest)``
Expand Down
Loading

0 comments on commit 85cbc71

Please sign in to comment.