Merge branch 'candidate-6.2.x' into candidate-6.2.10

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

docs/ECLStandardLibraryReference/SLR-Mods/DaysBetween.xml

@@ -40,8 +40,8 @@
     </tgroup>
   </informaltable>
 
-  <para>The <emphasis role="bold">DayOfYear</emphasis> function calculate the
-  number of whole months between two dates.</para>
+  <para>The <emphasis role="bold">DaysBetween</emphasis> function calculates
+  the number of whole days between two dates.</para>
 
   <para>Example:</para>
 

docs/ECLStandardLibraryReference/SLR-Mods/MonthsBetween.xml

@@ -40,8 +40,8 @@
     </tgroup>
   </informaltable>
 
-  <para>The <emphasis role="bold">DayOfYear</emphasis> function calculate the
-  number of whole months between two dates.</para>
+  <para>The <emphasis role="bold">MonthsBetween</emphasis> function calculates
+  the number of whole months between two dates.</para>
 
   <para>Example:</para>
 

docs/ECLWatch/ECLWa_mods/ECLWatchSrc.xml

@@ -362,7 +362,7 @@
 
         <para>The Workunit Details Action Buttons allow you to perform actions
         on the selected workunit. Press the corresponding Action button to
-        allow you to perform the following actions. </para>
+        allow you to perform the following actions.</para>
 
         <itemizedlist>
           <listitem>
@@ -1143,8 +1143,10 @@
                            vendor="eclwatchSS" />
               </imageobject>
             </mediaobject>
-          </figure>You can browse or search for logical files from this page
-        using the Filter drop menu. <variablelist>
+          </figure></para>
+
+        <para>You can browse or search for logical files from this page using
+        the Filter drop menu. <variablelist>
             <varlistentry>
               <term>Note:</term>
 
@@ -1152,7 +1154,29 @@
                 <para>Filter criteria are not case sensitive.</para>
               </listitem>
             </varlistentry>
-          </variablelist><figure>
+          </variablelist></para>
+
+        <para><informaltable colsep="1" frame="all" rowsep="1">
+            <?dbfo keep-together="always"?>
+
+            <tgroup cols="2">
+              <colspec colwidth="49.50pt" />
+
+              <colspec />
+
+              <tbody>
+                <row>
+                  <entry><inlinegraphic
+                  fileref="../../images/caution.png" /></entry>
+
+                  <entry>If there are more than 100,000 logical files present
+                  you may see a warning message. </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable></para>
+
+        <para><figure>
             <title>Logical Files Page</title>
 
             <mediaobject>

docs/HPCCSystemAdmin/HPCCSystemAdministratorsGuide.xml

@@ -636,9 +636,9 @@
       <title>Data Handling</title>
 
       <para>When you start working with your HPCC system, you will want to
-      have some data on the system to process. Data gets transferred to and
-      the HPCC system by a process called a spray. Likewise to get data out
-      from an HPCC system it must be desprayed.</para>
+      have some data on the system to process. Data gets transferred to the
+      HPCC system by a process called a spray. Likewise to get data out from
+      an HPCC system it must be desprayed.</para>
 
       <para>As HPCC is a computer cluster the data gets deployed out over the
       nodes that make up the cluster. A <emphasis>spray</emphasis> or import

docs/Installing_and_RunningTheHPCCPlatform/Inst-Mods/UserSecurityMaint.xml

@@ -1528,8 +1528,6 @@
           </tgroup>
         </informaltable></para>
 
-      <para></para>
-
       <sect4 id="FeaturePermissions_Login">
         <title>Some Feature Permissions Notes</title>
 
@@ -2090,14 +2088,23 @@
     </sect3>
   </sect2>
 
-  <sect2 id="permissions_cache">
+  <sect2 id="permissions_cache" role="brk">
     <title>Permission Caching</title>
 
+    <para>A helpful feature found on the Permissions tab is the
+    <emphasis>Clear Permissions Cache</emphasis> button. The <emphasis>Clear
+    Permissions Cache</emphasis> button clears the cached permissions from
+    Dali and ESP.</para>
+
     <para>When you change a permission in ECL Watch, the settings are cached
     in the ESP server and stored in the Dali server. The information in the
     cache is updated at a configurable interval. This value can be set in the
-    Configuration Manager under the LDAP Server settings Attributes tab. The
-    default cacheTimeout is 5 minutes.</para>
+    Configuration Manager under the <emphasis>LDAP Server settings
+    Attributes</emphasis> tab. The default cacheTimeout is 5 minutes.</para>
+
+    <para><graphic fileref="../../images/Perm002.jpg"
+    vendor="eclwatchSS" />The Permissions Cache can be cleared from anywhere
+    on the permissions tab in ECL Watch.</para>
 
     <para>When you want a permission change to take effect immediately, you
     can clear the cache and force Dali to update the permission settings by
@@ -2107,4 +2114,62 @@
     temporarily while the LDAP settings in the Dali System Data Store
     repopulate.</para>
   </sect2>
+
+  <sect2 id="Advanced_Permissions" role="brk">
+    <title>Advanced Permissions</title>
+
+    <para>On the Permissions tab is the <emphasis
+    role="bold">Advanced</emphasis> (Permissions) button. The Advanced
+    menu/button provides access to manage file and workunit scope security.
+    The Advanced button is only enabled when you select either File or
+    Workunit Scopes on the Permissions tab.</para>
+
+    <para><graphic fileref="../../images/Perm022.jpg"
+    vendor="eclwatchSS" /></para>
+
+    <para>Press the Advanced button to display the Advanced permissions menu.
+    The Advanced menu is context aware, so if you select File Scopes from the
+    Permissions tab, then you can only choose to apply the relevant file scope
+    permissions, likewise if you selected workunits scopes.</para>
+
+    <para><emphasis role="bold">File Scans</emphasis></para>
+
+    <para>Using the Advanced Menu with File Scopes selected:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Enable or disable file scope security</para>
+      </listitem>
+
+      <listitem>
+        <para>Access the file scope default permission page</para>
+      </listitem>
+
+      <listitem>
+        <para>Access the Physical Files permission page</para>
+      </listitem>
+
+      <listitem>
+        <para>Check the file permissions - This option opens a dialog where
+        you can input a File name and select Users and Groups for the File
+        security scope.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para><graphic fileref="../../images/Perm023.jpg"
+    vendor="eclwatchSS" /></para>
+
+    <para><emphasis role="bold">Workunit scans</emphasis></para>
+
+    <para>Using the Advanced Menu with the Workunit Scopes selected opens only
+    the Default Permissions tab for the Workunit Scope (Default)
+    Permissions.</para>
+
+    <para><emphasis role="bold">NOTE:</emphasis> File or Workunit Scope
+    security needs to be enabled in your system configuration in order to use
+    File or Workunit Scope security on your system.</para>
+
+    <!-- /*Note: Maybe include the doc or steps for configuring your system to use File or Workunit scope security */
+-->
+  </sect2>
 </sect1>