summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
committerChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
commitb2e8884a94d9e869bf29ea55298ad308f16ed420 (patch)
treee46bf79d1a8811ad273a40ce194d05836fcc7409 /docs/glossary.rst
parent7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff)
parent40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff)
downloadpyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst30
1 files changed, 25 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 9b41b4359..0f299c169 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -568,7 +568,7 @@ Glossary
:ref:`adding_and_overriding_renderers` for more information.
mod_wsgi
- `mod_wsgi <https://code.google.com/archive/p/modwsgi>`_ is an Apache
+ `mod_wsgi <https://modwsgi.readthedocs.io>`_ 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.
@@ -992,7 +992,7 @@ Glossary
pages rendered by your application, displaying request, routing, and
database information. :mod:`pyramid_debugtoolbar` is configured into
the ``development.ini`` of all applications which use a Pyramid
- :term:`scaffold`. For more information, see
+ :term:`cookiecutter`. For more information, see
http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest/.
scaffold
@@ -1000,6 +1000,10 @@ Glossary
application and helps users to quickly get started writing larger
applications. Scaffolds are usually used via the ``pcreate`` command.
+ .. deprecated:: 1.8
+
+ .. seealso:: See also :term:`cookiecutter`.
+
pyramid_exclog
A package which logs Pyramid application exception (error) information
to a standard Python logger. This add-on is most useful when
@@ -1058,8 +1062,8 @@ Glossary
:class:`pyramid.interfaces.IAssetDescriptor`.
Waitress
- A :term:`WSGI` server that runs on UNIX and Windows under Python 2.6+
- and Python 3.2+. Projects generated via Pyramid scaffolding use
+ A :term:`WSGI` server that runs on UNIX and Windows under Python 2.7+
+ and Python 3.3+. Projects generated via Pyramid cookiecutters use
Waitress as a WGSI server. See
http://docs.pylonsproject.org/projects/waitress/en/latest/ for detailed
information.
@@ -1133,4 +1137,20 @@ Glossary
Python Packaging Authority
The `Python Packaging Authority (PyPA) <https://www.pypa.io/en/latest/>`_
is a working group that maintains many of the relevant projects in Python
- packaging. \ No newline at end of file
+ packaging.
+
+ cookiecutter
+ A command-line utility that creates projects from :ref:`cookiecutters <cookiecutter:readme>` (project templates), e.g., creating a Python package project from a Python package project template.
+
+ Pyramid cookiecutters include:
+
+ * `pyramid-cookiecutter-alchemy <https://github.com/Pylons/pyramid-cookiecutter-alchemy>`_
+ * `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
+ * `pyramid-cookiecutter-zodb <https://github.com/Pylons/pyramid-cookiecutter-zodb>`_
+
+ .. versionadded:: 1.8
+
+ .. seealso:: See also :term:`scaffold`.
+
+ coverage
+ A measurement of code coverage, usually expressed as a percentage of which lines of code have been executed over which lines are executable, typically run during test execution.