summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Szatrowski <adam.szatrowski@warbyparker.com>2016-10-12 19:27:57 -0400
committerAdam Szatrowski <adam.szatrowski@warbyparker.com>2016-10-12 19:27:57 -0400
commit49c4747a87a4a14fb14eb0784be04dc7a1bca649 (patch)
tree6567c71ce98583025bc1c2af246aa4eb860a2fc7
parent4b94ee113baab901aee881ad94851587c912f785 (diff)
downloadsqlalchemy-pr/314.tar.gz
Replace uses of the phrase "comprised of" in docspr/314
-rw-r--r--doc/build/core/schema.rst2
-rw-r--r--doc/build/orm/nonstandard_mappings.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/core/schema.rst b/doc/build/core/schema.rst
index 8553ebcbf..21d1805f7 100644
--- a/doc/build/core/schema.rst
+++ b/doc/build/core/schema.rst
@@ -10,7 +10,7 @@ This section references SQLAlchemy **schema metadata**, a comprehensive system o
database schemas.
The core of SQLAlchemy's query and object mapping operations are supported by
-*database metadata*, which is comprised of Python objects that describe tables
+*database metadata*, which is composed of Python objects that describe tables
and other schema-level objects. These objects are at the core of three major
types of operations - issuing CREATE and DROP statements (known as *DDL*),
constructing SQL queries, and expressing information about structures that
diff --git a/doc/build/orm/nonstandard_mappings.rst b/doc/build/orm/nonstandard_mappings.rst
index 4645a8029..780154ae3 100644
--- a/doc/build/orm/nonstandard_mappings.rst
+++ b/doc/build/orm/nonstandard_mappings.rst
@@ -9,7 +9,7 @@ Mapping a Class against Multiple Tables
Mappers can be constructed against arbitrary relational units (called
*selectables*) in addition to plain tables. For example, the :func:`~.expression.join`
-function creates a selectable unit comprised of
+function creates a selectable unit composed of
multiple tables, complete with its own composite primary key, which can be
mapped in the same way as a :class:`.Table`::