From 7b16126c85c466be09868c26ea67e09bfa18a446 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 27 Jun 2017 10:06:50 +0200
Subject: [PATCH] Update all external links per `make linkcheck` - Most are changing http to https, or readthedocs.org to readthedocs.io,   and some for Python packaging reorganizing some docs into tutorials,   as well as miscellaneous changes.

---
 docs/tutorials/wiki2/installation.rst |    2 +-
 docs/narr/i18n.rst                    |    2 +-
 docs/quick_tutorial/package.rst       |    2 +-
 docs/narr/project.rst                 |    2 +-
 docs/copyright.rst                    |    2 +-
 docs/glossary.rst                     |   20 ++++++++++----------
 docs/narr/firstapp.rst                |    2 +-
 docs/narr/introduction.rst            |    4 ++--
 docs/narr/scaffolding.rst             |    2 +-
 docs/typographical-conventions.rst    |    2 +-
 docs/narr/webob.rst                   |    4 ++--
 docs/tutorials/wiki/installation.rst  |    2 +-
 docs/narr/install.rst                 |    4 ++--
 docs/narr/templates.rst               |    2 +-
 docs/narr/sessions.rst                |    4 ++--
 pyramid/request.py                    |    2 +-
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/docs/copyright.rst b/docs/copyright.rst
index e0833fa..be47aef 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -18,7 +18,7 @@
 All rights reserved.  This material may be copied or distributed only
 subject to the terms and conditions set forth in the `Creative Commons
 Attribution-Noncommercial-Share Alike 3.0 United States License
-<http://creativecommons.org/licenses/by-nc-sa/3.0/us/>`_.  You must
+<https://creativecommons.org/licenses/by-nc-sa/3.0/us/>`_.  You must
 give the original author credit.  You may not use this work for
 commercial purposes.  If you alter, transform, or build upon this
 work, you may distribute the resulting work only under the same or
diff --git a/docs/glossary.rst b/docs/glossary.rst
index ce8e727..fe2d097 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -321,7 +321,7 @@
      :term:`principal` (or principals) associated with a request.
 
    WSGI
-     `Web Server Gateway Interface <http://wsgi.readthedocs.org/en/latest/>`_.
+     `Web Server Gateway Interface <https://wsgi.readthedocs.io/en/latest/>`_.
      This is a Python standard for connecting web applications to web servers,
      similar to the concept of Java Servlets.  :app:`Pyramid` requires that
      your application be served as a WSGI application.
@@ -330,8 +330,8 @@
      *Middleware* is a :term:`WSGI` concept.  It is a WSGI component
      that acts both as a server and an application.  Interesting uses
      for middleware exist, such as caching, content-transport
-     encoding, and other functions.  See `WSGI.org
-     <http://wsgi.readthedocs.org/en/latest/>`_ or `PyPI
+     encoding, and other functions.  See `WSGI documentation
+     <https://wsgi.readthedocs.io/en/latest/>`_ or `PyPI
      <https://pypi.python.org/pypi>`_ to find middleware for your application.
 
    pipeline
@@ -339,7 +339,7 @@
      server, a WSGI application, with a set of :term:`middleware` in-between.
 
    Zope
-     `The Z Object Publishing Framework <http://zope.org>`_, a
+     `The Z Object Publishing Framework <http://www.zope.org/en/latest/>`_, a
      full-featured Python web framework.
 
    Grok
@@ -357,7 +357,7 @@
       Python object store.
 
    WebOb
-     `WebOb <http://webob.org>`_ is a WSGI request/response
+     `WebOb <https://webob.org>`_ is a WSGI request/response
      library created by Ian Bicking.
 
    PasteDeploy
@@ -375,7 +375,7 @@
      integrated support for loading a :term:`PasteDeploy` INI file.
 
    Chameleon
-     `chameleon <https://chameleon.readthedocs.org/en/latest/>`_ is an
+     `chameleon <https://chameleon.readthedocs.io/en/latest/>`_ is an
      attribute language template compiler which supports the :term:`ZPT`
      templating specification. It is written and maintained by Malthe Borch. It
      has several extensions, such as the ability to use bracketed (Mako-style)
@@ -401,7 +401,7 @@
      A `text templating language <http://jinja.pocoo.org/>`_ by Armin Ronacher.
 
    Routes
-     A `system by Ben Bangert <http://routes.readthedocs.org/en/latest/>`_
+     A `system by Ben Bangert <https://routes.readthedocs.io/en/latest/>`_
      which parses URLs and compares them against a number of user defined
      mappings. The URL pattern matching syntax in :app:`Pyramid` is inspired by
      the Routes syntax (which was inspired by Ruby On Rails pattern syntax).
@@ -500,7 +500,7 @@
      information.
 
    repoze.who
-     `Authentication middleware <http://repozewho.readthedocs.org/en/latest/>`_
+     `Authentication middleware <https://repozewho.readthedocs.io/en/latest/>`_
      for :term:`WSGI` applications.  It can be used by :app:`Pyramid` to
      provide authentication information.
 
@@ -576,7 +576,7 @@
      :ref:`adding_and_overriding_renderers` for more information.
 
    mod_wsgi
-     `mod_wsgi <https://modwsgi.readthedocs.io>`_ is an Apache
+     `mod_wsgi <https://modwsgi.readthedocs.io/en/develop/>`_ is an Apache
      module developed by Graham Dumpleton.  It allows :term:`WSGI` applications
      (such as applications developed using :app:`Pyramid`) to be served using
      the Apache web server.
@@ -1130,7 +1130,7 @@
       The :term:`Python Packaging Authority` formerly recommended using the
       ``pyvenv`` command for `creating virtual environments on Python 3.4 and
       3.5
-      <https://packaging.python.org/en/latest/installing/#creating-virtual-environments>`_,
+      <https://packaging.python.org/tutorials/installing-packages/#creating-virtual-environments>`_,
       but it was deprecated in 3.6 in favor of ``python3 -m venv`` on UNIX or
       ``python -m venv`` on Windows, which is backward compatible on Python
       3.3 and greater.
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index ad05976..63142ed 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -197,7 +197,7 @@
 server to present an application to a requestor. :term:`WSGI` is a protocol
 that allows servers to talk to Python applications.  We don't discuss
 :term:`WSGI` in any depth within this book, but you can learn more about it by
-reading its `documentation <http://wsgi.readthedocs.org/en/latest/>`_.
+reading its `documentation <https://wsgi.readthedocs.io/en/latest/>`_.
 
 The :app:`Pyramid` application object, in particular, is an instance of a class
 representing a :app:`Pyramid` :term:`router`.  It has a reference to the
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 29d4dd0..e645843 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -647,7 +647,7 @@
 
 The features represented by attributes of the ``i18n`` namespace of Chameleon
 will also consult the :app:`Pyramid` translations. See
-http://chameleon.readthedocs.org/en/latest/reference.html#translation-i18n.
+https://chameleon.readthedocs.io/en/latest/reference.html#translation-i18n.
 
 .. note::
 
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index c2bd00b..61c6e6c 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -54,7 +54,7 @@
 You can install the latest verion of Python for Mac OS X from the binaries on
 `python.org <https://www.python.org/downloads/mac-osx/>`_.
 
-Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager.
+Alternatively, you can use the `homebrew <https://brew.sh/>`_ package manager.
 
 .. code-block:: text
 
@@ -157,7 +157,7 @@
 
 .. seealso:: See the Python Packaging Authority's (PyPA) documention
    `Requirements for Installing Packages
-   <https://packaging.python.org/en/latest/installing/#requirements-for-installing-packages>`_
+   <https://packaging.python.org/tutorials/installing-packages/#requirements-for-installing-packages>`_
    for full details.
 
 
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 4efc35d..efc8825 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -52,7 +52,7 @@
 Tested
 ~~~~~~
 
-Untested code is broken by design. The :app:`Pyramid` community has a strong testing culture and our framework reflects that. Every release of :app:`Pyramid` has 100% statement coverage (as measured by `coverage <https://coverage.readthedocs.io>`_) and 95% decision/condition coverage. (as measured by `instrumental <http://instrumental.readthedocs.io/en/latest/intro.html>`_) It is automatically tested using `Travis <https://travis-ci.org/Pylons/pyramid>`_ and `Jenkins <http://jenkins.pylonsproject.org/job/pyramid/>`_ on supported versions of Python after each commit to its GitHub repository. `Official Pyramid add-ons <https://trypyramid.com/resources-extending-pyramid.html>`_ are held to a similar testing standard.
+Untested code is broken by design. The :app:`Pyramid` community has a strong testing culture and our framework reflects that. Every release of :app:`Pyramid` has 100% statement coverage (as measured by `coverage <http://coverage.readthedocs.io/en/latest/>`_) and 95% decision/condition coverage. (as measured by `instrumental <http://instrumental.readthedocs.io/en/latest/intro.html>`_) It is automatically tested using `Travis <https://travis-ci.org/Pylons/pyramid>`_ and `Jenkins <http://jenkins.pylonsproject.org/job/pyramid/>`_ on supported versions of Python after each commit to its GitHub repository. `Official Pyramid add-ons <https://trypyramid.com/resources-extending-pyramid.html>`_ are held to a similar testing standard.
 
 We still find bugs in :app:`Pyramid`, but we've noticed we find a lot fewer of them while working on projects with a solid testing regime.
 
@@ -324,7 +324,7 @@
 
 The :app:`Pyramid` core is fast. It has been engineered from the ground up for speed. It only does as much work as absolutely necessary when you ask it to get a job done. If you need speed from your application, :app:`Pyramid` is the right choice for you.
 
-Example: http://blog.curiasolutions.com/pages/the-great-web-framework-shootout.html
+Example: https://blog.curiasolutions.com/pages/the-great-web-framework-shootout.html
 
 Store session data
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 776a0de..d662649 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -740,7 +740,7 @@
    ``setup.py`` is the de facto standard which Python developers use to
    distribute their reusable code.  You can read more about ``setup.py`` files
    and their usage in the `Python Packaging User Guide
-   <https://packaging.python.org/en/latest/>`_ and `Setuptools documentation
+   <https://packaging.python.org/>`_ and `Setuptools documentation
    <http://pythonhosted.org/setuptools/>`_.
 
 Our generated ``setup.py`` looks like this:
diff --git a/docs/narr/scaffolding.rst b/docs/narr/scaffolding.rst
index 27239d3..82ae0f9 100644
--- a/docs/narr/scaffolding.rst
+++ b/docs/narr/scaffolding.rst
@@ -27,7 +27,7 @@
 To create a scaffold template, create a Python :term:`distribution` to house
 the scaffold which includes a ``setup.py`` that relies on the ``setuptools``
 package.  See `Packaging and Distributing Projects
-<https://packaging.python.org/en/latest/distributing/>`_ for more information
+<https://packaging.python.org/tutorials/distributing-packages/>`_ for more information
 about how to do this.  For example, we'll pretend the distribution you create
 is named ``CoolExtension``, and it has a package directory within it named
 ``coolextension``.
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index 7e2469d..b34d7a4 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -174,10 +174,10 @@
 .. _PyNaCl: https://pynacl.readthedocs.io/en/latest/secret/
 
 .. _pyramid_redis_sessions: https://pypi.python.org/pypi/pyramid_redis_sessions
-.. _Redis: http://redis.io/
+.. _Redis: https://redis.io/
 
 .. _pyramid_beaker: https://pypi.python.org/pypi/pyramid_beaker
-.. _Beaker: http://beaker.readthedocs.org/en/latest/
+.. _Beaker: https://beaker.readthedocs.io/en/latest/
 
 .. index::
    single: session factory (custom)
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 6738e92..156cb86 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -448,7 +448,7 @@
 | Mako_                     | pyramid_mako_              | .mak, .mako        |
 +---------------------------+----------------------------+--------------------+
 
-.. _Chameleon: http://chameleon.readthedocs.org/en/latest/
+.. _Chameleon: https://chameleon.readthedocs.io/en/latest/
 .. _pyramid_chameleon:
    https://docs.pylonsproject.org/projects/pyramid-chameleon/en/latest/
 
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 578fdeb..4063515 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -27,7 +27,7 @@
 :ref:`request_module` API documentation.
 
 WebOb provides objects for HTTP requests and responses.  Specifically it does
-this by wrapping the `WSGI <http://wsgi.readthedocs.org/en/latest/>`_ request
+this by wrapping the `WSGI <https://wsgi.readthedocs.io/en/latest/>`_ request
 environment and response status, header list, and app_iter (body) values.
 
 WebOb request and response objects provide many conveniences for parsing WSGI
@@ -88,7 +88,7 @@
 ``req.urlvars`` and ``req.urlargs``
     ``req.urlvars`` are the keyword parameters associated with the request URL.
     ``req.urlargs`` are the positional parameters. These are set by products
-    like `Routes <http://routes.readthedocs.org/en/latest/>`_ and `Selector
+    like `Routes <https://routes.readthedocs.io/en/latest/>`_ and `Selector
     <https://github.com/lukearno/selector>`_.
 
 Also for standard HTTP request headers, there are usually attributes such as
diff --git a/docs/quick_tutorial/package.rst b/docs/quick_tutorial/package.rst
index 94cb39f..66bafcd 100644
--- a/docs/quick_tutorial/package.rst
+++ b/docs/quick_tutorial/package.rst
@@ -108,4 +108,4 @@
 
 .. seealso:: :ref:`Python Packages <python:tut-packages>` and `Working in
    "Development Mode"
-   <https://packaging.python.org/en/latest/distributing/#working-in-development-mode>`_.
+   <https://packaging.python.org/tutorials/distributing-packages/#working-in-development-mode>`_.
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index fba488a..33cde17 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -388,4 +388,4 @@
    https://docs.pylonsproject.org/projects/pyramid-zodbconn/en/latest/
 
 .. _transaction:
-   http://zodb.readthedocs.org/en/latest/transactions.html
+   https://zodb.readthedocs.io/en/latest/transactions.html
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index d2c3308..5936c5a 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -471,4 +471,4 @@
    https://pypi.python.org/pypi/zope.sqlalchemy
 
 .. _transaction:
-   http://zodb.readthedocs.org/en/latest/transactions.html
+   https://zodb.readthedocs.io/en/latest/transactions.html
diff --git a/docs/typographical-conventions.rst b/docs/typographical-conventions.rst
index 5efc496..f128eff 100644
--- a/docs/typographical-conventions.rst
+++ b/docs/typographical-conventions.rst
@@ -35,7 +35,7 @@
 
 Links are presented as follows, and may be clickable.
 
-`TryPyramid <https://TryPyramid.com>`_
+`TryPyramid <https://trypyramid.com>`_
 
 .. seealso:: See also :ref:`typographical-conventions-cross-references` for other links within the documentation.
 
diff --git a/pyramid/request.py b/pyramid/request.py
index c1c1da5..201f1d6 100644
--- a/pyramid/request.py
+++ b/pyramid/request.py
@@ -175,7 +175,7 @@
     version number from which this documentation is autogenerated, but
     it will be the 'prevailing WebOb version' at the time of the
     release of this :app:`Pyramid` version.  See
-    http://webob.org/ for further information.
+    https://webob.org/ for further information.
     """
     exception = None
     exc_info = None

--
Gitblit v1.9.3