diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
| commit | 5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch) | |
| tree | 727028ad4eeb596c291d0f96fbc9bb520ec971fd /docs/whatsnew-1.1.rst | |
| parent | b210ce350a3856166376f63a32725cc1516ba294 (diff) | |
| parent | 7319ab677216063581e47a231fd70b8b55a19466 (diff) | |
| download | pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2 pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/whatsnew-1.1.rst')
| -rw-r--r-- | docs/whatsnew-1.1.rst | 4 |
1 files changed, 2 insertions, 2 deletions
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 |