Fix cross references

diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index d59aab8f7a9fea0f34e974795c9861904f59edc2..87072cb6bf53cd83221f8db8be14b75fdabecd45 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -17,11 +17,11 @@ Additional Connect Arguments
 
 When connecting with ``dbname`` present, the host, port, and dbname tokens are
 converted to a TNS name using
-the cx_oracle :func:`makedsn()` function.  Otherwise, the host token is taken
+the cx_oracle ``makedsn()`` function.  Otherwise, the host token is taken
 directly as a TNS name.
 
 Additional arguments which may be specified either as query string arguments
-on the URL, or as keyword arguments to :func:`~sqlalchemy.create_engine()` are:
+on the URL, or as keyword arguments to :func:`.create_engine()` are:
 
 * allow_twophase - enable two-phase transactions.  Defaults to ``True``.
 
@@ -96,7 +96,7 @@ like result.fetchmany() and result.fetchall().   This means that by default, LOB
 objects are fully fetched unconditionally by SQLAlchemy, and the linkage to a live
 cursor is broken.
 
-To disable this processing, pass ``auto_convert_lobs=False`` to :func:`create_engine()`.
+To disable this processing, pass ``auto_convert_lobs=False`` to :func:`.create_engine()`.
 
 Two Phase Transaction Support
 -----------------------------
@@ -129,7 +129,7 @@ the application can make one of several choices:
 
 * For ad-hoc two-phase operations without disabling pooling, the DBAPI
   connection in use can be evicted from the connection pool using the
-  :class:`.Connection.detach` method.
+  :meth:`.Connection.detach` method.
 
 .. versionchanged:: 0.8.0b2,0.7.10
     Support for cx_oracle prepared transactions has been implemented

diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
index 07f96a1af8d85c074cf50d429bfedebb2427ef2a..70d7a4b2e76bbfe9abfe30969496fbb9b6a92c55 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -162,8 +162,8 @@ Using Temporary Tables with SQLite
 Due to the way SQLite deals with temporary tables, if you wish to use a
 temporary table in a file-based SQLite database across multiple checkouts
 from the connection pool, such as when using an ORM :class:`.Session` where
-the temporary table should continue to remain after :meth:`.commit` or
-:meth:`.rollback` is called, a pool which maintains a single connection must
+the temporary table should continue to remain after :meth:`.Session.commit` or
+:meth:`.Session.rollback` is called, a pool which maintains a single connection must
 be used.   Use :class:`.SingletonThreadPool` if the scope is only needed
 within the current thread, or :class:`.StaticPool` is scope is needed within
 multiple threads for this case::

diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index 72dafb472f681e08dd9ba388d1b5225b088172c8..5991f2dc1e370ba419e5b62445f96a28983ad74a 100644 (file)
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -619,7 +619,7 @@ def joinedload(loadopt, attr, innerjoin=None):
         :class:`.Query` refer to these joins in any way, including ordering.
 
         To produce a specific SQL JOIN which is explicitly available, use
-        :class:`.Query.join`.   To combine explicit JOINs with eager loading
+        :meth:`.Query.join`.   To combine explicit JOINs with eager loading
         of collections, use :func:`.orm.contains_eager`; see :ref:`contains_eager`.
 
     .. seealso::

diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 046840110455a18c63904465c192e92b6b1a5f7c..1a71721b8c08607170b15adad2450c71b59b03d7 100644 (file)
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -1796,7 +1796,7 @@ class Select(HasPrefixes, SelectBase):
           to set the autocommit option.
 
         :param bind=None:
-          an :class:`~.base.Engine` or :class:`~.base.Connection` instance
+          an :class:`~.Engine` or :class:`~.Connection` instance
           to which the
           resulting :class:`.Select` object will be bound.  The :class:`.Select`
           object will otherwise automatically bind to whatever

diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 8f22ae81c29a06525623635d997c67794fc8f351..1fc4339ad23f794312600ed33f107b6ec28f7fa7 100644 (file)
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -119,7 +119,7 @@ class String(Concatenable, TypeEngine):
           unicode objects, this flag generally does not
           need to be set.  For columns that are explicitly
           intended to store non-ASCII data, the :class:`.Unicode`
-          or :class:`UnicodeText`
+          or :class:`.UnicodeText`
           types should be used regardless, which feature
           the same behavior of ``convert_unicode`` but
           also indicate an underlying column type that