summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-08-10 10:28:04 -0500
committerGitHub <noreply@github.com>2018-08-10 10:28:04 -0500
commit3ee04cc62205b10eb9041b0df5e156936765202f (patch)
tree666862c069fce963e4fac454b767f08586687686 /docs/glossary.rst
parent0ad05afc020d2790048d4ca85d936b4ea79eae13 (diff)
parent0760eba8fd5a0d8f0424c329ce92e9fb8d003f11 (diff)
downloadpyramid-3ee04cc62205b10eb9041b0df5e156936765202f.tar.gz
pyramid-3ee04cc62205b10eb9041b0df5e156936765202f.tar.bz2
pyramid-3ee04cc62205b10eb9041b0df5e156936765202f.zip
Merge branch 'master' into feature/more-samesite-work
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 7e16b569e..16a719e10 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1206,3 +1206,6 @@ Glossary
context manager
A context manager is an object that defines the runtime context to be established when executing a :ref:`with <python:with>` statement in Python. The context manager handles the entry into, and the exit from, the desired runtime context for the execution of the block of code. Context managers are normally invoked using the ``with`` statement, but can also be used by directly invoking their methods. Pyramid adds context managers for :class:`pyramid.config.Configurator`, :meth:`pyramid.interfaces.IRouter.request_context`, :func:`pyramid.paster.bootstrap`, :func:`pyramid.scripting.prepare`, and :func:`pyramid.testing.testConfig`. See also the Python documentation for :ref:`With Statement Context Managers <python:context-managers>` and :pep:`343`.
+
+ Alembic
+ `Alembic <http://alembic.zzzcomputing.com/en/latest/>`_ is a lightweight database migration tool for usage with the SQLAlchemy Database Toolkit for Python.