merge feature.introspection branch

1 files changed, 18 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 8bdb35d6e..41c608af5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,19 @@ Features
   This function sets up Python logging according to the logging configuration
   in a PasteDeploy ini file.
 
+- Configuration conflict reporting is reported in a more understandable way
+  ("Line 11 in file..." vs. a repr of a tuple of similar info).
+
+- An configuration introspection system was added; see the narrative
+  documentation chapter entitled "Pyramid Configuration Introspection" for
+  more information.  New APIs: ``pyramid.registry.Introspectable``,
+  ``pyramid.config.Configurator.introspector``,
+  ``pyramid.config.Configurator.introspectable``,
+  ``pyramid.registry.Registry.introspector``.
+
+- Allow extra keyword arguments to be passed to the
+  ``pyramid.config.Configurator.action`` method.
+
 Bug Fixes
 ---------
 
@@ -97,6 +110,11 @@ Documentation
 
 - Minor updates to the ZODB Wiki tutorial.
 
+- A narrative documentation chapter named "Extending Pyramid Configuration"
+  was added; it describes how to add a new directive, and how use the
+  ``pyramid.config.Configurator.action`` method within custom directives.  It
+  also describes how to add introspectable objects.
+
 Scaffolds
 ---------