Merge branch 'master' of github.com:Pylons/pyramid

45 files changed, 114 insertions, 158 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 69d00cdaa..ce1d1cce1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,6 +55,7 @@ extensions = [
 
 # Looks for objects in external projects
 intersphinx_mapping = {
+    'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
     'webob': ('http://docs.webob.org/en/latest', None),
     'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
     'who': ('http://docs.repoze.org/who/latest', None),
@@ -65,6 +66,9 @@ intersphinx_mapping = {
           None),
     'venusian':
         ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
+    'toolbar':
+        ('http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
+         None),
 }
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/docs/conventions.rst b/docs/conventions.rst
index 4cffd1084..21b506623 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -91,3 +91,24 @@ discussed on a page, is rendered like so:
 
    Sidebar information.
 
+When multiple objects are imported from the same package,
+the following convention is used:
+
+    .. code-block:: python
+
+       from foo import (
+           bar,
+           baz,
+           )
+
+It may look unusual, but it has advantages:
+
+* It allows one to swap out the higher-level package ``foo`` for something
+  else that provides the similar API. An example would be swapping out
+  one Database for another (e.g. graduating from SQLite to PostgreSQL).
+
+* Looks more neat in cases where a large number of objects get imported from
+  that package.
+
+* Adding/removing imported objects from the package is quicker and results
+  in simpler diffs.
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 1b7a5f307..241f951d6 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -314,7 +314,7 @@ Glossary
 
    pipeline
      The :term:`PasteDeploy` term for a single configuration of a WSGI
-     server, a WSGI application, with a set of middleware in-between.
+     server, a WSGI application, with a set of :term:`middleware` in-between.
 
    Zope
      `The Z Object Publishing Framework <http://zope.org>`_, a
@@ -901,9 +901,9 @@ Glossary
      The scaffold has been retired but the demo plays a similar role. 
 
    Pyramid Cookbook
-     An additional documentation resource for Pyramid which presents topical,
-     practical usages of Pyramid available via
-     http://docs.pylonsproject.org/ .
+     Additional documentation for Pyramid which presents topical,
+     practical uses of Pyramid:
+     http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest.
 
    distutils
      The standard system for packaging and distributing Python packages.  See
@@ -926,18 +926,18 @@ Glossary
      provide, for example, Pyramid-specific view timing support, bookkeeping
      code that examines exceptions before they are returned to the upstream
      WSGI application, or a variety of other features.  Tweens behave a bit
-     like :term:`WSGI` 'middleware' but they have the benefit of running in a
+     like :term:`WSGI` :term:`middleware` but they have the benefit of running in a
      context in which they have access to the Pyramid :term:`application
      registry` as well as the Pyramid rendering machinery.  See
      :ref:`registering_tweens`.
 
    pyramid_debugtoolbar
-     A Pyramid add on which displays a helpful debug toolbar "on top of" HTML
+     A Pyramid add-on which displays a helpful debug toolbar "on top of" HTML
      pages rendered by your application, displaying request, routing, and
      database information.  :mod:`pyramid_debugtoolbar` is configured into
      the ``development.ini`` of all applications which use a Pyramid
      :term:`scaffold`.  For more information, see
-     http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
+     http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest/.
 
    scaffold
      A project template that generates some of the major parts of a Pyramid
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index 99bcb187f..09a2b83f2 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -119,7 +119,7 @@ from the ``/var/www/static`` directory of the computer which runs the
    # config is an instance of pyramid.config.Configurator
    config.add_static_view(name='static', path='/var/www/static')
 
-The ``name`` prepresents a URL *prefix*.  In order for files that live in the
+The ``name`` represents a URL *prefix*.  In order for files that live in the
 ``path`` directory to be served, a URL that requests one of them must begin
 with that prefix.  In the example above, ``name`` is ``static``, and ``path``
 is ``/var/www/static``.  In English, this means that you wish to serve the
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 07c892439..e1347f3ca 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -172,8 +172,8 @@ name ``main`` as a section name:
 
 The WSGI application that is loaded will be available in the shell as the
 ``app`` global. Also, if the application that is loaded is the :app:`Pyramid`
-app with no surrounding middleware, the ``root`` object returned by the
-default :term:`root factory`, ``registry``, and ``request`` will be
+app with no surrounding :term:`middleware`, the ``root`` object returned by
+the default :term:`root factory`, ``registry``, and ``request`` will be
 available.
 
 You can also simply rely on the ``main`` default section name by omitting any
@@ -572,8 +572,8 @@ configuration implied by the ``[pipeline:main]`` section of your
 configuration file by default.  Specifying ``/path/to/my/development.ini`` is
 logically equivalent to specifying ``/path/to/my/development.ini#main``.  In
 this case, we'll be using a configuration that includes an ``app`` object
-which is wrapped in the Paste "translogger" middleware (which logs requests
-to the console).
+which is wrapped in the Paste "translogger" :term:`middleware` (which logs
+requests to the console).
 
 You can also specify a particular *section* of the PasteDeploy ``.ini`` file
 to load instead of ``main``:
diff --git a/docs/narr/extending.rst b/docs/narr/extending.rst
index beece7640..a60a49fea 100644
--- a/docs/narr/extending.rst
+++ b/docs/narr/extending.rst
@@ -50,7 +50,7 @@ layers are apt to provide the necessary "opinions" (such as mandating a
 storage layer, a templating system, and a structured, well-documented pattern
 of registering that certain URLs map to certain bits of code) which makes the
 concept of a "pluggable application" possible.  "Pluggable applications",
-thus, should not plug in to Pyramid itself but should instead plug into a
+thus, should not plug into Pyramid itself but should instead plug into a
 system written atop Pyramid.
 
 Although it does not provide for "pluggable applications", Pyramid *does*
@@ -209,7 +209,7 @@ like this:
 
 - Wire the new views and assets created in the new package up using
   imperative registrations within the ``main`` function of the
-  ``__init__.py`` file of the new application.  These wiring should happen
+  ``__init__.py`` file of the new application.  This wiring should happen
   *after* including the configuration functions of the old application.
   These registrations will extend or override any registrations performed by
   the original application.  See :ref:`overriding_views`,
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 330eb0cd3..a3de23baa 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -109,9 +109,8 @@ callable:
    instance of the :exc:`~pyramid.httpexceptions.HTTPNotFound` exception that
    caused the Not Found View to be called.  The value of
    ``request.exception.message`` will be a value explaining why the Not Found
-   error was raised.  This message will be different when the
-   ``pyramid.debug_notfound`` environment setting is true than it is when it
-   is false.
+   error was raised.  This message has different values depending whether the
+   ``pyramid.debug_notfound`` environment setting is true or false.
 
 .. note::
 
@@ -208,9 +207,9 @@ Here's some sample code that implements a minimal forbidden view:
    that caused the forbidden view to be called.  The value of
    ``request.exception.message`` will be a value explaining why the forbidden
    was raised and ``request.exception.result`` will be extended information
-   about the forbidden exception.  These messages will be different when the
-   ``pyramid.debug_authorization`` environment setting is true than it is when
-   it is false.
+   about the forbidden exception.  These messages have different values
+   depending whether the ``pyramid.debug_authorization`` environment setting
+   is true or false.
 
 .. index::
    single: request factory
@@ -694,7 +693,7 @@ represents the type of interface that must be possessed by the resource for
 this resource url factory to be found.  If the ``resource_iface`` argument is
 omitted, this resource url adapter will be used for *all* resources.
 
-The API that must be implemented by your a class that provides
+The API that must be implemented by a class that provides
 :class:`~pyramid.interfaces.IResourceURL` is as follows:
 
 .. code-block:: python
@@ -1036,7 +1035,7 @@ upstream WSGI component that uses :app:`Pyramid` as its "app".  This is a
 feature that may be used by Pyramid framework extensions, to provide, for
 example, Pyramid-specific view timing support bookkeeping code that examines
 exceptions before they are returned to the upstream WSGI application.  Tweens
-behave a bit like :term:`WSGI` middleware but they have the benefit of
+behave a bit like :term:`WSGI` :term:`middleware` but they have the benefit of
 running in a context in which they have access to the Pyramid
 :term:`application registry` as well as the Pyramid rendering machinery.
 
@@ -1110,8 +1109,8 @@ Once you've created a tween factory, you can register it into the implicit
 tween chain using the :meth:`pyramid.config.Configurator.add_tween` method
 using its :term:`dotted Python name`.
 
-Here's an example of registering the a tween factory as an "implicit"
-tween in a Pyramid application:
+Here's an example of registering a tween factory as an "implicit" tween in a
+Pyramid application:
 
 .. code-block:: python
    :linenos:
@@ -1447,7 +1446,7 @@ view/route predicate:
   subscriber predicates will assume a certain event type.
 
 Here's an example of a subscriber predicate that can be used in conjunction
-with a subscriber that subscribes to the :class:`pyramid.events.NewReqest`
+with a subscriber that subscribes to the :class:`pyramid.events.NewRequest`
 event type.
 
 .. code-block:: python
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index f9c25c69c..48164d323 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -600,10 +600,10 @@ Examples: :ref:`hello_traversal_chapter` and
 Tweens
 ~~~~~~
 
-Pyramid has a sort of internal WSGI-middleware-ish pipeline that can be
-hooked by arbitrary add-ons named "tweens".  The debug toolbar is a "tween",
-and the ``pyramid_tm`` transaction manager is also.  Tweens are more useful
-than WSGI middleware in some circumstances because they run in the context of
+Pyramid has a sort of internal WSGI-middleware-ish pipeline that can be hooked
+by arbitrary add-ons named "tweens".  The debug toolbar is a "tween", and the
+``pyramid_tm`` transaction manager is also.  Tweens are more useful than WSGI
+:term:`middleware` in some circumstances because they run in the context of
 Pyramid itself, meaning you have access to templates and other renderers, a
 "real" request object, and other niceties.
 
diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst
index 3b903be4d..b3bfb8a1e 100644
--- a/docs/narr/logging.rst
+++ b/docs/narr/logging.rst
@@ -298,14 +298,14 @@ Request Logging with Paste's TransLogger
 ----------------------------------------
 
 Paste provides the `TransLogger 
-<http://pythonpaste.org/modules/translogger.html>`_ middleware for logging 
-requests using the `Apache Combined Log Format 
+<http://pythonpaste.org/modules/translogger.html>`_ :term:`middleware` for
+logging requests using the `Apache Combined Log Format
 <http://httpd.apache.org/docs/2.2/logs.html#combined>`_. TransLogger combined 
 with a FileHandler can be used to create an ``access.log`` file similar to 
 Apache's. 
 
-Like any standard middleware with a Paste entry point, TransLogger can be
-configured to wrap your application using ``.ini`` file syntax.  First,
+Like any standard :term:`middleware` with a Paste entry point, TransLogger can
+be configured to wrap your application using ``.ini`` file syntax.  First,
 rename your Pyramid ``.ini`` file's ``[app:main]`` section to
 ``[app:mypyramidapp]``, then add a ``[filter:translogger]`` section, then use
 a ``[pipeline:main]`` section file to form a WSGI pipeline with both the
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index a168c24eb..9d69a65a5 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -416,7 +416,7 @@ If you don't see the debug toolbar image on the right hand top of the page,
 it means you're browsing from a system that does not have debugging access.
 By default, for security reasons, only a browser originating from
 ``localhost`` (``127.0.0.1``) can see the debug toolbar.  To allow your
-browser on a remote system to access the server, add the a line within the
+browser on a remote system to access the server, add a line within the
 ``[app:main]`` section of the ``development.ini`` file in the form
 ``debugtoolbar.hosts = X.X.X.X``.  For example, if your Pyramid application
 is running on a remote system, and you're browsing from a host with the IP
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 08ebd881e..b4eb95186 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -362,7 +362,7 @@ For example (Javascript):
    jqhxr = $.getJSON(api_url);
 
 The string ``callback=?`` above in the ``url`` param to the JQuery
-``getAjax`` function indicates to jQuery that the query should be made as
+``getJSON`` function indicates to jQuery that the query should be made as
 a JSONP request; the ``callback`` parameter will be automatically filled
 in for you and used.
 
@@ -720,7 +720,7 @@ factory, which expects to be passed a filesystem path:
 
 Adding the above code to your application startup will allow you to use the
 ``my.package.MyJinja2Renderer`` renderer factory implementation in view
-configurations by referring to any ``renderer`` which *ends in* ``.jinja`` in
+configurations by referring to any ``renderer`` which *ends in* ``.jinja2`` in
 the ``renderer`` attribute of a :term:`view configuration`:
 
 .. code-block:: python
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index 3a9225032..1affa1758 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -8,12 +8,12 @@ you'll see something much like this show up on the console:
 
 .. code-block:: text
 
-  $ pserve myproject/MyProject.ini
+  $ pserve development.ini
   Starting server in PID 16601.
   serving on 0.0.0.0:6543 view at http://127.0.0.1:6543
 
 This chapter explains what happens between the time you press the "Return"
-key on your keyboard after typing ``pserve myproject/MyProject.ini``
+key on your keyboard after typing ``pserve development.ini``
 and the time the line ``serving on 0.0.0.0:6543 ...`` is output to your
 console.
 
diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst
index 033f045a6..93ce747ee 100644
--- a/docs/narr/subrequest.rst
+++ b/docs/narr/subrequest.rst
@@ -155,7 +155,7 @@ In the example above, the call to
 exception.  This is because it's using the default value for ``use_tweens``,
 which is ``False``.  You can pass ``use_tweens=True`` instead to ensure that
 it will convert an exception to a Response if an :term:`exception view` is
-configured instead of raising the exception.  This because exception views
+configured instead of raising the exception.  This is because exception views
 are called by the exception view :term:`tween` as described in
 :ref:`exception_views` when any view raises an exception.
 
@@ -250,7 +250,7 @@ It's a poor idea to use the original ``request`` object as an argument to
 :meth:`~pyramid.request.Request.invoke_subrequest`.  You should construct a
 new request instead as demonstrated in the above example, using
 :meth:`pyramid.request.Request.blank`.  Once you've constructed a request
-object, you'll need to massage the it to match the view callable you'd like
+object, you'll need to massage it to match the view callable you'd like
 to be executed during the subrequest.  This can be done by adjusting the
 subrequest's URL, its headers, its request method, and other attributes.  The
 documentation for :class:`pyramid.request.Request` exposes the methods you
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst
index 0801a8eae..bfb1287d9 100644
--- a/docs/narr/testing.rst
+++ b/docs/narr/testing.rst
@@ -128,7 +128,7 @@ functions accepts various arguments that influence the environment of the
 test.  See the :ref:`testing_module` chapter for information about the extra
 arguments supported by these functions.
 
-If you also want to make :func:`~pyramid.get_current_request` return something
+If you also want to make :func:`~pyramid.threadlocal.get_current_request` return something
 other than ``None`` during the course of a single test, you can pass a
 :term:`request` object into the :func:`pyramid.testing.setUp` within the
 ``setUp`` method of your test:
@@ -231,7 +231,7 @@ application registry is not created and populated (e.g. by initializing the
 configurator with an authorization policy), like when you invoke application
 code via a unit test, :app:`Pyramid` API functions will tend to either fail
 or return default results.  So how do you test the branch of the code in this
-view function that raises :exc:`HTTPForbidden`?
+view function that raises :exc:`~pyramid.httpexceptions.HTTPForbidden`?
 
 The testing API provided by :app:`Pyramid` allows you to simulate various
 application registry registrations for use under a unit testing framework
@@ -272,7 +272,7 @@ without needing to invoke the actual application configuration implied by its
            self.assertEqual(response, {'greeting':'hello'})
            
 In the above example, we create a ``MyTest`` test case that inherits from
-:mod:`unittest.TestCase`.  If it's in our :app:`Pyramid` application, it will
+:class:`unittest.TestCase`.  If it's in our :app:`Pyramid` application, it will
 be found when ``setup.py test`` is run.  It has two test methods.
 
 The first test method, ``test_view_fn_forbidden`` tests the ``view_fn`` when
@@ -287,8 +287,9 @@ request object that requires less setup than a "real" :app:`Pyramid` request.
 We call the function being tested with the manufactured request.  When the
 function is called, :func:`pyramid.security.has_permission` will call the
 "dummy" authentication policy we've registered through
-:meth:`~pyramid.config.Configuration.testing_securitypolicy`, which denies
-access.  We check that the view function raises a :exc:`HTTPForbidden` error.
+:meth:`~pyramid.config.Configurator.testing_securitypolicy`, which denies
+access.  We check that the view function raises a
+:exc:`~pyramid.httpexceptions.HTTPForbidden` error.
 
 The second test method, named ``test_view_fn_allowed`` tests the alternate
 case, where the authentication policy allows access.  Notice that we pass
@@ -425,4 +426,4 @@ invoke the root URL.  We then assert that the returned HTML has the string
 ``Pyramid`` in it.
 
 See the :term:`WebTest` documentation for further information about the
-methods available to a :class:`webtest.TestApp` instance.
+methods available to a :class:`webtest.app.TestApp` instance.
diff --git a/docs/narr/traversal.rst b/docs/narr/traversal.rst
index a2eac61de..2eb6ece13 100644
--- a/docs/narr/traversal.rst
+++ b/docs/narr/traversal.rst
@@ -359,13 +359,13 @@ when this request comes in that we're traversing the following resource tree:
 
 Here's what happens:
 
-- :mod:`traversal` traverses the root, and attempts to find "foo", which it
+- :term:`traversal` traverses the root, and attempts to find "foo", which it
   finds.
 
-- :mod:`traversal` traverses "foo", and attempts to find "bar", which it
+- :term:`traversal` traverses "foo", and attempts to find "bar", which it
   finds.
 
-- :mod:`traversal` traverses "bar", and attempts to find "baz", which it does
+- :term:`traversal` traverses "bar", and attempts to find "baz", which it does
   not find (the "bar" resource raises a :exc:`KeyError` when asked for
   "baz").
 
@@ -410,16 +410,16 @@ However, for this tree:
 
 The user asks for ``http://example.com/foo/bar/baz/biz/buz.txt``
 
-- :mod:`traversal` traverses "foo", and attempts to find "bar", which it
+- :term:`traversal` traverses "foo", and attempts to find "bar", which it
   finds.
 
-- :mod:`traversal` traverses "bar", and attempts to find "baz", which it
+- :term:`traversal` traverses "bar", and attempts to find "baz", which it
   finds.
 
-- :mod:`traversal` traverses "baz", and attempts to find "biz", which it
+- :term:`traversal` traverses "baz", and attempts to find "biz", which it
   finds.
 
-- :mod:`traversal` traverses "biz", and attempts to find "buz.txt" which it
+- :term:`traversal` traverses "biz", and attempts to find "buz.txt" which it
   does not find.
 
 The fact that it does not find a resource related to "buz.txt" at this point
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index bcd5fff94..18cb3e4db 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -1263,7 +1263,7 @@ invoked with the request that caused the invocation.
 
 For most usage, you needn't understand more than this; how it works is an
 implementation detail.  In the interest of completeness, however, we'll
-explain how it *does* work in the this section.  You can skip it if you're
+explain how it *does* work in this section.  You can skip it if you're
 uninterested.
 
 When a view is associated with a route configuration, :app:`Pyramid` ensures
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 14a2fc807..6f0001f61 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -313,9 +313,9 @@ configured view.
 
   This argument ensures that the view will only be called when the
   :term:`request` has key/value pairs in its :term:`matchdict` that equal
-  those supplied in the predicate.  e.g. ``match_param="action=edit" would
+  those supplied in the predicate.  e.g. ``match_param="action=edit"`` would
   require the ``action`` parameter in the :term:`matchdict` match the right
-  hande side of the expression (``edit``) for the view to "match" the current
+  hand side of the expression (``edit``) for the view to "match" the current
   request.
 
   If the ``match_param`` is a dict, every key/value pair must match for the
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index 5a7be15b0..b2dd549ce 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -39,7 +39,7 @@ object.  A request object represents a :term:`WSGI` environment provided to
 object contains everything your application needs to know about the specific
 HTTP request being made.
 
-A view callable's ultimate responsibility is to create a :mod:`Pyramid`
+A view callable's ultimate responsibility is to create a :app:`Pyramid`
 :term:`Response` object. This can be done by creating a :term:`Response`
 object in the view callable code and returning it directly or by raising
 special kinds of exceptions from within the body of a view callable.
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 63a08adaa..02c03c8db 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -354,7 +354,7 @@ initialization.
    cause ``DBSession.remove`` to be called in an application generated from
    any :app:`Pyramid` scaffold, because these all use the ``pyramid_tm``
    package.  The cleanup done by ``DBSession.remove`` is unnecessary when
-   ``pyramid_tm`` middleware is configured into the application.
+   ``pyramid_tm`` :term:`middleware` is configured into the application.
 
 More Details
 ++++++++++++
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 5499cf4a5..2ef8a7373 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -44,7 +44,7 @@ framework implementation detail.
 
 However, developers who are already used to writing :term:`Zope`
 applications often still wish to use the ZCA while building a
-:app:`Pyramid` application; :mod:`pyramid` makes this possible.
+:app:`Pyramid` application; :app:`Pyramid` makes this possible.
 
 .. index::
    single: get_current_registry
@@ -151,7 +151,6 @@ Consider the following bit of idiomatic :app:`Pyramid` startup code:
 .. code-block:: python
    :linenos:
 
-   from zope.component import getGlobalSiteManager
    from pyramid.config import Configurator
 
    def app(global_settings, **settings):
@@ -188,7 +187,6 @@ For example:
 .. code-block:: python
    :linenos:
 
-   from zope.component import getGlobalSiteManager
    from pyramid.config import Configurator
 
    def app(global_settings, **settings):
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index f9d4775ad..25ac9aabd 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -36,7 +36,7 @@ point happens to be the ``main`` function within the file named
 
 #. *Line 15*.  Register a "static view" which answers requests whose URL path
    start with ``/static`` using the
-   :meth:`pyramid.config.Configurator.add_static_view method`.  This
+   :meth:`pyramid.config.Configurator.add_static_view` method.  This
    statement registers a view that will serve up static assets, such as CSS
    and image files, for us, in this case, at
    ``http://localhost:6543/static/`` and below.  The first argument is the
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index 0d0738f7f..c3a0acf6b 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -54,9 +54,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 2c7235761..3612dccde 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -50,9 +50,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index 84824f605..e8672104d 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index 9dd6540cf..90e20764d 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -57,9 +57,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index 84824f605..e8672104d 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index 84824f605..e8672104d 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt
index 0d0738f7f..c3a0acf6b 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt
@@ -54,9 +54,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/login.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/login.pt
index 2c7235761..3612dccde 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/login.pt
@@ -50,9 +50,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
index 84824f605..e8672104d 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt
index 9dd6540cf..90e20764d 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt
@@ -57,9 +57,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index c56d7fecf..df2c83398 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -100,7 +100,7 @@ listed in the following table:
 |                      |  with existing        |             |            |            |
 |                      |  content.             |             |            |            |
 |                      |                       |             |            |            |
-|                      |  If the form was      |             |            |            |
+|                      |  If the form is       |             |            |            |
 |                      |  submitted, redirect  |             |            |            |
 |                      |  to /PageName         |             |            |            |
 +----------------------+-----------------------+-------------+------------+------------+
@@ -110,15 +110,15 @@ listed in the following table:
 |                      |  the edit form        |             |            |            |
 |                      |  without content.     |             |            |            |
 |                      |                       |             |            |            |
-|                      |  If the form was      |             |            |            |
+|                      |  If the form is       |             |            |            |
 |                      |  submitted,           |             |            |            |
 |                      |  redirect to          |             |            |            |
 |                      |  /PageName            |             |            |            |
 +----------------------+-----------------------+-------------+------------+------------+
 | /login               |  Display login form,  |  login      |  login.pt  |            |
-|                      |   Forbidden [3]_      |             |            |            |
+|                      |  Forbidden [3]_       |             |            |            |
 |                      |                       |             |            |            |
-|                      |  If the form was      |             |            |            |
+|                      |  If the form is       |             |            |            |
 |                      |  submitted,           |             |            |            |
 |                      |  authenticate.        |             |            |            |
 |                      |                       |             |            |            |
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
index 15ea6614f..ee9fdb7fa 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
index fbfa9870b..ee9fdb7fa 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/tests/tutorial/templates/edit.pt
index ca28b9fa5..2004273fe 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki2/src/tests/tutorial/templates/edit.pt
@@ -54,9 +54,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/templates/login.pt b/docs/tutorials/wiki2/src/tests/tutorial/templates/login.pt
index 64e592ea9..5f8e9b98c 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki2/src/tests/tutorial/templates/login.pt
@@ -50,9 +50,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt
index 14b88d16a..9c077568d 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/tests/tutorial/templates/view.pt
index 5a69818c1..19c50fb36 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki2/src/tests/tutorial/templates/view.pt
@@ -57,9 +57,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
index 3f2039cb6..5f962bbf5 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
@@ -50,9 +50,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
index fbfa9870b..ee9fdb7fa 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
@@ -69,8 +69,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
index 423c1d5a1..78c0d2d4c 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
@@ -53,9 +53,5 @@
       </div>
     </div>
   </div>
-  <div id="footer">
-    <div class="footer"
-         >&copy; Copyright 2008-2011, Agendaless Consulting.</div>
-  </div>
 </body>
 </html>
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst
index f33fc94ba..5cba8dd3e 100644
--- a/docs/whatsnew-1.1.rst
+++ b/docs/whatsnew-1.1.rst
@@ -43,7 +43,7 @@ The major feature additions in Pyramid 1.1 are:
 
   The object passed to a view callable as ``request`` is an instance of
   :class:`pyramid.request.Request`. ``request.response`` is an instance of
-  the class :class:`pyramid.request.Response`.  View callables that are
+  the class :class:`pyramid.response.Response`.  View callables that are
   configured with a :term:`renderer` will return this response object to the
   Pyramid router.  Therefore, code in a renderer-using view callable can set
   response attributes such as ``request.response.content_type`` (before they
@@ -95,7 +95,7 @@ Default HTTP Exception View
   is passed for this value, an exception view for HTTP exceptions will not be
   registered.  Passing ``None`` returns the behavior of raising an HTTP
   exception to that of Pyramid 1.0 (the exception will propagate to
-  middleware and to the WSGI server).
+  :term:`middleware` and to the WSGI server).
 
 ``http_cache``
 ~~~~~~~~~~~~~~
@@ -289,7 +289,7 @@ Minor Feature Additions
   when you want the static view to behave like the older deprecated version.
 
 - A new api function :func:`pyramid.scripting.prepare` has been added.  It is
-  a lower-level analogue of :func:`pyramid.paster.boostrap` that accepts a
+  a lower-level analogue of :func:`pyramid.paster.bootstrap` that accepts a
   request and a registry instead of a config file argument, and is used for
   the same purpose:
 
@@ -313,7 +313,7 @@ Minor Feature Additions
 
 - New API attribute :attr:`pyramid.config.global_registries` is an iterable
   object that contains references to every Pyramid registry loaded into the
-  current process via :meth:`pyramid.config.Configurator.make_app`.  It also
+  current process via :meth:`pyramid.config.Configurator.make_wsgi_app`.  It also
   has a ``last`` attribute containing the last registry loaded.  This is used
   by the scripting machinery, and is available for introspection.
 
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index ea56cf52d..a9fc38908 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -31,11 +31,11 @@ Tweens
 ~~~~~~
 
 A :term:`tween` is used to wrap the Pyramid router's primary request handling
-function.  This is a feature that can be used by Pyramid framework
-extensions, to provide, for example, view timing support and can provide a
-convenient place to hang bookkeeping code.  Tweens are is a little like
-:term:`WSGI` middleware, but have access to Pyramid functionality such as
-renderers and a full-featured request object.
+function.  This is a feature that can be used by Pyramid framework extensions,
+to provide, for example, view timing support and can provide a convenient
+place to hang bookkeeping code.  Tweens are a little like :term:`WSGI`
+:term:`middleware`, but have access to Pyramid functionality such as renderers
+and a full-featured request object.
 
 To support this feature, a new configurator directive exists named
 :meth:`pyramid.config.Configurator.add_tween`.  This directive adds a
@@ -51,7 +51,7 @@ Scaffolding Changes
 ~~~~~~~~~~~~~~~~~~~
 
 - All scaffolds now use the ``pyramid_tm`` package rather than the
-  ``repoze.tm2`` middleware to manage transaction management.
+  ``repoze.tm2`` :term:`middleware` to manage transaction management.
 
 - The ZODB scaffold now uses the ``pyramid_zodbconn`` package rather than the
   ``repoze.zodbconn`` package to provide ZODB integration.
@@ -59,9 +59,9 @@ Scaffolding Changes
 - All scaffolds now use the ``pyramid_debugtoolbar`` package rather than the
   ``WebError`` package to provide interactive debugging features.
 
-- Projects created via a scaffold no longer depend on the ``WebError``
-  package at all; configuration in the ``production.ini`` file which used to
-  require its ``error_catcher`` middleware has been removed.  Configuring
+- Projects created via a scaffold no longer depend on the ``WebError`` package
+  at all; configuration in the ``production.ini`` file which used to require
+  its ``error_catcher`` :term:`middleware` has been removed.  Configuring
   error catching / email sending is now the domain of the ``pyramid_exclog``
   package (see http://docs.pylonsproject.org/projects/pyramid_exclog/dev/).
 
@@ -160,7 +160,7 @@ Minor Feature Additions
   a value of ``edit``.
 
 - Support an ``onerror`` keyword argument to
-  :meth:`pyramid.config.Configurator.scan``.  This argument is passed to
+  :meth:`pyramid.config.Configurator.scan`.  This argument is passed to
   :meth:`venusian.Scanner.scan` to influence error behavior when an exception
   is raised during scanning.
 
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index ef0256383..2606c3df3 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -210,13 +210,13 @@ Not Found and Forbidden View Helpers
 Not Found helpers:
 
 - New API: :meth:`pyramid.config.Configurator.add_notfound_view`.  This is a
-  wrapper for :meth:`pyramid.Config.configurator.add_view` which provides
+  wrapper for :meth:`pyramid.config.Configurator.add_view` which provides
   support for an "append_slash" feature as well as doing the right thing when
   it comes to permissions (a Not Found View should always be public).  It
   should be preferred over calling ``add_view`` directly with
   ``context=HTTPNotFound`` as was previously recommended.
 
-- New API: :class:`pyramid.view.notfound_view_config``.  This is a decorator
+- New API: :class:`pyramid.view.notfound_view_config`.  This is a decorator
   constructor like :class:`pyramid.view.view_config` that calls
   :meth:`pyramid.config.Configurator.add_notfound_view` when scanned.  It
   should be preferred over using ``pyramid.view.view_config`` with
@@ -225,7 +225,7 @@ Not Found helpers:
 Forbidden helpers:
 
 - New API: :meth:`pyramid.config.Configurator.add_forbidden_view`.  This is a
-  wrapper for :meth:`pyramid.Config.configurator.add_view` which does the
+  wrapper for :meth:`pyramid.config.Configurator.add_view` which does the
   right thing about permissions.  It should be preferred over calling
   ``add_view`` directly with ``context=HTTPForbidden`` as was previously
   recommended.
@@ -267,7 +267,7 @@ Minor Feature Additions
 - We allow extra keyword arguments to be passed to the
   :meth:`pyramid.config.Configurator.action` method.
 
-- Responses generated by Pyramid's :class:`pyramid.views.static_view` now use
+- Responses generated by Pyramid's :class:`pyramid.static.static_view` now use
   a ``wsgi.file_wrapper`` (see
   http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling)
   when one is provided by the web server.
@@ -389,8 +389,8 @@ Backwards Incompatibilities
   and upgrade Pyramid itself "in-place"; it may simply break instead
   (particularly if you use ZCML's ``includeOverrides`` directive).
 
-- String values passed to :meth:`Pyramid.request.Request.route_url` or
-  :meth:`Pyramid.request.Request.route_path` that are meant to replace
+- String values passed to :meth:`pyramid.request.Request.route_url` or
+  :meth:`pyramid.request.Request.route_path` that are meant to replace
   "remainder" matches will now be URL-quoted except for embedded slashes. For
   example::
 
diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index f725615f3..505b9d798 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -184,11 +184,12 @@ Minor Feature Additions
   returns the policy object it creates.
 
 - The DummySecurityPolicy created by
-  :meth:`pyramid.config.testing_securitypolicy` now sets a ``forgotten`` value 
-  on the policy (the value ``True``) when its ``forget`` method is called.
+  :meth:`pyramid.config.Configurator.testing_securitypolicy` now sets a
+  ``forgotten`` value  on the policy (the value ``True``) when its ``forget``
+  method is called.
 
 - The DummySecurityPolicy created by
-  :meth:`pyramid.config.testing_securitypolicy` now sets a
+  :meth:`pyramid.config.Configurator.testing_securitypolicy` now sets a
   ``remembered`` value on the policy, which is the value of the ``principal``
   argument it's called with when its ``remember`` method is called.
 
@@ -301,7 +302,7 @@ Backwards Incompatibilities
     :meth:`pyramid.config.Configurator.testing_add_subscriber` instead.
 
   * ``registerTemplateRenderer`` (aka ``registerDummyRenderer``), use
-    :meth:`pyramid.config.Configurator.testing_add_template` instead.
+    :meth:`pyramid.config.Configurator.testing_add_renderer` instead.
 
   * ``registerView``, use :meth:`pyramid.config.Configurator.add_view` instead.