Merge branch 'candidate-6.4.x' into candidate-6.4.2

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

docs/ECLLanguageReference/ECLR_mods/Basics-AttributeDef.xml

@@ -74,14 +74,20 @@ My First Definition := 5;  // INVALID name, spaces not allowed</programlisting>
         <primary>Reserved Words</primary>
       </indexterm>, but they are generally reserved only in the context within
     which they are valid for use. Even in that context, you may use reserved
-    words as field or attribute names, provided you explicitly disambiguate
+    words as field or definition names, provided you explicitly disambiguate
     them, as in this example:</para>
 
     <programlisting>ds2 := DEDUP(ds, ds.all, ALL); //ds.all is the 'all' field in the
                                //ds dataset - not DEDUP’s ALL option</programlisting>
 
     <para>However, it is still a good idea to avoid using ECL keywords as
-    attribute or field names.</para>
+    definition or field names. </para>
+
+    <para>Definition or field names cannot begin with <emphasis
+    role="bold">UNICODE_</emphasis> , <emphasis role="bold">UTF8_</emphasis>,
+    or <emphasis role="bold">VARUNICODE_</emphasis>. Labels beginning with
+    those prefixes are treated as type names, and should be regarded as
+    reserved.</para>
   </sect2>
 
   <sect2 id="Attribute_Naming">

docs/ECLProgrammersGuide/PRG_Mods/PrG_File_layout_resolution.xml

@@ -59,7 +59,7 @@
     </listitem>
   </itemizedlist>
 
-  <sect2>
+  <sect2 id="Using_LOOKUP_on_DATASET">
     <title>Using LOOKUP on a DATASET</title>
 
     <para>Adding the LOOKUP attribute to a DATASET declaration indicates that
@@ -113,7 +113,7 @@ f := PROJECT(actualfile, TRANSFORM(myrecord, SELF := LEFT; SELF := []));
     datasets.</para>
   </sect2>
 
-  <sect2>
+  <sect2 id="Using_LOOKUP_in_RECORDOF">
     <title>Using LOOKUP in a RECORDOF function</title>
 
     <para>Using a LOOKUP attribute in a RECORDOF function is useful when
@@ -153,7 +153,7 @@ filtered := myfile(id=‘123’);
 OUTPUT(filtered,,’myfilteredfile’);</programlisting></para>
   </sect2>
 
-  <sect2>
+  <sect2 id="LOOKUP-Additional_Details">
     <title>Additional Details</title>
 
     <itemizedlist>

docs/ECLWatch/ECLWa_mods/ECLWatchSrc.xml

@@ -171,7 +171,8 @@
 
         <listitem>
           <para>Press the <emphasis role="bold">Reschedule</emphasis> button
-          to change a selected scheduled workunit.</para>
+          to reschedule selected workunit(s) which have been
+          descheduled.</para>
         </listitem>
 
         <listitem>
@@ -386,6 +387,16 @@
           </listitem>
 
           <listitem>
+            <para><emphasis role="bold">Reschedule</emphasis> - Reschedules a
+            workunit which has been descheduled.</para>
+          </listitem>
+
+          <listitem>
+            <para><emphasis role="bold">Deschedule</emphasis> - Stops the
+            scheduled workunit from running.</para>
+          </listitem>
+
+          <listitem>
             <para><emphasis role="bold">Set To Failed</emphasis> - Changes the
             workunit state to failed.</para>
           </listitem>

docs/UsingConfigManager/UsingConfigManager.xml

@@ -898,7 +898,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
           </para>
         </sect3>
 
-        <sect3>
+        <sect3 role="brk">
           <title>DaliServerPlugin Options</title>
 
           <para>This section describes the DaliServerPlugin options</para>
@@ -1643,6 +1643,8 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
+          <?hard-pagebreak ?>
+
           <para>The following tables describe the ESPProcess Service Bindings,
           <emphasis role="bold">Feature Authentications</emphasis>.</para>
 
@@ -1825,6 +1827,8 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
+          <?hard-pagebreak ?>
+
           <para>Ws ECL VIPS option attributes.</para>
 
           <!--WsECL-Include-ZXX-2-->
@@ -2323,7 +2327,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
         <?hard-pagebreak ?>
 
-        <sect3>
+        <sect3 id="ThorClusterAttributesTab">
           <title>ThorCluster Attributes</title>
 
           <para>This section describes the Thor Cluster Attributes tab.</para>
@@ -2332,63 +2336,63 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
             <graphic fileref="images/CM-img18-1.jpg" vendor="configmgrSS" />
           </para>
 
-          <para>
-            <emphasis role="bold">Thor Memory Settings</emphasis>
-          </para>
-
-          <para>If <emphasis role="bold">globalMemorySize</emphasis> is left
-          unset, Thor[master] detects total physical memory and allocates 75%
-          of it. If there are multiple slaves per node (slavesPerNode&gt;1) it
-          divides the total among the slaves. If globalMemorySize is defined,
-          then it allocates that amount of memory to each slave. The
-          masterMemorySize attribute allocates memory for the Thor master. If
-          omitted, Thor master uses globalMemorySize, or the default 75% of
-          memory.</para>
-
-          <para>On systems with a lot of memory, the default 75% of physical
-          memory is probably too conservative and reserving total physical
-          minus 2GB (for the OS and other processes) is sensible. You should
-          then divide that number by the number of slavesPerNode.</para>
-
-          <para>If there are multiple Thors sharing the same nodes, then
-          globalMemorySize must be configured to take that into
-          account.</para>
-
-          <para>For example, if there are 2 Thors each with 2 slaves per box,
-          that will mean there are 4 slaves per physical node. So you should
-          use a formula similar to the following in your calculations when
-          configuring globalMemorySize:</para>
+          <sect4 id="ThorMemorySettings">
+            <title>Thor Memory Settings</title>
+
+            <para>When the <emphasis role="bold">globalMemorySize</emphasis>
+            is left unset, Thor[master] detects total physical memory and
+            allocates 75% of it. If there are multiple slaves per node
+            (slavesPerNode&gt;1) it divides the total among the slaves. If
+            globalMemorySize is defined, then it allocates that amount of
+            memory to each slave. The masterMemorySize attribute allocates
+            memory for the Thor master. If omitted, Thor master uses
+            globalMemorySize, or the default 75% of memory.</para>
+
+            <para>On systems with a lot of memory, the default 75% of physical
+            memory is probably too conservative and reserving total physical
+            minus 2GB (for the OS and other processes) is sensible. You should
+            then divide that number by the number of slavesPerNode.</para>
+
+            <para>If there are multiple Thors sharing the same nodes, then
+            globalMemorySize must be configured to take that into
+            account.</para>
+
+            <para>For example, if there are 2 Thors each with 2 slaves per
+            box, that will mean there are 4 slaves per physical node. So you
+            should use a formula similar to the following in your calculations
+            when configuring globalMemorySize:</para>
+
+            <programlisting>globalMemorySize = (total-physical-memory)-2GB / (2*2) </programlisting>
+
+            <para>Without any specified setting, Thor assumes it has exclusive
+            access to the memory and would therefore use too much (because
+            each Thor is unaware of the other's configuration and memory
+            usage).</para>
+
+            <para>If <emphasis role="bold">localThor</emphasis> is set to true
+            and <emphasis role="bold">masterMemorySize</emphasis> and
+            <emphasis role="bold">globalMemorySize</emphasis> are unspecified,
+            then the defaults will be 50% for <emphasis
+            role="bold">globalMemorySize</emphasis> (divided by <emphasis
+            role="bold">slavesPerNode</emphasis>) and 25% for <emphasis
+            role="bold">masterMemorySize.</emphasis></para>
+
+            <para>Although a configuration may be set using upper memory
+            limits that exceed total physical memory, Thor will not actually
+            reserve the memory ahead of time and will only hit memory problems
+            when and if your jobs use all of memory. So, for example, two
+            Thors that are configured to use all available memory could
+            peacefully co-exist until a query on each are simultaneously using
+            more memory than the node has available.</para>
+
+            <!--configMgr-Thor-Attribute-Include-XXX-->
 
-          <programlisting>globalMemorySize = (total-physical-memory)-2GB / (2*2) </programlisting>
-
-          <para>Without any specified setting, Thor assumes it has exclusive
-          access to the memory and would therefore use too much (because each
-          Thor is unaware of the other's configuration and memory
-          usage).</para>
-
-          <para>if <emphasis role="bold">localThor</emphasis> is set to true
-          and <emphasis role="bold">masterMemorySize</emphasis> and <emphasis
-          role="bold">globalMemorySize</emphasis> are unspecified, then the
-          defaults will be 50% for <emphasis
-          role="bold">globalMemorySize</emphasis> (divided by <emphasis
-          role="bold">slavesPerNode</emphasis>) and 25% for <emphasis
-          role="bold">masterMemorySize.</emphasis></para>
-
-          <para>Although a configuration may be set using upper memory limits
-          that exceed total physical memory, Thor will not actually reserve
-          the memory ahead of time and will only hit memory problems when and
-          if your jobs use all of memory. So, for example, two Thors that are
-          configured to use all available memory could peacefully co-exist
-          until a query on each are simultaneously using more memory than the
-          node has available.</para>
-
-          <!--configMgr-Thor-Attribute-Include-XXX-->
-
-          <para>
-            <xi:include href="XMLGeneration/xml/thor.xsd.mod.xml"
-                        xpointer="xpointer(//*[@id='Th.t1'])"
-                        xmlns:xi="http://www.w3.org/2001/XInclude" />
-          </para>
+            <para>
+              <xi:include href="XMLGeneration/xml/thor.xsd.mod.xml"
+                          xpointer="xpointer(//*[@id='Th.t1'])"
+                          xmlns:xi="http://www.w3.org/2001/XInclude" />
+            </para>
+          </sect4>
         </sect3>
 
         <?hard-pagebreak ?>