From cb28777f509b91708ae98c6f135cd0a167762739 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Sun, 3 Jun 2018 08:29:45 +0100 Subject: [PATCH] Correct spelling mistakes. --- CHANGES | 2 +- docs/bundles.rst | 2 +- docs/expiring.rst | 2 +- docs/generic/index.rst | 2 +- docs/script.rst | 2 +- docs/upgrading.rst | 2 +- examples/no-python/README.rst | 2 +- requirements-dev-2.x.pip | 2 +- requirements-dev.pip | 2 +- requirements-dev.sh | 2 +- src/webassets/filter/compass.py | 2 +- src/webassets/filter/cssrewrite/urlpath.py | 2 +- src/webassets/filter/jspacker/jspacker.py | 4 ++-- src/webassets/filter/requirejs.py | 4 ++-- src/webassets/loaders.py | 2 +- src/webassets/script.py | 2 +- tests/test_script.py | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 543adb20..693d49be 100644 --- a/CHANGES +++ b/CHANGES @@ -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. diff --git a/docs/bundles.rst b/docs/bundles.rst index 91b18cd8..b697667c 100644 --- a/docs/bundles.rst +++ b/docs/bundles.rst @@ -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') diff --git a/docs/expiring.rst b/docs/expiring.rst index 3b85e59f..1aa1ccfa 100644 --- a/docs/expiring.rst +++ b/docs/expiring.rst @@ -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. diff --git a/docs/generic/index.rst b/docs/generic/index.rst index 45320e50..97a6e791 100644 --- a/docs/generic/index.rst +++ b/docs/generic/index.rst @@ -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`. diff --git a/docs/script.rst b/docs/script.rst index e261d4d7..5c5494c9 100644 --- a/docs/script.rst +++ b/docs/script.rst @@ -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 diff --git a/docs/upgrading.rst b/docs/upgrading.rst index c9221937..3ed77835 100644 --- a/docs/upgrading.rst +++ b/docs/upgrading.rst @@ -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 diff --git a/examples/no-python/README.rst b/examples/no-python/README.rst index 6aafb8ac..2684dbaa 100644 --- a/examples/no-python/README.rst +++ b/examples/no-python/README.rst @@ -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 diff --git a/requirements-dev-2.x.pip b/requirements-dev-2.x.pip index eed3ae45..717cc525 100644 --- a/requirements-dev-2.x.pip +++ b/requirements-dev-2.x.pip @@ -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 diff --git a/requirements-dev.pip b/requirements-dev.pip index 3a435a23..4bc13f8a 100644 --- a/requirements-dev.pip +++ b/requirements-dev.pip @@ -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 diff --git a/requirements-dev.sh b/requirements-dev.sh index b18949e5..01a8a123 100755 --- a/requirements-dev.sh +++ b/requirements-dev.sh @@ -24,5 +24,5 @@ npm install -g typescript npm install -g requirejs@2.1.11 npm install -g babel-cli@6.18.0 --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 babel-preset-es2015@6.18.0 diff --git a/src/webassets/filter/compass.py b/src/webassets/filter/compass.py index bb9896e0..256544fb 100644 --- a/src/webassets/filter/compass.py +++ b/src/webassets/filter/compass.py @@ -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 diff --git a/src/webassets/filter/cssrewrite/urlpath.py b/src/webassets/filter/cssrewrite/urlpath.py index 303508fb..f768da59 100644 --- a/src/webassets/filter/cssrewrite/urlpath.py +++ b/src/webassets/filter/cssrewrite/urlpath.py @@ -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 diff --git a/src/webassets/filter/jspacker/jspacker.py b/src/webassets/filter/jspacker/jspacker.py index 98296108..e6815310 100644 --- a/src/webassets/filter/jspacker/jspacker.py +++ b/src/webassets/filter/jspacker/jspacker.py @@ -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 @@ -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"); diff --git a/src/webassets/filter/requirejs.py b/src/webassets/filter/requirejs.py index 1d25cc02..536a0e3c 100644 --- a/src/webassets/filter/requirejs.py +++ b/src/webassets/filter/requirejs.py @@ -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 diff --git a/src/webassets/loaders.py b/src/webassets/loaders.py index 558c31ac..0d802a2f 100644 --- a/src/webassets/loaders.py +++ b/src/webassets/loaders.py @@ -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: diff --git a/src/webassets/script.py b/src/webassets/script.py index d4b51a2b..102a4217 100644 --- a/src/webassets/script.py +++ b/src/webassets/script.py @@ -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 = {} diff --git a/tests/test_script.py b/tests/test_script.py index 8ef01f81..a83bc07f 100644 --- a/tests/test_script.py +++ b/tests/test_script.py @@ -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