diff options
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 6932a0c25..e28ac9792 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -59,6 +59,10 @@ Documentation - Changed the "ZODB + Traversal Wiki Tutorial" based on changes to ``pyramid_zodb`` Paster template. +- Added "Advanced Configuration" narrative chapter which documents how to + deal with configuration conflicts, two-phase configuration, ``include`` and + ``commit``. + - Fix API documentation rendering for ``pyramid.view.static`` 1.0a7 (2010-12-20) |