diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:50:06 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:50:06 -0400 |
| commit | 0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch) | |
| tree | 6d9f12bc42fde9fea95d7754f2decff212acf6ee /docs/whatsnew-1.1.rst | |
| parent | d44d0e044555cd1287680fc8368632a64ebe979b (diff) | |
| parent | 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff) | |
| download | pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2 pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.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 |