Merge remote-tracking branch 'origin/master' into docs.gettingstarted

Conflicts:
	docs/index.rst
	docs/latexindex.rst
	setup.py

3 files changed, 12 insertions, 2 deletions

diff --git a/docs/api/config.rst b/docs/api/config.rst
index 39d504348..1f65be9f1 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -135,3 +135,4 @@
    will only exist for the lifetime of the actual applications for which they
    are being used.
 
+.. autoclass:: not_
diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index db348495c..7736cf075 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -29,6 +29,15 @@
      This attribute is often accessed as ``request.registry.introspector`` in
      a typical Pyramid application.
 
+   .. method:: notify(*events)
+
+     Fire one or more events. All event subscribers to the event(s)
+     will be notified. The subscribers will be called synchronously.
+     This method is often accessed as ``request.registry.notify``
+     in Pyramid applications to fire custom events. See
+     :ref:`custom_events` for more information.
+
+
 .. class:: Introspectable
 
    .. versionadded:: 1.3
diff --git a/docs/api/request.rst b/docs/api/request.rst
index b1f5918d7..a90cb1ac0 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -156,7 +156,7 @@
    .. attribute:: matched_route
 
       If a :term:`route` has matched during this request, this attribute will
-      be an obect representing the route matched by the URL pattern
+      be an object representing the route matched by the URL pattern
       associated with the route.  If a route has not matched during this
       request, the value of this attribute will be ``None``. See
       :ref:`matched_route`.
@@ -238,7 +238,7 @@
    .. attribute::  response_*
 
       In Pyramid 1.0, you could set attributes on a
-      :class:`pyramid.request.Request` which influenced the behavor of
+      :class:`pyramid.request.Request` which influenced the behavior of
       *rendered* responses (views which use a :term:`renderer` and which
       don't directly return a response).  These attributes began with
       ``response_``, such as ``response_headerlist``. If you needed to