Merge remote-tracking branch 'origin/candidate-6.4.x' into candidate-6.4.2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

docs/ECLScheduler/ECLSched-Mods/ECLSchedComp.xml

@@ -183,6 +183,20 @@
 
         <para>To view the workunit details, click on the workunit ID (WUID)
         link for the workunit.</para>
+
+        <para>You can modify scheduled workunits from the workunit details
+        page in ECL Watch. Select the workunit details page, then press the
+        <emphasis role="bold">Reschedule</emphasis> button to reschedule a
+        descheduled workunit. Press the <emphasis
+        role="bold">Deschedule</emphasis> button to stop a selected scheduled
+        workunit from running. You can also access the Reschedule and
+        Deschedule options from the context menu when you right click on a
+        workunit. </para>
+
+        <para>If you are using a WHEN clause and it contains a COUNT number,
+        when rescheduled the workunit will continue the COUNT from the point
+        where it stopped and resumes the remaining COUNT. Once a workunit
+        completes the COUNT, there is no reschedule option.</para>
       </sect2>
 
       <sect2 id="ECLSched_PushingEvents" role="brk">

docs/ECLStandardLibraryReference/SLR-Mods/Copy.xml

@@ -10,15 +10,15 @@
       <primary>File.Copy</primary>
     </indexterm><indexterm>
       <primary>Copy</primary>
-    </indexterm>(</emphasis> <emphasis> logicalname,
+    </indexterm>(</emphasis> <emphasis> sourceLogicalName,
   destinationGroup</emphasis> <emphasis role="bold">, </emphasis>
-  <emphasis>destinationLogicalname, </emphasis> <emphasis role="bold">
+  <emphasis>destinationLogicalName, </emphasis> <emphasis role="bold">
   [</emphasis> <emphasis>,sourceDali</emphasis> <emphasis role="bold">]
-  [</emphasis> <emphasis>,timeout</emphasis> <emphasis role="bold">]
-  [</emphasis> <emphasis>,espserverIPport </emphasis> <emphasis
+  [</emphasis> <emphasis>,timeOut</emphasis> <emphasis role="bold">]
+  [</emphasis> <emphasis>,espServerIPPort </emphasis> <emphasis
   role="bold">]</emphasis> <emphasis role="bold"> [</emphasis>
   <emphasis>,maxConnections</emphasis> <emphasis role="bold">] [</emphasis>
-  <emphasis>,allowoverwrite</emphasis> <emphasis role="bold">]</emphasis>
+  <emphasis>,allowOverwrite</emphasis> <emphasis role="bold">]</emphasis>
   <emphasis role="bold"> [</emphasis> <emphasis>,replicate</emphasis>
   <emphasis role="bold">] [</emphasis> <emphasis>,asSuperfile</emphasis>
   <emphasis role="bold">] [</emphasis> <emphasis>,compress</emphasis>
@@ -35,15 +35,15 @@
       <primary>File.fCopy</primary>
     </indexterm><indexterm>
       <primary>fCopy</primary>
-    </indexterm>(</emphasis> <emphasis> logicalname,
+    </indexterm>(</emphasis> <emphasis> sourceLogicalName,
   destinationGroup</emphasis> <emphasis role="bold">,</emphasis> <emphasis
-  role="bold"> </emphasis> <emphasis>destinationLogicalname, </emphasis>
+  role="bold"> </emphasis> <emphasis>destinationLogicalName, </emphasis>
   <emphasis role="bold"> [</emphasis> <emphasis>,sourceDali</emphasis>
-  <emphasis role="bold">] [</emphasis> <emphasis>,timeout</emphasis> <emphasis
-  role="bold">] [</emphasis> <emphasis>,espserverIPport </emphasis> <emphasis
+  <emphasis role="bold">] [</emphasis> <emphasis>,timeOut</emphasis> <emphasis
+  role="bold">] [</emphasis> <emphasis>,espServerIPPort </emphasis> <emphasis
   role="bold">]</emphasis> <emphasis role="bold"> [</emphasis>
   <emphasis>,maxConnections</emphasis> <emphasis role="bold">] [</emphasis>
-  <emphasis>,allowoverwrite</emphasis> <emphasis role="bold">]</emphasis>
+  <emphasis>,allowOverwrite</emphasis> <emphasis role="bold">]</emphasis>
   <emphasis role="bold"> [</emphasis> <emphasis>,replicate</emphasis>
   <emphasis role="bold">] [</emphasis> <emphasis>,asSuperfile</emphasis>
   <emphasis role="bold">] [</emphasis> <emphasis>,compress</emphasis>
@@ -61,7 +61,7 @@
 
       <tbody>
         <row>
-          <entry><emphasis>logicalname</emphasis></entry>
+          <entry><emphasis>sourceLogicalName</emphasis></entry>
 
           <entry>A null-terminated string containing the logical name of the
           file.</entry>
@@ -75,7 +75,7 @@
         </row>
 
         <row>
-          <entry><emphasis>destinationLogicalname</emphasis></entry>
+          <entry><emphasis>destinationLogicalName</emphasis></entry>
 
           <entry>A null-terminated string containing the new logical name of
           the file.</entry>
@@ -90,7 +90,7 @@
         </row>
 
         <row>
-          <entry><emphasis>timeout</emphasis></entry>
+          <entry><emphasis>timeOut</emphasis></entry>
 
           <entry>Optional. An integer value indicating the timeout setting. If
           omitted, the default is -1. If set to zero (0), execution control
@@ -99,7 +99,7 @@
         </row>
 
         <row>
-          <entry><emphasis>espserverIPport</emphasis></entry>
+          <entry><emphasis>espServerIPPort</emphasis></entry>
 
           <entry>Optional. A null-terminated string containing the protocol,
           IP, port, and directory, or the DNS equivalent, of the ESP server
@@ -116,7 +116,7 @@
         </row>
 
         <row>
-          <entry><emphasis>allowoverwrite</emphasis></entry>
+          <entry><emphasis>allowOverwrite</emphasis></entry>
 
           <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
           allow the new file to overwrite an existing file of the same name.

docs/ECLWatch/TheECLWatchMan.xml

@@ -199,8 +199,8 @@
       <sect2 id="ECLWA_BannerItems">
         <title>Banner Items</title>
 
-        <para>The banner area of ECL Watch appears at the top of all pages.
-        </para>
+        <para>The banner area of ECL Watch appears at the top of all
+        pages.</para>
 
         <sect3 id="ECLWAtchHomeButton">
           <title>Home Button</title>