diff options
| author | Michael Merickel <michael@merickel.org> | 2013-08-08 12:11:32 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-08-08 12:11:32 -0700 |
| commit | b292a9ff8b5376362f8ee62849fa30da37e823ab (patch) | |
| tree | 76a7408f7d99442ca7d839349a67fb73eb9e92f8 | |
| parent | d324c9f1fb5eb9d9d571534a2f32338fa3d66af9 (diff) | |
| parent | bfb395aa02dc9c451d1c8e0e77242cf2547cff8b (diff) | |
| download | pyramid-b292a9ff8b5376362f8ee62849fa30da37e823ab.tar.gz pyramid-b292a9ff8b5376362f8ee62849fa30da37e823ab.tar.bz2 pyramid-b292a9ff8b5376362f8ee62849fa30da37e823ab.zip | |
Merge pull request #1065 from tisdall/master
more spelling corrections
| -rw-r--r-- | docs/narr/i18n.rst | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.1.rst | 4 | ||||
| -rw-r--r-- | pyramid/interfaces.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst index 74765f8e2..bb336784f 100644 --- a/docs/narr/i18n.rst +++ b/docs/narr/i18n.rst @@ -808,7 +808,7 @@ If this setting is supplied within the :app:`Pyramid` application default_locale_name = settings['pyramid.default_locale_name'] .. index:: - single: detecting langauges + single: detecting languages "Detecting" Available Languages ------------------------------- diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst index 5cba8dd3e..cc63017df 100644 --- a/docs/whatsnew-1.1.rst +++ b/docs/whatsnew-1.1.rst @@ -13,7 +13,7 @@ Terminology Changes The term "template" used by the Pyramid documentation used to refer to both "paster templates" and "rendered templates" (templates created by a rendering engine. i.e. Mako, Chameleon, Jinja, etc.). "Paster templates" will now be -refered to as "scaffolds", whereas the name for "rendered templates" will +referred to as "scaffolds", whereas the name for "rendered templates" will remain as "templates." Major Feature Additions @@ -397,7 +397,7 @@ Deprecations and Behavior Differences shell you use to invoke ``paster serve`` to see these warnings, e.g. on UNIX, ``PYTHONWARNINGS=all $VENV/bin/paster serve development.ini``. Python 2.5 and 2.6 show deprecation warnings by default, - so this is unecessary there. + so this is unnecessary there. All deprecation warnings are emitted to the console. - The :class:`pyramid.view.static` class has been deprecated in favor of the diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index a57f61ddb..275209737 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -915,7 +915,7 @@ class ISession(IDict): by ``queue``. An alternate flash message queue can used by passing an optional ``queue``, which must be a string. If ``allow_duplicate`` is false, if the ``msg`` already exists in the - queue, it will not be readded.""" + queue, it will not be re-added.""" def pop_flash(queue=''): """ Pop a queue from the flash storage. The queue is removed from |