From 43d0756a51b80990da6b164a9075e5d67ff42d99 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 15 Dec 2010 16:19:52 -0500 Subject: gardening --- CHANGES.txt | 5 ++--- TODO.txt | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7ed4af632..62daf79b1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,9 +8,8 @@ Bug Fixes without a ``package`` argument (e.g. ``config.scan()`` as opposed to ``config.scan('packagename')``. The symptoms were: lots of deprecation warnings printed to the console about imports of deprecated Pyramid - functions and classes and non-detection of views decorated with - ``view_config`` decorators. This has now been fixed. - + functions and classes and non-detection of view callables decorated with + ``view_config`` decorators. This has been fixed. 1.0a5 (2010-12-14) ================== diff --git a/TODO.txt b/TODO.txt index 8f06d85c5..b95c7ae11 100644 --- a/TODO.txt +++ b/TODO.txt @@ -4,6 +4,8 @@ Pyramid TODOs Must-Have (before 1.0) ---------------------- +- Fix conflict info case for ``scan``. + - Narrative docs for ``Configurator.include`` and ``Configurator.commit``. - Fix session behavior: when a Forbidden/NotFound hander is invoked, we'd -- cgit v1.2.3