Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 9a68e59789106f19d39537daa01d30479da87a40 2 parents 71a5ae6 + 0b0e244
@mcdonc mcdonc authored
View
2  docs/glossary.rst
@@ -326,7 +326,7 @@ Glossary
:term:`ZODB` database.
WebOb
- `WebOb <http://pythonpaste.org/webob/>`_ is a WSGI request/response
+ `WebOb <http://webob.org>`_ is a WSGI request/response
library created by Ian Bicking.
Paste
View
2  docs/narr/security.rst
@@ -562,7 +562,7 @@ that implements the following interface:
.. code-block:: python
:linenos:
- class AuthenticationPolicy(object):
+ class IAuthenticationPolicy(object):
""" An object representing a Pyramid authentication policy. """
def authenticated_userid(self, request):
View
2  docs/narr/views.rst
@@ -409,7 +409,7 @@ various other clients. In :app:`Pyramid`, form submission handling logic is
always part of a :term:`view`. For a general overview of how to handle form
submission data using the :term:`WebOb` API, see :ref:`webob_chapter` and
`"Query and POST variables" within the WebOb documentation
-<http://pythonpaste.org/webob/reference.html#query-post-variables>`_.
+<http://docs.webob.org/en/latest/reference.html#query-post-variables>`_.
:app:`Pyramid` defers to WebOb for its request and response implementations,
and handling form submission data is a property of the request
implementation. Understanding WebOb's request API is the key to
View
17 docs/narr/webob.rst
@@ -22,9 +22,9 @@ of :class:`webob.Request`. The :term:`response` returned from a
WebOb is a project separate from :app:`Pyramid` with a separate set of
authors and a fully separate `set of documentation
-<http://pythonpaste.org/webob/>`_. Pyramid adds some functionality to the
-standard WebOb request, which is documented in the :ref:`request_module` API
-documentation.
+<http://docs.webob.org/en/latest/index.html>`_. Pyramid adds some
+functionality to the standard WebOb request, which is documented in the
+:ref:`request_module` API documentation.
WebOb provides objects for HTTP requests and responses. Specifically it does
this by wrapping the `WSGI <http://wsgi.org>`_ request environment and
@@ -35,7 +35,7 @@ requests and forming WSGI responses. WebOb is a nice way to represent "raw"
WSGI requests and responses; however, we won't cover that use case in this
document, as users of :app:`Pyramid` don't typically need to use the
WSGI-related features of WebOb directly. The `reference documentation
-<http://pythonpaste.org/webob/reference.html>`_ shows many examples of
+<http://docs.webob.org/en/latest/reference.html>`_ shows many examples of
creating requests and using response objects in this manner, however.
.. index::
@@ -300,8 +300,8 @@ More detail about the request object API is available in:
- The :class:`pyramid.request.Request` API documentation.
-- The `WebOb documentation <http://pythonpaste.org/webob>`_. All
- methods and attributes of a ``webob.Request`` documented within the
+- The `WebOb documentation <http://docs.webob.org/en/latest/index.html>`_.
+ All methods and attributes of a ``webob.Request`` documented within the
WebOb documentation will work with request objects created by
:app:`Pyramid`.
@@ -385,7 +385,7 @@ properties. These are parsed, so you can do things like
``response.last_modified = os.path.getmtime(filename)``.
The details are available in the `extracted Response documentation
-<http://pythonpaste.org/webob/class-webob.Response.html>`_.
+<http://docs.webob.org/en/latest/modules/webob.html#headers>`_.
.. index::
single: response (creating)
@@ -444,5 +444,6 @@ More Details
More details about the response object API are available in the
:mod:`pyramid.response` documentation. More details about exception
responses are in the :mod:`pyramid.httpexceptions` API documentation. The
-`WebOb documentation <http://pythonpaste.org/webob>`_ is also useful.
+`WebOb documentation <http://docs.webob.org/en/latest/index.html>`_ is also
+useful.

0 comments on commit 9a68e59

Please sign in to comment.
Something went wrong with that request. Please try again.