- Added "Advanced Configuration" narrative chapter which documents how to

  deal with configuration conflicts, two-phase configuration, ``include`` and
  ``commit``.

1 files changed, 2 insertions, 1 deletions

diff --git a/TODO.txt b/TODO.txt
index e3c2e5f6c..077e23012 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,7 +4,8 @@ Pyramid TODOs
 Must-Have (before 1.0)
 ----------------------
 
-- Narrative docs for ``Configurator.include`` and ``Configurator.commit``.
+- Reconcile "extending an existing application" chapter with existence of
+  "advanced configuration" chapter.
 
 - Consider deprecations for ``model`` and ``resource`` APIs.