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

4 files changed, 18 insertions, 15 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index b7e47f0e5..9d877c0ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Next release
 Bug Fixes
 ---------
 
+- Depend on a newer version of WebOb so that we pull in some crucial bug-fixes
+  that were showstoppers for functionality in Pyramid.
+
 - Add a trailing semicolon to the JSONP response. This fixes JavaScript syntax
   errors for old IE versions. See https://github.com/Pylons/pyramid/pull/1205
 
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 3e19f7198..00fc21634 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -38,8 +38,8 @@ within the body of a view callable like so:
    from pyramid.renderers import render_to_response
 
    def sample_view(request):
-       return render_to_response('templates/foo.pt', 
-                                 {'foo':1, 'bar':2}, 
+       return render_to_response('templates/foo.pt',
+                                 {'foo':1, 'bar':2},
                                  request=request)
 
 The ``sample_view`` :term:`view callable` function above returns a
@@ -56,7 +56,7 @@ In this case, this is the directory containing the file that
 defines the ``sample_view`` function.  Although a renderer path is
 usually just a simple relative pathname, a path named as a renderer
 can be absolute, starting with a slash on UNIX or a drive letter
-prefix on Windows. The path can alternately be a
+prefix on Windows. The path can alternately be an
 :term:`asset specification` in the form
 ``some.dotted.package_name:relative/path``. This makes it possible to
 address template assets which live in another package.  For example:
@@ -73,11 +73,11 @@ address template assets which live in another package.  For example:
 
 An asset specification points at a file within a Python *package*.
 In this case, it points at a file named ``foo.pt`` within the
-``templates`` directory of the ``mypackage`` package.  Using a
+``templates`` directory of the ``mypackage`` package.  Using an
 asset specification instead of a relative template name is usually
 a good idea, because calls to :func:`~pyramid.renderers.render_to_response`
 using asset specifications will continue to work properly if you move the
-code containing them around.
+code containing them to another location.
 
 In the examples above we pass in a keyword argument named ``request``
 representing the current :app:`Pyramid` request. Passing a request
@@ -94,8 +94,8 @@ Every view must return a :term:`response` object, except for views
 which use a :term:`renderer` named via view configuration (which we'll
 see shortly).  The :func:`pyramid.renderers.render_to_response`
 function is a shortcut function that actually returns a response
-object. This allows the example view above to simply return the result 
-of its call to ``render_to_response()`` directly. 
+object. This allows the example view above to simply return the result
+of its call to ``render_to_response()`` directly.
 
 Obviously not all APIs you might call to get response data will return a
 response object. For example, you might render one or more templates to
@@ -111,8 +111,8 @@ as the body of the response:
    from pyramid.response import Response
 
    def sample_view(request):
-       result = render('mypackage:templates/foo.pt', 
-                       {'foo':1, 'bar':2}, 
+       result = render('mypackage:templates/foo.pt',
+                       {'foo':1, 'bar':2},
                        request=request)
        response = Response(result)
        return response
@@ -194,7 +194,7 @@ of :func:`~pyramid.renderers.render` (a string):
 
    def sample_view(request):
        result = render('mypackage:templates/foo.pt',
-                       {'foo':1, 'bar':2}, 
+                       {'foo':1, 'bar':2},
                        request=request)
        response = Response(result)
        response.content_type = 'text/plain'
@@ -241,7 +241,7 @@ These values are provided to the template:
   The renderer name used to perform the rendering,
   e.g. ``mypackage:templates/foo.pt``.
 
-``renderer_info`` 
+``renderer_info``
   An object implementing the :class:`pyramid.interfaces.IRendererInfo`
   interface.  Basically, an object with the following attributes: ``name``,
   ``package`` and ``type``.
@@ -273,7 +273,7 @@ Templates Used as Renderers via Configuration
 An alternative to using :func:`~pyramid.renderers.render_to_response`
 to render templates manually in your view callable code, is
 to specify the template as a :term:`renderer` in your
-*view configuration*. This can be done with any of the 
+*view configuration*. This can be done with any of the
 templating languages supported by :app:`Pyramid`.
 
 To use a renderer via view configuration, specify a template
diff --git a/pyramid/session.py b/pyramid/session.py
index 8c9900975..e3ce4a090 100644
--- a/pyramid/session.py
+++ b/pyramid/session.py
@@ -165,7 +165,7 @@ def BaseCookieSessionFactory(
     Parameters:
 
     ``serializer``
-      An object with two methods: `loads`` and ``dumps``.  The ``loads`` method
+      An object with two methods: ``loads`` and ``dumps``.  The ``loads`` method
       should accept bytes and return a Python object.  The ``dumps`` method
       should accept a Python object and return bytes.  A ``ValueError`` should
       be raised for malformed inputs.
@@ -572,7 +572,7 @@ def SignedCookieSessionFactory(
       while rendering a view. Default: ``True``.
 
     ``serializer``
-      An object with two methods: `loads`` and ``dumps``.  The ``loads`` method
+      An object with two methods: ``loads`` and ``dumps``.  The ``loads`` method
       should accept bytes and return a Python object.  The ``dumps`` method
       should accept a Python object and return bytes.  A ``ValueError`` should
       be raised for malformed inputs.  If a serializer is not passed, the
diff --git a/setup.py b/setup.py
index e6c9a490a..5bf096622 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ except IOError:
 
 install_requires=[
     'setuptools',
-    'WebOb >= 1.3', # request.domain and CookieProfile
+    'WebOb >= 1.3.1', # request.domain and CookieProfile
     'repoze.lru >= 0.4', # py3 compat
     'zope.interface >= 3.8.0',  # has zope.interface.registry
     'zope.deprecation >= 3.5.0', # py3 compat