merge r6497 of 0.5 branch

diff --git a/doc/build/ormtutorial.rst b/doc/build/ormtutorial.rst
index 855f951406eed92d1231667f58f5aea542bf4466..b1f647e51b5f4c5e81229a19a0c3bfd2421f37a1 100644 (file)
--- a/doc/build/ormtutorial.rst
+++ b/doc/build/ormtutorial.rst
@@ -449,10 +449,22 @@ Here's a rundown of some of the most common operators used in ``filter()``:
 
     query.filter(User.name.in_(['ed', 'wendy', 'jack']))
 
+    # works with query objects too:
+    
+    query.filter(User.name.in_(session.query(User.name).filter(User.name.like('%ed%'))))
+    
+* NOT IN::
+
+    query.filter(~User.name.in_(['ed', 'wendy', 'jack']))
+
 * IS NULL::
 
     filter(User.name == None)
 
+* IS NOT NULL::
+
+    filter(User.name != None)
+
 * AND::
 
     from sqlalchemy import and_