Merge pull request doctrine#866 from bountin/doc_refresh

Ocramius · Ocramius · commit 3caf1fdfa61a · 2013-12-01T14:07:21.000-08:00
Mentioning the 'refresh' cascading property in the documentation list
diff --git a/docs/en/reference/working-with-associations.rst b/docs/en/reference/working-with-associations.rst
@@ -403,7 +403,7 @@ There are two approaches to handle this problem in your code:
 Transitive persistence / Cascade Operations
 -------------------------------------------
 
-Persisting, removing, detaching and merging individual entities can
+Persisting, removing, detaching, refreshing and merging individual entities can
 become pretty cumbersome, especially when a highly interweaved object graph
 is involved. Therefore Doctrine 2 provides a
 mechanism for transitive persistence through cascading of these
@@ -419,7 +419,8 @@ The following cascade options exist:
 -  remove : Cascades remove operations to the associated entities.
 -  merge : Cascades merge operations to the associated entities.
 -  detach : Cascades detach operations to the associated entities.
--  all : Cascades persist, remove, merge and detach operations to
+-  refresh : Cascades refresh operations to the associated entities.
+-  all : Cascades persist, remove, merge, refresh and detach operations to
    associated entities.
 
 .. note::
