diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 21:54:04 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 21:54:04 -0500 |
| commit | 58d2a5f14bb787defefe7a2b1b36665c4991c0da (patch) | |
| tree | 3eff83e38ad641e7285ce6788cad47a12fa14262 /docs/glossary.rst | |
| parent | f081ae991a9107363fceeeeccd361c2f85bdd046 (diff) | |
| parent | 279ee00fff1894b3451d84a8eeafae42e8638776 (diff) | |
| download | pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.gz pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.bz2 pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.zip | |
Merge branch 'master' into fix-deprecated-accept-predicate
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 7244aeb8d..7a9c91668 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 |