svn commit: r1866653 - /jackrabbit/site/live/filevault/filter.html

[kw...@apache.org]

Author: kwin
Date: Mon Sep  9 06:47:45 2019
New Revision: 1866653

URL: http://svn.apache.org/viewvc?rev=1866653&view=rev
Log:
@trivial: Site checkin for project Apache Jackrabbit FileVault Documentation-3.2.9-SNAPSHOT

Modified:
    jackrabbit/site/live/filevault/filter.html

Modified: jackrabbit/site/live/filevault/filter.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/filevault/filter.html?rev=1866653&r1=1866652&r2=1866653&view=diff
==============================================================================
--- jackrabbit/site/live/filevault/filter.html (original)
+++ jackrabbit/site/live/filevault/filter.html Mon Sep  9 06:47:45 2019
@@ -310,9 +310,12 @@
 
 <ol style="list-style-type: decimal">
   
-<li><tt>replace</tt></li>
+<li><tt>replace</tt> : This is the normal behavior. Existing content is replaced completely by the imported content, i.e. is overridden or deleted accordingly.</li>
+  
+<li><tt>merge</tt> : Existing content is not modified, i.e. only new content is added and none is deleted or modified.</li>
+  
+<li><tt>update</tt> : Existing content is updated, new content is added and none is deleted.</li>
 </ol>
-<p>: This is the normal behavior. Existing content is replaced completely by the imported content, i.e. is overridden or  deleted accordingly. 1. <tt>merge</tt> : Existing content is not modified, i.e. only new content is added and none is deleted or modified. 1. <tt>update</tt> : Existing content is updated, new content is added and none is deleted.</p>
 <p>For a more detailed description of the import mode, see <a href="importmode.html">here</a></p></div>
 <div class="section">
 <h3>Include and Exclude Elements<a name="Include_and_Exclude_Elements"></a></h3>