From 10fd8fe6bc26a7241542353032540cd4415ee9cc Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 24 Dec 2010 17:09:32 -0500 Subject: - Added "Advanced Configuration" narrative chapter which documents how to deal with configuration conflicts, two-phase configuration, ``include`` and ``commit``. --- CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CHANGES.txt') 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) -- cgit v1.2.3