HPCC-17400 DOCS: Standardize usage of plugin

Fix HPCC-17400 DOCS: Standardize usage of plugin
Changes to docs to ensure consistent usage of the term plugin

Signed-off-by: G-Pan <greg.panagiotatos@lexisnexis.com>

docs/ECLLanguageReference/ECLR_mods/ExtrSvcs-ExternalServicesImpl.xml

@@ -380,17 +380,17 @@
     a[][20].</para>
   </sect2>
 
-  <sect2 id="Plug-In_Requirements">
-    <title>Plug-In Requirements</title>
+  <sect2 id="PlugIn_Requirements">
+    <title>Plugin Requirements</title>
 
-    <para>Plug-ins require an exported function with the following signature
+    <para>Plugins require an exported function with the following signature
     under Windows:</para>
 
     <para>Extern "C" _declspec(dllexport) bool
     getECLPluginDefinition(ECLPluginDefinitionBlock *pb)</para>
 
     <para>The function must fill the passed structure with correct information
-    for the features of the plug-in. The structure is defined as
+    for the features of the plugin. The structure is defined as
     follows:</para>
 
     <para><emphasis role="bold">Warning:</emphasis> This function may be
@@ -412,14 +412,14 @@
     Const char *ECL;
        // ECL Service definition for non-HOLE applications
     Unsigned flags;
-       // Type of plug-in - for user plugin use 1
+       // Type of plugin - for user plugin use 1
     Const char *version ;
        // Text describing version of plugin - used in debugging
     Const char *description;
        // Text describing plugin
   } </programlisting>
 
-    <para>To initialize information in a plug-in, use a global variable or
+    <para>To initialize information in a plugin, use a global variable or
     class and it will be appropriately constructed/destructed when the plugin
     is loaded and unloaded.</para>
   </sect2>

docs/ECLPluginForEclipse/ECL_Plugin_for_Eclipse.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <book xml:base="../">
   <bookinfo>
-    <title>ECL Plug-in for the Eclipse IDE</title>
+    <title>ECL Plugin for the Eclipse IDE</title>
 
     <mediaobject>
       <imageobject>
@@ -74,16 +74,15 @@
     and multi-platform. It can be used instead of the ECL IDE to write and
     execute queries into data on an HPCC cluster .</para>
 
-    <para>The ECL plug-in is also open source.</para>
+    <para>The ECL plugin is also open source.</para>
 
-    <para>The following sections cover how to install and use the ECL plug-in
+    <para>The following sections cover how to install and use the ECL plugin
     for Eclipse.</para>
 
     <sect1 id="ECL_Files" role="nobrk">
       <title>Prerequisites and Requirements</title>
 
-      <para>These are the basic requirements to run the Eclipse
-      plug-in.</para>
+      <para>These are the basic requirements to run the Eclipse plugin.</para>
 
       <sect2>
         <title>Windows Prerequisites:</title>
@@ -108,7 +107,7 @@
             </listitem>
 
             <listitem>
-              <para>The ECL plug-in for Eclipse</para>
+              <para>The ECL plugin for Eclipse</para>
 
               <para><informaltable colsep="1" frame="all" rowsep="1">
                   <?dbfo keep-together="always"?>
@@ -126,16 +125,16 @@
                         <entry>On a machine running Windows 7 (either the 32-
                         or 64-bit), depending on your install location, you
                         may need to start Eclipse with <emphasis>administrator
-                        privileges</emphasis> for plug-ins to install
-                        properly. This is necessary even if your account has
+                        privileges</emphasis> for plugins to install properly.
+                        This is necessary even if your account has
                         administrator privileges. <para>Right-click on the
                         Eclipse shortcut, then select <emphasis
                         role="bold">Run as Administrator</emphasis> from the
-                        pop-up menu. </para><para>After installing the
-                        plug-in, you do not need to run as administrator in
-                        the normal course of your work. However, to install
-                        any future updates will require running as
-                        administrator. </para></entry>
+                        pop-up menu. </para><para>After installing the plugin,
+                        you do not need to run as administrator in the normal
+                        course of your work. However, to install any future
+                        updates will require running as administrator.
+                        </para></entry>
                       </row>
                     </tbody>
                   </tgroup>
@@ -171,7 +170,7 @@
             </listitem>
 
             <listitem>
-              <para>The ECL plug-in for Eclipse</para>
+              <para>The ECL plugin for Eclipse</para>
             </listitem>
           </itemizedlist></para>
       </sect2>
@@ -203,7 +202,7 @@
           </listitem>
 
           <listitem>
-            <para>The ECL plug-in for Eclipse</para>
+            <para>The ECL plugin for Eclipse</para>
           </listitem>
         </itemizedlist>
       </sect2>
@@ -215,7 +214,7 @@
 
     <para>This section describes how to install the Eclipse IDE. If you
     already have the Eclipse IDE installed, skip this section and go to
-    <emphasis>Installing the ECL Plug-In</emphasis>.</para>
+    <emphasis>Installing the ECL PlugIn</emphasis>.</para>
 
     <sect1 id="Used_to_Build_Queries" role="nobrk">
       <title>Getting Eclipse</title>
@@ -249,9 +248,9 @@
     </sect1>
 
     <sect1 id="Configuration_Files">
-      <title>Installing the ECL Plug-in</title>
+      <title>Installing the ECL Plugin</title>
 
-      <para>To install the Eclipse plug-in:</para>
+      <para>To install the Eclipse plugin:</para>
 
       <para><orderedlist>
           <listitem>
@@ -376,7 +375,7 @@
     </sect1>
 
     <sect1>
-      <title>Updating the ECL Plug-in for Eclipse</title>
+      <title>Updating the ECL Plugin for Eclipse</title>
 
       <para>We recommend using the Eclipse Automatic Update feature.</para>
 
@@ -409,7 +408,7 @@
             <para>Set your options, then press the<emphasis role="bold">
             OK</emphasis> button.</para>
           </listitem>
-        </orderedlist>To manually update the Eclipse plug-in:</para>
+        </orderedlist>To manually update the Eclipse plugin:</para>
 
       <para><orderedlist>
           <listitem>
@@ -753,7 +752,7 @@
           <para><emphasis role="bold">The Six Degrees of Kevin
           Bacon</emphasis> example</para>
         </listitem>
-      </itemizedlist>To discuss this plug-in or get help using it, visit the
+      </itemizedlist>To discuss this plugin or get help using it, visit the
     forum on the HPCC System's portal at:</para>
 
     <para><ulink

docs/ECLProgrammersGuide/PRG_Mods/CodeSign.xml

@@ -36,7 +36,7 @@
     <para>In Configuration Manager, the ECLCC Server component has a tab named
     <emphasis role="bold">Options</emphasis>. This tab allows you to enter
     name value pairs for permissions to execute various types of embedded code
-    or plug-ins.</para>
+    or plugins.</para>
 
     <para><emphasis role="bold">Name</emphasis></para>
 
@@ -90,7 +90,7 @@
             <entry><emphasis>cpp</emphasis></entry>
 
             <entry>Allow/Deny C++ and other embedded languages. For languages
-            other than C++ and Cassandra, an optional plug-in must also be
+            other than C++ and Cassandra, an optional plugin must also be
             installed</entry>
           </row>
 
@@ -127,7 +127,7 @@
     unchanged.</para>
 
     <para>We have signed the SERVICE definitions provided by the ECL standard
-    plug-ins and included the public key in the HPCC platform installation.
+    plugins and included the public key in the HPCC platform installation.
     Code that tries to use service definitions that are signed will continue
     to work as before but, code that tries to call arbitrary library functions
     using user-supplied SERVICE definitions will give compile errors, if the

docs/ECLWatch/TheECLWatchMan.xml

@@ -71,7 +71,7 @@
 
       <para>ECL Watch provides an interface to the HPCC system and allows you
       to view information and interrogate nodes to confirm all expected
-      processes are running. It is a plug-in that is useful for Systems
+      processes are running. It is a plugin that is useful for Systems
       Administrators to check processes, examine topology, and view logs. It
       is useful to ECL Programmers to monitor the status of jobs and files,
       and other pertinent information. This provides a simple view into the
@@ -1363,14 +1363,14 @@
   </chapter>
 
   <chapter id="Plug-Ins_for_ECLWatch">
-    <title>Plug-ins</title>
+    <title>Plugins</title>
 
-    <para>You can add functionality to ECL Watch by installing plug-ins. These
-    plug-ins are designed to integrate into the ECL Watch interface. After you
-    install an approved plug-in, the plug-in icon displays in the navigation
-    bar at the top of the ECL Watch page to provide access to the plug-in(s).
-    Click on the plug-in icon to view the plug-ins page in ECL Watch. <figure>
-        <title>ECL Watch Plug-in icon</title>
+    <para>You can add functionality to ECL Watch by installing plugins. These
+    plugins are designed to integrate into the ECL Watch interface. After you
+    install an approved plugin, the plugin icon displays in the navigation bar
+    at the top of the ECL Watch page to provide access to the plugin(s). Click
+    on the plugin icon to view the plugins page in ECL Watch. <figure>
+        <title>ECL Watch Plugin icon</title>
 
         <mediaobject>
           <imageobject>
@@ -1383,10 +1383,10 @@
       <title>Ganglia in ECL Watch</title>
 
       <para>With the HPCC Systems<superscript>®</superscript>
-      Ganglia-monitoring plug-in installed, you can view the Ganglia
-      statistics and graphs through the ECL Watch interface. The default
-      monitoring displays several key statistics, but you can customize and
-      configure the views.</para>
+      Ganglia-monitoring plugin installed, you can view the Ganglia statistics
+      and graphs through the ECL Watch interface. The default monitoring
+      displays several key statistics, but you can customize and configure the
+      views.</para>
 
       <figure>
         <title>Ganglia in ECL Watch</title>
@@ -1637,7 +1637,7 @@
     Systems<superscript>®</superscript> web portal. Visit the HPCC
     Systems<superscript>®</superscript> Web Portal at <ulink
     url="http://hpccsystems.com/">http://hpccsystems.com/</ulink> for software
-    updates, plug-ins, support, documentation, and more. This is where you can
+    updates, plugins, support, documentation, and more. This is where you can
     find resources useful for running and maintaining HPCC on the web
     portal.</para>
 

docs/HPCCClientTools/CT_Mods/CT_ECL_IDE.xml

@@ -69,7 +69,7 @@
         role="bold">ToUpperCase </emphasis> function which converts characters
         in a string to uppercase.</para>
 
-        <para>These are installed as plug-ins and are in the ecllib folder
+        <para>These are installed as plugins and are in the ecllib folder
         shown in the Repository window.</para>
 
         <!-- add screen shot***-->
@@ -923,7 +923,7 @@
 
           <para><graphic fileref="../../images/CT12.jpg" /></para>
 
-          <para>In addition to folders, plug-in service libraries are also
+          <para>In addition to folders, plugin service libraries are also
           displayed at the bottom of the repository. These special folders are
           pre-compiled libraries of functions that you can use in your ECL
           code. For example, the Standard Library (stringlib) contains common
@@ -931,9 +931,9 @@
           role="bold">ToUpperCase</emphasis> function which converts
           characters in a string to uppercase.</para>
 
-          <para>Plug-in service libraries are added to a system in one of
-          three ways. Several are provided as standard. Others are available
-          as optional addons. And, you can create your own and add them to a
+          <para>Plugin service libraries are added to a system in one of three
+          ways. Several are provided as standard. Others are available as
+          optional addons. And, you can create your own and add them to a
           system.</para>
 
           <para>A right-click on the folders in the Repository Toolbox gives

docs/HPCCClientTools/CT_Mods/ECLCC.xml

@@ -121,7 +121,7 @@
       </emphasis></title>
 
       <para>The ECL Compiler is normally used through the ECL IDE or Eclipse
-      using the ECL plug-in for Eclipse, however, you can use the ECL Compiler
+      using the ECL plugin for Eclipse, however, you can use the ECL Compiler
       in a stand alone manner, to create stand alone programs, or workunits.
       The ECL Compiler can read ECL code from standard input, or can read it
       from a specified input file. It compiles the code into an executable

docs/HPCCMonitoring/HPCCMonitoringAndReporting.xml

@@ -421,7 +421,7 @@
     <sect1 id="GangliaInECLWatch">
       <title>Ganglia in ECL Watch</title>
 
-      <para>With the Ganglia for HPCC Plug-in installed. You can view the
+      <para>With the Ganglia for HPCC Plugin installed. You can view the
       Ganglia statistics and graphs right through the ECL Watch interface. The
       out of the box monitoring displays several key statistics by default.
       You can customize and configure the views.</para>
@@ -436,8 +436,8 @@
         </mediaobject>
       </figure>
 
-      <para>The default Plug-ins page has a tab for Custom Monitoring where
-      you can easily add some custom monitoring components.</para>
+      <para>The default Plugins page has a tab for Custom Monitoring where you
+      can easily add some custom monitoring components.</para>
 
       <para>Select the Custom Monitoring tab, and press the Metrics button.
       Use the drop menus to display the various graphing utilities.</para>
@@ -466,7 +466,7 @@
             </listitem>
 
             <listitem>
-              <para>Click the plug-in icon at the top of the ECL Watch
+              <para>Click the plugin icon at the top of the ECL Watch
               page.</para>
 
               <para>The graphs display data.</para>
@@ -475,7 +475,7 @@
 
         <para>It is also possible for EclWatch/Esp to be on a separate,
         different node from the gmetad machine, as long as the rrd data
-        directories are exposed to the plug-in.</para>
+        directories are exposed to the plugin.</para>
       </sect2>
 
       <sect2 id="ConfiguringGangliaGraphsInECLWatch">
@@ -533,7 +533,7 @@
         </listitem>
       </itemizedlist></para>
 
-    <para>With additional available (3rd party) plug-ins, check utilities, and
+    <para>With additional available (3rd party) plugins, check utilities, and
     modification of the config file, Nagios can also monitor:</para>
 
     <para><itemizedlist>
@@ -575,9 +575,9 @@
       and easily integrate that data into Nagios.</para>
 
       <para>Administrators should note that different platforms may not
-      support all plug-ins. The <emphasis>hpcc-nagios-tools</emphasis> utility
-      can be used to simplify the addition of custom plug-ins. Many additional
-      Nagios plug-ins and utilities are available from 3rd parties.</para>
+      support all plugins. The <emphasis>hpcc-nagios-tools</emphasis> utility
+      can be used to simplify the addition of custom plugins. Many additional
+      Nagios plugins and utilities are available from 3rd parties.</para>
 
       <para>The Nagios package is not simply an "install and run" utility, it
       requires additional steps to configure and use properly. If you are not
@@ -755,7 +755,7 @@
         Systems portal.</para>
 
         <para>The HPCC Systems<superscript>®</superscript> web portal is where
-        you can find HPCC resources, downloads, plug-ins, as well as helpful
+        you can find HPCC resources, downloads, plugins, as well as helpful
         information.</para>
 
         <para><ulink

docs/HPCCSystemAdmin/HPCCSystemAdministratorsGuide.xml

@@ -331,11 +331,11 @@
         <sect3 id="SysAdm_Eclipse">
           <title>Eclipse</title>
 
-          <para>With the ECL plug-in for Eclipse, you can use the Eclipse IDE
+          <para>With the ECL plugin for Eclipse, you can use the Eclipse IDE
           to create and execute queries into your data on an HPCC platform
           using Enterprise Control Language (ECL). Eclipse is open-source, and
           multi-platform and it can be used to interface with your data and
-          workunits on HPCC. The ECL plug-in for Eclipse is also
+          workunits on HPCC. The ECL plugin for Eclipse is also
           open-source.</para>
         </sect3>
 
@@ -1915,7 +1915,7 @@ heapUseTransparentHugePages</programlisting>
       Systems<superscript>®</superscript> web portal. Visit the HPCC
       Systems<superscript>®</superscript> Web Portal at <ulink
       url="http://hpccsystems.com/">http://hpccsystems.com/</ulink> for
-      software updates, plug-ins, support, documentation, and more. This is
+      software updates, plugins, support, documentation, and more. This is
       where you can find resources useful for running and maintaining HPCC on
       the web portal.</para>
 

docs/HPCCSystemAdmin/SA-Mods/SecMgrMod.xml

@@ -4,13 +4,13 @@
 <chapter id="security-manager-plugin-development">
   <title role="nbrk">Security Manager Development</title>
 
-  <para>The Security Manager Plug-in framework provides a mechanism for the
-  creation and deployment of custom security manager plug-ins.</para>
+  <para>The Security Manager Plugin framework provides a mechanism for the
+  creation and deployment of custom security manager plugins.</para>
 
   <sect1 id="how-to-create-a-security-manager-plugin">
-    <title>Plug-in Development</title>
+    <title>Plugin Development</title>
 
-    <para>A custom Security Manager Plug-in consists of a <emphasis
+    <para>A custom Security Manager Plugin consists of a <emphasis
     role="bold">library</emphasis> (.so or .dll) file which provides
     implementation(s) of the iSecManager interface, a <emphasis
     role="bold">configuration definition</emphasis> (articulated as an XSD
@@ -43,10 +43,10 @@
         </listitem>
       </itemizedlist></para>
 
-    <para><emphasis role="bold">Buildset definition</emphasis> - The plug-in
-    declares itself as an HPCC Security Manager Plug-in component, and
-    declares the location of the plug-in files and the configuration
-    definition schema.</para>
+    <para><emphasis role="bold">Buildset definition</emphasis> - The plugin
+    declares itself as an HPCC Security Manager Plugin component, and declares
+    the location of the plugin files and the configuration definition
+    schema.</para>
 
     <para><emphasis role="bold">EXAMPLE:</emphasis></para>
 
@@ -65,17 +65,16 @@
 &lt;/Environment&gt;</programlisting></para>
 
     <para><emphasis role="bold">Configuration Definition</emphasis> - The
-    plug-in must provide a definition of the configuration elements and the
+    plugin must provide a definition of the configuration elements and the
     structure it expects to receive at the time it is instantiated. The XSD
     file is consumed by the HPCC Configuration manager component and is
     rendered as a GUI form. The configuration definition is defined as an
     element of the component name (as declared in the buildset) followed by
     attributes and/or complex elements.</para>
 
-    <para>There are four attributes every plug-in is required to declare in
-    its configuration definition in addition to any custom configuration
-    defined by the plug-in: 'type', 'name', 'libName', and
-    'instanceFactoryName'</para>
+    <para>There are four attributes every plugin is required to declare in its
+    configuration definition in addition to any custom configuration defined
+    by the plugin: 'type', 'name', 'libName', and 'instanceFactoryName'</para>
 
     <itemizedlist spacing="compact">
       <listitem>
@@ -85,19 +84,19 @@
 
       <listitem>
         <para><emphasis role="bold">name</emphasis> - The name of the custom
-        Security Manager Plug-in instance</para>
+        Security Manager Plugin instance</para>
       </listitem>
 
       <listitem>
         <para><emphasis role="bold">libName</emphasis> - The name of the
-        library which provides instances of this Security Manager Plug-in
+        library which provides instances of this Security Manager Plugin
         type</para>
       </listitem>
 
       <listitem>
         <para><emphasis role="bold">instanceFactoryName</emphasis> - Name of
         the method provided by the library, which is responsible for creating
-        instances of the Security Manager Plug-in</para>
+        instances of the Security Manager Plugin</para>
       </listitem>
     </itemizedlist>
 
@@ -136,7 +135,7 @@
                    &lt;xs:attribute name="Option" type="xs:string" use="required"&gt;
                        &lt;xs:annotation&gt;&lt;xs:appinfo&gt;
                              &lt;tooltip&gt;This is an example compound option element 
-                             which Security Manager Plug-ins can define&lt;/tooltip&gt;
+                             which Security Manager Plugins can define&lt;/tooltip&gt;
                            &lt;/xs:appinfo&gt;&lt;/xs:annotation&gt;
                    &lt;/xs:attribute&gt;
                &lt;/xs:complexType&gt;
@@ -145,13 +144,13 @@
         &lt;xs:attribute name="optionalAttribute" type="xs:string" use="optional"&gt;
             &lt;xs:annotation&gt;&lt;xs:appinfo&gt;
                    &lt;tooltip&gt;This is an example optional attribute 
-                           which Security Manager Plug-ins can define&lt;/tooltip&gt;
+                           which Security Manager Plugins can define&lt;/tooltip&gt;
                 &lt;/xs:appinfo&gt;&lt;/xs:annotation&gt;
          &lt;/xs:attribute&gt;
          &lt;xs:attribute name="samplepasswordfile" type="xs:string" use="required"&gt;
             &lt;xs:annotation&gt;&lt;xs:appinfo&gt;
                   &lt;tooltip&gt;An attribute which defines a file name required 
-                          by this Security Manager Plug-in&lt;/tooltip&gt;
+                          by this Security Manager Plugin&lt;/tooltip&gt;
                &lt;/xs:appinfo&gt;&lt;/xs:annotation&gt;
          &lt;/xs:attribute&gt;
      &lt;/xs:complexType&gt;
@@ -161,7 +160,7 @@
     <?hard-pagebreak ?>
 
     <para><emphasis role="bold">genenvrules.conf</emphasis> - (optional) This
-    file allows the plug-in to add itself to the
+    file allows the plugin to add itself to the
     "do_not(automatically)_generate" list. While this is an optional file,
     more often than not it is actually needed.</para>
 
@@ -177,8 +176,8 @@
     <sect2 id="concrete-example">
       <title>Concrete Example</title>
 
-      <para>The HPCC Platform includes a security manager plug-in
-      implementation (HTPasswd) and can be used as a guidance for the plug-in
+      <para>The HPCC Platform includes a security manager plugin
+      implementation (HTPasswd) and can be used as a guidance for the plugin
       development process:</para>
 
       <para><ulink

docs/HPCCSystemAdmin/SA-Mods/SecMgrModConfDeploy.xml

@@ -2,15 +2,15 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <chapter id="configure-and-deploy-security-manager-plugin">
-  <title role="nbrk">Configure and Deploy the Security Manager Plug-in</title>
+  <title role="nbrk">Configure and Deploy the Security Manager Plugin</title>
 
   <para>The following sections detail the process of configuring your HPCC
-  system to use the Security Manager Plug-in.</para>
+  system to use the Security Manager Plugin.</para>
 
   <sect1 id="how-to-configure-an-existing-security-manager-plugin">
-    <title>How to Configure a Security Manager Plug-in</title>
+    <title>How to Configure a Security Manager Plugin</title>
 
-    <para>Once the plug-in has been installed, the plug-in can be configured
+    <para>Once the plugin has been installed, the plugin can be configured
     onto the HPCC platform using Configuration Manager.</para>
 
     <para><orderedlist>
@@ -51,7 +51,7 @@
         </listitem>
 
         <listitem>
-          <para>Create an instance of the Security Manager Plug-in:
+          <para>Create an instance of the Security Manager Plugin:
           <orderedlist numeration="loweralpha">
               <listitem>
                 <para>Right-click on Navigator Pane on the left side.</para>
@@ -64,7 +64,7 @@
 
               <listitem>
                 <para>Select the appropriate component
-                &lt;name_of_Security_Manager_plug-in&gt;</para>
+                &lt;name_of_Security_Manager_plugin&gt;</para>
               </listitem>
             </orderedlist></para>
         </listitem>
@@ -72,8 +72,8 @@
         <listitem>
           <?dbfo keep-together="always"?>
 
-          <para>Configure the Security Manager Plug-in: (Example shown using
-          the Htpasswd plug-in*)<figure>
+          <para>Configure the Security Manager Plugin: (Example shown using
+          the Htpasswd plugin*)<figure>
               <title>Security Mgr Configuration page</title>
 
               <mediaobject>
@@ -108,7 +108,7 @@
         <listitem>
           <?dbfo keep-together="always"?>
 
-          <para>Associate the Security Manager Plug-in with the ESP binding(s)
+          <para>Associate the Security Manager Plugin with the ESP binding(s)
           <orderedlist numeration="loweralpha">
               <listitem>
                 <para>Click on the target Esp in the Navigator Pane on the
@@ -139,7 +139,7 @@
         <listitem>
           <?dbfo keep-together="always"?>
 
-          <para>Enable the use of the Security Manager Plug-in - Select the
+          <para>Enable the use of the Security Manager Plugin - Select the
           <emphasis role="bold">Authentication</emphasis> tab, in the method
           entry select <emphasis role="bold">secmgrPlugin</emphasis> <figure>
               <title>Security Mgr Configuration page</title>
@@ -170,7 +170,7 @@
       <title>A video tutorial</title>
 
       <para>Need further information? Check out the following video tutorial
-      demonstrating how to configure a security plug-in.</para>
+      demonstrating how to configure a security plugin.</para>
 
       <para><ulink
       url="https://www.youtube.com/watch?v=lNVwEOFkKgY&amp;feature=youtu.be">https://www.youtube.com/watch?v=lNVwEOFkKgY&amp;feature=youtu.be</ulink></para>

docs/HPCCSystemAdmin/SecMgrInc.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <book xml:base="../">
   <bookinfo>
-    <title>Security Manager Plug-in Framework</title>
+    <title>Security Manager Plugin Framework</title>
 
     <!--some-book-set-up-stuff-->
 
@@ -59,9 +59,8 @@
   <xi:include href="HPCCSystemAdmin/SA-Mods/SecMgrMod.xml"
               xpointer="element(/1)"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-              
- <xi:include href="HPCCSystemAdmin/SA-Mods/SecMgrModConfDeploy.xml"
-	                    xpointer="element(/1)"
+
+  <xi:include href="HPCCSystemAdmin/SA-Mods/SecMgrModConfDeploy.xml"
+              xpointer="element(/1)"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-              
 </book>

docs/Installing_and_RunningTheHPCCPlatform/Inst-Mods/hpcc_ldap.xml

@@ -6,7 +6,7 @@
 
   <para>This section details the steps to configure your HPCC platform to use
   authentication. There are currently a few ways to use authentication with
-  your HPCC system: simple htpasswd authentication, LDAP, or another plug-in
+  your HPCC system: simple htpasswd authentication, LDAP, or another plugin
   security method.</para>
 
   <para>The htpasswd authentication method is basic password authentication.
@@ -125,7 +125,7 @@
       <orderedlist continuation="continues">
         <listitem>
           <para>Create an instance of the <emphasis role="bold">Security
-          Manager</emphasis> Plug-in: <orderedlist numeration="loweralpha">
+          Manager</emphasis> Plugin: <orderedlist numeration="loweralpha">
               <listitem>
                 <para>Right-click on Navigator Pane on the left side.</para>
               </listitem>
@@ -145,7 +145,7 @@
         <listitem>
           <?dbfo keep-together="always"?>
 
-          <para>Configure the htpasswd plug-in<figure>
+          <para>Configure the htpasswd plugin<figure>
               <title>Security Mgr Configuration page</title>
 
               <mediaobject>
@@ -203,7 +203,7 @@
         <listitem>
           <?dbfo keep-together="always"?>
 
-          <para>Associate the Security Manager Plug-in with the ESP binding(s)
+          <para>Associate the Security Manager Plugin with the ESP binding(s)
           <orderedlist numeration="loweralpha">
               <listitem>
                 <para>Click on the target <emphasis role="bold">Esp</emphasis>

docs/Installing_and_RunningTheHPCCPlatform/Installing_and_RunningTheHPCCPlatform.xml

@@ -297,24 +297,24 @@
         </sect3>
 
         <sect3 id="HPCC_Plug-Ins" role="brk">
-          <title>Plug-Ins</title>
+          <title>Plugins</title>
 
-          <para>There are several optional plug-ins that you could choose to
+          <para>There are several optional plugins that you could choose to
           add to your installation.</para>
 
           <para>For RPM based systems, you could install using yum.</para>
 
-          <para><programlisting>sudo yum install &lt;hpccsystems plugin plug-in_name&gt;  </programlisting>Optionally,
-          you could also choose to add optional plug-ins using rpm:</para>
+          <para><programlisting>sudo yum install &lt;hpccsystems plugin plugin_name&gt;  </programlisting>Optionally,
+          you could also choose to add optional plugins using rpm:</para>
 
-          <programlisting>sudo rpm -Uvh &lt;hpccsystems plugin plug-in_name&gt; </programlisting>
+          <programlisting>sudo rpm -Uvh &lt;hpccsystems plugin plugin_name&gt; </programlisting>
 
           <para>To install the optional plug ins for a Ubuntu/Debian package,
           use:</para>
 
-          <programlisting>sudo dpkg -i &lt;hpccsystems plugin plug-in_name&gt;  </programlisting>
+          <programlisting>sudo dpkg -i &lt;hpccsystems plugin plugin_name&gt;  </programlisting>
 
-          <para>The optional plug-ins are:</para>
+          <para>The optional plugins are:</para>
 
           <para><informaltable>
               <tgroup cols="2">
@@ -364,8 +364,8 @@
               </tgroup>
             </informaltable></para>
 
-          <para>Although Cassandra support (cassandraembed) is a plug-in, it
-          is not optional and is installed with the platform.</para>
+          <para>Although Cassandra support (cassandraembed) is a plugin, it is
+          not optional and is installed with the platform.</para>
         </sect3>
       </sect2>
 
@@ -2919,28 +2919,27 @@ sudo /etc/init.d/hpcc-init -c esp start
       External language support is included with the platform installation
       package, however there are RPM-based HPCC Platform installation packages
       that explicitly state <emphasis role="bold">with
-      plug-ins</emphasis>.</para>
+      plugins</emphasis>.</para>
 
       <para><emphasis role="bold">RPM-based systems:</emphasis></para>
 
       <para>If you are interested in using external languages for RPM-based
       systems (CentOS/Red Hat), you need to download and install the
       appropriate platform installation distribution <emphasis
-      role="bold">with plug-ins</emphasis> option from the downloads
+      role="bold">with plugins</emphasis> option from the downloads
       site.</para>
 
       <para>For RPM based systems, there are two different installation
-      packages available. One package includes the optional plug-ins to
-      support embedded code from other languages. If you want support for
-      other languages, choose the package for your distro that begins
-      with:</para>
+      packages available. One package includes the optional plugins to support
+      embedded code from other languages. If you want support for other
+      languages, choose the package for your distro that begins with:</para>
 
       <programlisting>hpccsystems-platform_community-with-plugins- </programlisting>
 
       <para><emphasis role="bold">Debian-based systems:</emphasis></para>
 
-      <para>Optional plug-in downloads are NOT needed for the Debian-based
-      systems (Ubuntu) installation package, as the plug-ins are included in
+      <para>Optional plugin downloads are NOT needed for the Debian-based
+      systems (Ubuntu) installation package, as the plugins are included in
       all the Debian installation packages.</para>
 
       <para>The external languages currently supported include:</para>
@@ -2971,10 +2970,10 @@ sudo /etc/init.d/hpcc-init -c esp start
       languages in your HPCC platform.</para>
 
       <para>In addition to these languages, you can add support for additional
-      languages by creating your own plug-in. This is not very difficult to
-      do. For example the JavaScript plug-in is about 500 lines of C++ code.
-      You can use that as a template to write your own and, if desired, you
-      can contribute it back to the open source initiative.</para>
+      languages by creating your own plugin. This is not very difficult to do.
+      For example the JavaScript plugin is about 500 lines of C++ code. You
+      can use that as a template to write your own and, if desired, you can
+      contribute it back to the open source initiative.</para>
 
       <sect2 id="Add_On_Java" role="brk">
         <title>Java</title>
@@ -3154,12 +3153,12 @@ add1(10);
         plugins for both Python2 and Python3, but only one may be safely
         enabled at a time as the Python libraries export the same symbols for
         both versions. Enabling both may lead to unpredictable results
-        including segmentation faults or undefined symbol errors. </para>
+        including segmentation faults or undefined symbol errors.</para>
 
         <para>By default the Python3 plugin will be present but disabled, and
         the Python2 plugin will be present and enabled. If you want to use
         Python3 modify the your environment.conf file according to the example
-        in the file. </para>
+        in the file.</para>
 
         <para>To enable Python support within the HPCC
         Systems<superscript>®</superscript> Platform:</para>
@@ -3324,7 +3323,7 @@ sudo R CMD INSTALL <emphasis role="bold">RInside_0.2.10</emphasis>.tar.gz</progr
           <listitem>
             <para>Test the R integration.</para>
 
-            <para>R is not multi-thread aware, so the plug-in has to wrap all
+            <para>R is not multi-thread aware, so the plugin has to wrap all
             calls to R for critical sections. Scripts are compiled with every
             call to R.</para>
 

docs/InstantCloud/InstantCloud.xml

@@ -165,13 +165,13 @@
 
               <listitem>
                 <para><emphasis>Linux workstation with the Eclipse IDE and the
-                ECL plug-in for Eclipse (available soon)</emphasis></para>
+                ECL plugin for Eclipse (available soon)</emphasis></para>
               </listitem>
 
               <listitem>
                 <para><emphasis>Mac<superscript></superscript> workstation
-                with the Eclipse IDE and the ECL plug-in for Eclipse
-                (available soon)</emphasis></para>
+                with the Eclipse IDE and the ECL plugin for Eclipse (available
+                soon)</emphasis></para>
               </listitem>
             </itemizedlist></para>
         </listitem>

docs/One-Click_HPCCinAWS/One-Click_RuningHPCCinAmazonWebServicesEC2.xml

@@ -165,13 +165,13 @@
 
               <listitem>
                 <para><emphasis>Linux workstation with the Eclipse IDE and the
-                ECL plug-in for Eclipse (available soon)</emphasis></para>
+                ECL plugin for Eclipse (available soon)</emphasis></para>
               </listitem>
 
               <listitem>
                 <para><emphasis>Mac<superscript></superscript> workstation
-                with the Eclipse IDE and the ECL plug-in for Eclipse
-                (available soon)</emphasis></para>
+                with the Eclipse IDE and the ECL plugin for Eclipse (available
+                soon)</emphasis></para>
               </listitem>
             </itemizedlist></para>
         </listitem>

docs/RuningHPCCinAmazonWebServicesEC2/RuningHPCCinAmazonWebServicesEC2.xml

@@ -147,13 +147,13 @@
 
               <listitem>
                 <para><emphasis>Linux workstation with the Eclipse IDE and the
-                ECL plug-in for Eclipse (available soon)</emphasis></para>
+                ECL plugin for Eclipse (available soon)</emphasis></para>
               </listitem>
 
               <listitem>
                 <para><emphasis>Mac<superscript>*</superscript> workstation
-                with the Eclipse IDE and the ECL plug-in for Eclipse
-                (available soon)</emphasis></para>
+                with the Eclipse IDE and the ECL plugin for Eclipse (available
+                soon)</emphasis></para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -3190,9 +3190,9 @@ s3cmd --configure
           </question>
 
           <answer>
-            <para>Yes, you can use the Eclipse IDE with the ECL plug-in
-            instead of the ECL IDE. Another option is to run the ECL IDE under
-            WINE. See the Client Tools Manual for details.</para>
+            <para>Yes, you can use the Eclipse IDE with the ECL plugin instead
+            of the ECL IDE. Another option is to run the ECL IDE under WINE.
+            See the Client Tools Manual for details.</para>
           </answer>
         </qandaentry>