diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-10-05 02:33:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 02:33:18 -0700 |
| commit | 086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch) | |
| tree | 1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/glossary.rst | |
| parent | 2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff) | |
| parent | f6becd23966248fb7fc4db218258be4364902f8f (diff) | |
| download | pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2 pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip | |
Merge branch 'master' into one_cc
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index ae7d4cf42..8f94eeaca 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/>`_. @@ -853,7 +853,7 @@ Glossary Localization The process of displaying the user interface of an internationalized application in a particular language or - cultural context. Often shortened to "l10" (because the word + cultural context. Often shortened to "l10n" (because the word "localization" is L, 10 letters, then N). .. seealso:: @@ -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 |