summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorGunnlaugur Þór Briem <gunnlaugur@gmail.com>2014-07-31 23:26:18 +0000
committerGunnlaugur Þór Briem <gunnlaugur@gmail.com>2014-08-21 18:38:23 +0000
commita12fcd1487f6ae210486fa4a015d9ea71e3bb7d7 (patch)
tree86d4b75d9cf0261f30243e979f643220ee303126 /lib/sqlalchemy
parent7c4d0a4d6611fd891fb7afda6db277e9fbf83e70 (diff)
downloadsqlalchemy-pr/130.tar.gz
Fix doc typo 'conjunection'pr/130
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/pool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 89cddfc31..bc9affe4a 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -305,7 +305,7 @@ class Pool(log.Identified):
"""Return a new :class:`.Pool`, of the same class as this one
and configured with identical creation arguments.
- This method is used in conjunection with :meth:`dispose`
+ This method is used in conjunction with :meth:`dispose`
to close out an entire :class:`.Pool` and create a new one in
its place.