Skip to content

Commit

Permalink
Fix grammar, spelling in recently added docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
miracle2k committed Oct 13, 2012
1 parent 151e6fc commit 5c20bba
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions docs/generic/custom_resolver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ __ django_assets_

For normal usage, you will not need to write your own resolver, or
indeed need to know how they work. However, if you want to integrate
``webassets`` with another framework, or if you applicatoin is
``webassets`` with another framework, or if your application is
complex enough that it requires custom file referencing, read on.


Expand All @@ -45,10 +45,10 @@ Methods to overwrite
However, in practice, you will usually want to override the builtin
:class:`Resolver`, and customize it's behaviour where necessary. The
default resolver already splits what is is doing into multiple
methods; so that you can either override then, or
methods; so that you can either override them, or
refer to them in your own implementation, as makes sense.

Instead of the official entry points above, may may instead prefer
Instead of the official entrypoints above, you may instead prefer
to override the following methods of the default resolver class:

.. automethod:: Resolver.search_for_source
Expand Down Expand Up @@ -103,7 +103,9 @@ directory part.
return self.consider_single_directory(self.map[prefix], name)
Using it::
Using it:

.. code-block:: python
env = webassets.Environment(path, url)
env.resolver = PrefixResolver(env, {
Expand Down
6 changes: 3 additions & 3 deletions src/webassets/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def consider_single_directory(self, directory, item):
resolve glob instructions.
Subclasses can call this when they have narrowed done the
location of a bundle to a single directory.
location of a bundle item to a single directory.
"""
expr = path.join(directory, item)
if has_magic(expr):
Expand Down Expand Up @@ -213,7 +213,7 @@ def query_url_mapping(self, filepath):
the correct url for ``filepath``.
Subclasses should be sure that they really want to call this
method, instead of simply falling back to the ``super()``.
method, instead of simply falling back to ``super()``.
"""
# Build a list of dir -> url mappings
mapping = self.env.url_mapping.items()
Expand Down Expand Up @@ -244,7 +244,7 @@ def resolve_source(self, item):
reason why the name of this method does not imply a
return type.
The incoming is usually a relative path, but may also be
The incoming item is usually a relative path, but may also be
an absolute path, or a url. These you will commonly want to
return unmodified.
Expand Down

0 comments on commit 5c20bba

Please sign in to comment.