Fix doc typo 'conjunection'

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 89cddfc312c67ab035b453bca59360b5e918c7b6..bc9affe4a176a0d403a6cafe911137aa3758589c 100644 (file)
--- 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 6eba38d15cab453959c3801939872537ab645677..1c1a797a680bc93e8b6fb499fb58d5ca2c268763 100644 (file)
--- 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
 
     """