Merge pull request #404 from Pylons/fix-linkcheck

Fix linkcheck

9 files changed, 40 insertions, 40 deletions

diff --git a/HISTORY.txt b/HISTORY.txt
index 2bbd1da..070cddc 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -21,7 +21,7 @@ Backwards Incompatibilities
 - Many changes have been made to the way WebOb does Accept handling, not just
   for the Accept header itself, but also for Accept-Charset, Accept-Encoding
   and Accept-Language. This was a `Google Summer of Code
-  <https://developers.google.com/open-source/gsoc/>`_ project completed by
+  <https://summerofcode.withgoogle.com/>`_ project completed by
   Whiteroses (https://github.com/whiteroses). Many thanks to Google for running
   GSoC, the Python Software Foundation for organising and a huge thanks to Ira
   for completing the work. See https://github.com/Pylons/webob/pull/338 and
@@ -441,7 +441,7 @@ Features
   longer quoted in cookie values: ``~/=<>()[]{}?@`` .  The full set of
   non-letter-or-digit unquoted cookie value characters is now
   ``!#$%&'*+-.^_`|~/: =<>()[]{}?@``.  See
-  http://tools.ietf.org/html/rfc6265#section-4.1.1 for more information.
+  https://tools.ietf.org/html/rfc6265#section-4.1.1 for more information.
 
 - Cookie names are now restricted to the set of characters expected by RFC
   6265.  Previously they could contain unsupported characters such as ``/``.
@@ -454,7 +454,7 @@ Features
   however.
 
 - Added support for draft status code 451 ("Unavailable for Legal Reasons").
-  See http://tools.ietf.org/html/draft-tbray-http-legally-restricted-status-00
+  See https://tools.ietf.org/html/draft-tbray-http-legally-restricted-status-00
 
 - Added status codes 428, 429, 431 and 511 to ``util.status_reasons`` (they
   were already present in a previous release as ``webob.exc`` exceptions).
@@ -725,7 +725,7 @@ Bug Fixes
 ---------
 
 * Fix disconnect detection being incorrect in some cases (`issue 21
-  <https://bitbucket.org/ianb/webob/issue/21>`_).
+  <https://bitbucket.org/ianb/webob/issues/21>`_).
 
 * Fix exception when calling ``.accept.best_match(..)`` on a header containing
   ``'*'`` (instead of ``'*/*'``).
@@ -758,7 +758,7 @@ Bug Fixes
   (the old names will be removed in 1.3 or even later).
 
 * Make ``Response.write`` much more efficient (`issue 18
-  <https://bitbucket.org/ianb/webob/issue/18>`_).
+  <https://bitbucket.org/ianb/webob/issues/18>`_).
 
 * Make sure copying responses does not reset Content-Length or Content-MD5 of the
   original (and that of future copies).
@@ -783,12 +783,12 @@ Bug Fixes
 
 * Revert the restriction on req.body not being settable for GET and some
   other requests. Such requests actually can have a body according to HTTP BIS
-  (see also `commit message <https://bitbucket.org/ianb/webob/changeset/b3ef34c57936>`_)
+  (see also `commit message <https://bitbucket.org/ianb/webob/commits/b3ef34c57936>`_)
 
 * Add support for file upload testing via ``Request.blank(POST=..)``. Patch contributed by
   Tim Perevezentsev. See also:
-  `ticket <https://bitbucket.org/ianb/webob/issue/15>`_,
-  `changeset <https://bitbucket.org/ianb/webob/changeset/4ba9ab0c3f99>`_.
+  `ticket <https://bitbucket.org/ianb/webob/issues/15>`_,
+  `changeset <https://bitbucket.org/ianb/webob/commits/4ba9ab0c3f99>`_.
 
 * Deprecate ``req.str_GET``, ``str_POST``, ``str_params`` and ``str_cookies`` (warning).
 
@@ -803,8 +803,8 @@ Bug Fixes
 1.1b1
 ---------
 
-* We have acquired the webob.org domain, docs are now hosted at `docs.webob.org
-  <http://docs.webob.org/>`_
+* We have acquired the webob.org domain, docs are now hosted at `https://docs.pylonsproject.org/projects/webob/en/stable/
+  <https://docs.pylonsproject.org/projects/webob/en/stable/>`_
 
 * Make ``accept.quality(..)`` return best match quality, not first match quality.
 
@@ -830,7 +830,7 @@ Bug Fixes
 ------
 
 * Escape commas in cookie values (see also:
-  `stdlib Cookie bug <http://bugs.python.org/issue9824>`_)
+  `stdlib Cookie bug <https://bugs.python.org/issue9824>`_)
 
 * Change cookie serialization to more closely match how cookies usually
   are serialized (unquoted expires, semicolon separators even between morsels)
@@ -839,20 +839,20 @@ Bug Fixes
 
 * Enhance the req.is_body_readable to always guess GET, HEAD, DELETE and TRACE
   as unreadable and PUT and POST as readable
-  (`issue 12 <https://bitbucket.org/ianb/webob/issue/12>`_)
+  (`issue 12 <https://bitbucket.org/ianb/webob/issues/12>`_)
 
 * Deny setting req.body or req.body_file to non-empty values for GET, HEAD and
   other bodiless requests
 
 * Fix running nosetests with arguments on UNIX systems
-  (`issue 11 <https://bitbucket.org/ianb/webob/issue/11>`_)
+  (`issue 11 <https://bitbucket.org/ianb/webob/issues/11>`_)
 
 
 1.0.7
 ------
 
 * Fix ``Accept`` header matching for items with zero-quality
-  (`issue 10 <https://bitbucket.org/ianb/webob/issue/10>`_)
+  (`issue 10 <https://bitbucket.org/ianb/webob/issues/10>`_)
 
 * Hide password values in ``MultiDict.__repr__``
 
@@ -868,7 +868,7 @@ Bug Fixes
   or this flag is set.
 
 * The two changes above fix a hangup with CherryPy and wsgiref servers
-  (`issue 6 <https://bitbucket.org/ianb/webob/issue/6>`_)
+  (`issue 6 <https://bitbucket.org/ianb/webob/issues/6>`_)
 
 * ``req.body_file`` is now safer to read directly. For ``GET`` and other similar requests
   it returns an empty ``StringIO`` or ``BytesIO`` object even if the server passed in
@@ -881,7 +881,7 @@ Bug Fixes
 * Fix ``.pop()`` and ``.setdefault(..)`` methods of ``req/resp.cache_control``
 
 * Thanks to the participants of `Pyramid sprint at the PyCon US 2011
-  <https://bitbucket.org/ianb/webob/changeset/7b7dc3ec6159>`_ WebOb now has
+  <https://bitbucket.org/ianb/webob/commits/7b7dc3ec6159>`_ WebOb now has
   100% test coverage.
 
 1.0.5
@@ -897,7 +897,7 @@ Bug Fixes
   Now it is fixed properly.
 
 * Make sure that req.url and related properties do not unnecessarily escape some chars
-  (``:@&+$``) in the URI path (`issue 5 <https://bitbucket.org/ianb/webob/issue/5>`_)
+  (``:@&+$``) in the URI path (`issue 5 <https://bitbucket.org/ianb/webob/issues/5>`_)
 
 * Revert some changes from 1.0.3 that have broken backwards compatibility for some apps.
   Getting ``req.body_file`` does not make input stream seekable, but there's a new property
@@ -927,16 +927,16 @@ Bug Fixes
 
 * Fix a bug regarding field names escaping for forms submitted as ``multipart/form-data``.
   For more infromation see `the bug report and discussion
-  <https://bitbucket.org/ianb/webob/issue/2>`_ and 1.0.4 notes for further fix.
+  <https://bitbucket.org/ianb/webob/issues/2>`_ and 1.0.4 notes for further fix.
 
 * Add ``req.http_version`` attribute.
 
 1.0.2
 ------
 
-* Primary maintainer is now `Sergey Schetinin <http://self.maluke.com/>`_.
+* Primary maintainer is now Sergey Schetinin.
 
-* Issue tracker moved from `Trac <http://bit.ly/webob-tickets>`_ to bitbucket's `issue
+* Issue tracker moved from Trac to bitbucket's `issue
   tracker <https://bitbucket.org/ianb/webob/issues>`_
 
 * WebOb 1.0.1 changed the behavior of ``MultiDict.update`` to be more in line with
@@ -1126,7 +1126,7 @@ Bug Fixes
 -----
 
 * Moved repository from svn location to
-  http://bitbucket.org/ianb/webob/
+  https://bitbucket.org/ianb/webob/wiki/Home
 
 * Arguments to :meth:`Accept.best_match` must be specific types,
   not wildcards. The server should know a list of specic types it can
diff --git a/docs/comment-example.txt b/docs/comment-example.txt
index 21377ac..62824a4 100644
--- a/docs/comment-example.txt
+++ b/docs/comment-example.txt
@@ -252,7 +252,7 @@ Because we put in some text without quoting it is susceptible to a
 <https://en.wikipedia.org/wiki/Cross-site_scripting>`_ attack.  Fixing
 that is beyond the scope of this tutorial; you could quote it or clean
 it with something like `lxml.html.clean
-<http://lxml.de/lxmlhtml.html#cleaning-up-html>`_.
+<https://lxml.de/lxmlhtml.html#cleaning-up-html>`_.
 
 Accepting Comments
 ------------------
diff --git a/docs/differences.txt b/docs/differences.txt
index b7f9638..9da7285 100644
--- a/docs/differences.txt
+++ b/docs/differences.txt
@@ -321,7 +321,7 @@ From information `from the wiki
 Yaro
 ====
 
-`Yaro <https://pypi.python.org/pypi/yaro>`_ is a small wrapper around
+`Yaro <https://pypi.org/project/yaro>`_ is a small wrapper around
 the WSGI environment, much like WebOb in scope.
 
 The WebOb objects have many more methods and attributes.  The Yaro
@@ -365,7 +365,7 @@ An offshoot of `Pocoo <http://www.pocoo.org/>`_,
 this library is based around WSGI, similar to Paste and Yaro.
 
 This is taken from the `wrapper documentation
-<http://werkzeug.pocoo.org/docs/0.12/wrappers/>`_.
+<https://werkzeug.palletsprojects.com/en/0.15.x/contrib/wrappers/#werkzeug-contrib-wrappers>`_.
 
 Request
 -------
@@ -399,7 +399,7 @@ Zope 3
 From the Zope 3 interfaces for the `Request
 <https://zopepublisher.readthedocs.io/en/sphinx-docs/browser_api.html#zope.publisher.interfaces.browser.IBrowserRequest>`_
 and `Response
-<http://zopepublisher.readthedocs.io/en/sphinx-docs/http_api.html#zope.publisher.interfaces.http.IHTTPResponse>`_.
+<https://zopepublisher.readthedocs.io/en/sphinx-docs/http_api.html#zope.publisher.interfaces.http.IHTTPResponse>`_.
 
 Request
 -------
@@ -589,7 +589,7 @@ webapp Response
     <https://cloud.google.com/appengine/docs/standard/python/tools/webapp2>`_.
 
 The Google App Engine `webapp
-<https://cloud.google.com/appengine/docs/standard/python/tools/webapp/>`_
+<https://cloud.google.com/appengine/docs/standard/python/python25>`_
 framework uses the WebOb Request object, but does not use its Response
 object.
 
diff --git a/docs/do-it-yourself.txt b/docs/do-it-yourself.txt
index e92bd2e..11cf343 100644
--- a/docs/do-it-yourself.txt
+++ b/docs/do-it-yourself.txt
@@ -84,7 +84,7 @@ These two pieces solve a lot of the more tedious parts of making a framework.  T
 Serving Your Application
 ------------------------
 
-While we can test the application using WebOb, you might want to serve the application.  Here's the basic recipe, using the `Paste <https://pypi.python.org/pypi/Paste>`_ HTTP server:
+While we can test the application using WebOb, you might want to serve the application.  Here's the basic recipe, using the `Paste <https://pypi.org/project/Paste>`_ HTTP server:
 
 .. code-block:: python
 
@@ -268,7 +268,7 @@ Controllers
 
 The router just passes the request on to the controller, so the controllers are themselves just WSGI applications.  But we'll want to set up something to make those applications friendlier to write.
 
-To do that we'll write a `decorator <http://www.drdobbs.com/web-development/python-24-decorators/184406073>`_.  A decorator is a function that wraps another function.  After decoration the function will be a WSGI application, but it will be decorating a function with a signature like ``controller_func(req, **urlvars)``.  The controller function will return a response object (which, remember, is a WSGI application on its own).
+To do that we'll write a `decorator <https://wiki.python.org/moin/PythonDecorators>`_.  A decorator is a function that wraps another function.  After decoration the function will be a WSGI application, but it will be decorating a function with a signature like ``controller_func(req, **urlvars)``.  The controller function will return a response object (which, remember, is a WSGI application on its own).
 
 .. code-block:: python
    :linenos:
@@ -537,7 +537,7 @@ Well, we don't *really* need to factor templating into our framework.  After all
 
 But we'll add a little helper, because I think it shows a clever trick.
 
-We'll use `Tempita <https://pypi.python.org/pypi/Tempita>`_ for templating, mostly because it's very simplistic about how it does loading.  The basic form is:
+We'll use `Tempita <https://pypi.org/project/Tempita>`_ for templating, mostly because it's very simplistic about how it does loading.  The basic form is:
 
 .. code-block:: python
 
diff --git a/docs/index.txt b/docs/index.txt
index 805c5bb..393a144 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -316,7 +316,7 @@ Status and License
 ==================
 
 WebOb is an extraction and refinement of pieces from `Paste
-<https://pypi.python.org/pypi/Paste>`_.  It is under active development on `GitHub
+<https://pypi.org/project/Paste>`_.  It is under active development on `GitHub
 <https://github.com/pylons/webob>`_. It was originally written by `Ian Bicking
 <http://www.ianbicking.org/>`_, and is maintained by the `Pylons Project
 <https://pylonsproject.org/>`_.
@@ -332,6 +332,6 @@ Report issues on the `issue tracker <https://github.com/Pylons/webob/issues>`_.
 If you've got questions that aren't answered by this documentation, contact the
 `pylons-discuss mail list
 <https://groups.google.com/forum/#!forum/pylons-discuss>`_ or join the
-`#pyramid IRC channel <https://webchat.freenode.net/?channels=pyramid>`_.
+`#pyramid IRC channel <https://webchat.freenode.net/#pyramid>`_.
 
 WebOb is released under an :doc:`MIT-style license <license>`.
diff --git a/docs/jsonrpc-example.txt b/docs/jsonrpc-example.txt
index c105913..68db47b 100644
--- a/docs/jsonrpc-example.txt
+++ b/docs/jsonrpc-example.txt
@@ -9,11 +9,11 @@ Introduction
 ------------
 
 This is an example of how to write a web service using WebOb.  The
-example shows how to create a `JSON-RPC <http://json-rpc.org/>`_
+example shows how to create a `JSON-RPC <https://www.jsonrpc.org/>`_
 endpoint using WebOb and the `simplejson
-<https://pypi.python.org/pypi/simplejson>`_ JSON library.  This
+<https://pypi.org/project/simplejson>`_ JSON library.  This
 also shows how to use WebOb as a client library using `WSGIProxy
-<https://pypi.python.org/pypi/WSGIProxy/>`_.
+<https://pypi.org/project/WSGIProxy/>`_.
 
 While this example presents JSON-RPC, this is not an endorsement of
 JSON-RPC.  In fact I don't like JSON-RPC.  It's unnecessarily
@@ -36,7 +36,7 @@ and get the return values.  It also provides a way to get error
 responses.
 
 The `specification
-<http://json-rpc.org/wiki/specification>`_ goes into the
+<https://www.jsonrpc.org/specification_v1>`_ goes into the
 details (though in a vague sort of way).  Here's the basics:
 
 * All access goes through a POST to a single URL.
@@ -318,7 +318,7 @@ code:
 
     class JsonRpcApp(object):
         """
-        Serve the given object via json-rpc (http://json-rpc.org/)
+        Serve the given object via json-rpc (https://www.jsonrpc.org/)
         """
 
         def __init__(self, obj):
diff --git a/docs/reference.txt b/docs/reference.txt
index 13112e3..35ef861 100644
--- a/docs/reference.txt
+++ b/docs/reference.txt
@@ -53,9 +53,9 @@ use this exclusively of other libraries.  If those other libraries
 also keep their state in the environment, multiple wrappers can
 coexist.  Examples of libraries that can coexist include
 `paste.wsgiwrappers.Request
-<https://bitbucket.org/ianb/paste/src/0e5a48796ab969d874c6b772c5c33561ac2d1b0d/paste/wsgiwrappers.py?at=default&fileviewer=file-view-default#wsgiwrappers.py-64>`_
+<https://github.com/cdent/paste/blob/master/paste/wsgiwrappers.py#L64>`_
 (used by Pylons) and `yaro.Request
-<https://pypi.python.org/pypi/yaro>`_.
+<https://pypi.org/project/yaro>`_.
 
 The WSGI environment has a number of required variables.  To make it
 easier to test and play around with, the ``Request`` class has a
diff --git a/docs/whatsnew-1.8.txt b/docs/whatsnew-1.8.txt
index 50fb24a..e8c83fc 100644
--- a/docs/whatsnew-1.8.txt
+++ b/docs/whatsnew-1.8.txt
@@ -24,7 +24,7 @@ Backwards Incompatibilities
 - Many changes have been made to the way WebOb does Accept handling, not just
   for the ``Accept`` header itself, but also for ``Accept-Charset``,
   ``Accept-Encoding`` and ``Accept-Language``. This was a `Google Summer of
-  Code <https://developers.google.com/open-source/gsoc/>`_ project completed by
+  Code <https://summerofcode.withgoogle.com/>`_ project completed by
   Whiteroses (https://github.com/whiteroses). Many thanks to Google for running
   GSoC, the Python Software Foundation for organising and a huge thanks to Ira
   for completing the work. See https://github.com/Pylons/webob/pull/338 and
diff --git a/docs/wiki-example.txt b/docs/wiki-example.txt
index 1afa22d..bacd751 100644
--- a/docs/wiki-example.txt
+++ b/docs/wiki-example.txt
@@ -350,7 +350,7 @@ page doesn't exist.  ``exc.HTTPTemporaryRedirect`` is a response that
 gives a ``307 Temporary Redirect`` response with the given location.
 
 Otherwise we fill in a template.  The template language we're going to
-use in this example is `Tempita <https://pypi.python.org/pypi/Tempita>`_, a
+use in this example is `Tempita <https://pypi.org/project/Tempita>`_, a
 very simple template language with a similar interface to
 :py:class:`string.Template`.