diff options
| author | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
| commit | cf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch) | |
| tree | c792a3bf12b2b2615fbb306e354c85b10983d63b /CHANGES.txt | |
| parent | 1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff) | |
| parent | c5d01d4667d678782898b7d6859d60c617e30a9e (diff) | |
| download | pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2 pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index cfa49fb1a..adf448945 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -332,7 +332,7 @@ Bug Fixes - When registering a view configuration that named a Chameleon ZPT renderer with a macro name in it (e.g. ``renderer='some/template#somemacro.pt``) as - well as a view configuration without a macro name it it that pointed to the + well as a view configuration without a macro name in it that pointed to the same template (e.g. ``renderer='some/template.pt'``), internal caching could confuse the two, and your code might have rendered one instead of the other. @@ -536,7 +536,7 @@ Features - An ``add_permission`` directive method was added to the Configurator. This directive registers a free-standing permission introspectable into the Pyramid introspection system. Frameworks built atop Pyramid can thus use - the the ``permissions`` introspectable category data to build a + the ``permissions`` introspectable category data to build a comprehensive list of permissions supported by a running system. Before this method was added, permissions were already registered in this introspectable category as a side effect of naming them in an ``add_view`` |