CRNT-24607 - Updated for Conflict, Replace dialog

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/documentation@55806 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

2 files changed, 7 insertions, 0 deletions

diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/modelling/images/conflict-replace.png b/org.eclipse.stardust.docs.dev/html/handbooks/modelling/images/conflict-replace.png
new file mode 100644
index 0000000..a078efe
--- a/dev/null
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/modelling/images/conflict-replace.png
diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/modelling/mg-defdesk-10.htm b/org.eclipse.stardust.docs.dev/html/handbooks/modelling/mg-defdesk-10.htm
index e3a6429..d9a4f88 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/modelling/mg-defdesk-10.htm
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/modelling/mg-defdesk-10.htm
@@ -571,6 +571,13 @@ reference from a provider model. In such a case, a model validation error is dis
 <p>For more information, please refer to the section <a href="mg-deploy-model.html#consistency">Consistency Checks</a> 

 of the <a href="mg-deploy-model.html">Deploying a Workflow Model</a> chapter.

 </p>

+<p>Also, the following dialog is displayed in case the referenced participant ID 
+identical with the consumer participant. If you click Ok, only the selected element is imported by refenence. 
+If the organization has sub-organizations, then those sub-organizations do not get imported by referenced. </p>
+
+<p class="image"><img src="images/conflict-replace.png"
+    alt="Conflict - Replace"> <br>
+<strong>Figure:</strong> Conflict - Replace</p>
 

 	

 <script language="JavaScript" type="text/javascript">