From: Gunnlaugur Þór Briem <gunnlaugur@gmail.com>
Date: Thu, 31 Jul 2014 23:26:18 +0000 (+0000)
Subject: Fix doc typo 'conjunection'
X-Git-Tag: rel_0_9_8~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea503767a23e474735a858d97475e2505009a88c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix doc typo 'conjunection'
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 89cddfc312..bc9affe4a1 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.
 
diff --git a/test/orm/test_options.py b/test/orm/test_options.py
index 6eba38d15c..1c1a797a68 100644
--- a/test/orm/test_options.py
+++ b/test/orm/test_options.py
@@ -497,7 +497,7 @@ class OptionsTest(PathTest, QueryTest):
 
 class OptionsNoPropTest(_fixtures.FixtureTest):
     """test the error messages emitted when using property
-    options in conjunection with column-only entities, or
+    options in conjunction with column-only entities, or
     for not existing options
 
     """