From 364a98d4a1e5061a063657940ad9b06280cf512d Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sat, 19 May 2018 14:52:36 +0200
Subject: [PATCH] Merge pull request #3296 from stevepiercy/1.8-branch

---
 docs/glossary.rst |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/glossary.rst b/docs/glossary.rst
index e668713..6dc12e3 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -330,9 +330,9 @@
      *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
+     encoding, and other functions.  See `WSGI documentation
      <http://wsgi.readthedocs.org/en/latest/>`_ or `PyPI
-     <https://pypi.python.org/pypi>`_ to find middleware for your application.
+     <https://pypi.org/>`_ to find middleware for your application.
 
    pipeline
      The :term:`PasteDeploy` term for a single configuration of a WSGI
@@ -386,7 +386,7 @@
      between templates.
 
    Genshi
-     An `XML templating language <https://pypi.python.org/pypi/Genshi/>`_
+     An `XML templating language <https://pypi.org/project/Genshi/>`_
      by Christopher Lenz.
 
    Jinja2
@@ -441,7 +441,7 @@
      subpath.  See :ref:`star_subpath` for more information.
 
    interface
-     A `Zope interface <https://pypi.python.org/pypi/zope.interface>`_
+     A `Zope interface <https://pypi.org/project/zope.interface/>`_
      object.  In :app:`Pyramid`, an interface may be attached to a
      :term:`resource` object or a :term:`request` object in order to
      identify that the object is "of a type".  Interfaces are used
@@ -487,7 +487,7 @@
 
    repoze.catalog
      An indexing and search facility (fielded and full-text) based on
-     `zope.index <https://pypi.python.org/pypi/zope.index>`_.  See `the
+     `zope.index <https://pypi.org/project/zope.index/>`_.  See `the
      documentation <http://docs.repoze.org/catalog>`_ for more
      information.
 
@@ -699,7 +699,7 @@
      :ref:`multidict_narr` and :class:`pyramid.interfaces.IMultiDict`.
 
    PyPI
-     `The Python Package Index <https://pypi.python.org/pypi>`_, a collection
+     `The Python Package Index <https://pypi.org/>`_, a collection
      of software available for Python.
 
    Agendaless Consulting
@@ -1087,7 +1087,7 @@
    pyramid_redis_sessions
       A package by Eric Rasmussen which allows you to store Pyramid session 
       data in a Redis database.  See 
-      https://pypi.python.org/pypi/pyramid_redis_sessions for more information.
+      https://pypi.org/project/pyramid_redis_sessions/ for more information.
 
    cache busting
       A technique used when serving a cacheable static asset in order to force

--
Gitblit v1.9.3