From: Michael Trier <mtrier@gmail.com>
Date: Mon, 4 Aug 2008 19:53:04 +0000 (+0000)
Subject: Corrected problem in docstring.
X-Git-Tag: rel_0_5beta3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=045d0d63ea004f1fa2a0cb1ca171065caa1d3455;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Corrected problem in docstring.
---

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 4479492832..34867c871f 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -181,16 +181,23 @@ def relation(argument, secondary=None, **kwargs):
           to "False", which means the default cascade should be used.
           The default value is "save-update, merge".
           Available cascades are:
+
             save-update - cascade the "add()" operation 
             (formerly known as save() and update())
+
             merge - cascade the "merge()" operation
+            
             expunge - cascade the "expunge()" operation
+            
             delete - cascade the "delete()" operation
+            
             delete-orphan - if an item of the child's type with no parent is detected,
             mark it for deletion.  Note that this option prevents a pending item
             of the child's class from being persisted without a parent 
             present.
+            
             refresh-expire - cascade the expire() and refresh() operations
+            
             all - shorthand for "save-update,merge, refresh-expire, expunge, delete"
 
         collection_class