summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-10-30 19:16:19 -0400
committerChris McDonough <chrism@plope.com>2010-10-30 19:16:19 -0400
commitabf8249430fdc23901099d9e848d3a3b97c69526 (patch)
tree16a6f7aeb212c52ff94f574a80c11770b75bd173
parentd0581dec86a34827781f93f8f7e0d6ebf7c273cb (diff)
parent00c54262f122e5b8986ecd50961b1039339ec642 (diff)
downloadpyramid-abf8249430fdc23901099d9e848d3a3b97c69526.tar.gz
pyramid-abf8249430fdc23901099d9e848d3a3b97c69526.tar.bz2
pyramid-abf8249430fdc23901099d9e848d3a3b97c69526.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--TODO.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/TODO.txt b/TODO.txt
index 808c47b5a..a8d9f057e 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -70,8 +70,6 @@
- CRSF token machinery
-- Mako docs (in templating chapter).
-
- ``add_handler`` documentation.
- ``handler`` ZCML directive.
@@ -100,3 +98,9 @@
``renderer``; pass a dictionary to each renderer instead of a string.
- Test on GAE, Jython, PyPy, IronPython.
+
+- Remove references to 'WebOb' Response and just call it 'Response', and note
+ that it is imported from pyramid. API docs can mention its inheritance from
+ webob.
+
+- Add docs for httpexceptions.