Merge branch '1.3-branch'

29 files changed, 228 insertions, 143 deletions

diff --git a/docs/api/config.rst b/docs/api/config.rst
index 3fc2cfc44..b76fed9cb 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -1,102 +1,102 @@
 .. _configuration_module:
 
+.. role:: methodcategory
+   :class: methodcategory
+
 :mod:`pyramid.config`
 ---------------------
 
 .. automodule:: pyramid.config
 
-  .. autoclass:: Configurator
-
-     .. attribute:: registry
-
-        The :term:`application registry` which holds the configuration
-        associated with this configurator.
+.. autoclass:: Configurator
 
-     .. automethod:: begin
+  :methodcategory:`Controlling Configuration State`
 
-     .. automethod:: end
+    .. automethod:: commit
+    .. automethod:: begin
+    .. automethod:: end
+    .. automethod:: include
+    .. automethod:: make_wsgi_app()
+    .. automethod:: scan
 
-     .. automethod:: hook_zca
+  :methodcategory:`Adding Routes and Views`
 
-     .. automethod:: unhook_zca
+    .. automethod:: add_route
+    .. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED)
+    .. automethod:: add_view
+    .. automethod:: set_forbidden_view
+    .. automethod:: set_notfound_view
 
-     .. automethod:: get_settings
+  :methodcategory:`Adding an Event Subscriber`
 
-     .. automethod:: commit
+    .. automethod:: add_subscriber
 
-     .. automethod:: action
+  :methodcategory:`Using Security`
 
-     .. automethod:: include
+     .. automethod:: set_authentication_policy
+     .. automethod:: set_authorization_policy
+     .. automethod:: set_default_permission
 
-     .. automethod:: add_directive
+   :methodcategory:`Setting Request Properties`
 
-     .. automethod:: with_package
+     .. automethod:: set_request_property
 
-     .. automethod:: maybe_dotted
+   :methodcategory:`Using I18N`
 
-     .. automethod:: absolute_asset_spec
+     .. automethod:: add_translation_dirs
+     .. automethod:: set_locale_negotiator
 
-     .. automethod:: setup_registry
+   :methodcategory:`Overriding Assets`
 
-     .. automethod:: add_renderer
+     .. automethod:: override_asset(to_override, override_with)
 
-     .. automethod:: add_response_adapter
+   :methodcategory:`Setting Renderer Globals`
 
-     .. automethod:: add_route
+     .. automethod:: set_renderer_globals_factory(factory)
 
-     .. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED)
+   :methodcategory:`Getting and Adding Settings`
 
      .. automethod:: add_settings
+     .. automethod:: get_settings
 
-     .. automethod:: add_subscriber
-
-     .. automethod:: add_translation_dirs
-
-     .. automethod:: add_view
+   :methodcategory:`Hooking Pyramid Behavior`
 
+     .. automethod:: add_renderer
+     .. automethod:: add_resource_url_adapter
+     .. automethod:: add_response_adapter
+     .. automethod:: add_traverser
      .. automethod:: add_tween
-
-     .. automethod:: derive_view
-
-     .. automethod:: make_wsgi_app()
-
-     .. automethod:: override_asset(to_override, override_with)
-
-     .. automethod:: scan
-
-     .. automethod:: set_locale_negotiator
-
-     .. automethod:: set_default_permission
-
-     .. automethod:: set_session_factory
-
      .. automethod:: set_request_factory
-
-     .. automethod:: set_request_property
-
      .. automethod:: set_root_factory
-
+     .. automethod:: set_session_factory
      .. automethod:: set_view_mapper
 
-     .. automethod:: set_authentication_policy
-
-     .. automethod:: set_authorization_policy
+   :methodcategory:`Extension Author APIs`
 
-     .. automethod:: testing_securitypolicy
+     .. automethod:: action
+     .. automethod:: add_directive
+     .. automethod:: with_package
 
-     .. automethod:: testing_resources
+   :methodcategory:`Utility Methods`
 
-     .. automethod:: testing_add_subscriber
+     .. automethod:: absolute_asset_spec
+     .. automethod:: derive_view
+     .. automethod:: maybe_dotted
+     .. automethod:: setup_registry
 
-     .. automethod:: testing_add_renderer
+   :methodcategory:`ZCA-Related APIs`
 
-     .. automethod:: set_forbidden_view
+     .. automethod:: hook_zca
+     .. automethod:: unhook_zca
 
-     .. automethod:: set_notfound_view
+   :methodcategory:`Testing Helper APIs`
 
-     .. automethod:: add_traverser
+     .. automethod:: testing_add_renderer
+     .. automethod:: testing_add_subscriber
+     .. automethod:: testing_resources
+     .. automethod:: testing_securitypolicy
 
-     .. automethod:: set_renderer_globals_factory(factory)
+   :methodcategory:`Attributes`
 
      .. attribute:: introspectable
 
@@ -104,7 +104,9 @@
         :class:`pyramid.registry.Introspectable` class (used during
         directives to provide introspection to actions).
 
-        This attribute is new as of :app:`Pyramid` 1.3.
+        .. note::
+
+           This attribute is new as of :app:`Pyramid` 1.3.
 
      .. attribute:: introspector
 
@@ -114,17 +116,24 @@
         ``introspector`` argument, this attribute will be that value.
         Otherwise, it will be an instance of a default introspector type.
 
-        This attribute is new as of :app:`Pyramid` 1.3.
+        .. note::
+
+           This attribute is new as of :app:`Pyramid` 1.3.
+
+     .. attribute:: registry
+
+        The :term:`application registry` which holds the configuration
+        associated with this configurator.
 
-  .. attribute:: global_registries
+.. attribute:: global_registries
 
-     The set of registries that have been created for :app:`Pyramid`
-     applications, one per each call to
-     :meth:`pyramid.config.Configurator.make_wsgi_app` in the current
-     process. The object itself supports iteration and has a ``last``
-     property containing the last registry loaded.
+   The set of registries that have been created for :app:`Pyramid`
+   applications, one per each call to
+   :meth:`pyramid.config.Configurator.make_wsgi_app` in the current
+   process. The object itself supports iteration and has a ``last`` property
+   containing the last registry loaded.
 
-     The registries contained in this object are stored as weakrefs,
-     thus they will only exist for the lifetime of the actual
-     applications for which they are being used.
+   The registries contained in this object are stored as weakrefs, thus they
+   will only exist for the lifetime of the actual applications for which they
+   are being used.
 
diff --git a/docs/conf.py b/docs/conf.py
index 0c56f56e7..3e38226c1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.3a7'
+version = '1.3a8'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 8307c0472..60920a73a 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -876,12 +876,11 @@ Glossary
      on the Jinja2 templating system.
 
    Akhet
-     Akhet is a Pyramid-based development environment which provides a
-     Pylons-esque scaffold which sports support for :term:`view handler`
-     application development, :term:`SQLAlchemy` support, :term:`Mako`
-     templating by default, and other Pylons-like features.  See
-     http://docs.pylonsproject.org/projects/akhet/dev/index.html for more
-     information.
+     `Akhet <http://docs.pylonsproject.org/projects/akhet/en/latest/>`_ is a 
+     Pyramid library and demo application with a Pylons-like feel.
+     It's most known for its former application scaffold, which helped 
+     users transition from Pylons and those prefering a more Pylons-like API.
+     The scaffold has been retired but the demo plays a similar role. 
 
    Pyramid Cookbook
      An additional documentation resource for Pyramid which presents topical,
diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 2ccedb27b..3c38e3805 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
+pyramid.includes =
+    pyramid_debugtoolbar
 
 [server:main]
 use = egg:waitress#main
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 5f2175d2a..0060ef65c 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -122,9 +122,10 @@ configuration or configuration that results from the execution of a
 Manually Resolving Conflicts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-There are a number of ways to manually resolve conflicts: the "right" way, by
-strategically using :meth:`pyramid.config.Configurator.commit`, or by using
-an "autocommitting" configurator.
+There are a number of ways to manually resolve conflicts: by changing
+registrations to not conflict, by strategically using
+:meth:`pyramid.config.Configurator.commit`, or by using an "autocommitting"
+configurator.
 
 The Right Thing
 +++++++++++++++
@@ -294,9 +295,18 @@ These are the methods of the configurator which provide conflict detection:
 :meth:`~pyramid.config.Configurator.add_route`,
 :meth:`~pyramid.config.Configurator.add_renderer`,
 :meth:`~pyramid.config.Configurator.set_request_factory`,
+:meth:`~pyramid.config.Configurator.set_session_factory`,
+:meth:`~pyramid.config.Configurator.set_request_property`,
+:meth:`~pyramid.config.Configurator.set_root_factory`,
+:meth:`~pyramid.config.Configurator.set_view_mapper`,
+:meth:`~pyramid.config.Configurator.set_authentication_policy`,
+:meth:`~pyramid.config.Configurator.set_authorization_policy`,
 :meth:`~pyramid.config.Configurator.set_renderer_globals_factory`,
-:meth:`~pyramid.config.Configurator.set_locale_negotiator` and
-:meth:`~pyramid.config.Configurator.set_default_permission`.
+:meth:`~pyramid.config.Configurator.set_locale_negotiator`,
+:meth:`~pyramid.config.Configurator.set_default_permission`,
+:meth:`~pyramid.config.Configurator.add_traverser`,
+:meth:`~pyramid.config.Configurator.add_resource_url_adapter`,
+and :meth:`~pyramid.config.Configurator.add_response_adapter`.
 
 :meth:`~pyramid.config.Configurator.add_static_view` also indirectly
 provides conflict detection, because it's implemented in terms of the
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 2c4310080..eaccc14a3 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -145,10 +145,10 @@ Here's some sample code that implements a minimal forbidden view:
 Changing the Request Factory
 ----------------------------
 
-Whenever :app:`Pyramid` handles a :term:`WSGI` request, it creates a
-:term:`request` object based on the WSGI environment it has been passed.  By
-default, an instance of the :class:`pyramid.request.Request` class is created
-to represent the request object.
+Whenever :app:`Pyramid` handles a request from a :term:`WSGI` server, it
+creates a :term:`request` object based on the WSGI environment it has been
+passed.  By default, an instance of the :class:`pyramid.request.Request`
+class is created to represent the request object.
 
 The class (aka "factory") that :app:`Pyramid` uses to create a request object
 instance can be changed by passing a ``request_factory`` argument to the
@@ -236,11 +236,11 @@ Adding Renderer Globals (Deprecated)
    is documented in :ref:`beforerender_event`.
 
 Whenever :app:`Pyramid` handles a request to perform a rendering (after a
-view with a ``renderer=`` configuration attribute is invoked, or when any
-of the methods beginning with ``render`` within the :mod:`pyramid.renderers`
+view with a ``renderer=`` configuration attribute is invoked, or when any of
+the methods beginning with ``render`` within the :mod:`pyramid.renderers`
 module are called), *renderer globals* can be injected into the *system*
 values sent to the renderer.  By default, no renderer globals are injected,
-and the "bare" system values (such as ``request``, ``context``, and
+and the "bare" system values (such as ``request``, ``context``, ``view``, and
 ``renderer_name``) are the only values present in the system dictionary
 passed to every renderer.
 
@@ -447,7 +447,7 @@ that implements the following interface:
 
 More than one traversal algorithm can be active at the same time.  For
 instance, if your :term:`root factory` returns more than one type of object
-conditionally, you could claim that an alternate traverser adapter is ``for``
+conditionally, you could claim that an alternate traverser adapter is "for"
 only one particular class or interface.  When the root factory returned an
 object that implemented that class or interface, a custom traverser would be
 used.  Otherwise, the default traverser would be used.  For example:
@@ -495,7 +495,7 @@ For example:
    from myapp.traversal import ResourceURLAdapter
    from myapp.resources import MyRoot
 
-   config.add_resource_url_adapter(ResourceURLAdapter, resource_iface=MyRoot)
+   config.add_resource_url_adapter(ResourceURLAdapter, MyRoot)
 
 In the above example, the ``myapp.traversal.ResourceURLAdapter`` class will
 be used to provide services to :meth:`~pyramid.request.Request.resource_url`
diff --git a/docs/narr/introspector.rst b/docs/narr/introspector.rst
index 08cc430f6..d465c47d9 100644
--- a/docs/narr/introspector.rst
+++ b/docs/narr/introspector.rst
@@ -540,10 +540,30 @@ introspectables in categories not described here.
     The (resolved) interface or class object that represents the return value
     of a root factory that this traverser will be used for.
 
-  ``factory``
+  ``adapter``
 
     The (resolved) traverser class.
 
+``resource url adapters``
+
+  Each introspectable in the ``resource url adapters`` category represents a
+  call to :meth:`pyramid.config.Configurator.add_resource_url_adapter`; each
+  will have the following data.
+
+  ``adapter``
+
+    The (resolved) resource URL adapter class.
+
+  ``resource_iface``
+
+    The (resolved) interface or class object that represents the resource
+    interface that this url adapter is registered for.
+
+  ``request_iface``
+
+    The (resolved) interface or class object that represents the request
+    interface that this url adapter is registered for.
+
 Introspection in the Toolbar
 ----------------------------
 
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 4566a4fb8..5a519ca30 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -348,27 +348,48 @@ when you use the ``production.ini`` file instead of the ``development.ini``
 ini file to run the application.
 
 You can also turn the debug toolbar off by editing ``development.ini`` and
-commenting out the line ``pyramid.includes = pyramid_debugtoolbar``.  For
-example, instead of:
+commenting out a line.  For example, instead of:
 
 .. code-block:: ini
    :linenos:
 
    [app:main]
    ...
-   pyramid.includes = pyramid_debugtoolbar
+   pyramid.includes =
+       pyramid_debugtoolbar
 
-Put a hash mark in front of the ``pyramid.includes`` line:
+Put a hash mark at the beginning of the ``pyramid_debugtoolbar`` line:
 
 .. code-block:: ini
    :linenos:
 
    [app:main]
    ...
-   #pyramid.includes = pyramid_debugtoolbar
+   pyramid.includes =
+   #    pyramid_debugtoolbar
 
 Then restart the application to see that the toolbar has been turned off.
 
+Note that if you comment out the ``pryamid_debugtoolbar`` line, the ``#``
+*must* be in the first column.  If you put the hash mark anywhere except the
+first column instead, for example like this:
+
+.. code-block:: ini
+   :linenos:
+
+   [app:main]
+   ...
+   pyramid.includes =
+       #pyramid_debugtoolbar
+
+When you attempt to restart the application with a section like the abvoe
+you'll receive an error that ends something like this, and the application
+will not start:
+
+.. code-block:: text
+
+   ImportError: No module named #pyramid_debugtoolbar
+
 .. index::
    single: project structure
 
diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 47566515c..74781caed 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -6,9 +6,11 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_zodbconn
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_zodbconn
+    pyramid_tm
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index 919efce1e..2da493def 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -6,8 +6,10 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
-                   pyramid_zodbconn
+pyramid.includes =
+    pyramid_tm
+    pyramid_zodbconn
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 3acff7f6d..5a3dba52a 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -6,9 +6,11 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_zodbconn
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_zodbconn
+    pyramid_tm
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index 919efce1e..2da493def 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -6,8 +6,10 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
-                   pyramid_zodbconn
+pyramid.includes =
+    pyramid_tm
+    pyramid_zodbconn
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 47566515c..74781caed 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -6,9 +6,11 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_zodbconn
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_zodbconn
+    pyramid_tm
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index 919efce1e..2da493def 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -6,8 +6,10 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
-                   pyramid_zodbconn
+pyramid.includes =
+    pyramid_tm
+    pyramid_zodbconn
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index 47566515c..74781caed 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -6,9 +6,11 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_zodbconn
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_zodbconn
+    pyramid_tm
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini
index 919efce1e..2da493def 100644
--- a/docs/tutorials/wiki/src/tests/production.ini
+++ b/docs/tutorials/wiki/src/tests/production.ini
@@ -6,8 +6,10 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
-                   pyramid_zodbconn
+pyramid.includes =
+    pyramid_tm
+    pyramid_zodbconn
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 3acff7f6d..5a3dba52a 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -6,9 +6,11 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_zodbconn
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_zodbconn
+    pyramid_tm
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index 919efce1e..2da493def 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -6,8 +6,10 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
-                   pyramid_zodbconn
+pyramid.includes =
+    pyramid_tm
+    pyramid_zodbconn
+
 tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index 2bb74454c..06c51fb12 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -7,8 +7,9 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/authorization/production.ini b/docs/tutorials/wiki2/src/authorization/production.ini
index ec6dea135..cefb5c231 100644
--- a/docs/tutorials/wiki2/src/authorization/production.ini
+++ b/docs/tutorials/wiki2/src/authorization/production.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
+pyramid.includes =
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 2bb74454c..06c51fb12 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -7,8 +7,9 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index ec6dea135..cefb5c231 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
+pyramid.includes =
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index 2bb74454c..06c51fb12 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -7,8 +7,9 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini
index ec6dea135..cefb5c231 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
+pyramid.includes =
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index 2bb74454c..06c51fb12 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -7,8 +7,9 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/tests/production.ini b/docs/tutorials/wiki2/src/tests/production.ini
index ec6dea135..cefb5c231 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
+pyramid.includes =
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index 2bb74454c..06c51fb12 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -7,8 +7,9 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
-                   pyramid_tm
+pyramid.includes =
+    pyramid_debugtoolbar
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/tutorials/wiki2/src/views/production.ini b/docs/tutorials/wiki2/src/views/production.ini
index ec6dea135..cefb5c231 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.debug_templates = false
 pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
+pyramid.includes =
+    pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index acb884d49..d2df88093 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -243,11 +243,6 @@ Minor Feature Additions
 - We allow extra keyword arguments to be passed to the
   :meth:`pyramid.config.Configurator.action` method.
 
-- New API: :meth:`pyramid.config.Configurator.set_request_property`. Add lazy
-  property descriptors to a request without changing the request factory.
-  This method provides conflict detection and is the suggested way to add
-  properties to a request.
-
 - Responses generated by Pyramid's :class:`pyramid.views.static_view` now use
   a ``wsgi.file_wrapper`` (see
   http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling)
@@ -318,7 +313,7 @@ Minor Feature Additions
   partially.
 
 - A new API named :meth:`pyramid.request.Request.resource_path` now exists.
-  It works like :meth:`pyramid.request.Request.resource_url`` but produces a
+  It works like :meth:`pyramid.request.Request.resource_url` but produces a
   relative URL rather than an absolute one.
 
 - The :meth:`pyramid.request.Request.route_url` API now accepts these