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

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

docs/ECLProgrammersGuide/PRG_Mods/PrG_Creating_example_data.xml

@@ -10,9 +10,8 @@
     <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>
+    url="https://hpccsystems.com/training/documentation/learning-ecl">https://hpccsystems.com/training/documentation/learning-ecl</ulink>).
+    To make this code available for use in the ECL IDE, you simply:</para>
 
     <orderedlist>
       <listitem>

docs/HPCCDataTutorial/DataTutorial.xml

@@ -42,21 +42,24 @@
       <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" />
 
     <!--Release Info makes a running page footer: now an include! -->
 
     <!--The following include statement pulls in the date_ver from version.xml-->
 
-    <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>
 
     <!--corpname never prints-->
 
-    <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" />
 
     <!--Copyright tag inserts the symbol automatically: Now an Include!-->
@@ -116,7 +119,7 @@
           <para>Download a raw data file</para>
 
           <para>There are links to data file available at <ulink
-          url="http://hpccsystems.com/community/docs/data-tutorial-guide">http://hpccsystems.com/community/docs/data-tutorial-guide</ulink></para>
+          url="https://hpccsystems.com/training/documentation/learning-ecl">https://hpccsystems.com/training/documentation/learning-ecl</ulink></para>
 
           <para>The download is approximately 30 MB (compressed) and is
           available in either ZIP or .tar.gz format. Choose the appropriate

docs/UsingConfigManager/UsingConfigManager.xml

@@ -2597,7 +2597,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
                 then press OK.</para>
               </listitem>
             </orderedlist>All configured servers are then used when you create
-          a port to listen on. </para>
+          a port to listen on.</para>
 
           <variablelist>
             <varlistentry>
@@ -2611,6 +2611,33 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
             </varlistentry>
           </variablelist>
         </sect3>
+
+        <sect3>
+          <title>Redundancy</title>
+
+          <para>Roxie can be configured to utilize a few different redundancy
+          models. <itemizedlist>
+              <listitem>
+                <para>Simple Redundancy - One channel per slave. Most commonly
+                used for a single node Roxie.</para>
+              </listitem>
+
+              <listitem>
+                <para>Full Redundancy - More slaves than the number of
+                channels. Multiple slaves host each channel.</para>
+              </listitem>
+
+              <listitem>
+                <para>Overloaded Redundancy - There are multiple channels per
+                slave.</para>
+              </listitem>
+
+              <listitem>
+                <para>Cyclic Redundancy - Each node hosts multiple channels in
+                rotation. The most commonly used configuration.</para>
+              </listitem>
+            </itemizedlist></para>
+        </sect3>
       </sect2>
 
       <sect2 id="Topology" role="brk">