summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.2.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-01-11 18:58:50 +0000
committerChris McDonough <chrism@agendaless.com>2010-01-11 18:58:50 +0000
commit9ec2d646eb23b88e4ef8119b0b46240081953daf (patch)
tree80296b92edb8310bfb7699d165e92a1ea9e36256 /docs/whatsnew-1.2.rst
parent96d63068ba033809ed73834e095f274800e4d4e8 (diff)
downloadpyramid-9ec2d646eb23b88e4ef8119b0b46240081953daf.tar.gz
pyramid-9ec2d646eb23b88e4ef8119b0b46240081953daf.tar.bz2
pyramid-9ec2d646eb23b88e4ef8119b0b46240081953daf.zip
Merge of andrew-docs branch.
Diffstat (limited to 'docs/whatsnew-1.2.rst')
-rw-r--r--docs/whatsnew-1.2.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index cae307c14..e3f89fbe7 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -279,10 +279,6 @@ Documentation Enhancements
configuration; doing :mod:`repoze.bfg` application configuration
imperatively was previously much more difficult.
-- A narrative documentation chapter entitled "Configuration,
- Decorations and Code Scanning" (:ref:`scanning_chapter`) explaining
- ZCML- vs. imperative- vs. decorator-based configuration equivalence.
-
- The "ZCML Hooks" chapter has been renamed to "Hooks"
(:ref:`hooks_chapter`); it documents how to override hooks now via
imperative configuration and ZCML.