CRNT-25977 - Removed Manual and Application activity terms, adjusted the chapter accordingly

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

1 files changed, 14 insertions, 11 deletions

diff --git a/org.eclipse.stardust.docs.analyst/html/handbooks/modelling_analyst/pep-activities.htm b/org.eclipse.stardust.docs.analyst/html/handbooks/modelling_analyst/pep-activities.htm
index 1fc239b..45d6ad1 100644
--- a/org.eclipse.stardust.docs.analyst/html/handbooks/modelling_analyst/pep-activities.htm
+++ b/org.eclipse.stardust.docs.analyst/html/handbooks/modelling_analyst/pep-activities.htm
@@ -21,19 +21,22 @@
 
 <h1>Specifying Activities</h1>
 <p>When you create a new activity in the Business Process Modeling perspective, 
-by default, it creates a manual activity. You can create following type of activities in Business
+by default, it creates a User task. You can create following types of activities in Business
  Process Modeling perspective.</p>
  <ul>
- 	<li>User Task - This <img src="images/manual-act.png"> icon represents the manual activity or user task. </li>
+ 	<li>Task 
+ 	<ul>
+ 	<li>User Task - This <img src="images/manual-act.png"> icon represents the user task. </li>
  	<li>Script Task - This  <img src="images/app-act.png"> icon represents the script task.</li>
+ 	</ul></li>
  	<li>Subprocess - This  <img src="images/subpro-act.png"> icon represents the subprocess activity.</li>
  
  </ul>
- <p>For more information, please refer to the chapter 
+<!--  <p>For more information, please refer to the chapter 
  <a href="PLUGINS_ROOT/org.eclipse.stardust.docs.dev/html/handbooks/concepts/workflow-basics/mg-basics-5.htm">Activities</a> 
   of the 
   <a href="PLUGINS_ROOT/org.eclipse.stardust.docs.dev/html/handbooks/concepts/key-concepts.html">
-  Concepts handbook</a>.</p>
+  Concepts handbook</a>.</p> -->
  
 <p>You can perform following operations on activities:</p> 
 <ul>
@@ -47,7 +50,7 @@ by default, it creates a manual activity. You can create following type of activ
 
 <h2 id="add">Adding Activities</h2>
 <p>
-You can add activity using four different ways:
+You can add activities using four different ways:
 </p>
 <ul>
 	<li>In the toolbar, click <strong>Create Activity</strong> icon and drop it to swim lanes</li>
@@ -65,14 +68,14 @@ You can add activity using four different ways:
 <li>Drop it in the swim lane</li>
 
 </ul>
-<p>By default, manual activity is created.</p>
+<p>By default, User task is created.</p>
 
 <p>OR</p>
 <ul>
 
 	<li>Drag an application from the <strong>Applications</strong> node of the <strong>My Process Models</strong> panel 
 	and drop it in the swim lane.
-	The application activity gets created.</li>
+	The Script task gets created.</li>
 </ul>
 
 <p>OR</p>
@@ -134,7 +137,7 @@ You can add activity using four different ways:
 		<td><img src="images/act-fly-sub.png" alt="">
 		</td>
 		<td>Application</td>
-		<td>Changes the activity type to application. Click the Application icon to change the activity type to Application.</td>
+		<td>Changes the activity type to Script task. Click the Application icon to change the activity type to Script task.</td>
 	</tr>
 	<tr>
 		<td><img src="images/act-fly-connect.png" alt="">
@@ -145,8 +148,8 @@ You can add activity using four different ways:
 	<tr>
 		<td>
 		<img src="images/act-fly-newact.png" alt=""></td>
-		<td>New Manual Activity</td>
-		<td>Adds a new manual activity connected from the existing activity. Click the new activity icon and drop it on the swim lane.</td>
+		<td>New Activity</td>
+		<td>Adds a new User task connected from the existing activity. Click the new activity icon and drop it on the swim lane.</td>
 	</tr>
 	<tr>
 		<td>
@@ -194,7 +197,7 @@ You can add activity using four different ways:
 		hibernated after creation - thus ending the synchronous flow here.</li>
 		<li>Supports relocation -Determines if relocation is supported for this 
 		activity and it can be used as starting point for the relocation. 
-		This check box is enabled for manual activities and application activities only.</li>
+		This check box is enabled for User task and Script task only.</li>
 		<li>Is Relocation Target -Determines if the activity is allowed as 
 		target point of relocation. For details on relocation, 
 		refer to chapter