diff --git a/docs/404.rst b/docs/404.rst
index ffef38e..f4fc9fc 100644
--- a/docs/404.rst
+++ b/docs/404.rst
@@ -1,3 +1,4 @@
+:orphan:
 
 #################
 404 — Not Found
diff --git a/docs/conf.py b/docs/conf.py
index 81fcc6f..974736f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -279,5 +279,5 @@ epub_exclude_files = [
 todo_include_todos = True
 
 intersphinx_mapping = {
-    'python': ('http://docs.python.org/', None),
+    'python': ('https://docs.python.org/3', None),
 }
diff --git a/docs/scenarios/crypto.rst b/docs/scenarios/crypto.rst
index e6956d7..55cad28 100644
--- a/docs/scenarios/crypto.rst
+++ b/docs/scenarios/crypto.rst
@@ -48,7 +48,7 @@ GPGME bindings
 
 The `GPGME Python bindings <https://dev.gnupg.org/source/gpgme/browse/master/lang/python/>`_ provide pythonic access to `GPG Made Easy <https://dev.gnupg.org/source/gpgme/browse/master/>`_, a C API for the entire GNU Privacy Guard suite of projects, including GPG, libgcrypt and gpgsm (the S/MIME engine). It supports Python 2.6, 2.7, 3.4 and above. Depends on the SWIG C interface for Python as well as the GnuPG software and libraries.
 
-A more comprehensive `GPGME Python Bindings HOWTO <https://dev.gnupg.org/source/gpgme/browse/master/lang/python/docs/GPGMEpythonHOWTOen.org>`_ is available with the source and a HTML version is available `here <http://files.au.adversary.org/crypto/GPGMEpythonHOWTOen.html>`_.  Python 3 sample scripts from the examples in the HOWTO are also provided with the source and are accessible `here <https://dev.gnupg.org/source/gpgme/browse/master/lang/python/examples/howto/>`_.
+A more comprehensive `GPGME Python Bindings HOWTO <https://dev.gnupg.org/source/gpgme/browse/master/lang/python/docs/GPGMEpythonHOWTOen.org>`_ is available with the source, and a HTML version is available `on http://files.au.adversary.org <http://files.au.adversary.org/crypto/GPGMEpythonHOWTOen.html>`_.  Python 3 sample scripts from the examples in the HOWTO are also provided with the source and are accessible `on gnupg.org <https://dev.gnupg.org/source/gpgme/browse/master/lang/python/examples/howto/>`_.
 
 Available under the same terms as the rest of the GnuPG Project: GPLv2 and LGPLv2.1, both with the "or any later version" clause.
 
diff --git a/docs/scenarios/web.rst b/docs/scenarios/web.rst
index 40b6656..b83ac0b 100644
--- a/docs/scenarios/web.rst
+++ b/docs/scenarios/web.rst
@@ -136,7 +136,7 @@ applications today.
 Masonite
 --------
 
-`Masonite <https://docs.masoniteproject.com>`_ is a modern and developer centric, "batteries included", web framework. 
+`Masonite <https://docs.masoniteproject.com>`_ is a modern and developer centric, "batteries included", web framework.
 
 The Masonite framework follows the MVC (Model-View-Controller) architecture pattern and is heavily inspired by frameworks such as Rails and Laravel, so if you are coming to Python from a Ruby or PHP background then you will feel right at home!
 
@@ -170,7 +170,7 @@ WSGI Servers
 ************
 
 Stand-alone WSGI servers typically use less resources than traditional web
-servers and provide top performance [3]_.
+servers and provide top performance [1]_.
 
 .. _gunicorn-ref:
 
@@ -531,6 +531,4 @@ Mako is well respected within the Python web community.
 
 .. rubric:: References
 
-.. [1] `The mod_python project is now officially dead <http://blog.dscpl.com.au/2010/06/modpython-project-is-now-officially.html>`_
-.. [2] `mod_wsgi vs mod_python <http://modpython.org/pipermail/mod_python/2007-July/024080.html>`_
-.. [3] `Benchmark of Python WSGI Servers <http://nichol.as/benchmark-of-python-web-servers>`_
+.. [1] `Benchmark of Python WSGI Servers <http://nichol.as/benchmark-of-python-web-servers>`_