From 3eccda6837ccc00a4660a5ceb28a7590cb5a41eb Mon Sep 17 00:00:00 2001
From: pz636264 <pavel.zlatnik@broadcom.com>
Date: Tue, 9 Jul 2024 12:50:04 +0200
Subject: [PATCH 1/4] install command step optional

Signed-off-by: pz636264 <pavel.zlatnik@broadcom.com>
---
 workflows/files/ZWECONF.xml | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index 8f4ee7b153..d3185f714e 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -1147,6 +1147,19 @@ How we want to verify SSL certificates of services. Valid values are:
             <default>ZWESASTC</default>
         </string>
     </variable>
+    <variable name="zowe_setup_installStep_enabled" scope="instance" visibility="public">
+        <label>Install the MVS data sets</label>
+        <abstract>Only for convenience build, check this to enable to run optional step with zwe install command</abstract>
+        <description>Check this to enable optional workflow step with zwe install command. After Zowe convenience build was extracted, 
+            you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. 
+        Only for convenience build, SMP/E installs the MVS data sets during install.</description>
+        <category>installMVSDatasets</category>
+        <boolean>
+            <!-- Put validation here -->
+            <!-- Specify choices here -->
+            <default>false</default>
+        </boolean>
+    </variable>
     <!--atCreate-->
     <!--steps-->
     <step name="define_variables" optional="false">
@@ -1219,6 +1232,7 @@ How we want to verify SSL certificates of services. Valid values are:
             <variableValue name="zowe_setup_security_stcs_zowe" scope="instance" noPromptIfSet="false" required="true"/>
             <variableValue name="zowe_setup_security_stcs_zis" scope="instance" noPromptIfSet="false" required="true"/>
             <variableValue name="zowe_setup_security_stcs_aux" scope="instance" noPromptIfSet="false" required="true"/>
+            <variableValue name="zowe_setup_installStep_enabled" scope="instance" noPromptIfSet="false" required="true"/>
             <instructions>Run this step to fill base variables.</instructions>
             <weight>1</weight>
             <skills>z/OS System Programmer</skills>
@@ -1408,7 +1422,7 @@ How we want to verify SSL certificates of services. Valid values are:
             <variableValue name="zowe_setup_vsam_mode" scope="instance" noPromptIfSet="false" required="true"/>
             <variableValue name="zowe_setup_vsam_volume" scope="instance" noPromptIfSet="false" required="false"/>
             <variableValue name="zowe_setup_vsam_storageClass" scope="instance" noPromptIfSet="false" required="false"/>
-            <variableValue name="components_caching_service_storage_vsam_name" scope="instance" noPromptIfSet="false" required="false"/>
+            <variableValue name="components_caching_service_storage_vsam_name" scope="instance" noPromptIfSet="false" required="true"/>
             <instructions substitution="false">Run this step to specify the variables for the Caching Service</instructions>
             <weight>1</weight>
             <skills>z/OS System Programmer</skills>
@@ -2410,10 +2424,22 @@ echo '#         enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
     <step name="zowe_installation_steps" optional="false">
         <title>Zowe installation</title>
         <description>Zowe installation</description>
-        <step name="install_zowe" optional="false">
-            <title>Run the Zowe install</title>
-            <description>Configure the Zowe</description>
-            <prereqStep name="configure"/>
+        <step name="install_zowe" optional="true">
+            <title>Run the Zowe install (only for convenience build)</title>
+            <description>Configure the Zowe.</description>
+            <prereqStep name="main_variables"/>
+            <prereqStep name="configure"/>            
+            <condition>
+                <expression>1==1</expression>
+                <description>Always true</description>
+                <targetStateSet>
+                    <extendStateExpression>
+                        <description>Skips this step if Install the MVS data sets wasn't selected</description>
+                        <expression>!${instance-zowe_setup_installStep_enabled}</expression>
+                        <targetState>skipped</targetState>
+                    </extendStateExpression>
+                </targetStateSet>
+            </condition>
             <!-- condition -->
             <!--variableValues-->
             <instructions substitution="true"><![CDATA[

From 7824bc8d22d230f90acbc2d270e83f4d3449cbb7 Mon Sep 17 00:00:00 2001
From: Andrew Jandacek <andrew.jandacek@broadcom.com>
Date: Mon, 15 Jul 2024 16:16:05 +0200
Subject: [PATCH 2/4] language refactor

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
---
 workflows/files/ZWECONF.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index d3185f714e..1781c05b49 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -1149,10 +1149,10 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="zowe_setup_installStep_enabled" scope="instance" visibility="public">
         <label>Install the MVS data sets</label>
-        <abstract>Only for convenience build, check this to enable to run optional step with zwe install command</abstract>
-        <description>Check this to enable optional workflow step with zwe install command. After Zowe convenience build was extracted, 
+        <abstract>This install option is only for convenience build. Check this option to enable this run step with the zwe install command.</abstract>
+        <description>Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted, 
             you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. 
-        Only for convenience build, SMP/E installs the MVS data sets during install.</description>
+        This option is for convenience build only. SMP/E installs the MVS data sets during installation.</description>
         <category>installMVSDatasets</category>
         <boolean>
             <!-- Put validation here -->
@@ -2426,7 +2426,7 @@ echo '#         enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
         <description>Zowe installation</description>
         <step name="install_zowe" optional="true">
             <title>Run the Zowe install (only for convenience build)</title>
-            <description>Configure the Zowe.</description>
+            <description>Configure Zowe.</description>
             <prereqStep name="main_variables"/>
             <prereqStep name="configure"/>            
             <condition>
@@ -2434,7 +2434,7 @@ echo '#         enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
                 <description>Always true</description>
                 <targetStateSet>
                     <extendStateExpression>
-                        <description>Skips this step if Install the MVS data sets wasn't selected</description>
+                        <description>Skips this step if Install the MVS data sets was not selected</description>
                         <expression>!${instance-zowe_setup_installStep_enabled}</expression>
                         <targetState>skipped</targetState>
                     </extendStateExpression>

From e9b758b2f2179d845c5458de89e89f9b3dc1c4b3 Mon Sep 17 00:00:00 2001
From: Andrew Jandacek <andrew.jandacek@broadcom.com>
Date: Tue, 16 Jul 2024 15:26:47 +0200
Subject: [PATCH 3/4] fix component abstract/description language

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
---
 workflows/files/ZWECONF.xml | 54 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index 1781c05b49..d55f7f5060 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -448,9 +448,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="components_gateway_enabled" scope="instance" visibility="public">
-        <label>Enable gateway</label>
-        <abstract>Should the APIML gateway be enabled?</abstract>
-        <description>Should the APIML gateway be enabled?</description>
+        <label>Enable the gateway</label>
+        <abstract>Check this option to enable the gateway</abstract>
+        <description>Check this option to enable the gateway</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -579,9 +579,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_metrics_service_enabled" scope="instance" visibility="public">
-        <label>Enable metrics service</label>
-        <abstract>Use this option to enable the metrics seervice</abstract>
-        <description>Use this option to enable the metrics seervice</description>
+        <label>Enable the Metrics service</label>
+        <abstract>Check this option to enable the Metrics service</abstract>
+        <description>Check this option to enable the Metrics service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -612,9 +612,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
   <variable name="components_cloud_gateway_enabled" scope="instance" visibility="public">
-        <label>Enable cloud gateway</label>
-        <abstract>Use this option to enable the cloud gateway</abstract>
-        <description>Use this option to enable the cloud gateway</description>
+        <label>Enable the Cloud gateway</label>
+        <abstract>Check this option to enable the Cloud gateway</abstract>
+        <description>Check this option to enable the Cloud gateway</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -645,9 +645,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_api_catalog_enabled" scope="instance" visibility="public">
-        <label>Enable API catalog</label>
-        <abstract>Use this option to enable the API catalog</abstract>
-        <description>Use this option to enable the API catalog</description>
+        <label>Enable API Catalog</label>
+        <abstract>Check this option to enable the API Catalog</abstract>
+        <description>Check this option to enable the API Catalog</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -678,9 +678,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_discovery_enabled" scope="instance" visibility="public">
-        <label>Enable discovery</label>
-        <abstract>Should the automatic discovery be enabled?</abstract>
-        <description>Should the automatic discovery be enabled?</description>
+        <label>Enable the Discovery service</label>
+        <abstract>Check this option to enable the Discovery service</abstract>
+        <description>Check this option to enable the Discovery service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -711,9 +711,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_caching_service_enabled" scope="instance" visibility="public">
-        <label>Enable caching service</label>
-        <abstract>Check to enable the caching service</abstract>
-        <description>Check to enable the caching service</description>
+        <label>Enable the Caching service</label>
+        <abstract>Check this option to enable the Caching service</abstract>
+        <description>Check this option to enable the Caching service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -804,7 +804,7 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="components_app_server_enabled" scope="instance" visibility="public">
-        <label>Enable app server</label>
+        <label>Enable the app server</label>
         <abstract>Check this option to enable the app server</abstract>
         <description>Check this option to enable the app server</description>
         <category>components</category>
@@ -838,8 +838,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_zss_enabled" scope="instance" visibility="public">
         <label>Enable ZSS</label>
-        <abstract>Check this option to enable the ZSS component</abstract>
-        <description>Check this option to enable the ZSS component</description>
+        <abstract>Check this option to enable ZSS</abstract>
+        <description>Check this option to enable ZSS</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -959,8 +959,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_jes_enabled" scope="instance" visibility="public">
         <label>Enable explorer JES</label>
-        <abstract>Check this to enable the JES explorer</abstract>
-        <description>Check this to enable the JES explorer</description>
+        <abstract>Check this option to enable the JES explorer</abstract>
+        <description>Check this option to enable the JES explorer</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -970,8 +970,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_mvs_enabled" scope="instance" visibility="public">
         <label>Enable explorer MVS</label>
-        <abstract>Check this option to enable MVS explorer</abstract>
-        <description>Check this option to enable MVS explorer</description>
+        <abstract>Check this option to enable the MVS explorer</abstract>
+        <description>Check this option to enable the MVS explorer</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -981,8 +981,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_uss_enabled" scope="instance" visibility="public">
         <label>Enable explorer USS</label>
-        <abstract>Check this option to enable USS explorer</abstract>
-        <description>Check this option to enable USS explorer</description>
+        <abstract>Check this option to enable the USS explorer</abstract>
+        <description>Check this option to enable the USS explorer</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->

From d252a5321a84590bcb644517d56eeddb29c08caa Mon Sep 17 00:00:00 2001
From: Andrew Jandacek <andrew.jandacek@broadcom.com>
Date: Tue, 16 Jul 2024 15:55:35 +0200
Subject: [PATCH 4/4] fix abstract lengths

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
---
 workflows/files/ZWECONF.xml | 72 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index d55f7f5060..183af7feb5 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -101,8 +101,8 @@
     </variable>
     <variable name="zowe_setup_vsam_mode" scope="instance" visibility="public">
         <label>Zowe setup VSAM mode</label>
-        <abstract>VSAM data set with Record-Level-Sharing enabled or not</abstract>
-        <description>VSAM data set with Record-Level-Sharing enabled or not</description>
+        <abstract>VSAM data set with Record-Level-Sharing enabled or disabled</abstract>
+        <description>VSAM data set with Record-Level-Sharing enabled or disabled</description>
         <category>components</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -202,8 +202,8 @@ It is used by ZWESLSTC or by zwe command</description>
     </variable>
     <variable name="zowe_externalDomains" scope="instance" visibility="public">
         <label>Zowe external domains</label>
-        <abstract>This should be the domain name of your Dynamic VIP Address (DVIPA)</abstract>
-        <description>This should be the domain name of your Dynamic VIP Address (DVIPA)</description>
+        <abstract>The domain name of your Dynamic VIP Address (DVIPA)</abstract>
+        <description>The domain name of your Dynamic VIP Address (DVIPA)</description>
         <category>zowe</category>
         <string valueMustBeChoice="false" multiLine="true">
             <!-- Put validation here -->
@@ -213,7 +213,7 @@ It is used by ZWESLSTC or by zwe command</description>
     </variable>
     <variable name="zowe_externalPort" scope="instance" visibility="public">
         <label>Zowe external port</label>
-        <abstract>This is the port you use to access Zowe Gateway from your web browser</abstract>
+        <abstract>The port you use to access Zowe Gateway from your web browser</abstract>
         <description>This is the port you use to access Zowe Gateway from your web browser.
 In many use cases, this should be same as &lt;b&gt;components.gateway.port&lt;/b&gt;. But in
 some use cases, like containerization, this port could be different.</description>
@@ -268,7 +268,7 @@ some use cases, like containerization, this port could be different.</descriptio
     </variable>
     <variable name="zowe_certificate_keystore_file" scope="instance" visibility="public">
         <label>Zowe certificate keystore file</label>
-        <abstract>Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING".</abstract>
+        <abstract>Zowe certificate keystore file. For keyring, the format is "safkeyring://OWNER/KEYRING".</abstract>
         <description>Zowe certificate keystore file</description>
         <category>certificates</category>
         <string valueMustBeChoice="false" multiLine="false">
@@ -317,7 +317,7 @@ some use cases, like containerization, this port could be different.</descriptio
     </variable>
     <variable name="zowe_certificate_truststore_file" scope="instance" visibility="public">
         <label>Zowe certificate truststore file</label>
-        <abstract>File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING".</abstract>
+        <abstract>File location for cert truststore. For keyring, the format is "safkeyring://OWNER/KEYRING"</abstract>
         <description>File location for the certificate truststore</description>
         <category>certificates</category>
         <string valueMustBeChoice="false" multiLine="false">
@@ -460,8 +460,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_port" scope="instance" visibility="public">
         <label>Gateway port</label>
-        <abstract>Port for the APIML gateway</abstract>
-        <description>Port for the APIML gateway</description>
+        <abstract>Port for the API ML gateway</abstract>
+        <description>Port for the API ML gateway</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -515,8 +515,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_authorization_endpoint_enabled" scope="instance" visibility="public">
         <label>Enable gateway APIML security authorization endpoint</label>
-        <abstract>Use this to enable the security authorization endpoint</abstract>
-        <description>Use this to enable the security authorization endpoint</description>
+        <abstract>Check to enable the security authorization endpoint</abstract>
+        <description>Check to enable the security authorization endpoint</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -547,8 +547,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_server_internal_enabled" scope="instance" visibility="public">
         <label>Enable gateway server internal connector</label>
-        <abstract>Enable gateway server internal connector</abstract>
-        <description>Enable gateway server internal connector</description>
+        <abstract>Check this option to enable gateway server internal connector</abstract>
+        <description>Check this option to enable gateway server internal connector</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -657,8 +657,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_api_catalog_port" scope="instance" visibility="public">
         <label>API catalog port</label>
-        <abstract>Port on which the API catalog should be running.</abstract>
-        <description>Port on which the API catalog should be running.</description>
+        <abstract>Port on which the API Catalog should be running.</abstract>
+        <description>Port on which the API Catalog should be running.</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -668,8 +668,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_api_catalog_debug" scope="instance" visibility="public">
         <label>API catalog debug</label>
-        <abstract>Extra debugging information from API catalog.</abstract>
-        <description>Extra debugging information from API catalog.</description>
+        <abstract>Extra debugging information from API Catalog.</abstract>
+        <description>Extra debugging information from API Catalog.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -690,8 +690,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_discovery_port" scope="instance" visibility="public">
         <label>Discovery port</label>
-        <abstract>Port on which the discovery service should be running</abstract>
-        <description>Port on which the discovery service should be running</description>
+        <abstract>Port on which the Discovery service should be running</abstract>
+        <description>Port on which the Discovery service should be running</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -701,8 +701,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_discovery_debug" scope="instance" visibility="public">
         <label>Discovery debug</label>
-        <abstract>Should there be extra debugging information?</abstract>
-        <description>Should there be extra debugging information?</description>
+        <abstract>Check this option to include extra debugging information</abstract>
+        <description>Check this option to include extra debugging information</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -745,7 +745,7 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_caching_service_storage_evictionStrategy" scope="instance" visibility="public">
         <label>Caching service storage eviction strategy</label>
-        <abstract>Specifies the eviction strategy when storage size is achieved.</abstract>
+        <abstract>Specifies the eviction strategy when storage size is achieved</abstract>
         <description>Specifies the eviction strategy when storage size is achieved.</description>
         <category>components</category>
         <string valueMustBeChoice="true" multiLine="false">
@@ -759,7 +759,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_caching_service_storage_mode" scope="instance" visibility="public">
         <label>Caching service storage mode</label>
         <abstract>Specifies the components caching service storage mode</abstract>
-        <description>Specifies the components caching service storage mode</description>
+        <description>Specifies the components caching service storage mode.</description>
         <category>components</category>
         <string valueMustBeChoice="true" multiLine="false">
             <!-- Put validation here -->
@@ -774,7 +774,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_caching_service_storage_size" scope="instance" visibility="public">
         <label>Caching service storage size</label>
         <abstract>Number of records before the eviction strategies kick in</abstract>
-        <description>Number of records before the eviction strategies kick in</description>
+        <description>Number of records before the eviction strategies kick in.</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -806,7 +806,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_app_server_enabled" scope="instance" visibility="public">
         <label>Enable the app server</label>
         <abstract>Check this option to enable the app server</abstract>
-        <description>Check this option to enable the app server</description>
+        <description>Check this option to enable the app server.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -817,7 +817,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_app_server_debug" scope="instance" visibility="public">
         <label>App server debug</label>
         <abstract>Check to get extra debug information from the service</abstract>
-        <description>Check to get extra debug information from the service</description>
+        <description>Check to get extra debug information from the service.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -894,7 +894,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_jobs_api_enabled" scope="instance" visibility="public">
         <label>Enable jobs API</label>
         <abstract>Check this option to enable the jobs API</abstract>
-        <description>Check this option to enable the jobs API</description>
+        <description>Check this option to enable the jobs API.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -905,7 +905,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_jobs_api_debug" scope="instance" visibility="public">
         <label>Jobs API debug</label>
         <abstract>Check to get extra debug information from the service</abstract>
-        <description>Check to get extra debug information from the service</description>
+        <description>Check to get extra debug information from the service.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -927,7 +927,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_files_api_enabled" scope="instance" visibility="public">
         <label>Enable files API</label>
         <abstract>Check this option to enable the files API</abstract>
-        <description>Check this option to enable the files API</description>
+        <description>Check this option to enable the files API.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -938,7 +938,7 @@ How we want to verify SSL certificates of services. Valid values are:
   <variable name="components_files_api_debug" scope="instance" visibility="public">
         <label>Files API debug</label>
         <abstract>Check to get extra debug information from the service</abstract>
-        <description>Check to get extra debug information from the service</description>
+        <description>Check to get extra debug information from the service.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -960,7 +960,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_explorer_jes_enabled" scope="instance" visibility="public">
         <label>Enable explorer JES</label>
         <abstract>Check this option to enable the JES explorer</abstract>
-        <description>Check this option to enable the JES explorer</description>
+        <description>Check this option to enable the JES explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -971,7 +971,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_explorer_mvs_enabled" scope="instance" visibility="public">
         <label>Enable explorer MVS</label>
         <abstract>Check this option to enable the MVS explorer</abstract>
-        <description>Check this option to enable the MVS explorer</description>
+        <description>Check this option to enable the MVS explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -982,7 +982,7 @@ How we want to verify SSL certificates of services. Valid values are:
     <variable name="components_explorer_uss_enabled" scope="instance" visibility="public">
         <label>Enable explorer USS</label>
         <abstract>Check this option to enable the USS explorer</abstract>
-        <description>Check this option to enable the USS explorer</description>
+        <description>Check this option to enable the USS explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -992,8 +992,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="useconfig_manager_enabled" scope="instance" visibility="public">
         <label>Enable Zowe configuration manager</label>
-        <abstract>Should Zowe configuration manager be enabled?</abstract>
-        <description>Should Zowe configuration manager be enabled?</description>
+        <abstract>Check this option to enable Zowe configuration manager</abstract>
+        <description>Check this option to enable Zowe configuration manager.</description>
         <category>configManager</category>
         <boolean>
             <!-- Put validation here -->
@@ -1149,7 +1149,7 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="zowe_setup_installStep_enabled" scope="instance" visibility="public">
         <label>Install the MVS data sets</label>
-        <abstract>This install option is only for convenience build. Check this option to enable this run step with the zwe install command.</abstract>
+        <abstract>Check to enable this run step with the zwe install command. For convenience build only.</abstract>
         <description>Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted, 
             you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. 
         This option is for convenience build only. SMP/E installs the MVS data sets during installation.</description>