more linkcheck and intersphinx fixes

4 files changed, 12 insertions, 13 deletions

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 32ae5ed..9d2a7bb 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -54,7 +54,7 @@ Execute tests
 Use tox to test many Python versions
 ====================================
 
-`Tox <http://tox.testrun.org/>`_ installation :
+`Tox <https://tox.readthedocs.io/en/latest/>`_ installation :
 
 .. code-block:: bash
 
diff --git a/docs/index.rst b/docs/index.rst
index c18b33e..9171833 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,15 +10,15 @@ Status & License
 ================
 
 WebTest is an extraction of ``paste.fixture.TestApp``, rewriting
-portions to use `WebOb <http://docs.webob.org/>`_.  It is under
+portions to use `WebOb <https://webob.org>`_.  It is under
 active development as part of the Pylons cloud of packages.
 
 Feedback and discussion should take place on the `Pylons discuss list
-<https://groups.google.com/forum/?fromgroups#!forum/pylons-discuss>`_, and bugs
+<https://groups.google.com/forum/#!forum/pylons-discuss>`_, and bugs
 should go into the `Github tracker
 <https://github.com/Pylons/webtest/issues>`_.
 
-This library is licensed under an `MIT-style license <license.html>`_.
+This library is licensed under an :ref:`MIT-style license <license>`.
 
 Installation
 ============
@@ -121,4 +121,6 @@ Contents
    contributing.rst
    changelog.rst
 
+.. _license:
+
 .. include:: license.rst
diff --git a/docs/testapp.rst b/docs/testapp.rst
index 911daca..e600eb0 100644
--- a/docs/testapp.rst
+++ b/docs/testapp.rst
@@ -143,8 +143,7 @@ shouldn't have to check everytime you do a request.  It is assumed
 that the response will either be a 2xx or 3xx response; if it isn't an
 exception will be raised (you can override this for a request, of
 course).  The WSGI application is tested for WSGI compliance with
-a slightly modified version of `wsgiref.validate
-<http://python.org/doc/current/lib/module-wsgiref.validate.html>`_
+a slightly modified version of :mod:`python:wsgiref.validate`
 (modified to support arguments to ``InputWrapper.readline``)
 automatically.  Also it checks that nothing is printed to the
 ``environ['wsgi.errors']`` error stream, which typically indicates a
diff --git a/docs/testresponse.rst b/docs/testresponse.rst
index 0eb1343..bfaa0eb 100644
--- a/docs/testresponse.rst
+++ b/docs/testresponse.rst
@@ -59,7 +59,7 @@ The added methods:
 ``str(response)``:
     Gives a slightly-compacted version of the response.  This is
     compacted to remove newlines, making it easier to use with
-    `doctest <http://python.org/doc/current/lib/module-doctest.html>`_
+    :mod:`python:doctest`.
 
 ``response.click(description=None, linkid=None, href=None, anchor=None, index=None, verbose=False)``:
     Clicks the described link (see :meth:`~webtest.response.TestResponse.click`)
@@ -93,7 +93,7 @@ are the attributes:
 
 ``response.html``:
     Return a `BeautifulSoup
-    <http://www.crummy.com/software/BeautifulSoup/>`_ version of the
+    <https://www.crummy.com/software/BeautifulSoup/>`_ version of the
     response body::
 
         >>> res = app.get('/index.html')
@@ -103,8 +103,7 @@ are the attributes:
         <class '...BeautifulSoup'>
 
 ``response.xml``:
-    Return an `ElementTree
-    <http://python.org/doc/current/lib/module-xml.etree.ElementTree.html>`_
+    Return an :mod:`ElementTree <python:xml.etree.ElementTree>`
     version of the response body::
 
         >>> res = app.get('/document.xml')
@@ -117,8 +116,7 @@ are the attributes:
 
 
 ``response.lxml``:
-    Return an `lxml <http://codespeak.net/lxml/>`_ version of the
-    response body::
+    Return an `lxml <https://lxml.de/>`_ version of the response body::
 
         >>> res = app.get('/index.html')
         >>> res.lxml
@@ -135,7 +133,7 @@ are the attributes:
         'hey!'
 
 ``response.pyquery``:
-    Return an `PyQuery <http://pypi.python.org/pypi/pyquery>`_ version of the
+    Return a `PyQuery <https://pypi.org/project/pyquery/>`_ version of the
     response body::
 
         >>> res.pyquery('message')