summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-10 20:21:42 -0700
committerChris McDonough <chrism@plope.com>2011-07-10 20:21:42 -0700
commit0b0e24425346b2bbce1d87cc2321da07e74a4938 (patch)
tree2b59a294b9113d5c13b8481291f03feadf0b7078 /docs
parentfe5374dfccaf235458dd3f8343a81c80cb3180c2 (diff)
parente005c27ae54f12d5f9579451c1c894a534eb7d48 (diff)
downloadpyramid-0b0e24425346b2bbce1d87cc2321da07e74a4938.tar.gz
pyramid-0b0e24425346b2bbce1d87cc2321da07e74a4938.tar.bz2
pyramid-0b0e24425346b2bbce1d87cc2321da07e74a4938.zip
Merge pull request #229 from mmerickel/garden.webob-refs
Modified docs to reference webob's new website.
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
-rw-r--r--docs/narr/views.rst2
-rw-r--r--docs/narr/webob.rst17
3 files changed, 11 insertions, 10 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index c8943acae..0a1c363f4 100644
--- a/docs/glossary.rst
+++ b/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
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index cbd8fcfb7..ca5aac508 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -483,7 +483,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
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index beb319084..0d928e532 100644
--- a/docs/narr/webob.rst
+++ b/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.