diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
| commit | f4404b11a89f9d32652702190506984a594d8393 (patch) | |
| tree | 67a7b7b22726d89be68383d27da80c3ef4a72cb2 /docs/glossary.rst | |
| parent | 97ee7f3aa8af74a01e51c0c14fda1c0a5a490663 (diff) | |
| parent | 4eade6a2fa6111673231b02344afdc562fe7f05d (diff) | |
| download | pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.gz pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.bz2 pyramid-f4404b11a89f9d32652702190506984a594d8393.zip | |
Merge branch 'master' into deprecate-pickle-sessions
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 587e7c63e..ec4cffef2 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -343,7 +343,7 @@ Glossary full-featured Python web framework. Grok - `A web framework based on Zope 3 <http://grok.zope.org>`_. + `A web framework based on Zope 3 <https://web.archive.org/web/20180615015013/http://grok.zope.org>`_. Django `A full-featured Python web framework <https://www.djangoproject.com/>`_. @@ -1083,7 +1083,7 @@ Glossary Green Unicorn Aka ``gunicorn``, a fast :term:`WSGI` server that runs on Unix under - Python 2.6+ or Python 3.1+. See http://gunicorn.org/ for detailed + Python 2.6+ or Python 3.1+. See https://gunicorn.org/ for detailed information. predicate factory |