merge latest default

3 files changed, 20 insertions, 20 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 626fee8c6..e3b09e63a 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -121,7 +121,7 @@ class Connection(Connectable):
 
         Note that any key/value can be passed to
         :meth:`.Connection.execution_options`, and it will be stored in the
-        ``_execution_options`` dictionary of the :class:`.Connnection`.   It
+        ``_execution_options`` dictionary of the :class:`.Connection`.   It
         is suitable for usage by end-user schemes to communicate with
         event listeners, for example.
 
@@ -1295,8 +1295,8 @@ class TwoPhaseTransaction(Transaction):
 class Engine(Connectable, log.Identified):
     """
     Connects a :class:`~sqlalchemy.pool.Pool` and
-    :class:`~sqlalchemy.engine.base.Dialect` together to provide a source
-    of database connectivity and behavior.
+    :class:`~sqlalchemy.engine.interfaces.Dialect` together to provide a
+    source of database connectivity and behavior.
 
     An :class:`.Engine` object is instantiated publicly using the
     :func:`~sqlalchemy.create_engine` function.
@@ -1426,15 +1426,15 @@ class Engine(Connectable, log.Identified):
 
     @property
     def name(self):
-        """String name of the :class:`~sqlalchemy.engine.Dialect` in use by
-        this ``Engine``."""
+        """String name of the :class:`~sqlalchemy.engine.interfaces.Dialect`
+        in use by this :class:`Engine`."""
 
         return self.dialect.name
 
     @property
     def driver(self):
-        """Driver name of the :class:`~sqlalchemy.engine.Dialect` in use by
-        this ``Engine``."""
+        """Driver name of the :class:`~sqlalchemy.engine.interfaces.Dialect`
+        in use by this :class:`Engine`."""
 
         return self.dialect.driver
 
diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index 8367d8761..f1681d616 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -55,7 +55,7 @@ class Inspector(object):
     """Performs database schema inspection.
 
     The Inspector acts as a proxy to the reflection methods of the
-    :class:`~sqlalchemy.engine.base.Dialect`, providing a
+    :class:`~sqlalchemy.engine.interfaces.Dialect`, providing a
     consistent interface as well as caching support for previously
     fetched metadata.
 
@@ -72,7 +72,7 @@ class Inspector(object):
         engine = create_engine('...')
         insp = Inspector.from_engine(engine)
 
-    Where above, the :class:`~sqlalchemy.engine.base.Dialect` may opt
+    Where above, the :class:`~sqlalchemy.engine.interfaces.Dialect` may opt
     to return an :class:`.Inspector` subclass that provides additional
     methods specific to the dialect's target database.
 
@@ -81,13 +81,13 @@ class Inspector(object):
     def __init__(self, bind):
         """Initialize a new :class:`.Inspector`.
 
-        :param bind: a :class:`~sqlalchemy.engine.base.Connectable`,
+        :param bind: a :class:`~sqlalchemy.engine.Connectable`,
           which is typically an instance of
           :class:`~sqlalchemy.engine.Engine` or
           :class:`~sqlalchemy.engine.Connection`.
 
         For a dialect-specific instance of :class:`.Inspector`, see
-        :meth:`Inspector.from_engine`
+        :meth:`.Inspector.from_engine`
 
         """
         # this might not be a connection, it could be an engine.
@@ -111,16 +111,16 @@ class Inspector(object):
         """Construct a new dialect-specific Inspector object from the given
         engine or connection.
 
-        :param bind: a :class:`~sqlalchemy.engine.base.Connectable`,
+        :param bind: a :class:`~sqlalchemy.engine.Connectable`,
           which is typically an instance of
           :class:`~sqlalchemy.engine.Engine` or
           :class:`~sqlalchemy.engine.Connection`.
 
         This method differs from direct a direct constructor call of
         :class:`.Inspector` in that the
-        :class:`~sqlalchemy.engine.base.Dialect` is given a chance to provide
-        a dialect-specific :class:`.Inspector` instance, which may provide
-        additional methods.
+        :class:`~sqlalchemy.engine.interfaces.Dialect` is given a chance to
+        provide a dialect-specific :class:`.Inspector` instance, which may
+        provide additional methods.
 
         See the example at :class:`.Inspector`.
 
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 98b0ea4b2..dcfd5ac31 100644
--- a/lib/sqlalchemy/engine/result.py
+++ b/lib/sqlalchemy/engine/result.py
@@ -557,7 +557,7 @@ class ResultProxy(object):
         supports "returning" and the insert statement executed
         with the "implicit returning" enabled.
 
-        Raises :class:`.InvalidRequestError` if the executed
+        Raises :class:`~sqlalchemy.exc.InvalidRequestError` if the executed
         statement is not a compiled expression construct
         or is not an insert() construct.
 
@@ -583,7 +583,7 @@ class ResultProxy(object):
         """Return the collection of updated parameters from this
         execution.
 
-        Raises :class:`.InvalidRequestError` if the executed
+        Raises :class:`~sqlalchemy.exc.InvalidRequestError` if the executed
         statement is not a compiled expression construct
         or is not an update() construct.
 
@@ -605,7 +605,7 @@ class ResultProxy(object):
         """Return the collection of inserted parameters from this
         execution.
 
-        Raises :class:`.InvalidRequestError` if the executed
+        Raises :class:`~sqlalchemy.exc.InvalidRequestError` if the executed
         statement is not a compiled expression construct
         or is not an insert() construct.
 
@@ -639,7 +639,7 @@ class ResultProxy(object):
 
         See :class:`.ExecutionContext` for details.
 
-        Raises :class:`.InvalidRequestError` if the executed
+        Raises :class:`~sqlalchemy.exc.InvalidRequestError` if the executed
         statement is not a compiled expression construct
         or is not an insert() or update() construct.
 
@@ -661,7 +661,7 @@ class ResultProxy(object):
 
         See :class:`.ExecutionContext` for details.
 
-        Raises :class:`.InvalidRequestError` if the executed
+        Raises :class:`~sqlalchemy.exc.InvalidRequestError` if the executed
         statement is not a compiled expression construct
         or is not an insert() or update() construct.