From f5775bcba0c94ed83531df62e29c0efbb5fdeeef Mon Sep 17 00:00:00 2001 From: "Carlos E. Garcia" Date: Mon, 15 Sep 2014 20:29:00 -0400 Subject: [PATCH] minor spelling fixes --- THANKS | 2 +- docs/contribute.rst | 2 +- docs/plugins.rst | 2 +- pelican/__init__.py | 2 +- pelican/contents.py | 2 +- pelican/log.py | 2 +- pelican/tests/support.py | 2 +- pelican/tests/test_utils.py | 2 +- pelican/utils.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/THANKS b/THANKS index 1d867471..15503473 100644 --- a/THANKS +++ b/THANKS @@ -4,7 +4,7 @@ contributed or implemented key features over time. We do our best to keep this list up-to-date, but you can also have a look at the nice contributor graphs produced by GitHub: https://github.com/getpelican/pelican/graphs/contributors -If you want to contibute, check the documentation section about how to do so: +If you want to contribute, check the documentation section about how to do so: Aaron Kavlie diff --git a/docs/contribute.rst b/docs/contribute.rst index 7c117d26..2962ddb1 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -202,5 +202,5 @@ Try to limit them to ``--debug`` mode like the following:: try: some_action() except Exception as e: - logger.error('Exception occured: %s', e, + logger.error('Exception occurred: %s', e, exc_info=settings.get('DEBUG', False)) diff --git a/docs/plugins.rst b/docs/plugins.rst index 01e67810..27299e83 100644 --- a/docs/plugins.rst +++ b/docs/plugins.rst @@ -67,7 +67,7 @@ Signal Arguments Description ================================= ============================ =========================================================================== initialized pelican object finalized pelican object invoked after all the generators are executed and just before pelican exits - usefull for custom post processing actions, such as: + useful for custom post processing actions, such as: - minifying js/css assets. - notify/ping search engines with an updated sitemap. generator_init generator invoked in the Generator.__init__ diff --git a/pelican/__init__.py b/pelican/__init__.py index 3080be37..86fb0fbe 100644 --- a/pelican/__init__.py +++ b/pelican/__init__.py @@ -157,7 +157,7 @@ class Pelican(object): ] # erase the directory if it is not the source and if that's - # explicitely asked + # explicitly asked if (self.delete_outputdir and not os.path.realpath(self.path).startswith(self.output_path)): clean_output_dir(self.output_path, self.output_retention) diff --git a/pelican/contents.py b/pelican/contents.py index 2e17b56f..4b7117dd 100644 --- a/pelican/contents.py +++ b/pelican/contents.py @@ -193,7 +193,7 @@ class Content(object): """Update the content attribute. Change all the relative paths of the content to relative paths - suitable for the ouput content. + suitable for the output content. :param content: content resource that will be passed to the templates. :param siteurl: siteurl which is locally generated by the writer in diff --git a/pelican/log.py b/pelican/log.py index 089bc0ac..cd750927 100644 --- a/pelican/log.py +++ b/pelican/log.py @@ -33,7 +33,7 @@ class BaseFormatter(logging.Formatter): s = super(BaseFormatter, self).formatException(ei) # fancy format traceback s = str('\n').join(str(' | ') + line for line in s.splitlines()) - # seperate the traceback from the preceding lines + # separate the traceback from the preceding lines s = str(' |___\n{}').format(s) return s diff --git a/pelican/tests/support.py b/pelican/tests/support.py index a4fd2c35..151fa3b6 100644 --- a/pelican/tests/support.py +++ b/pelican/tests/support.py @@ -74,7 +74,7 @@ def mute(returns_output=False): If "returns_output" is True, the function will return a generator yielding the printed lines instead of the return values. - The decorator litterally hijack sys.stdout during each function + The decorator literally hijack sys.stdout during each function execution, so be careful with what you apply it to. >>> def numbers(): diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py index 18740f21..7c9e6e5a 100644 --- a/pelican/tests/test_utils.py +++ b/pelican/tests/test_utils.py @@ -471,7 +471,7 @@ class TestDateFormatter(unittest.TestCase): locale_available('French'), 'French locale needed') def test_french_strftime(self): - # This test tries to reproduce an issue that occured with python3.3 under macos10 only + # This test tries to reproduce an issue that occurred with python3.3 under macos10 only locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8')) date = utils.SafeDatetime(2014,8,14) # we compare the lower() dates since macos10 returns "Jeudi" for %A whereas linux reports "jeudi" diff --git a/pelican/utils.py b/pelican/utils.py index d458cdd9..4efd18f4 100644 --- a/pelican/utils.py +++ b/pelican/utils.py @@ -656,7 +656,7 @@ class FileStampDataCacher(FileDataCacher): '''Subclass that also caches the stamp of the file''' def __init__(self, settings, cache_name, caching_policy, load_policy): - '''This sublcass additionaly sets filestamp function + '''This sublcass additionally sets filestamp function and base path for filestamping operations ''' super(FileStampDataCacher, self).__init__(settings, cache_name,