summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-24 17:09:32 -0500
committerChris McDonough <chrism@plope.com>2010-12-24 17:09:32 -0500
commit10fd8fe6bc26a7241542353032540cd4415ee9cc (patch)
treec43f7f2bfc1dca30a6f230279baeb23dee5c75e8 /CHANGES.txt
parent8fdcf54bee2cf9609bf4a6a2a0e13a9632ad295b (diff)
downloadpyramid-10fd8fe6bc26a7241542353032540cd4415ee9cc.tar.gz
pyramid-10fd8fe6bc26a7241542353032540cd4415ee9cc.tar.bz2
pyramid-10fd8fe6bc26a7241542353032540cd4415ee9cc.zip
- Added "Advanced Configuration" narrative chapter which documents how to
deal with configuration conflicts, two-phase configuration, ``include`` and ``commit``.
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
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)