From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 31 Aug 2014 22:05:17 +0000 (-0400)
Subject: - improve from_statement() doc
X-Git-Tag: rel_1_0_0b1~205^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdfe680708d869d37dd5c1bc2d2b045639caba9d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- improve from_statement() doc
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 72989f34b9..090284d9f8 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2348,9 +2348,15 @@ class Query(object):
         This method bypasses all internal statement compilation, and the
         statement is executed without modification.
 
-        The statement argument is either a string, a ``select()`` construct,
-        or a ``text()`` construct, and should return the set of columns
-        appropriate to the entity class represented by this ``Query``.
+        The statement is typically either a :func:`~.expression.text`
+        or :func:`~.expression.select` construct, and should return the set
+        of columns
+        appropriate to the entity class represented by this :class:`.Query`.
+
+        .. seealso::
+
+            :ref:`orm_tutorial_literal_sql` - usage examples in the
+            ORM tutorial
 
         """
         if isinstance(statement, util.string_types):