Skip to content

Commit

Permalink
Merge pull request #506 from EdwardBetts/spelling
Browse files Browse the repository at this point in the history
Correct spelling mistakes.
  • Loading branch information
miracle2k committed Jun 5, 2018
2 parents dfb5e70 + cb28777 commit e3e8211
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
example, the command line can now load YAML files.
- Added a new JSON manifest implementation (Krzysztof Tarnowski).
- Bundles now support an ``extra`` dict that is made available by the
template tags, usuable for arbitrary custom data.
template tags, usable for arbitrary custom data.
- Various API finetuning (Bundle.build, inheritance of the ``debug=``
flag, ``auto_build`` behaviour). See the "Upgrading" section in the
documentation for more information on this.
Expand Down
2 changes: 1 addition & 1 deletion docs/bundles.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ arguments:
:doc:`/expiring`.
If ``merge`` is ``True``, this argument is required and you can also use
these placeholders:
- ``%(name)s`` Just the name of the source file, whithout path or extension (eg: 'common')
- ``%(name)s`` Just the name of the source file, without path or extension (eg: 'common')
- ``%(path)s`` The path and name of the source file (eg: 'portal/js/common')
- ``%(ext)s`` The extension of source file (eg: 'js')

Expand Down
2 changes: 1 addition & 1 deletion docs/expiring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ provides a manifest type that writes all information to a single file::

env = Environment(...)
env.manifest = 'file'
env.manifest = 'file:/tmp/manifest.to-be-deployed' # explict filename
env.manifest = 'file:/tmp/manifest.to-be-deployed' # explicit filename

You can then just copy this one file to the web server, and ``webassets``
will know all about the versions without having to consult the media files.
Expand Down
2 changes: 1 addition & 1 deletion docs/generic/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Using ``webassets`` in standalone mode
======================================

You don't need to use one of the frameworks into which ``webassets`` can
integrate. Using the underlying facilites directly is almost as easy.
integrate. Using the underlying facilities directly is almost as easy.

And depending on what libraries you use, there may still be some things
*webassets* can help you with, see :doc:`/integration/index`.
Expand Down
2 changes: 1 addition & 1 deletion docs/script.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ the commands as simple methods.
cmdenv.build()
You are reponsible for parsing the command line in any way you see fit
You are responsible for parsing the command line in any way you see fit
(using for example the :py:mod:`optparse` or :py:mod:`argparse` libraries,
or whatever your framework provides as a command line utility shell), and
then invoking the corresponding methods on your instance of
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ In 0.8
:meth:`Environment._normalize_source_path` method used mainly by
extensions like ``Flask-Assets`` has been removed. Instead, extensions now
need to implement a custom :class:`Resolver`. The
:class:`Evironment.absurl` method has also disappeared, and replacing it
:class:`Environment.absurl` method has also disappeared, and replacing it
can now be done via a custom :class:`Resolver`` class.

- :attr:`Environment.directory` now always returns an absolute path; if a
Expand Down
2 changes: 1 addition & 1 deletion examples/no-python/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Standalone example

This shows how you might use ``webassets`` outside of a Python project.

A global script ``webassets`` is installed by the Pyton package. In this
A global script ``webassets`` is installed by the Python package. In this
directory, run::

$ webasssets -c bundles.yaml build
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev-2.x.pip
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Some additonal dependencies that are currently not yet available on Python 3.
# Some additional dependencies that are currently not yet available on Python 3.

pillow<4
clevercss
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.pip
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# webassets has no dependencies for it's base functionality.
#
# However, most filters are wrappers around external libraries and
# tools, and some features also need additonal library support
# tools, and some features also need additional library support
# (e.g. loading from YAML files).
#
# Libs required to run the tests
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ npm install -g typescript
npm install -g [email protected]
npm install -g [email protected] --save
# Don't install the babel-preset globally because
# there's a bug with older verisons of node
# there's a bug with older versions of node
npm install [email protected]
2 changes: 1 addition & 1 deletion src/webassets/filter/compass.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def open(self, out, source_path, **kw):
Also, there's a bunch of other issues we need to work around:
- compass doesn't support given an explict output file, only a
- compass doesn't support given an explicit output file, only a
"--css-dir" output directory.
We have to "guess" the filename that will be created in that
Expand Down
2 changes: 1 addition & 1 deletion src/webassets/filter/cssrewrite/urlpath.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def testRelpath():
CHANGELOG
2005/07/31
Can now pass mulitple args to ``pathjoin``.
Can now pass multiple args to ``pathjoin``.
Finalised as version 0.1.0
2005/06/18
Expand Down
4 changes: 2 additions & 2 deletions src/webassets/filter/jspacker/jspacker.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def repl(match, offset):

def analyze(self, script, regexp, encode):
# analyse
# retreive all words in the script
# retrieve all words in the script
regexp = re.compile(regexp, re.M)
all = regexp.findall(script)
sorted = [] # list of words sorted by frequency
Expand Down Expand Up @@ -433,7 +433,7 @@ def bootStrap(self, packed, keywords, encoding, fastDecode):
if ascii < 36:
decode = ENCODE.sub(inline, decode)
# special case: when $count==0 there ar no keywords. i want to keep
# the basic shape of the unpacking funcion so i'll frig the code...
# the basic shape of the unpacking function so i'll frig the code...
if not count:
raise NotImplemented
#) $decode = $decode.replace(/(\$count)\s*=\s*1/, "$1=0");
Expand Down
4 changes: 2 additions & 2 deletions src/webassets/filter/requirejs.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ class RequireJSFilter(ExternalTool):
config (env: REQUIREJS_CONFIG)
The RequireJS options file. The path is taken to be relative
to the Enviroment.directory (by defualt is /static).
to the Environment.directory (by default is /static).
baseUrl (env: REQUIREJS_BASEURL)
The ``baseUrl`` parameter to r.js; this is the directory that
AMD modules will be loaded from. The path is taken relative
to the Enviroment.directory (by defualt is /static).
to the Environment.directory (by default is /static).
Typically, this is used in
conjunction with a ``baseUrl`` parameter set in the `config`
options file, where the baseUrl value in the config file is
Expand Down
2 changes: 1 addition & 1 deletion src/webassets/loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def load_environment(self):
"""Load an ``Environment`` defined in the Python module.
Expects as default a global name ``environment`` to be defined,
or overriden by passing a string ``module:environent`` to the
or overridden by passing a string ``module:environment`` to the
constructor.
"""
try:
Expand Down
2 changes: 1 addition & 1 deletion src/webassets/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def __call__(self, loop=None):
``loop``
A callback, taking no arguments, to be called once every loop
iteration. Can be useful to integrate the command with other code.
If not specified, the loop wil call ``time.sleep()``.
If not specified, the loop will call ``time.sleep()``.
"""
# TODO: This should probably also restart when the code changes.
mtimes = {}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,6 @@ def test_watch_with_fixed_env_and_no_config(self):
self.cmd_env, argparse.Namespace())
with self:
time.sleep(0.1)
# No errors occured
# No errors occurred


0 comments on commit e3e8211

Please sign in to comment.