summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-06-22 18:22:21 -0700
committerSteve Piercy <web@stevepiercy.com>2018-06-22 18:22:21 -0700
commitc8f3bf5a70ff74a509a7ec4721797e407a31d507 (patch)
tree76ab039d78a3a96b352421534f9ba90dc7123fdb /docs
parent8b43919a98177d4591736c3125b79ab0eeed290f (diff)
downloadpyramid-c8f3bf5a70ff74a509a7ec4721797e407a31d507.tar.gz
pyramid-c8f3bf5a70ff74a509a7ec4721797e407a31d507.tar.bz2
pyramid-c8f3bf5a70ff74a509a7ec4721797e407a31d507.zip
Add mention of migrations and Alembic in design and glossary.
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst3
-rw-r--r--docs/tutorials/wiki2/design.rst2
2 files changed, 4 insertions, 1 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.
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index 515aff276..e3b35d24a 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -19,7 +19,7 @@ Models
======
We'll be using an SQLite database to hold our wiki data, and we'll be using
-:term:`SQLAlchemy` to access the data in this database.
+:term:`SQLAlchemy` to access the data in this database. We will also use :term:`Alembic` for database migrations, including initialization of the SQLite database.
Within the database, we will define two tables: