summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorVraj Mohan <r.vrajmohan@gmail.com>2013-11-15 11:32:38 -0500
committerVraj Mohan <r.vrajmohan@gmail.com>2013-11-17 17:37:55 -0500
commitc8c88213a762a0365dcdd6752fd82d5bd115e90e (patch)
tree4b85fcd418b328f3d43ec727e780740413bad212 /lib/sqlalchemy/sql
parent90d1f98f43fecd50ec215815e99f436748a92136 (diff)
downloadsqlalchemy-pr/46.tar.gz
Fix cross referencespr/46
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/selectable.py2
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 046840110..1a71721b8 100644
--- 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 8f22ae81c..1fc4339ad 100644
--- 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