Merge branch '1.3-branch'

1 files changed, 9 insertions, 21 deletions

diff --git a/TODO.txt b/TODO.txt
index 3d11470dd..ab26a87a8 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,26 +1,22 @@
 Pyramid TODOs
 =============
 
-Must-Have
----------
-
-- Fix deployment recipes in cookbook (discourage proxying without changing
-  server).
+Nice-to-Have
+------------
 
-- Use waitress instead of wsgiref.
+- Fix renderers chapter to better document system values passed to template
+  renderers.
 
-- pyramid.config.util.ActionInfo.__str__ potentially returns Unicode under
-  Py2, fix.
+- Put includes in development.ini on separate lines and fix project.rst to
+  tell people to comment out only the debugtoolbar include when they want to
+  disable.
 
-- Tests for view names/route patterns that contain Unicode.
-
-Nice-to-Have
-------------
+- Modify view mapper narrative docs to not use pyramid_handlers.
 
 - Modify the urldispatch chapter examples to assume a scan rather than
   ``add_view``.
 
-- Decorator for append_slash_notfound_view_factory?
+- Decorator for append_slash_notfound_view_factory.
 
 - Introspection:
 
@@ -38,18 +34,10 @@ Nice-to-Have
 - Fix deployment recipes in cookbook (discourage proxying without changing
   server).
 
-Nice-to-Have
-------------
-
-- CherryPy server testing / exploded from CherryPy itself.
-
 - Try "with transaction.manager" in an exception view with SQLA (preempt
   homina homina response about how to write "to the database" from within in
   an exception view).
 
-- Add a default-view-config-params decorator that can be applied to a class
-  which names defaults for method-based view_config decorator options.
-
 - Add narrative docs for wsgiapp and wsgiapp2.
 
 - Flesh out "Paste" narrative docs chapter.