From: Mike Bayer Date: Wed, 31 Oct 2012 04:17:16 +0000 (-0400) Subject: - i think this is a sphinx bug X-Git-Tag: rel_0_8_0b2~75 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78b620055706535502fc55fe422e2b318d5b298c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - i think this is a sphinx bug --- diff --git a/doc/build/orm/relationships.rst b/doc/build/orm/relationships.rst index 227f57240c..c6e6670c61 100644 --- a/doc/build/orm/relationships.rst +++ b/doc/build/orm/relationships.rst @@ -937,7 +937,6 @@ one :class:`.Column` we need:: billing_address = relationship("Address", foreign_keys="Customer.billing_address_id") .. versionchanged:: 0.8 - :func:`.relationship` can resolve ambiguity between foreign key targets on the basis of the ``foreign_keys`` argument alone; the ``primaryjoin`` argument is no longer needed in this situation.