summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-08-22 18:15:59 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-08-22 18:16:08 -0400
commit6a8955f32bfbe0ace80efc6770003affe10ded6c (patch)
treeab42035ee3a10f84ab9c9c5e9235cdac67f86a6e
parentb6412f6029f31079321674f175c80fc402af4795 (diff)
downloadsqlalchemy-6a8955f32bfbe0ace80efc6770003affe10ded6c.tar.gz
- fix typos
Change-Id: Ibf8bc0e997ff989c7b0c16afad48a95414078052 (cherry picked from commit d8a80a35a0f117c7659c7a9c62e27994d3aadc01)
-rw-r--r--doc/build/faq/connections.rst6
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py2
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/build/faq/connections.rst b/doc/build/faq/connections.rst
index 40bef6a50..3c7175fe8 100644
--- a/doc/build/faq/connections.rst
+++ b/doc/build/faq/connections.rst
@@ -53,11 +53,15 @@ and replaced with a new connection when it is next checked out.
For the more general case of accommodating database restarts and other
temporary loss of connectivity due to network issues, connections that
are in the pool may be recycled in response to more generalized disconnect
-detection techniques. The section :ref:`:ref:`pool_disconnects` provides
+detection techniques. The section :ref:`pool_disconnects` provides
background on both "pessimistic" (e.g. pre-ping) and "optimistic"
(e.g. graceful recovery) techniques. Modern SQLAlchemy tends to favor
the "pessimistic" approach.
+.. seealso::
+
+ :ref:`pool_disconnects`
+
Why does SQLAlchemy issue so many ROLLBACKs?
--------------------------------------------
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index fdca42fed..5ccdb1e17 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -42,7 +42,7 @@ be employed. See :ref:`pool_disconnects` for current approaches.
.. seealso::
:ref:`pool_disconnects` - Background on several techniques for dealing
- with timed out connections as well as database restarts.
+ with timed out connections as well as database restarts.
.. _mysql_storage_engines: