diff --git a/CHANGES.txt b/CHANGES.txt
index 42ef1ae90d..873c445e9b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,12 +31,6 @@ Dependencies
 - Pyramid now requires Venusian 1.0a1 or better to support the ``onerror``
   keyword argument to ``pyramid.config.Configurator.scan``.
 
-Documentation
--------------
-
-- Added a "Fixing HTTP vs. HTTP When Deploying Behind a Proxy" section to the
-  "Virtual Hosting" chapter.
-
 1.2a3 (2011-08-29)
 ==================
 
diff --git a/TODO.txt b/TODO.txt
index 7fcd7ff1c9..f39e640fc8 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -9,9 +9,6 @@ Nice-to-Have
 
 - Flesh out "paste" chapter.
 
-- Move config-related stuff from "renderers" to config/rendering, and
-  possibly mako/chameleon rendering stuff to config/rendering.
-
 - _fix_registry should dictify the registry being fixed.
 
 - Make "localizer" a property of request (instead of requiring
@@ -20,9 +17,6 @@ Nice-to-Have
 - Deprecate pyramid.security.view_execution_permitted (it only works for
   traversal).
 
-- Some sort of API for rendering a view callable object to a response from
-  within another view callable.
-
 - Eliminate non-deployment-non-scaffold-related Paste dependencies:
   ``paste.urlparser.StaticURLParser``, ``paste.auth.auth_tkt`` (cutnpaste or
   reimplement both).
@@ -31,13 +25,8 @@ Nice-to-Have
 
 - Add narrative docs for wsgiapp and wsgiapp2.
 
-- Provide a ``has_view`` function.
-
 - Debug option to print view matching decision (e.g. debug_viewlookup or so).
 
-- Speed up startup time (defer _bootstrap and registerCommonDirectives()
-  until needed by ZCML, as well as unfound speedups).
-
 - Better "Extending" chapter.
 
 - Try to make test suite pass on IronPython.
@@ -70,6 +59,11 @@ Nice-to-Have
 
 - Create a function which performs a recursive request.
 
+- Some sort of API for rendering a view callable object to a response from
+  within another view callable.
+
+- Provide a ``has_view`` function.
+
 - Update App engine chapter with less creaky directions.
 
 Future
@@ -86,7 +80,8 @@ Future
 
 - 1.3/1.4: use zope.registry rather than zope.component.
 
-- 1.3/1.4: get rid of zope.configuration dependency.
+- 1.3/1.4: get rid of zope.configuration dependency.  This will also speed up
+  startup time (defer _bootstrap and registerCommonDirectives() until needed).
 
 - 1.3: Michael's route group work
 
diff --git a/docs/narr/vhosting.rst b/docs/narr/vhosting.rst
index 086af78f7b..8697df6a05 100644
--- a/docs/narr/vhosting.rst
+++ b/docs/narr/vhosting.rst
@@ -139,55 +139,6 @@ the same can be achieved using ``SetEnv``:
 Setting a virtual root has no effect when using an application based
 on :term:`URL dispatch`.
 
-Fixing HTTP vs. HTTPS When Deploying Behind a Proxy
----------------------------------------------------
-
-In a configuration where you have a :app:`Pyramid` server behind an Apache or
-Nginx or Squid proxy which serves your website over SSL (as ``https``) as in
-the above example in :ref:`virtual_root_support`, the request will be passed
-by the proxy to an `http://`` URL that will be served by :app:`Pyramid`.
-Because this is true, URLs generated by :app:`Pyramid` will be generated with
-``http://`` instead of ``https://``; the SSL info has been "lost" during the
-proxying.
-
-To work around this, convert your application to use a "pipeline" instead of
-a simple "app" in your PasteDeploy configuration, then add ``prefix``
-middleware to the pipeline.  For example, if your ``production.ini`` file has
-a ``main`` section that looks like this:
-
-.. code-block:: ini
-
-   [app:main]
-   use = egg:MyProject
-
-Convert it to look like this:
-
-.. code-block:: ini
-
-   [app:myapp]
-   use = egg:MyProject
-
-   [pipeline:main]
-   pipeline =
-       myapp
-
-Then add the ``paste.prefix`` middleware with no options to the pipeline:
-
-.. code-block:: ini
-
-   [app:myapp]
-   use = egg:MyProject
-
-   [filter:paste_prefix]
-   use = egg:PasteDeploy#prefix
-
-   [pipeline:main]
-   pipeline =
-       paste_prefix
-       myapp
-
-This will have the side effect of retaining ``https`` URLs during generation.
-
 Further Documentation and Examples
 ----------------------------------