From: mike bayer <mike_mp@zzzcomputing.com>
Date: Tue, 11 Mar 2014 15:30:33 +0000 (-0400)
Subject: Merge pull request #79 from nibrahim/master
X-Git-Tag: rel_0_8_6~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b39c8dd9f83f9b8d3752b22d73e882659d8df8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge pull request #79 from nibrahim/master

Fixes argument number in docs
---

diff --git a/doc/build/orm/inheritance.rst b/doc/build/orm/inheritance.rst
index a82fcf675d..bf9895065f 100644
--- a/doc/build/orm/inheritance.rst
+++ b/doc/build/orm/inheritance.rst
@@ -227,7 +227,7 @@ subclasses:
     # use with Query
     session.query(entity).all()
 
-It also accepts a second argument ``selectable`` which replaces the automatic
+It also accepts a third argument ``selectable`` which replaces the automatic
 join creation and instead selects directly from the selectable given. This
 feature is normally used with "concrete" inheritance, described later, but can
 be used with any kind of inheritance setup in the case that specialized SQL