Merge branch 'master' of github.com:vrajmohan/sqlalchemy into mm

14 files changed, 29 insertions, 26 deletions

diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index 461f5eb23..1f219e30c 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -161,7 +161,7 @@ class Inspector(object):
         """Return all table names in referred to within a particular schema.
 
         The names are expected to be real tables only, not views.
-        Views are instead returned using the :meth:`.get_view_names`
+        Views are instead returned using the :meth:`.Inspector.get_view_names`
         method.
 
 
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 74584b787..8f84ab039 100644
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -24,8 +24,8 @@ class URL(object):
     Represent the components of a URL used to connect to a database.
 
     This object is suitable to be passed directly to a
-    ``create_engine()`` call.  The fields of the URL are parsed from a
-    string by the ``module-level make_url()`` function.  the string
+    :func:`~sqlalchemy.create_engine` call.  The fields of the URL are parsed from a
+    string by the :func:`.make_url` function.  the string
     format of the URL is an RFC-1738-style string.
 
     All initialization parameters are available as public attributes.
diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py
index b58b53916..c0118dd9f 100644
--- a/lib/sqlalchemy/events.py
+++ b/lib/sqlalchemy/events.py
@@ -307,7 +307,7 @@ class PoolEvents(event.Events):
         Processing of all checkout listeners will abort and restart
         using the new connection.
 
-        .. seealso:: :meth:`.ConnectionEvents.connect` - a similar event
+        .. seealso:: :meth:`.ConnectionEvents.engine_connect` - a similar event
            which occurs upon creation of a new :class:`.Connection`.
 
         """
@@ -668,7 +668,7 @@ class ConnectionEvents(event.Events):
         Note that this method is not called when a new :class:`.Connection`
         is produced which is inheriting execution options from its parent
         :class:`.Engine`; to intercept this condition, use the
-        :meth:`.ConnectionEvents.connect` event.
+        :meth:`.ConnectionEvents.engine_connect` event.
 
         :param conn: The newly copied :class:`.Connection` object
 
diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index 7ebdc3983..3c0c6c365 100644
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -6,9 +6,9 @@
 
 """Exceptions used with SQLAlchemy.
 
-The base exception class is :class:`.SQLAlchemyError`.  Exceptions which are
+The base exception class is :exc:`.SQLAlchemyError`.  Exceptions which are
 raised as a result of DBAPI exceptions are all subclasses of
-:class:`.DBAPIError`.
+:exc:`.DBAPIError`.
 
 """
 
@@ -169,7 +169,7 @@ class UnboundExecutionError(InvalidRequestError):
 
 class DontWrapMixin(object):
     """A mixin class which, when applied to a user-defined Exception class,
-    will not be wrapped inside of :class:`.StatementError` if the error is
+    will not be wrapped inside of :exc:`.StatementError` if the error is
     emitted within the process of executing a statement.
 
     E.g.::
diff --git a/lib/sqlalchemy/inspection.py b/lib/sqlalchemy/inspection.py
index 42e08b30d..865ec4af6 100644
--- a/lib/sqlalchemy/inspection.py
+++ b/lib/sqlalchemy/inspection.py
@@ -39,11 +39,11 @@ def inspect(subject, raiseerr=True):
 
     The returned value in some cases may be the
     same object as the one given, such as if a
-    :class:`.orm.Mapper` object is passed.   In other
+    :class:`.Mapper` object is passed.   In other
     cases, it will be an instance of the registered
     inspection type for the given object, such as
-    if a :class:`.engine.Engine` is passed, an
-    :class:`.engine.Inspector` object is returned.
+    if an :class:`.engine.Engine` is passed, an
+    :class:`.Inspector` object is returned.
 
     :param subject: the subject to be inspected.
     :param raiseerr: When ``True``, if the given subject
diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py
index 7e56b0228..22c92b7c1 100644
--- a/lib/sqlalchemy/orm/base.py
+++ b/lib/sqlalchemy/orm/base.py
@@ -338,8 +338,8 @@ def class_mapper(class_, configure=True):
     """Given a class, return the primary :class:`.Mapper` associated
     with the key.
 
-    Raises :class:`.UnmappedClassError` if no mapping is configured
-    on the given class, or :class:`.ArgumentError` if a non-class
+    Raises :exc:`.UnmappedClassError` if no mapping is configured
+    on the given class, or :exc:`.ArgumentError` if a non-class
     object is passed.
 
     Equivalent functionality is available via the :func:`.inspect`
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 4336c191d..375e7b1af 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -622,7 +622,7 @@ class Mapper(_InspectionAttr):
     def entity(self):
         """Part of the inspection API.
 
-        Returns self.class_.
+        Returns self.class\_.
 
         """
         return self.class_
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 34b9691f5..7b6de0d01 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -541,7 +541,7 @@ class Query(object):
         :class:`.Query`, converted
         to a scalar subquery with a label of the given name.
 
-        Analogous to :meth:`sqlalchemy.sql.SelectBaseMixin.label`.
+        Analogous to :meth:`sqlalchemy.sql.expression.SelectBase.label`.
 
         .. versionadded:: 0.6.5
 
@@ -553,7 +553,7 @@ class Query(object):
         """Return the full SELECT statement represented by this
         :class:`.Query`, converted to a scalar subquery.
 
-        Analogous to :meth:`sqlalchemy.sql.SelectBaseMixin.as_scalar`.
+        Analogous to :meth:`sqlalchemy.sql.expression.SelectBase.as_scalar`.
 
         .. versionadded:: 0.6.5
 
@@ -1625,7 +1625,7 @@ class Query(object):
         example :ref:`examples_xmlpersistence` which illustrates
         an XPath-like query system using algorithmic joins.
 
-        :param *props: A collection of one or more join conditions,
+        :param \*props: A collection of one or more join conditions,
          each consisting of a relationship-bound attribute or string
          relationship name representing an "on clause", or a single
          target entity, or a tuple in the form of ``(target, onclause)``.
@@ -2204,7 +2204,7 @@ class Query(object):
         ``Query``.
 
         :param \*prefixes: optional prefixes, typically strings,
-        not using any commas.   In particular is useful for MySQL keywords.
+         not using any commas.   In particular is useful for MySQL keywords.
 
         e.g.::
 
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index e9b995eaa..5058b90e0 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -361,7 +361,7 @@ class ClauseElement(Visitable):
         as well as by :func:`.select` constructs when placed into
         the FROM clause of another :func:`.select`.  (Note that
         subqueries should be normally created using the
-        :func:`.Select.alias` method, as many platforms require
+        :meth:`.Select.alias` method, as many platforms require
         nested SELECT statements to be named).
 
         As expressions are composed together, the application of
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 6be32f454..d1f019482 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -44,7 +44,7 @@ from .base import ColumnCollection, Generative, Executable, \
           PARSE_AUTOCOMMIT
 
 from .selectable import Alias, Join, Select, Selectable, TableClause, \
-        CompoundSelect, FromClause, FromGrouping, SelectBase, \
+        CompoundSelect, CTE, FromClause, FromGrouping, SelectBase, \
         alias, \
         subquery, HasPrefixes, Exists, ScalarSelect
 
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index e9b904d7c..5bd4b302b 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -27,8 +27,11 @@ else:
 class Operators(object):
     """Base of comparison and logical operators.
 
-    Implements base methods :meth:`operate` and :meth:`reverse_operate`,
-    as well as :meth:`__and__`, :meth:`__or__`, :meth:`__invert__`.
+    Implements base methods :meth:`~sqlalchemy.sql.operators.Operators.operate` and
+    :meth:`~sqlalchemy.sql.operators.Operators.reverse_operate`, as well as
+    :meth:`~sqlalchemy.sql.operators.Operators.__and__`,
+    :meth:`~sqlalchemy.sql.operators.Operators.__or__`,
+    :meth:`~sqlalchemy.sql.operators.Operators.__invert__`.
 
     Usually is used via its most common subclass
     :class:`.ColumnOperators`.
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 4fcf06290..046840110 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -1347,8 +1347,8 @@ class SelectBase(Executable, FromClause):
 
     @_generative
     @util.deprecated('0.6',
-                     message=":func:`.autocommit` is deprecated. Use "
-                     ":func:`.Executable.execution_options` with the "
+                     message="``autocommit()`` is deprecated. Use "
+                     ":meth:`.Executable.execution_options` with the "
                      "'autocommit' flag.")
     def autocommit(self):
         """return a new selectable with the 'autocommit' flag set to
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 82ab3d556..8f22ae81c 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -1512,7 +1512,7 @@ class NullType(TypeEngine):
     The :class:`.NullType` can be used within SQL expression invocation
     without issue, it just has no behavior either at the expression construction
     level or at the bind-parameter/result processing level.  :class:`.NullType`
-    will result in a :class:`.CompileException` if the compiler is asked to render
+    will result in a :exc:`.CompileError` if the compiler is asked to render
     the type itself, such as if it is used in a :func:`.cast` operation
     or within a schema creation operation such as that invoked by
     :meth:`.MetaData.create_all` or the :class:`.CreateTable` construct.
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index e64b67fcf..b51bf510a 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -8,7 +8,7 @@
 
 """
 
-__all__ = ['TypeEngine', 'TypeDecorator', 'AbstractType', 'UserDefinedType',
+__all__ = ['TypeEngine', 'TypeDecorator', 'UserDefinedType',
             'INT', 'CHAR', 'VARCHAR', 'NCHAR', 'NVARCHAR', 'TEXT', 'Text',
             'FLOAT', 'NUMERIC', 'REAL', 'DECIMAL', 'TIMESTAMP', 'DATETIME',
             'CLOB', 'BLOB', 'BINARY', 'VARBINARY', 'BOOLEAN', 'BIGINT',