From a12fcd1487f6ae210486fa4a015d9ea71e3bb7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gunnlaugur=20=C3=9E=C3=B3r=20Briem?= Date: Thu, 31 Jul 2014 23:26:18 +0000 Subject: Fix doc typo 'conjunection' --- lib/sqlalchemy/pool.py | 2 +- test/orm/test_options.py | 2 +- 2 files changed, 2 insertions(+), 2 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. diff --git a/test/orm/test_options.py b/test/orm/test_options.py index 6eba38d15..1c1a797a6 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 """ -- cgit v1.2.1