From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 7 Aug 2014 13:59:59 +0000 (-0400)
Subject: - clarify docs that contains_eager() is included in the of_type() system,
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57dc0581462f2014e56c6f30a2ad8caf3d33f9c5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- clarify docs that contains_eager() is included in the of_type() system,
fix #2438
---

diff --git a/doc/build/orm/inheritance.rst b/doc/build/orm/inheritance.rst
index d68228259c..3b6a284d07 100644
--- a/doc/build/orm/inheritance.rst
+++ b/doc/build/orm/inheritance.rst
@@ -472,7 +472,8 @@ subselect back to the parent ``companies`` table.
 Eager Loading of Specific or Polymorphic Subtypes
 ++++++++++++++++++++++++++++++++++++++++++++++++++
 
-The :func:`.joinedload` and :func:`.subqueryload` options also support
+The :func:`.joinedload`, :func:`.subqueryload`, :func:`.contains_eager` and
+other loading-related options also support
 paths which make use of :func:`~sqlalchemy.orm.interfaces.PropComparator.of_type`.
 Below we load ``Company`` rows while eagerly loading related ``Engineer``
 objects, querying the ``employee`` and ``engineer`` tables simultaneously::
@@ -497,11 +498,13 @@ can be loaded::
         )
 
 .. versionadded:: 0.8
-    :func:`.joinedload` and :func:`.subqueryload` support
+    :func:`.joinedload`, :func:`.subqueryload`, :func:`.contains_eager`
+    and related loader options support
     paths that are qualified with
     :func:`~sqlalchemy.orm.interfaces.PropComparator.of_type`, supporting
     single target types as well as :func:`.orm.with_polymorphic` targets.
 
+
 Single Table Inheritance
 ------------------------