From: Vraj Mohan Date: Thu, 14 Nov 2013 15:10:59 +0000 (-0500) Subject: Fix cross reference X-Git-Tag: rel_0_9_0~121^2^2~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24a46499308dad8bef072aa4f5052d054e769786;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix cross reference --- diff --git a/doc/build/core/event.rst b/doc/build/core/event.rst index d5111b0c0c..1b873972a7 100644 --- a/doc/build/core/event.rst +++ b/doc/build/core/event.rst @@ -75,7 +75,7 @@ as long as the names match up:: print("New DBAPI connection:", dbapi_connection) print("Connection record:", kw['connection_record']) -Above, the presence of ``**kw`` tells :func:`.event.listen_for` that +Above, the presence of ``**kw`` tells :func:`.listens_for` that arguments should be passed to the function by name, rather than positionally. .. versionadded:: 0.9.0 Added optional ``named`` argument dispatch to diff --git a/lib/sqlalchemy/inspection.py b/lib/sqlalchemy/inspection.py index 42e08b30df..865ec4af6c 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/sql/elements.py b/lib/sqlalchemy/sql/elements.py index e9b995eaac..5058b90e02 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