Merge branch 'candidate-6.4.4'

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

clienttools/IDEPlugins/ESDL/esdl.bat.in

@@ -32,8 +32,8 @@ echo New Input file:  %newinput% >> %TMP%\log.txt
 echo New Ouput file:  %newoutput% >> %TMP%\log.txt
 copy /Y %3 %newinput%
 
-set "clienttoolsbindir=.\..\bin"
-set "clienttoolscompdir=.\..\componentfiles"
+set "clienttoolsbindir=..\..\bin"
+set "clienttoolscompdir=..\..\componentfiles"
 
 :begin
 if %action%==CalcIncludes goto eof

common/environment/environment.cpp

@@ -922,7 +922,10 @@ class CConstDropZoneInfo : public CConstEnvBase, implements IConstDropZoneInfo
 public:
     IMPLEMENT_IINTERFACE;
     IMPLEMENT_ICONSTENVBASE;
-    CConstDropZoneInfo(CLocalEnvironment *env, IPropertyTree *root) : CConstEnvBase(env, root) {}
+    CConstDropZoneInfo(CLocalEnvironment *env, IPropertyTree *root) : CConstEnvBase(env, root)
+    {
+        getStandardPosixPath(posixPath, root->queryProp("@directory"));
+    }
 
     virtual IStringVal&     getComputerName(IStringVal &str) const
     {
@@ -936,7 +939,7 @@ public:
     }
     virtual IStringVal&     getDirectory(IStringVal &str) const
     {
-        str.set(root->queryProp("@directory"));
+        str.set(posixPath.str());
         return str;
     }
     virtual IStringVal&     getUMask(IStringVal &str) const
@@ -953,6 +956,8 @@ public:
     {
         return new CConstDropZoneServerInfoIterator(this);
     }
+private:
+    StringBuffer posixPath;
 };
 
 #if 0

common/remote/sockfile.cpp

@@ -1706,6 +1706,11 @@ public:
         : CRemoteBase(_ep, _filename)
     {
         flags = ((unsigned)IFSHread)|((S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)<<16);
+        if (filename.length()>2 && isPathSepChar(filename[0]) && isShareChar(filename[2]))
+        {
+            VStringBuffer winDriveFilename("%c:%s", filename[1], filename+3);
+            filename.set(winDriveFilename);
+        }
     }
 
     bool exists()

dali/base/dacsds.cpp

@@ -210,7 +210,7 @@ void CRemoteConnection::rollback()
             virtual bool applyChild(IPropertyTree &parent, IPropertyTree &_child, bool &levelBreak)
             {
                 CClientRemoteTree &child = (CClientRemoteTree &)_child;
-                if (child.queryState())
+                if (!child.queryServerId() || child.queryState())
                 {
                     ((CClientRemoteTree &)parent).clearChildren(); // wipe children - SDS will lazy fetch them again as needed.
                     levelBreak = true;

dali/ft/filecopy.cpp

@@ -465,29 +465,32 @@ FileSizeThread::FileSizeThread(FilePartInfoArray & _queue, CriticalSection & _cs
 
 bool FileSizeThread::wait(unsigned timems)
 {
-    while (!sem.wait(timems))   { // report every time
-        if (!cur.get())
-            continue;       // window here?
-        cur->Link();
-        RemoteFilename *rfn=NULL;
-        if (copy) {
-            if (!cur->mirrorFilename.isNull())
-                rfn = &cur->mirrorFilename;
-        }
-        else {
-            rfn = &cur->filename;
-        }
-        if (rfn) {
-            StringBuffer url;
-            WARNLOG("Waiting for file: %s",rfn->getRemotePath(url).str());
-            cur->Release();
+    while (!sem.wait(timems))
+    { // report every time
+        StringBuffer rfn;
+        {
+            CriticalBlock lock(cs);
+            if (cur.get())
+            {
+                if (copy)
+                {
+                    if (!cur->mirrorFilename.isNull())
+                        cur->mirrorFilename.getRemotePath(rfn);
+                }
+                else
+                {
+                    cur->filename.getRemotePath(rfn);
+                }
+            }
+        }
+        if (!rfn.isEmpty())
+        {
+            WARNLOG("Waiting for file: %s",rfn.str());
             return false;
         }
-        cur->Release();
     }
     sem.signal(); // if called again
     return true;
-
 }
 
 int FileSizeThread::run()
@@ -497,17 +500,20 @@ int FileSizeThread::run()
         RemoteFilename remoteFilename;
         for (;;)
         {
-            cur.clear();
-            cs.enter();
-            if (queue.ordinality())
-                cur.setown(&queue.popGet());
-            cs.leave();
+            {
+                CriticalBlock lock(cs);
+                cur.clear();
+                if (queue.ordinality())
+                    cur.setown(&queue.popGet());
+            }
 
             if (!cur.get())
                 break;
             copy=0;
-            for (copy = 0;copy<2;copy++) {
-                if (copy) {
+            for (copy = 0;copy<2;copy++)
+            {
+                if (copy)
+                {
                     if (cur->mirrorFilename.isNull())
                         continue;  // not break
                     remoteFilename.set(cur->mirrorFilename);
@@ -516,8 +522,10 @@ int FileSizeThread::run()
                     remoteFilename.set(cur->filename);
                 OwnedIFile thisFile = createIFile(remoteFilename);
                 offset_t thisSize = thisFile->size();
-                if (thisSize == -1) {
-                    if (errorIfMissing) {
+                if (thisSize == -1)
+                {
+                    if (errorIfMissing)
+                    {
                         StringBuffer s;
                         throwError1(DFTERR_CouldNotOpenFile, remoteFilename.getRemotePath(s).str());
                     }
@@ -527,7 +535,8 @@ int FileSizeThread::run()
                 if (isCompressed)
                 {
                     Owned<IFileIO> io = createCompressedFileReader(thisFile); //check succeeded?
-                    if (!io) {
+                    if (!io)
+                    {
                         StringBuffer s;
                         throwError1(DFTERR_CouldNotOpenCompressedFile, remoteFilename.getRemotePath(s).str());
                     }
@@ -536,11 +545,12 @@ int FileSizeThread::run()
                 cur->size = thisSize;
                 break;
             }
-            if (copy==1) { // need to set primary
+            if (copy==1)
+            { // need to set primary
+                CriticalBlock lock(cs);
                 cur->mirrorFilename.set(cur->filename);
                 cur->filename.set(remoteFilename);
             }
-            cur.clear();
         }
     }
     catch (IException * e)

dali/ft/filecopy.ipp

@@ -34,12 +34,12 @@ public:
     SimplePartFilter(IDFPartFilter * _nextFilter)   { nextFilter.set(_nextFilter); }
     IMPLEMENT_IINTERFACE
 
-    virtual bool includePart(unsigned part)     
-    { 
+    virtual bool includePart(unsigned part)
+    {
         if (nextFilter && !nextFilter->includePart(part))
             return false;
-        if (include.isItem(part)) 
-            return include.item(part); 
+        if (include.isItem(part))
+            return include.item(part);
         return false;
      }
 
@@ -64,7 +64,7 @@ public:
 
     virtual int run();
     virtual bool abortRequested() { return isAborting(); }
-    
+
 protected:
     bool catchReadBuffer(ISocket * socket, MemoryBuffer & msg, unsigned timeout);
 
@@ -154,9 +154,9 @@ public:
     FileSizeThread(FilePartInfoArray & _queue, CriticalSection & _cs, bool _isCompressed, bool _errorIfMissing);
 
     virtual int run();
-            bool wait(unsigned timems);
+    bool wait(unsigned timems);
 
-            void queryThrowError()  { if (error) throw error.getLink(); }
+    void queryThrowError()  { if (error) throw error.getLink(); }
 
 protected:
     Semaphore                   sem;
@@ -271,7 +271,7 @@ protected:
     void storeCsvRecordStructure(IFormatPartitioner &partitioner);
     void examineCsvStructure();
     IFormatPartitioner * createPartitioner(aindex_t index, bool calcOutput, unsigned numParts);
-    
+
 private:
     bool calcUsePull();
     // Get and store Remote File Name parts into the History record

docs/DynamicESDL/DESDL-Mods/ESDLESParray.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESParray">
-  <title><emphasis role="bold">ESParray</emphasis></title>
+  <title>ESParray</title>
 
   <para><indexterm>
       <primary>ESParray</primary>

docs/DynamicESDL/DESDL-Mods/ESDLESPinclude.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESPinclude">
-  <title><emphasis role="bold">ESPinclude</emphasis></title>
+  <title>ESPinclude</title>
 
   <para>ESPinclude <indexterm>
       <primary>ESPinclude</primary>

docs/DynamicESDL/DESDL-Mods/ESDLESPmethod.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESPmethod">
-  <title><emphasis role="bold">ESPmethod</emphasis></title>
+  <title>ESPmethod</title>
 
   <para><indexterm>
       <primary>ESPmethod</primary>

docs/DynamicESDL/DESDL-Mods/ESDLESPrequest.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESPrequest">
-  <title><emphasis role="bold">ESPrequest</emphasis></title>
+  <title>ESPrequest</title>
 
   <para><indexterm>
       <primary>ESPrequest</primary>

docs/DynamicESDL/DESDL-Mods/ESDLESPresponse.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESPresponse">
-  <title><emphasis role="bold">ESPresponse</emphasis></title>
+  <title>ESPresponse</title>
 
   <para><indexterm>
       <primary>ESPresponse</primary>

docs/DynamicESDL/DESDL-Mods/ESDLESPstruct.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESP_Struct">
-  <title>ESP<emphasis role="bold">struct</emphasis></title>
+  <title>ESPstruct</title>
 
   <para>ESPstruct <indexterm>
       <primary>ESPstruct</primary>

docs/DynamicESDL/DESDL-Mods/ESDLTypeMapping.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_ECLTypeMapping">
-  <title><emphasis role="bold">ESDL, XSD, and ECL Type
-  Mapping</emphasis></title>
+  <title>ESDL, XSD, and ECL Type Mapping</title>
 
   <para><informaltable colsep="1" frame="all" rowsep="1">
       <tgroup cols="3">

docs/DynamicESDL/DESDL-Mods/ESDLauth_feature.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_auth_feature">
-  <title><emphasis role="bold">auth_feature</emphasis></title>
+  <title>auth_feature</title>
 
   <para><indexterm>
       <primary>auth_feature</primary>

docs/DynamicESDL/DESDL-Mods/ESDLbinary.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_binary">
-  <title><emphasis role="bold">binary</emphasis></title>
+  <title>binary</title>
 
   <para><indexterm>
       <primary>binary</primary>

docs/DynamicESDL/DESDL-Mods/ESDLbooleanbool.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_boolean">
-  <title><emphasis role="bold">boolean <indexterm>
+  <title>boolean<indexterm>
       <primary>boolean</primary>
-    </indexterm>bool</emphasis></title>
+    </indexterm>bool </title>
 
   <para><indexterm>
       <primary>bool</primary>

docs/DynamicESDL/DESDL-Mods/ESDLdepr_ver.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_depr_ver">
-  <title><emphasis role="bold">depr_ver</emphasis></title>
+  <title>depr_ver</title>
 
   <para><indexterm>
       <primary>depr_ver</primary>

docs/DynamicESDL/DESDL-Mods/ESDLdescription.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_description">
-  <title><emphasis role="bold">description</emphasis></title>
+  <title>description</title>
 
   <para><indexterm>
       <primary>description</primary>

docs/DynamicESDL/DESDL-Mods/ESDLdouble.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_double">
-  <title><emphasis role="bold">double</emphasis></title>
+  <title>double</title>
 
   <para><indexterm>
       <primary>double</primary>

docs/DynamicESDL/DESDL-Mods/ESDLecl_max_len.xml

@@ -4,8 +4,7 @@
 <sect1 id="ESDL_Attributes_ecl_max_len">
   <title>ecl_max_len <indexterm>
       <primary>ecl_max_len</primary>
-    </indexterm>(<emphasis role="bold">n</emphasis><emphasis
-  role="bold">)</emphasis></title>
+    </indexterm>(n)</title>
 
   <para>This <emphasis>ecl_max_len</emphasis> attribute tells the ECL
   generator to use ECL <emphasis>maxlength </emphasis>instead of the regular

docs/DynamicESDL/DESDL-Mods/ESDLecl_name.xml

@@ -4,8 +4,7 @@
 <sect1 id="ESDL_Attributes_ecl_name">
   <title>ecl_name <indexterm>
       <primary>ecl_name</primary>
-    </indexterm>("<emphasis role="bold">name</emphasis><emphasis
-  role="bold">")</emphasis></title>
+    </indexterm>("name")</title>
 
   <para>The <emphasis>ecl_name</emphasis> attribute specifies the field name
   in generated ECL code. By default, the field name in ECL is the same as the

docs/DynamicESDL/DESDL-Mods/ESDLecl_null.xml

@@ -4,9 +4,8 @@
 <sect1 id="ESDL_Attributes_ecl_null">
   <title>ecl_null <indexterm>
       <primary>ecl_null</primary>
-    </indexterm>(<emphasis role="bold">n</emphasis><emphasis role="bold"> |
-  </emphasis><emphasis role="bold">string</emphasis><emphasis
-  role="bold">)</emphasis></title>
+    </indexterm>(n |
+  string)</title>
 
   <para>The <emphasis>ecl_null </emphasis>attribute tells ESP to remove the
   field altogether if the field's value is <emphasis>n</emphasis> or

docs/DynamicESDL/DESDL-Mods/ESDLecl_type.xml

@@ -4,8 +4,7 @@
 <sect1 id="ESDL_Attributes_ecl_type">
   <title>ecl_type <indexterm>
       <primary>ecl_type</primary>
-    </indexterm>("<emphasis role="bold">type</emphasis><emphasis
-  role="bold">")</emphasis></title>
+    </indexterm>("type")</title>
 
   <para>The <emphasis>ecl_type</emphasis> attribute defines the field type in
   ECL.</para>

docs/DynamicESDL/DESDL-Mods/ESDLfloat.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_float">
-  <title><emphasis role="bold">float</emphasis></title>
+  <title>float</title>
 
   <para><indexterm>
       <primary>float</primary>

docs/DynamicESDL/DESDL-Mods/ESDLget_data_from.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_get_data_from">
-  <title><emphasis role="bold">get_data_from</emphasis></title>
+  <title>get_data_from</title>
 
   <para><indexterm>
       <primary>get_data_from</primary>
@@ -22,11 +22,11 @@
 
   <para>In the example above, the query returns the data in Var1 then the
   service puts the data into the Var2 field and sends that in the response to
-  the client. </para>
+  the client.</para>
 
   <para>In this example both Var1 and Var2 are in the response to the client.
   Typically, Var1 and Var2 are in non-overlapping versions so only one will be
-  in the response depending on the version specified. </para>
+  in the response depending on the version specified.</para>
 
   <para>Since the get_data_from attribute supports complex data types, such as
   an ESPstruct, the fields do not have to be limited to string types.</para>

docs/DynamicESDL/DESDL-Mods/ESDLhelp.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_help">
-  <title><emphasis role="bold">help</emphasis></title>
+  <title>help</title>
 
   <para><indexterm>
       <primary>help</primary>

docs/DynamicESDL/DESDL-Mods/ESDLint.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_int">
-  <title><emphasis role="bold">int</emphasis></title>
+  <title>int</title>
 
   <para><indexterm>
       <primary>int</primary>

docs/DynamicESDL/DESDL-Mods/ESDLint64.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_int64">
-  <title><emphasis role="bold">int64</emphasis></title>
+  <title>int64</title>
 
   <para><indexterm>
       <primary>int64</primary>

docs/DynamicESDL/DESDL-Mods/ESDLleading_zero.xml

@@ -4,8 +4,7 @@
 <sect1 id="ESDL_Attributes_leading_zero">
   <title>leading_zero(<indexterm>
       <primary>leading_zero</primary>
-    </indexterm><emphasis role="bold">n</emphasis><emphasis
-  role="bold">)</emphasis></title>
+    </indexterm>n)</title>
 
   <para>The <emphasis>leading_zero</emphasis> attribute adds zero(s) to the
   field value to so that the total length is <emphasis>n</emphasis>.</para>

docs/DynamicESDL/DESDL-Mods/ESDLmax_count_var.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_max_count_var">
-  <title><emphasis role="bold">max_count_var</emphasis></title>
+  <title>max_count_var</title>
 
   <para><indexterm>
       <primary>max_count_var</primary>

docs/DynamicESDL/DESDL-Mods/ESDLmax_len.xml

@@ -2,10 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_max_len">
-  <title><emphasis role="bold">max_len <indexterm>
+  <title>max_len <indexterm>
       <primary>max_len</primary>
-    </indexterm>(</emphasis><emphasis role="bold">n</emphasis><emphasis
-  role="bold">)</emphasis></title>
+    </indexterm>(n)</title>
 
   <para>The <emphasis>max_len</emphasis> attribute specifies the field length
   for ECL string field.</para>

docs/DynamicESDL/DESDL-Mods/ESDLmax_ver.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_max_ver">
-  <title><emphasis role="bold">max_ver</emphasis></title>
+  <title>max_ver</title>
 
   <para><indexterm>
       <primary>max_ver</primary>

docs/DynamicESDL/DESDL-Mods/ESDLmin_ver.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_min_ver">
-  <title><emphasis role="bold">min_ver</emphasis></title>
+  <title>min_ver</title>
 
   <para><indexterm>
       <primary>min_ver</primary>

docs/DynamicESDL/DESDL-Mods/ESDLoptional.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_optional">
-  <title><emphasis role="bold">optional</emphasis></title>
+  <title>optional</title>
 
   <para><indexterm>
       <primary>optional</primary>

docs/DynamicESDL/DESDL-Mods/ESDLstring.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Data_string">
-  <title><emphasis role="bold">string</emphasis></title>
+  <title>string</title>
 
   <para><indexterm>
       <primary>string</primary>

docs/DynamicESDL/DESDL-Mods/ESDLversion.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ESDL_Attributes_version">
-  <title><emphasis role="bold">version <indexterm>
+  <title>version <indexterm>
       <primary>version</primary>
-    </indexterm>and default_client_version</emphasis></title>
+    </indexterm>and default_client_version</title>
 
   <para><indexterm>
       <primary>default_client_version</primary>

docs/ECLPlayground/ECLPlayground-includer.xml

@@ -62,7 +62,7 @@
   </bookinfo>
 
   <chapter id="ECLPlaygroundChap">
-    <title><emphasis>ECL Playground</emphasis></title>
+    <title>ECL Playground</title>
 
     <para>This manual covers the ECL Playground which is a component found in
     ECL Watch.</para>

docs/ECLProgrammersGuide/PRG_Mods/CodeSign.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="code-signing">
-  <title><emphasis role="strong">Code Signing, Embedded languages, and
-  Security</emphasis></title>
+  <title>Code Signing, Embedded languages, and Security</title>
 
   <para>Versions of HPCC Systems<superscript>®</superscript> platform prior to
   6.0.0 have always allowed some control over which operations were permitted
@@ -113,7 +112,7 @@
 
             <entry>(Valid only for --allowedsigned). This specifies that
             access to data is only allowed if the code has been signed and the
-            key is present. </entry>
+            key is present.</entry>
           </row>
         </tbody>
       </tgroup>

docs/ECLProgrammersGuide/PRG_Mods/PrG_Automated_ECL.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Automated_ECL">
-  <title><emphasis role="bold">Automated ECL</emphasis></title>
+  <title>Automated ECL</title>
 
   <para>Once you have established standard ECL processes that you know you
   need to perform regularly, you can begin to make those processes automated.

docs/ECLProgrammersGuide/PRG_Mods/PrG_Complex_ROXIE_Queries.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Complex_Roxie_Query_Techniques">
-  <title><emphasis role="bold">Complex Roxie Query
-  Techniques</emphasis></title>
+  <title>Complex Roxie Query Techniques</title>
 
   <para>The ECL coding techniques used in Roxie queries can be quite complex,
   making use of multiple keys, payload keys, half-keyed JOINs, the KEYDIFF

docs/ECLProgrammersGuide/PRG_Mods/PrG_CreateMaintain_Superfiles.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Creating_and_Maintaining_SuperFiles">
-  <title><emphasis role="bold">Creating and Maintaining
-  SuperFiles</emphasis></title>
+  <title>Creating and Maintaining SuperFiles</title>
 
   <sect2 id="Creating_Data">
     <title>Creating Data</title>

docs/ECLProgrammersGuide/PRG_Mods/PrG_Creating_example_data.xml

@@ -2,55 +2,57 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Creating_Example_Data">
-  <title><emphasis role="bold">Creating Example Data</emphasis></title>
+  <title>Creating Example Data</title>
 
   <sect2 id="Getting_Code_Files">
     <title>Getting Code Files</title>
-  <para>All the example code for the <emphasis>Programmer's Guide</emphasis>
-  is available for download from the HPCC Systems website from the same page
-  that the PDF is available (<ulink
-  url="http://hpccsystems.com/download/docs/learning-ecl">click here</ulink>).
-  To make this code available for use in the ECL IDE, you simply:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>Download the ECL_Code_Files.ZIP file.</para>
-    </listitem>
-
-    <listitem>
-      <para>In the ECL IDE, highlight your "My Files" folder, right-click and
-      select "Insert Folder" from the popup menu.</para>
-    </listitem>
-
-    <listitem>
-      <para>Name your new folder "ProgrammersGuide" (please note -- spaces are
-      NOT allowed in your ECL repository folder names).</para>
-    </listitem>
-
-    <listitem>
-      <para>In the ECL IDE, highlight your "ProgrammersGuide" folder,
-      right-click and select "Locate File in Explorer" from the popup
-      menu.</para>
-    </listitem>
-
-    <listitem>
-      <para>Extract all the files from the ECL_Code_Files.ZIP file into your
-      new folder.</para>
-    </listitem>
-  </orderedlist>
+
+    <para>All the example code for the <emphasis>Programmer's Guide</emphasis>
+    is available for download from the HPCC Systems website from the same page
+    that the PDF is available (<ulink
+    url="http://hpccsystems.com/download/docs/learning-ecl">click
+    here</ulink>). To make this code available for use in the ECL IDE, you
+    simply:</para>
+
+    <orderedlist>
+      <listitem>
+        <para>Download the ECL_Code_Files.ZIP file.</para>
+      </listitem>
+
+      <listitem>
+        <para>In the ECL IDE, highlight your "My Files" folder, right-click
+        and select "Insert Folder" from the popup menu.</para>
+      </listitem>
+
+      <listitem>
+        <para>Name your new folder "ProgrammersGuide" (please note -- spaces
+        are NOT allowed in your ECL repository folder names).</para>
+      </listitem>
+
+      <listitem>
+        <para>In the ECL IDE, highlight your "ProgrammersGuide" folder,
+        right-click and select "Locate File in Explorer" from the popup
+        menu.</para>
+      </listitem>
+
+      <listitem>
+        <para>Extract all the files from the ECL_Code_Files.ZIP file into your
+        new folder.</para>
+      </listitem>
+    </orderedlist>
   </sect2>
 
   <sect2 id="Generating_Files">
     <title>Generating Files</title>
 
-  <para>The code that generates the example data used by all the
-  <emphasis>Programmer's Guide</emphasis> articles is contained in a file
-  named Gendata.ECL. You simply need to open that file in the ECL IDE (select
-  <emphasis role="bold">File &gt; Open</emphasis> from the menu, select the
-  Gendata.ECL file, and it will open in a Builder window) then press the
-  <emphasis role="bold">Submit</emphasis> button to generate the data files.
-  The process takes a couple of minutes to run. Here is the code, fully
-  explained.</para>
+    <para>The code that generates the example data used by all the
+    <emphasis>Programmer's Guide</emphasis> articles is contained in a file
+    named Gendata.ECL. You simply need to open that file in the ECL IDE
+    (select <emphasis role="bold">File &gt; Open</emphasis> from the menu,
+    select the Gendata.ECL file, and it will open in a Builder window) then
+    press the <emphasis role="bold">Submit</emphasis> button to generate the
+    data files. The process takes a couple of minutes to run. Here is the
+    code, fully explained.</para>
   </sect2>
 
   <sect2 id="Some_Constants">

docs/ECLProgrammersGuide/PRG_Mods/PrG_Crosstab_reports.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Cross-Tab_Reports">
-  <title><emphasis role="bold">Cross-Tab Reports</emphasis></title>
+  <title>Cross-Tab Reports</title>
 
   <para>Cross-Tab reports are a very useful way of discovering statistical
   information about the data that you work with. They can be easily produced

docs/ECLProgrammersGuide/PRG_Mods/PrG_Indexing_Superfiles.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Indexing_into_SuperFiles">
-  <title><emphasis role="bold">Indexing into SuperFiles</emphasis></title>
+  <title>Indexing into SuperFiles</title>
 
   <sect2 id="SuperFiles_vs_SuperKeys">
     <title>SuperFiles vs. SuperKeys</title>

docs/ECLProgrammersGuide/PRG_Mods/PrG_Job_Failure.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Job_Failure">
-  <title><emphasis role="bold">Job “Failure”</emphasis></title>
+  <title>Job “Failure”</title>
 
   <para>Sometimes jobs fail. And sometimes that behavior is by design.</para>
 

docs/ECLProgrammersGuide/PRG_Mods/PrG_NonRandom_Random.xml

@@ -2,13 +2,12 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Non-Random_RANDOM">
-  <title><emphasis role="bold">Non-Random RANDOM</emphasis></title>
+  <title>Non-Random RANDOM</title>
 
-  <para>There are occasions when you need a random number, but once
-  you've gotten it, you want that value to stay the same for the duration of
-  the workunit. For example, the “problem” with this code is that it will
-  OUTPUT three different values (this code is in
-  NonRandomRandom.ECL):</para>
+  <para>There are occasions when you need a random number, but once you've
+  gotten it, you want that value to stay the same for the duration of the
+  workunit. For example, the “problem” with this code is that it will OUTPUT
+  three different values (this code is in NonRandomRandom.ECL):</para>
 
   <programlisting>INTEGER1 Rand1 := (RANDOM() % 25) + 1;
 OUTPUT(Rand1);

docs/ECLProgrammersGuide/PRG_Mods/PrG_Records_Containing_Any_Set_of_Words.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Records_Containing_Any_of_a_Set_of_Words">
-  <title><emphasis>Records Containing Any of a Set of Words</emphasis></title>
+  <title>Records Containing Any of a Set of Words</title>
 
   <para>Part of the data cleanup problem is the possible presence of profanity
   or cartoon character names in the data. This can become an issue whenever
@@ -109,17 +109,17 @@ ENDMACRO;
   <para>This MACRO does a bit more than the previous example. It begins by
   passing in:</para>
 
-  <para> * The set of words to find</para>
+  <para>* The set of words to find</para>
 
-  <para> * The file to search</para>
+  <para>* The file to search</para>
 
-  <para> * The unique identifier field for the search record</para>
+  <para>* The unique identifier field for the search record</para>
 
-  <para> * The field to search in</para>
+  <para>* The field to search in</para>
 
-  <para> * The attribute name of the resulting recordset</para>
+  <para>* The attribute name of the resulting recordset</para>
 
-  <para> * The type of matching to do (defaulting to 1)</para>
+  <para>* The type of matching to do (defaulting to 1)</para>
 
   <para>Passing in the set of words to seek allows the MACRO to operate
   against any given set of strings. Specifying the result attribute name

docs/ECLProgrammersGuide/PRG_Mods/PrG_Roxie_Overview.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Roxie_Overview" role="nobrk">
-  <title><emphasis role="bold">Roxie Overview</emphasis></title>
+  <title>Roxie Overview</title>
 
   <para>Let's start with some definitions:</para>
 

docs/ECLProgrammersGuide/PRG_Mods/PrG_SOAPCALL_fromTHOR_to_ROXIE.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="SOAPCALL_from_Thor_to_Roxie">
-  <title><emphasis role="bold">SOAPCALL from Thor to Roxie</emphasis></title>
+  <title>SOAPCALL from Thor to Roxie</title>
 
   <para>Once you have your SOAP-enabled queries tested and deployed to Roxie,
   you need to be able to use them. Many Roxie queries can be launched through

docs/ECLProgrammersGuide/PRG_Mods/PrG_SOAPenable_Queries.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="SOAP-enabling_Queries">
-  <title><emphasis role="bold">SOAP-enabling Queries</emphasis></title>
+  <title>SOAP-enabling Queries</title>
 
   <para>Queries destined for use in Roxie are SOAP-enabled first. The required
   ECL code to accomplish this is the STORED workflow service. Roxie queries

docs/ECLProgrammersGuide/PRG_Mods/PrG_Simple_Random_Samples.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Simple_Random_Samples">
-  <title><emphasis>Simple Random Samples</emphasis></title>
+  <title>Simple Random Samples</title>
 
   <para>There is a statistical concept called a “Simple Random Sample” in
   which a statistically “random” (different from simply using the RANDOM()

docs/ECLProgrammersGuide/PRG_Mods/PrG_Smart_Stepping.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Smart_Stepping">
-  <title><emphasis role="bold">Smart Stepping</emphasis></title>
+  <title>Smart Stepping</title>
 
   <sect2 id="PG_Overview">
     <title>Overview</title>

docs/ECLProgrammersGuide/PRG_Mods/PrG_Using_ECL_Keys.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Using_ECL_Keys-INDEX_Files">
-  <title><emphasis role="bold">Using ECL Keys (INDEX Files)</emphasis></title>
+  <title>Using ECL Keys (INDEX Files)</title>
 
   <para>The ETL (Extract, Transform, and Load—standard data ingest processing)
   operations in ECL typically operate against all or most of the records in

docs/ECLProgrammersGuide/PRG_Mods/PrG_Using_Group_Function.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Using_the_GROUP_Function">
-  <title><emphasis role="bold">Using the GROUP Function</emphasis></title>
+  <title>Using the GROUP Function</title>
 
   <para>The GROUP function provides important functionality when processing
   very large datasets. The basic concept is that the GROUP function will break

docs/ECLProgrammersGuide/PRG_Mods/PrG_Using_Superkeys.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Using_SuperKeys">
-  <title><emphasis role="bold">Using SuperKeys</emphasis></title>
+  <title>Using SuperKeys</title>
 
   <para>A SuperFile whose sub-files are INDEXes (not DATASETs) is a SuperKey.
   As described previously in the <emphasis>Indexing Into SuperFiles</emphasis>
@@ -19,8 +19,8 @@
   operation for a payload key is the half-keyed JOIN, that also becomes the
   primary SuperKey operational use.</para>
 
-  <para>Both SuperFiles and SuperKeys may be used in Thor or Roxie operations.
-  </para>
+  <para>Both SuperFiles and SuperKeys may be used in Thor or Roxie
+  operations.</para>
 
   <para>The following attribute definitions used by the code examples in this
   article are declared in the DeclareData MODULE structure attribute:</para>

docs/ECLProgrammersGuide/PRG_Mods/PrG_Workwith_Blobs.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Working_with_BLOBs">
-  <title><emphasis role="bold">Working with BLOBs</emphasis></title>
+  <title>Working with BLOBs</title>
 
   <para>BLOB (Binary Large OBject) support in ECL begins with the DATA value
   type. This type may contain any type of data, making it perfect for housing
@@ -76,7 +76,7 @@ imageData := DATASET('LE::imagedb',imageRecord,FLAT);
     contain an integer value specifying the number of bytes in the original
     file, followed by the XML data from the file.</para>
 
-    <para>The upper size limit for any STRING or DATA value is 4GB. </para>
+    <para>The upper size limit for any STRING or DATA value is 4GB.</para>
 
     <para>The addition of the RecPos field (a standard ECL “record pointer”
     field) allows us to create an INDEX, like this:</para>

docs/ECLProgrammersGuide/PRG_Mods/PrG_Workwith_XML_Data.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Working_with_XML_Data">
-  <title><emphasis role="bold">Working with XML Data</emphasis></title>
+  <title>Working with XML Data</title>
 
   <para>Data is not always handed to you in nice, easy-to-work-with,
   fixed-length flat files; it comes in many forms. One form growing in usage

docs/ECLProgrammersGuide/PRG_Mods/PrG_control_ROXIE_queries.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Controlling_Roxie_Queries">
-  <title><emphasis role="bold">Controlling Roxie Queries</emphasis></title>
+  <title>Controlling Roxie Queries</title>
 
   <para>There are several ECL functions that are designed specifically to help
   optimize queries for execution on Roxie. These include PRELOAD, ALLNODES,

docs/ECLProgrammersGuide/PRG_Mods/PrG_query_libraries.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Query_Libraries">
-  <title><emphasis role="bold">Query Libraries</emphasis></title>
+  <title>Query Libraries</title>
 
   <para>A Query Library is a set of attributes, packaged together in a self
   contained unit, which allows the code to be shared between different

docs/ECLStandardLibraryReference/SLR-Mods/DaliServers.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="DaliServer">
-  <title><emphasis role="bold">DaliServer</emphasis></title>
+  <title>DaliServer</title>
 
   <para><emphasis role="bold">STD.System.Thorlib.DaliServer <indexterm>
       <primary>STD.System.ThorLib.DaliServer</primary>

docs/ECLStandardLibraryReference/SLR-Mods/Double.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Double">
-  <title><emphasis role="bold">Double</emphasis></title>
+  <title>Double</title>
 
   <para><emphasis role="bold">STD.Metaphone.Double<indexterm>
       <primary>Std.Metaphone.Double</primary>

docs/ECLStandardLibraryReference/SLR-Mods/GetExpandLogicalFileName.xml

@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="GetExpandLogicalFileName">
-   <title>
-      <emphasis role="bold">GetExpandLogicalFileName</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">ThorLib.GetExpandLogicalFileName<indexterm>
+  <title>GetExpandLogicalFileName</title>
+
+  <para><emphasis role="bold">ThorLib.GetExpandLogicalFileName<indexterm>
       <primary>STD.System.ThorLib.GetExpandLogicalFileName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.ThorLib.GetExpandLogicalFileName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>ThorLib.GetExpandLogicalFileName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>GetExpandLogicalFileName</primary>
-    </indexterm>
-(
-        </emphasis>
-      <emphasis>filename </emphasis>
-      <emphasis role="bold">)</emphasis>
-   </para>
+    </indexterm> ( </emphasis> <emphasis>filename </emphasis> <emphasis
+  role="bold">)</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -31,28 +23,29 @@
 
       <tbody>
         <row>
+          <entry><emphasis>filename</emphasis></entry>
 
-   
-
-   <entry>
-      <emphasis>filename</emphasis> </entry><entry>A null-terminated string
-        containing the logical name of the file.</entry>
+          <entry>A null-terminated string containing the logical name of the
+          file.</entry>
         </row>
-        <row>
-   <entry>Return:<emphasis> </emphasis></entry><entry>GetExpandLogicalFileName returns a
-        VARSTRING (null-terminated) value.</entry>
 
+        <row>
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>GetExpandLogicalFileName returns a VARSTRING
+          (null-terminated) value.</entry>
         </row>
-
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">GetExpandLogicalFileName
-        </emphasis>function returns a string containing the expanded logical
-        filename (ncluding the default scope, if the filename does not contain
-        a leading tilde), all in lowercase. This is the same value as is used
-        internally by DATASET and OUTPUT.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">A := ThorLib.GetExpandLogicalFileName('Fred');</programlisting>
-</sect1>
+
+  <para>The <emphasis role="bold">GetExpandLogicalFileName </emphasis>function
+  returns a string containing the expanded logical filename (ncluding the
+  default scope, if the filename does not contain a leading tilde), all in
+  lowercase. This is the same value as is used internally by DATASET and
+  OUTPUT.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">A := ThorLib.GetExpandLogicalFileName('Fred');</programlisting>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/GetHostName.xml

@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="GetHostName">
-   <title>
-      <emphasis role="bold">GetHostName</emphasis>
-   </title>
-   <para>
-      <emphasis>result</emphasis>
-      <emphasis role="bold"> :=
-        STD.System.Util.GetHostName<indexterm>
+  <title>GetHostName</title>
+
+  <para><emphasis>result</emphasis> <emphasis role="bold"> :=
+  STD.System.Util.GetHostName<indexterm>
       <primary>STD.System.Util.GetHostName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.Util.GetHostName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Util.GetHostName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>GetHostName</primary>
-    </indexterm>(</emphasis>
-      <emphasis> ip </emphasis>
-      <emphasis role="bold">);</emphasis>
-   </para>
+    </indexterm>(</emphasis> <emphasis> ip </emphasis> <emphasis
+  role="bold">);</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -31,28 +24,30 @@
 
       <tbody>
         <row>
-          
+          <entry><emphasis>ip</emphasis></entry>
 
-
-   <entry>
-      <emphasis>ip</emphasis> </entry><entry>A null-terminated string containing the
-        IP address of the remote machine.</entry>
+          <entry>A null-terminated string containing the IP address of the
+          remote machine.</entry>
         </row>
-        <row>
-   <entry>Return:<emphasis> </emphasis></entry><entry>GetHostName returns returns a
-        VARSTRING (null-terminated) value.</entry>
 
+        <row>
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>GetHostName returns returns a VARSTRING (null-terminated)
+          value.</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">GetHostName </emphasis>function does a
-        reverse DNS lookup to return the host name for the machine at the
-        specified <emphasis>ip</emphasis> address.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">IP   := '10.150.254.6';
+
+  <para>The <emphasis role="bold">GetHostName </emphasis>function does a
+  reverse DNS lookup to return the host name for the machine at the specified
+  <emphasis>ip</emphasis> address.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">IP   := '10.150.254.6';
    
 OUTPUT(STD.System.Util.GetHostName(IP));
 </programlisting>
-</sect1>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/GetLogicalFileAttribute.xml

@@ -35,8 +35,8 @@
           size, clusterName, directory, owner, description, ECL, partmask,
           numparts, name, modified, format, job, checkSum, kind, csvSeparate,
           csvTerminate, headerLength, footerLength, rowTag, workunit,
-          accessed, maxRecordSize, csvQuote, blockCompressed, compressedSize,
-          fileCrc, formatCrc, or protected. The value is
+          accessed, expireDays, maxRecordSize, csvQuote, blockCompressed,
+          compressedSize, fileCrc, formatCrc, or protected. The value is
           case-sensitive.</entry>
         </row>
 
@@ -84,6 +84,7 @@ OUTPUT(STD.File.GetLogicalFileAttribute(file,'footerLength'));
 OUTPUT(STD.File.GetLogicalFileAttribute(file,'rowtag'));
 OUTPUT(STD.File.GetLogicalFileAttribute(file,'workunit'));
 OUTPUT(STD.File.GetLogicalFileAttribute(file,'accessed'));
+OUTPUT(STD.File.GetLogicalFileAttribute(file,'expireDays'));
 OUTPUT(STD.File.GetLogicalFileAttribute(file,'maxRecordSize'));
 OUTPUT(STD.File.GetLogicalFileAttribute(file,'csvQuote'));
 OUTPUT(STD.File.GetLogicalFileAttribute(file,'blockCompressed'));

docs/ECLStandardLibraryReference/SLR-Mods/Group.xml

@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Group">
-   <title>
-      <emphasis role="bold">Group</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">STD.System.Thorlib.Group<indexterm>
+  <title>Group</title>
+
+  <para><emphasis role="bold">STD.System.Thorlib.Group<indexterm>
       <primary>STD.System.ThorLib.Group</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.ThorLib.Group</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>ThorLib.Group</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Group</primary>
-    </indexterm>
-( )</emphasis>
-   </para>
+    </indexterm> ( )</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -28,20 +22,20 @@
 
       <tbody>
         <row>
+          <entry>Return:<emphasis> </emphasis></entry>
 
-    <entry>Return:<emphasis> </emphasis></entry><entry>Group returns a VARSTRING
-        value.</entry>
-
-
+          <entry>Group returns a VARSTRING value.</entry>
         </row>
-
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">Group </emphasis>function returns the
-        name of the node group running the workunit. Not supported on Roxie
-        clusters. This name is used in ECL code to specify the target CLUSTER
-        for an OUTPUT action or a PERSISTed attribute.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">A := Thorlib.Group();</programlisting>
-</sect1>
+
+  <para>The <emphasis role="bold">Group </emphasis>function returns the name
+  of the node group running the workunit. Not supported on Roxie clusters.
+  This name is used in ECL code to specify the target CLUSTER for an OUTPUT
+  action or a PERSISTed attribute.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">A := Thorlib.Group();</programlisting>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/JobName.xml

@@ -1,27 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Name">
-   <title>
-      <emphasis role="bold">Name</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">STD.System.Job.Name<indexterm>
+  <title>Name</title>
+
+  <para><emphasis role="bold">STD.System.Job.Name<indexterm>
       <primary>STD.System.Job.Name</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.Job.Name</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Job.Name</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Name</primary>
-    </indexterm>(</emphasis>
-      <emphasis>
-        </emphasis>
-      <emphasis role="bold">)</emphasis>
-   </para>
+    </indexterm>(</emphasis> <emphasis> </emphasis> <emphasis
+  role="bold">)</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -30,18 +23,18 @@
 
       <tbody>
         <row>
-          
-
-   <entry>Return:<emphasis> </emphasis></entry><entry>Name returns a VARSTRING
-        value.</entry>
-
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>Name returns a VARSTRING value.</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">Name </emphasis>function returns
-        the name of the workunit.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">A := STD.System.Job.Name();</programlisting>
-</sect1>
+
+  <para>The <emphasis role="bold">Name </emphasis>function returns the name of
+  the workunit.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">A := STD.System.Job.Name();</programlisting>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/JobOwner.xml

@@ -1,27 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="User">
-   <title>
-      <emphasis role="bold">User</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">STD.System.Job.User<indexterm>
+  <title>User</title>
+
+  <para><emphasis role="bold">STD.System.Job.User<indexterm>
       <primary>STD.System.Job.User</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.Job.User</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Job.User</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>User</primary>
-    </indexterm>(</emphasis>
-      <emphasis>
-        </emphasis>
-      <emphasis role="bold">)</emphasis>
-   </para>
+    </indexterm>(</emphasis> <emphasis> </emphasis> <emphasis
+  role="bold">)</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -30,18 +23,18 @@
 
       <tbody>
         <row>
-          
-
-   <entry>Return:<emphasis> </emphasis></entry><entry>User returns a VARSTRING
-        value.</entry>
-
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>User returns a VARSTRING value.</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">User </emphasis>function returns
-        the username of the person running the workunit.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">A := STD.System.Job.User();</programlisting>
-</sect1>
+
+  <para>The <emphasis role="bold">User </emphasis>function returns the
+  username of the person running the workunit.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">A := STD.System.Job.User();</programlisting>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/LogicalToPhysical.xml

@@ -1,34 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="LogicalToPhysical">
-   <title>
-      <emphasis role="bold">LogicalToPhysical</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">STD.System.Thorlib.LogicalToPhysical    <indexterm>
+  <title>LogicalToPhysical</title>
+
+  <para><emphasis role="bold">STD.System.Thorlib.LogicalToPhysical <indexterm>
       <primary>STD.System.ThorLib.LogicalToPhysical</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.ThorLib.LogicalToPhysical</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>ThorLib.LogicalToPhysical</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>LogicalToPhysical</primary>
-    </indexterm>
-(</emphasis>
-      <emphasis> filename
-        </emphasis>
-      <emphasis role="bold">[</emphasis>
-      <emphasis>, createflag
-        </emphasis>
-      <emphasis role="bold">]</emphasis>
-      <emphasis>
-        </emphasis>
-      <emphasis role="bold">)</emphasis>
-   </para>
+    </indexterm> (</emphasis> <emphasis> filename </emphasis> <emphasis
+  role="bold">[</emphasis> <emphasis>, createflag </emphasis> <emphasis
+  role="bold">]</emphasis> <emphasis> </emphasis> <emphasis
+  role="bold">)</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -37,32 +25,34 @@
 
       <tbody>
         <row>
+          <entry><emphasis>filename</emphasis></entry>
 
-   
-
-   <entry>
-      <emphasis>filename</emphasis> </entry><entry>A null-terminated string
-        containing the logical name of the file.</entry>
+          <entry>A null-terminated string containing the logical name of the
+          file.</entry>
         </row>
+
         <row>
-   <entry>
-      <emphasis>createflag</emphasis> </entry><entry>A boolean value indicating
-        whether to create the <emphasis>filename</emphasis>. If omitted, the
-        default is FALSE.</entry>
+          <entry><emphasis>createflag</emphasis></entry>
+
+          <entry>A boolean value indicating whether to create the
+          <emphasis>filename</emphasis>. If omitted, the default is
+          FALSE.</entry>
         </row>
-        <row>
-   <entry>Return:<emphasis> </emphasis></entry><entry>LogicalToPhysical returns a VARSTRING
-        value.</entry>
 
+        <row>
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>LogicalToPhysical returns a VARSTRING value.</entry>
         </row>
-
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">LogicalToPhysical </emphasis>function (Logical to
-        Physical) returns the physical name of the file represented by the
-        logical <emphasis>filename</emphasis>.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">A := STD.System.Thorlib.LogicalToPhysical('Fred');</programlisting>
-</sect1>
+
+  <para>The <emphasis role="bold">LogicalToPhysical </emphasis>function
+  (Logical to Physical) returns the physical name of the file represented by
+  the logical <emphasis>filename</emphasis>.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">A := STD.System.Thorlib.LogicalToPhysical('Fred');</programlisting>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/Nodes.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Nodes">
-  <title><emphasis role="bold">Nodes</emphasis></title>
+  <title>Nodes</title>
 
   <para><emphasis role="bold">STD.System.Thorlib.Nodes<indexterm>
       <primary>STD.System.Thorlib.Nodes</primary>

docs/ECLStandardLibraryReference/SLR-Mods/Platform.xml

@@ -1,27 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Platform">
-   <title>
-      <emphasis role="bold">Platform</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">STD.System.Job.Platform<indexterm>
+  <title>Platform</title>
+
+  <para><emphasis role="bold">STD.System.Job.Platform<indexterm>
       <primary>STD.System.Job.Platform</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.Job.Platform</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Job.Platform</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Platform</primary>
-    </indexterm>(</emphasis>
-      <emphasis>
-        </emphasis>
-      <emphasis role="bold">)</emphasis>
-   </para>
+    </indexterm>(</emphasis> <emphasis> </emphasis> <emphasis
+  role="bold">)</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -30,19 +23,19 @@
 
       <tbody>
         <row>
-          
-
-   <entry>Return:<emphasis> </emphasis></entry><entry>Platform returns a VARSTRING
-        value.</entry>
-
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>Platform returns a VARSTRING value.</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">Platform </emphasis>function returns
-        the platform name (hthor, thor, or roxie) of the cluster running the
-        workunit.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">A := STD.System.Job.Platform();</programlisting>
-</sect1>
+
+  <para>The <emphasis role="bold">Platform </emphasis>function returns the
+  platform name (hthor, thor, or roxie) of the cluster running the
+  workunit.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">A := STD.System.Job.Platform();</programlisting>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/Primary.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Primary">
-  <title><emphasis role="bold">Primary</emphasis></title>
+  <title>Primary</title>
 
   <para><emphasis role="bold">STD.Metaphone.Primary<indexterm>
       <primary>Std.Metaphone.Primary</primary>

docs/ECLStandardLibraryReference/SLR-Mods/RemoteDirectory.xml

@@ -77,9 +77,14 @@ END;</programlisting>
   contains the relative path to the file from the specified
   <emphasis>directory</emphasis>.</para>
 
+  <para>The mask argument is a string that can include wildcard characters.
+  Valid wildcard characters are '*' (to match zero or more characters) and '?'
+  (to match exactly one character). Non-wild characters are matched exactly
+  and are case-sensitive. </para>
+
   <para>Example:</para>
 
   <programlisting format="linespecific">OUTPUT(STD.File.RemoteDirectory('edata12','\in','*.d00'));
 OUTPUT(STD.File.RemoteDirectory('10.150.254.6',
-      '/c$/training',,TRUE));</programlisting>
+      '/var/lib/HPCCSystems/hpcc-data/thor/','acc*',TRUE));</programlisting>
 </sect1>

docs/ECLStandardLibraryReference/SLR-Mods/ResolveHostName.xml

@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ResolveHostName">
-   <title>
-      <emphasis role="bold">ResolveHostName</emphasis>
-   </title>
-   <para>
-      <emphasis>result</emphasis>
-      <emphasis role="bold"> :=
-        STD.System.Util.ResolveHostName<indexterm>
+  <title>ResolveHostName</title>
+
+  <para><emphasis>result</emphasis> <emphasis role="bold"> :=
+  STD.System.Util.ResolveHostName<indexterm>
       <primary>STD.System.Util.ResolveHostName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.Util.ResolveHostName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Util.ResolveHostName</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>ResolveHostName</primary>
-    </indexterm>(</emphasis>
-      <emphasis> host
-        </emphasis>
-      <emphasis role="bold">);</emphasis>
-   </para>
+    </indexterm>(</emphasis> <emphasis> host </emphasis> <emphasis
+  role="bold">);</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -32,27 +24,29 @@
 
       <tbody>
         <row>
-          
+          <entry><emphasis>host</emphasis></entry>
 
-
-   <entry>
-      <emphasis>host</emphasis> </entry><entry>A null-terminated string containing
-        the DNS name of the remote machine.</entry>
+          <entry>A null-terminated string containing the DNS name of the
+          remote machine.</entry>
         </row>
-        <row>
-   <entry>Return:<emphasis> </emphasis></entry><entry>ResolveHostName returns returns a
-        VARSTRING (null-terminated) value.</entry>
 
+        <row>
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>ResolveHostName returns returns a VARSTRING (null-terminated)
+          value.</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">ResolveHostName </emphasis>function
-        does a DNS lookup to return the ip address for the specified
-        <emphasis>host</emphasis> name.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">host := 'dataland_dali.br.seisint.com';
+
+  <para>The <emphasis role="bold">ResolveHostName </emphasis>function does a
+  DNS lookup to return the ip address for the specified
+  <emphasis>host</emphasis> name.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">host := 'dataland_dali.br.seisint.com';
 OUTPUT(STD.System.Util.ResolveHostName(host));
 </programlisting>
-</sect1>
+</sect1>

docs/ECLStandardLibraryReference/SLR-Mods/Secondary.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Secondary">
-  <title><emphasis role="bold">Secondary</emphasis></title>
+  <title>Secondary</title>
 
   <para><emphasis role="bold">STD.Metaphone.Secondary<indexterm>
       <primary>Std.Metaphone.Secondary</primary>

docs/ECLStandardLibraryReference/SLR-Mods/SetWorkunitAppValue.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="SetWorkunitAppValue">
-  <title><emphasis role="bold">SetWorkunitAppValue</emphasis></title>
+  <title>SetWorkunitAppValue</title>
 
   <para><emphasis role="bold">STD.System.Workunit.SetWorkunitAppValue
   <indexterm>

docs/ECLStandardLibraryReference/SLR-Mods/Target.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="Target">
-  <title><emphasis role="bold">Target</emphasis></title>
+  <title>Target</title>
 
   <para><emphasis role="bold">STD.System.Job.Target <indexterm>
       <primary>STD.System.Job.Target</primary>

docs/ECLStandardLibraryReference/SLR-Mods/ToGregorianYMD.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="ToGregorianYMD">
-  <title><emphasis role="bold">ToGregorianYMD</emphasis></title>
+  <title>ToGregorianYMD</title>
 
   <para><emphasis role="bold">STD.Date.ToGregorianYMD<indexterm>
       <primary>STD.Date.ToGregorianYMD</primary>

docs/ECLStandardLibraryReference/SLR-Mods/WUIDonDate.xml

@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
-  PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <sect1 id="WUIDonDate">
-   <title>
-      <emphasis role="bold">WUIDonDate</emphasis>
-   </title>
-   <para>
-      <emphasis role="bold">STD.System.Workunit.WUIDonDate    <indexterm>
+  <title>WUIDonDate</title>
+
+  <para><emphasis role="bold">STD.System.Workunit.WUIDonDate <indexterm>
       <primary>STD.System.Workunit.WUIDonDate</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>System.Workunit.WUIDonDate</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>Workunit.WUIDonDate</primary>
-    </indexterm>
-    <indexterm>
+    </indexterm> <indexterm>
       <primary>WUIDonDate</primary>
-    </indexterm>
-(</emphasis>
-      <emphasis> year,
-        month, day, hour, minute </emphasis>
-      <emphasis role="bold">
-        )</emphasis>
-   </para>
+    </indexterm> (</emphasis> <emphasis> year, month, day, hour, minute
+  </emphasis> <emphasis role="bold"> )</emphasis></para>
+
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
       <colspec colwidth="80.50pt" />
@@ -32,45 +23,52 @@
 
       <tbody>
         <row>
+          <entry><emphasis>year</emphasis></entry>
 
-   <entry>
-      <emphasis>year</emphasis> </entry><entry>An unsigned integer containing the
-        year value.</entry>
+          <entry>An unsigned integer containing the year value.</entry>
         </row>
+
         <row>
-   <entry>
-      <emphasis>month</emphasis> </entry><entry>An unsigned integer containing the
-        month value.</entry>
+          <entry><emphasis>month</emphasis></entry>
+
+          <entry>An unsigned integer containing the month value.</entry>
         </row>
+
         <row>
-   <entry>
-      <emphasis>day</emphasis> </entry><entry>An unsigned integer containing the day
-        value.</entry>
+          <entry><emphasis>day</emphasis></entry>
+
+          <entry>An unsigned integer containing the day value.</entry>
         </row>
+
         <row>
-   <entry>
-      <emphasis>hour</emphasis> </entry><entry>An unsigned integer containing the
-        hour value.</entry>
+          <entry><emphasis>hour</emphasis></entry>
+
+          <entry>An unsigned integer containing the hour value.</entry>
         </row>
+
         <row>
-   <entry>
-      <emphasis>minute</emphasis> </entry><entry>An unsigned integer containing the
-        minute value.</entry>
+          <entry><emphasis>minute</emphasis></entry>
+
+          <entry>An unsigned integer containing the minute value.</entry>
         </row>
+
         <row>
-   <entry>Return:<emphasis> </emphasis></entry><entry>WUIDonDate returns a VARSTRING
-        value.</entry>
+          <entry>Return:<emphasis> </emphasis></entry>
 
+          <entry>WUIDonDate returns a VARSTRING value.</entry>
         </row>
       </tbody>
     </tgroup>
   </informaltable>
-   <para>The <emphasis role="bold">WUIDonDate </emphasis>function returns
-        a valid WorkUnit IDentifier for a workunit that meets the passed
-        parameters.</para>
-   <para>Example:</para>
-   <programlisting format="linespecific">lowwuid  := STD.System.Workunit.WUIDonDate(2008,02,13,13,00);
+
+  <para>The <emphasis role="bold">WUIDonDate </emphasis>function returns a
+  valid WorkUnit IDentifier for a workunit that meets the passed
+  parameters.</para>
+
+  <para>Example:</para>
+
+  <programlisting format="linespecific">lowwuid  := STD.System.Workunit.WUIDonDate(2008,02,13,13,00);
 highwuid := STD.System.Workunit.WUIDonDate(2008,02,13,14,00);
 OUTPUT(STD.System.Workunit.WorkunitList(lowwuid,highwuid));
  //returns a list of workunits between 1 &amp; 2 PM on 2/13/08</programlisting>
-</sect1>
+</sect1>

docs/ECLStandardLibraryReference/SLR-includer.xml

@@ -40,15 +40,18 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='DateVer'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <corpname>HPCC Systems<superscript>®</superscript></corpname>
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -257,10 +260,10 @@
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/EditDistanceWithinRadius.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-    
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/EncodeBase64.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-    
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/EndsWith.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
@@ -356,7 +359,7 @@
   </chapter>
 
   <chapter id="MetaphoneSupport">
-    <title>Metaphone Support</title>
+    <title><emphasis>Metaphone Support</emphasis></title>
 
     <para>These functions provide a means to implement Double Metaphone or
     Metaphone 3 phonetic encoding or fuzzy-match algorithms which return a
@@ -377,8 +380,10 @@
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/DateDataTypes.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/TimeDataTypes.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/Year.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
@@ -387,28 +392,34 @@
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/Day.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-   <xi:include href="ECLStandardLibraryReference/SLR-Mods/Hour.xml"
+
+    <xi:include href="ECLStandardLibraryReference/SLR-Mods/Hour.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-   <xi:include href="ECLStandardLibraryReference/SLR-Mods/Minute.xml"
+
+    <xi:include href="ECLStandardLibraryReference/SLR-Mods/Minute.xml"
+                xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+    <xi:include href="ECLStandardLibraryReference/SLR-Mods/Second.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-   <xi:include href="ECLStandardLibraryReference/SLR-Mods/Second.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />                
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/DateFromParts.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/TimeFromParts.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/IsLeapYear.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/IsDateLeapYear.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-                
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/IsValidDate.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/IsValidTime.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/IsValidGregorianDate.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
@@ -423,6 +434,7 @@
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/Today.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
+
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/CurrentDate.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 

docs/ECLWatch/ECLWa_mods/ECLWatchSrc.xml

@@ -1671,7 +1671,16 @@
         <title>Upload files</title>
 
         <para>You can upload files to your landing zone from the Landing Zone
-        page.</para>
+        page. <figure>
+            <title>Landing Zone Upload</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="../../images/ECLWA440a.jpg"
+                           vendor="eclwatchSS" />
+              </imageobject>
+            </mediaobject>
+          </figure></para>
 
         <orderedlist>
           <listitem>
@@ -1704,8 +1713,9 @@
           </listitem>
 
           <listitem>
-            <para>Verify the file and dropzone are correct in the <emphasis
-            role="bold">Info Dialog</emphasis> that displays. <figure>
+            <para>Verify the file, folder, and dropzone information are
+            correct in the <emphasis role="bold">File Uploader</emphasis>
+            dialog that displays. <figure>
                 <title>Info Dialog</title>
 
                 <mediaobject>
@@ -1721,8 +1731,8 @@
             <para>Press the <emphasis role="bold">Start</emphasis> button to
             begin the upload.</para>
 
-            <para>The file progress indicator shows as the file uploads. When
-            upload is complete, the window closes.</para>
+            <para>The Upload action button displays the progress as the file
+            uploads. </para>
           </listitem>
         </orderedlist>
 

docs/ECLWatch/TheECLWatchMan.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <book xml:base="../">
   <title>Using ECL Watch</title>
@@ -362,19 +362,25 @@
           messages. You can filter this page by checking the boxes at the
           bottom of the tab. A copy facility is also provided.</para>
 
-          <para>The <emphasis role="bold">Transition Guide</emphasis> link
-          opens a new browser tab to the page where you can find more
-          information about transitioning from using the previous version of
-          HPCC and ECL Watch.</para>
+          <para>The <emphasis role="bold">Release Notes</emphasis> link opens
+          a new browser tab to the HPCC release notes page where you can find
+          more release specific information about the contents of each version
+          of HPCC.</para>
+
+          <para>The <emphasis role="bold">Documentation</emphasis> link opens
+          a new browser tab to the HPCC documentation page, where you can view
+          and download the HPCC system documentation.</para>
+
+          <para>The <emphasis role="bold">Downloads</emphasis> link opens a
+          new browser tab to the HPCC downloads page, where you can find and
+          download the HPCC Platform, Client Tools, and Plugins.</para>
 
           <para>The <emphasis role="bold">Additional Resources</emphasis> link
-          opens submenu with links to the HPCC
-          Systems<superscript>®</superscript> <emphasis
-          role="bold">Downloads</emphasis> page, where you can browse and
-          download additional HPCC resources. It also has links to <emphasis
-          role="bold">Issue Reporting</emphasis>, <emphasis
-          role="bold">Forums</emphasis>, and the HPCC <emphasis
-          role="bold">Red Book</emphasis>.</para>
+          opens a submenu that provides links to areas on the HPCC Systems web
+          site where you can find additional resources, such as the <emphasis
+          role="bold">Red Book</emphasis>, <emphasis role="bold">User
+          Forums</emphasis>, <emphasis role="bold">Issue Reporting</emphasis>,
+          and the <emphasis role="bold">Transition Guide</emphasis>. </para>
 
           <para>The <emphasis role="bold">Configuration</emphasis> link opens
           for viewing the XML version of the configuration file in use on your

docs/HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml

@@ -19,7 +19,7 @@
   </bookinfo>
 
   <chapter id="Command_Line_DFU">
-    <title><emphasis role="bold">Command Line DFU</emphasis></title>
+    <title>Command Line DFU</title>
 
     <sect1 id="Command_Line_InterfaceDFU" role="nobrk">
       <title>Command Line Interface</title>

docs/HPCCClientTools/CT_Mods/CT_Comm_Line_ECL.xml

@@ -19,7 +19,7 @@
   </bookinfo>
 
   <chapter id="Command_Line_ECL">
-    <title><emphasis role="bold">ECL Plus</emphasis></title>
+    <title>ECL Plus</title>
 
     <sect1 id="Command_Line_Interface" role="nobrk">
       <title>Command Line Interface</title>

docs/HPCCClientTools/CT_Mods/CT_ECL_CLI.xml

@@ -19,7 +19,7 @@
   </bookinfo>
 
   <chapter id="ECL_CLI">
-    <title><emphasis role="bold">ECL Command Line Interface</emphasis></title>
+    <title>ECL Command Line Interface</title>
 
     <sect1 id="The_ECL_Command_Syntax" role="nobrk">
       <title>The ECL Command Syntax</title>

docs/HPCCClientTools/CT_Mods/CT_ECL_IDE.xml

@@ -19,7 +19,7 @@
   </bookinfo>
 
   <chapter id="The_ECL_Ide">
-    <title><emphasis role="bold">The ECL IDE</emphasis></title>
+    <title>The ECL IDE</title>
 
     <sect1 id="ECL_IDE_Introduction" role="nobrk">
       <title>Introduction</title>
@@ -93,7 +93,7 @@
       </sect2>
 
       <sect2 id="Configuration_Files">
-        <title><emphasis>Configuration Files</emphasis></title>
+        <title>Configuration Files</title>
 
         <para>ECL IDE uses configuration files (.CFG) to store the information
         for environments to which it will connect. Create multiple
@@ -738,7 +738,7 @@
       </sect2>
 
       <sect2 id="Login" role="brk">
-        <title><emphasis>Login</emphasis></title>
+        <title>Login</title>
 
         <para>When you start the ECL IDE, the Login window
         displays.<itemizedlist>
@@ -926,7 +926,7 @@
           tree format. Expand any folder branch to see the ECL files within
           it. The IDE supports other languages in addition to ECL, namely
           ESDL, KEL, SALT, and others. To help differentiate the files are
-          color coded according to the type of file they are. </para>
+          color coded according to the type of file they are.</para>
 
           <para><graphic fileref="../../images/CT12.jpg" /></para>
 
@@ -1290,7 +1290,7 @@
       </sect2>
 
       <sect2 id="Orb_Menu">
-        <title><emphasis>Orb Menu</emphasis></title>
+        <title>Orb Menu</title>
 
         <sect3 id="CT_ECLIDE_OrbMenu">
           <title>Orb Menu</title>
@@ -1398,7 +1398,7 @@
       </sect2>
 
       <sect2 id="Ribbon_Tabs">
-        <title><emphasis>Ribbon Tabs</emphasis></title>
+        <title>Ribbon Tabs</title>
 
         <para></para>
 
@@ -2114,7 +2114,7 @@
       </sect2>
 
       <sect2 id="CT_ECLIDE_Pop-Up_Menus">
-        <title><emphasis>Pop-up Menus</emphasis></title>
+        <title>Pop-up Menus</title>
 
         <sect3 id="CT_ECLIDE_WorkUnitPopUpMenu_">
           <title>Workunit Pop-up Menu</title>
@@ -3018,7 +3018,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="ECL_Builder_Window" role="brk">
-        <title><emphasis>ECL Builder Window</emphasis></title>
+        <title>ECL Builder Window</title>
 
         <para>This window allows you to edit, build, and run ECL Queries. It
         also shows results and Workunit information for each Workunit created
@@ -3174,7 +3174,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Editing" role="brk">
-        <title><emphasis>Editing</emphasis></title>
+        <title>Editing</title>
 
         <para>The Builder Window also supports editing ECL files.</para>
 
@@ -3229,7 +3229,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Results_Viewer">
-        <title><emphasis>Results Viewer</emphasis></title>
+        <title>Results Viewer</title>
 
         <para>Each result is displayed on a results tab on the workunit
         tab.</para>
@@ -3326,7 +3326,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Graph_Viewer" role="brk">
-        <title><emphasis>Graph Viewer </emphasis></title>
+        <title>Graph Viewer </title>
 
         <para>A workunit’s execution graph is displayed in the Graph
         Tab.</para>
@@ -3360,7 +3360,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="ECLWatch_View" role="brk">
-        <title><emphasis>ECL Watch View </emphasis></title>
+        <title>ECL Watch View </title>
 
         <para>A workunit’s Workunit Details page view is displayed in the ECL
         Watch Tab.</para>
@@ -3460,7 +3460,7 @@ ENDMACRO;
       <title>ECL Debugger</title>
 
       <sect2 id="ECL_Debugger_Intro">
-        <title><emphasis>Introduction</emphasis></title>
+        <title>Introduction</title>
 
         <para>The ECL Debugger provides quick and easy access to features
         which show you exactly how your ECL query is working. It is integrated
@@ -3510,7 +3510,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Global_and_Active_Graphs">
-        <title><emphasis>Global and Active Graphs</emphasis></title>
+        <title>Global and Active Graphs</title>
 
         <para>The two graph windows are displayed side by side within the ECL
         IDE.</para>
@@ -3535,7 +3535,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Edges_and_Vertices">
-        <title><emphasis>Edges and Vertices</emphasis></title>
+        <title>Edges and Vertices</title>
 
         <para>The graphs are displayed as a series of edges and
         vertices.</para>
@@ -3557,7 +3557,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Breakpoints">
-        <title><emphasis>Breakpoints</emphasis></title>
+        <title>Breakpoints</title>
 
         <para>Using the ECL Debugger breakpoint feature, the debugging process
         can be paused at any point.</para>
@@ -3644,7 +3644,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Starting_the_ECL_Debugger">
-        <title><emphasis>Starting the ECL Debugger</emphasis></title>
+        <title>Starting the ECL Debugger</title>
 
         <itemizedlist mark="bullet">
           <listitem>
@@ -3675,7 +3675,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Debugger_Menus">
-        <title><emphasis>Debugger Menus</emphasis></title>
+        <title>Debugger Menus</title>
 
         <para>The Home and View menu options are identical to those on the
         main the ECL IDE menu.</para>
@@ -3980,7 +3980,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Stepping_through_a_query">
-        <title><emphasis>Stepping through a query</emphasis></title>
+        <title>Stepping through a query</title>
 
         <itemizedlist mark="bullet">
           <listitem>
@@ -4076,7 +4076,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Setting_Local_Breakpoints">
-        <title><emphasis>Setting local breakpoints</emphasis></title>
+        <title>Setting local breakpoints</title>
 
         <itemizedlist mark="bullet">
           <listitem>
@@ -4115,8 +4115,7 @@ ENDMACRO;
       </sect2>
 
       <sect2 id="Setting_a_breakpoint_line_in_ECL">
-        <title><emphasis>Setting a breakpoint on a line of
-        ECL</emphasis></title>
+        <title>Setting a breakpoint on a line of ECL</title>
 
         <itemizedlist mark="bullet">
           <listitem>

docs/HPCCClientTools/CT_Mods/CT_Overview.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <chapter id="CT_Overview">
-  <title><emphasis role="bold">Overview</emphasis></title>
+  <title>Overview</title>
 
   <para>This manual contains documentation for the set of Client Tools for use
   with the LexisNexis HPCC. These tools include:</para>
@@ -70,7 +70,7 @@
     <title>Documentation Conventions</title>
 
     <sect2 id="ECL_Language">
-      <title><emphasis>ECL Language</emphasis></title>
+      <title>ECL Language</title>
 
       <para>Although ECL is not case-sensitive, ECL reserved keywords and
       built-in functions in this document are always shown in ALL CAPS to make

docs/HPCCClientTools/CT_Mods/ECLCC.xml

@@ -52,7 +52,7 @@
   </bookinfo>
 
   <chapter id="ECL_Compiler">
-    <title><emphasis role="bold">ECL Compiler</emphasis></title>
+    <title>ECL Compiler</title>
 
     <para>The ECL Compiler is the compiler component of the High Performance
     Computing Cluster (HPCC). It is embedded and included when you install the
@@ -117,8 +117,7 @@
          ***END OF COMMENT***   --></para>
 
     <sect1 id="Stand-Alone-ECL-Compiler">
-      <title><emphasis>Using the ECL Compiler as a Stand Alone option
-      </emphasis></title>
+      <title>Using the ECL Compiler as a Stand Alone option </title>
 
       <para>The ECL Compiler is normally used through the ECL IDE or Eclipse
       using the ECL plugin for Eclipse, however, you can use the ECL Compiler

docs/HPCCDataHandling/DH-Mods/DH-Mod1.xml

@@ -85,9 +85,12 @@
         </listitem>
 
         <listitem>
-          <para>From ECL Watch page, click on the <emphasis
-          role="bold">Upload/download File </emphasis> link in the menu on the
-          left side.</para>
+          <para>From the ECL Watch home page, press the <emphasis
+          role="bold">Files</emphasis> icon link at the top, then press the
+          <emphasis role="bold">Landing Zones</emphasis> button from the
+          sub-menu, and then click on the <emphasis
+          role="bold">Upload</emphasis> action button as illustrated in the
+          following image.</para>
 
           <para><figure>
               <title>Upload/download</title>
@@ -98,19 +101,16 @@
                              vendor="eclwatchSS" />
                 </imageobject>
               </mediaobject>
-            </figure></para>
-
-          <para><phrase> </phrase>Once you click on the Upload/download file
-          link, it will take you to the dropzones and files page, where you
-          can choose to <emphasis role="bold">Browse</emphasis> your machine
-          for a file to upload:</para>
+            </figure>A system file dialog opens. Browse and select the file to
+          upload and then press the <emphasis role="bold">Open</emphasis>
+          button.</para>
 
           <para><figure>
               <title>Dropzones</title>
 
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="../../images/LZimg04.jpg"
+                  <imagedata fileref="../../images/ECLWA440b.jpg"
                              vendor="eclwatchSS" />
                 </imageobject>
               </mediaobject>
@@ -118,16 +118,14 @@
         </listitem>
 
         <listitem>
-          <para>Press the <emphasis role="bold">Browse</emphasis> button to
-          browse the files on your local machine, select the file to upload
-          and then click <emphasis role="bold">Open</emphasis> button.</para>
-
-          <para>The file you selected should appear in the <emphasis
-          role="bold">Select a file to upload</emphasis> field.</para>
+          <para>Once you choose the file to upload, it will take you to the
+          <emphasis role="bold">File Uploader</emphasis> dialog, where you can
+          choose the landing zone, machine, and/or folder for the file to
+          upload.</para>
         </listitem>
 
         <listitem>
-          <para>Press on <emphasis role="bold">Upload Now</emphasis> to
+          <para>Press the <emphasis role="bold">Start</emphasis> button to
           complete the file upload.</para>
         </listitem>
       </orderedlist>
@@ -359,7 +357,7 @@
                   <row>
                     <entry><emphasis role="bold">Queue</emphasis></entry>
 
-                    <entry>Select the queue. </entry>
+                    <entry>Select the queue.</entry>
                   </row>
 
                   <row>

docs/HPCCSystemAdmin/HPCCSystemAdministratorsGuide.xml

@@ -804,8 +804,8 @@
 
           <programlisting>  /bin/su - hpcc -c "/opt/HPCCSystems/bin/start_backupnode thor400_7s" &amp; </programlisting>
 
-          <para><emphasis role="bold">Backupnode run regularly</emphasis>
-          </para>
+          <para><emphasis role="bold">Backupnode run
+          regularly</emphasis></para>
 
           <para>To run backupnode regularly you could use cron. For example,
           you may want a crontab entry (to backup thor400_7s) set to run at
@@ -921,11 +921,16 @@
         name, such as esp.log which is a short cut to the latest current log
         file for that component.</para>
 
+        <!-- # JIRA 18201 #-->
+
         <para>Understanding the log files, and what is normally reported in
         the log files, helps in troubleshooting the HPCC system.</para>
 
         <para>As part of routine maintenance you may want to backup, archive,
-        and remove the older log files.</para>
+        and remove the older log files. Some log files can grow quite large
+        and you should be mindful of available disk space where the system
+        writes out its log files. It could prove to be helpful to separate
+        your log file directory from your OS or component file system.</para>
       </sect2>
 
       <sect2 id="SysAdm_AccessLogFiles">
@@ -1754,7 +1759,7 @@ dfsSSLPrivateKeyFile=/keyfilepath/keyfile</programlisting>Set the <emphasis
       </sect2>
 
       <sect2 id="virtual-thor-slaves">
-        <title><emphasis role="strong">Virtual Thor slaves</emphasis></title>
+        <title>Virtual Thor slaves</title>
 
         <para><indexterm>
             <primary>Virtual Thor slaves</primary>

docs/IMDB/IMDB.xml

@@ -61,7 +61,7 @@
   </bookinfo>
 
   <chapter id="Working_with_Data">
-    <title><emphasis role="bold">Working with Data</emphasis></title>
+    <title>Working with Data</title>
 
     <sect1 id="Working_with_data_Intro" role="nobrk">
       <title>Introduction</title>
@@ -1147,7 +1147,7 @@ IMDB.KevinBaconNumberSets.doCounts;</programlisting></para>
   </chapter>
 
   <chapter id="Next_Steps">
-    <title><emphasis role="bold">Next Steps</emphasis></title>
+    <title>Next Steps</title>
 
     <para>Now that you have successfully processed the data and established
     links, what's next?</para>

docs/Installing_and_RunningTheHPCCPlatform/Installing_and_RunningTheHPCCPlatform.xml

@@ -1497,10 +1497,18 @@ OUTPUT(L);</programlisting></para>
           </listitem>
 
           <listitem>
-            <para>A dialog opens. <emphasis role="bold">Browse</emphasis> your
-            local machine select the file to upload and then press the
-            <emphasis role="bold">Open</emphasis> button. <figure>
-                <title>File Uploader</title>
+            <para>A dialog opens. <emphasis role="bold">Browse</emphasis> to
+            and select the file to upload and then press the <emphasis
+            role="bold">Open</emphasis> button. </para>
+
+            <para>The file you selected should appear in the <emphasis
+            role="bold">File Name</emphasis> field. The data file is named:
+            <emphasis role="bold">2of12.txt</emphasis>.</para>
+          </listitem>
+
+          <listitem>
+            <para><figure>
+                <title>Start File Upload</title>
 
                 <mediaobject>
                   <imageobject>
@@ -1510,14 +1518,8 @@ OUTPUT(L);</programlisting></para>
                 </mediaobject>
               </figure></para>
 
-            <para>The file you selected should appear in the <emphasis
-            role="bold">File Name</emphasis> field. The data file is named:
-            <emphasis role="bold">2of12.txt</emphasis>.</para>
-          </listitem>
-
-          <listitem>
             <para>Press the <emphasis role="bold">Start</emphasis> button to
-            complete the file upload.</para>
+            complete the file upload. </para>
           </listitem>
         </orderedlist>
       </sect2>

docs/InstantCloud/InstantCloud.xml

@@ -51,15 +51,18 @@
       <para><emphasis role="redbold"></emphasis></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='DateVer'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <corpname>HPCC Systems</corpname>
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -1112,18 +1115,9 @@ OUTPUT(L);</programlisting></para>
           </listitem>
 
           <listitem>
-            <para>A dialog opens. <emphasis role="bold">Browse</emphasis> your
-            local machine select the file to upload and then press the
-            <emphasis role="bold">Open</emphasis> button. <figure>
-                <title>File Uploader</title>
-
-                <mediaobject>
-                  <imageobject>
-                    <imagedata fileref="images/LZimg04a.jpg"
-                               vendor="eclwatchSS" />
-                  </imageobject>
-                </mediaobject>
-              </figure></para>
+            <para>A dialog opens. <emphasis role="bold">Browse</emphasis> to
+            and select the file to upload and then press the <emphasis
+            role="bold">Open</emphasis> button. </para>
 
             <para>The file you selected should appear in the <emphasis
             role="bold">File Name</emphasis> field. The data file is named:

docs/One-Click_HPCCinAWS/One-Click_RuningHPCCinAmazonWebServicesEC2.xml

@@ -1091,9 +1091,11 @@ OUTPUT(L);</programlisting></para>
           <listitem>
             <?dbfo keep-together="always"?>
 
-            <para>From ECL Watch page, click on the <emphasis
-            role="bluebold">Upload/download File </emphasis> link in the menu
-            on the left side.</para>
+            <para>From the ECL Watch page, click on the <emphasis
+            role="bold">Files</emphasis> link icon then the <emphasis
+            role="bold">Landing Zones</emphasis> button to get to the Landing
+            Zones tab. On the Landing Zones tab press the <emphasis
+            role="bold">Upload</emphasis> action button.</para>
 
             <para><figure>
                 <title>Upload/download</title>
@@ -1106,39 +1108,30 @@ OUTPUT(L);</programlisting></para>
                 </mediaobject>
               </figure></para>
 
-            <para>Once you click on the Upload/download file link, it will
-            take you to the <emphasis role="bold">Dropzones and
-            Files</emphasis> page, where you can choose to <emphasis
-            role="bold">Browse</emphasis> your machine for a file to
-            upload:</para>
-
-            <para><figure>
-                <title>Dropzones and Files</title>
-
-                <mediaobject>
-                  <imageobject>
-                    <imagedata fileref="images/LZimg04.jpg"
-                               vendor="eclwatchSS" />
-                  </imageobject>
-                </mediaobject>
-              </figure></para>
+            <para>Once you click on the Upload action button, it will open a
+            dialog where you can choose to <emphasis
+            role="bold">Browse</emphasis> for a file to upload:</para>
           </listitem>
 
           <listitem>
             <?dbfo keep-together="always"?>
 
-            <para>Press the <emphasis role="bold">Browse</emphasis> button to
-            browse the files on your local machine, select the file to upload
-            and then press the <emphasis role="bold">Open</emphasis>
-            button.</para>
-
-            <para>The file you selected should appear in the <emphasis
-            role="bold">Select a file to upload:</emphasis> field. The data
-            file is named: <emphasis role="bold">2of12.txt</emphasis>.</para>
+            <para>Browse the files on your local machine, select the file
+            <emphasis role="bold">2of12.txt</emphasis> to upload and then
+            press the <emphasis role="bold">Open</emphasis> button.</para>
           </listitem>
 
           <listitem>
-            <para>Press on <emphasis role="bold">Upload Now</emphasis> to
+            <para><figure>
+                <title>File Uploader</title>
+
+                <mediaobject>
+                  <imageobject>
+                    <imagedata fileref="images/LZimg04a.jpg"
+                               vendor="eclwatchSS" />
+                  </imageobject>
+                </mediaobject>
+              </figure>Press <emphasis role="bold">Start</emphasis> to
             complete the file upload.</para>
           </listitem>
         </orderedlist>

docs/RuningHPCCinAmazonWebServicesEC2/RuningHPCCinAmazonWebServicesEC2.xml

@@ -2569,18 +2569,16 @@ OUTPUT(L);</programlisting></para>
                 </mediaobject>
               </figure></para>
 
-            <para>Once you click on the Upload/download file link, it will
-            take you to the <emphasis role="bold">Dropzones and
-            Files</emphasis> page, where you can choose to <emphasis
-            role="bold">Browse</emphasis> your machine for a file to
+            <para>Once you click on the Upload action button, you can
+            <emphasis role="bold">Browse</emphasis> for a file to
             upload:</para>
 
             <para><figure>
-                <title>Dropzones and Files</title>
+                <title>File Uploader</title>
 
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/LZimg04.jpg"
+                    <imagedata fileref="images/LZimg04a.jpg"
                                vendor="eclwatchSS" />
                   </imageobject>
                 </mediaobject>
@@ -2590,19 +2588,13 @@ OUTPUT(L);</programlisting></para>
           <listitem>
             <?dbfo keep-together="always"?>
 
-            <para>Press the <emphasis role="bold">Browse</emphasis> button to
-            browse the files on your local machine, select the file to upload
-            and then press the <emphasis role="bold">Open</emphasis>
-            button.</para>
-
-            <para>The file you selected should appear in the <emphasis
-            role="bold">Select a file to upload:</emphasis> field. The data
-            file is named: <emphasis role="bold">2of12.txt</emphasis>.</para>
-          </listitem>
+            <para>Select the file to upload. The file you selected should
+            appear in the <emphasis role="bold">File Name</emphasis> field.
+            The data file is named: <emphasis
+            role="bold">2of12.txt</emphasis>.</para>
 
-          <listitem>
-            <para>Press on <emphasis role="bold">Upload Now</emphasis> to
-            complete the file upload.</para>
+            <para>Verify the file, folders, landing zone information then
+            press the <emphasis role="bold">Start</emphasis> button.</para>
           </listitem>
         </orderedlist>
       </sect2>

docs/RunningHPCCinaVirtualMachine/RunningHPCCinaVirtualMachine.xml

@@ -42,15 +42,18 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='DateVer'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <corpname>HPCC Systems<superscript>®</superscript></corpname>
 
-    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
+    <xi:include href="common/Version.xml"
+                xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -541,8 +544,8 @@
     <para><orderedlist>
         <listitem>
           <para>In your browser, go to the <emphasis role="bold">ECL
-          Watch</emphasis> URL displayed (circled in red) in Figure 1,
-          <emphasis>VM Welcome Screen</emphasis>. For example,
+          Watch</emphasis> URL displayed (circled in red) in the Figure above,
+          <emphasis>VirtualBox Welcome Screen</emphasis>. For example,
           http://nnn.nnn.nnn.nnn:8010, where nnn.nnn.nnn.nnn is your Virtual
           Machine's IP address.</para>
 
@@ -1124,8 +1127,8 @@ OUTPUT(L);</programlisting></para>
 
             <listitem>
               <para>A dialog opens. <emphasis role="bold">Browse</emphasis>
-              your local machine select the file to upload and then press the
-              <emphasis role="bold">Open</emphasis> button. <figure>
+              and select the file to upload and then press the <emphasis
+              role="bold">Open</emphasis> button. <figure>
                   <title>File Uploader</title>
 
                   <mediaobject>
@@ -1142,8 +1145,8 @@ OUTPUT(L);</programlisting></para>
             </listitem>
 
             <listitem>
-              <para>Press on <emphasis role="bold">Upload Now</emphasis> to
-              complete the file upload.</para>
+              <para>Press <emphasis role="bold">Start</emphasis> to complete
+              the file upload.</para>
             </listitem>
           </orderedlist>
         </sect3>