Merge branch 'dev' into xmlparser

Author: matthewpwilson

CONTRIBUTING.md

@@ -7,15 +7,15 @@ This project welcomes all contributions.
 - If you would like to contribute a bug fix or small enhancement, please fork the repo and make a pull request.
 - If you would like to contribute a new feature, please raise an issue describing your proposal so we can discuss it first.
 
-## Developing Zowe CLI plugins
+## Developing Zowe CLI plug-ins
 
 For guidelines on developing Zowe CLI plug-ins see the [Zowe CLI GitHub repository](https://github.com/zowe/zowe-cli). The following information is critical to working with the code, running/writing/maintaining automated tests, developing consistent syntax and ensuring that the plug-in integrates with Zowe CLI properly:
 
 | For more information about ... | See: |
 | ------------------------------ | ----- |
-| General guidelines that apply to contributing to Zowe CLI and Plug-ins | [Contribution Guidelines](https://github.com/zowe/zowe-cli/blob/master/CONTRIBUTING.md) |
+| General guidelines that apply to contributing to Zowe CLI and plug-ins | [Contribution Guidelines](https://github.com/zowe/zowe-cli/blob/master/CONTRIBUTING.md) |
 | Conventions and best practices for creating packages and plug-ins for Zowe CLI | [Package and Plug-in Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/PackagesAndPluginGuidelines.md)|
 | Guidelines for running tests on Zowe CLI | [Testing Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/TESTING.md) |
 | Guidelines for running tests on the plug-ins that you build for Zowe CLI | [Plug-in Testing Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/PluginTESTINGGuidelines.md) |
 | Documentation that describes the features of the Imperative CLI Framework | [About Imperative CLI Framework](https://github.com/zowe/imperative/wiki) |
-Versioning conventions for Zowe CLI and Plug-ins| [Versioning Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/MaintainerVersioning.md) |
+Versioning conventions for Zowe CLI and plug-ins| [Versioning Guidelines](https://github.com/zowe/zowe-cli/blob/master/docs/MaintainerVersioning.md) |

README.md

@@ -7,7 +7,7 @@ The project was started in February 2019 and is at an early stage of development
 To try it out, build the plug-in from source as described in [setup](docs-internal/tutorials/Setup.md).
 
 ## Documentation
-You can find information and tutorials on using this plugin in our [documentation](https://ibm.github.io/zowe-cli-cics-deploy-plugin/index.html).
+You can find information and tutorials on using this plug-in in our [documentation](https://ibm.github.io/zowe-cli-cics-deploy-plugin/index.html).
 
 ## Contributing
 Contributions are welcome - see the [contribution guidelines](CONTRIBUTING.md). If you have a question or encounter a problem please raise an issue in this repo.

docs/_includes/head.html

@@ -16,6 +16,12 @@
 <!-- most color styles are extracted out to here -->
 <link rel="stylesheet" href="css/theme-blue.css">
 
+<!-- Added by C Harris on 5th June 2019 -->
+<style>
+    @import url('https://fonts.googleapis.com/css?family=IBM+Plex+Sans&display=swap');
+    @import url('https://fonts.googleapis.com/css?family=IBM+Plex+Mono&display=swap');
+</style>
+
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 
 <!-- Added by C Harris on 1st May 2019 - used for code copying buttons -->

docs/css/customstyles.css

@@ -1,7 +1,16 @@
 body {
+    font-family: 'IBM Plex Sans', sans-serif;
     font-size:15px;
 }
 
+pre {
+    font-family: 'IBM Plex Mono', 'Courier New', Courier, monospace;
+}
+
+code {
+    font-family: 'IBM Plex Mono', 'Courier New', Courier, monospace;
+}
+
 .bs-callout {
     padding: 20px;
     margin: 20px 0;
@@ -429,7 +438,7 @@ ul#mysidebar {
 }
 
 span.projectTitle {
-    font-family: Helvetica;
+    font-family: 'IBM Plex Sans', sans-serif;
     font-weight: bold;
 }
 
@@ -820,7 +829,7 @@ a.accordion-toggle {
 
 span.red {
     color: red;
-    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+    font-family: 'IBM Plex Mono', Monaco, Menlo, Consolas, "Courier New", monospace;
 }
 
 h3.codeExplanation {

docs/pages/cdp/cdp-Creating-Zowe-CLI-profiles.md

@@ -8,9 +8,9 @@ permalink: cdp-Creating-Zowe-CLI-profiles.html
 folder: cdp
 ---
 
-### Step 1: Create a z/OSMF profile
+### Create a z/OSMF profile
 
-This profile defines the parameters needed to connect to the z/OSMF server on z/OS. You need to know the following from your z/OS system administrator:
+The z/OSMF profile defines the parameters needed to connect to the z/OSMF server on z/OS. You need to know the following from your z/OS system administrator:
 
 | Option | Description |
 | --- | --- |
@@ -39,9 +39,9 @@ To test the connection to the z/OSMF server using the profile:
 zowe zosmf check status
 ```
 
-### Step 2: Create an SSH profile
+### Create an SSH profile
 
-This profile defines the parameters needed to connect to the SSH server on z/OS. You need to know the following from your z/OS system administrator:
+The SSH profile defines the parameters needed to connect to the SSH server on z/OS. You need to know the following from your z/OS system administrator:
 
 | Option | Description |
 | --- | --- |
@@ -70,9 +70,9 @@ To test the connection to the SSH server using the profile:
 zowe zos-uss issue ssh 'uname -a'
 ```
 
-### Step 3: Create a cics-deploy profile
+### Create a cics-deploy profile
 
-This profile identifies the CICS environment for deployment. You need to know the following from your CICS system administrator:
+The cics-deploy profile identifies the CICS environment for deployment. An example of how to create an environment using using z/OS Provisioning Toolkit as described in [Provisioning a CICS region using z/OS PT](cdp-Provisioning-a-CICS-region-using-zospt). You need to know the following from your CICS system administrator:
 
 | Option | Description |
 | --- | --- |
@@ -96,4 +96,35 @@ For help on using the options:
 zowe profiles create cics-deploy-profile --help
 ```
 
-To test the cics-deploy profile, follow the steps in [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
+To test the cics-deploy profile, follow the steps in [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
+
+### Create a CICS profile
+
+The CICS profile identifies the connection to the CICS Web User Interface (WUI) server to query application resources. You need to know the following from your CICS system administrator:
+
+| Option | Description |
+| --- | --- |
+| cics-plex | CPSM CICSplex name. This will typically be set to the same as cicsplex in the cics-deploy profile. |
+| protocol | HTTP or HTTPS to use to connect to the CICS WUI server. |
+| host | Host name of the CICS WUI server. |
+| port | Port number of the CICS WUI server. |
+| user | User ID to identify yourself to the CICS WUI server . |
+| password | Password to identify yourself to the CICS WUI server. |
+
+For example, to create an SSH profile:
+
+```console
+zowe profiles create cics-profile cics --cics-plex PLEX1 --protocol https --host myzos.example.com --port 1490 --user myuserid --password mypassword --overwrite
+```
+
+For help on using the options:
+
+```console
+zowe profiles create cics-profile --help
+```
+
+To test the connection to the CICS WUI server using the profile:
+
+```console
+zowe cics get resource CICSRegion
+```

docs/pages/cdp/cdp-Deploying-your-first-nodejs-app.md

@@ -15,9 +15,9 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
 
 ### Procedure
 
-1. Install the Zowe CLI and cics-deploy plugin by following the steps in [Installing](cdp-Installing).
+1. Install the Zowe CLI and cics-deploy plug-in by following the steps in [Installing](cdp-Installing).
 
-2. Create Zowe CLI profiles for z/OSMF, SSH, and cics-deploy by following the steps in [Creating Zowe CLI profiles](cdp-Creating-Zowe-CLI-profiles).
+2. Create Zowe CLI profiles for z/OSMF, SSH, cics-deploy and CICS by following the steps in [Creating Zowe CLI profiles](cdp-Creating-Zowe-CLI-profiles).
 
 3. Create a Node.js application using the [Express Application Generator](https://expressjs.com/en/starter/generator.html):
 
@@ -29,19 +29,19 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
    npm start
    ```
 
-   The Node.js application will start. You can call the application from a browser using URL [http://localhost:3000/](http://localhost:3000/). To stop the application in the console press CTRL+C.
+   The Node.js application will start. You can call the application from a browser by using URL [http://localhost:3000/](http://localhost:3000/). To stop the application in the console press CTRL+C.
 
 4. Package the Node.js application into a [CICS bundle](cdp-cics-bundles).
 
-    Make sure you are in the root directory of the application.
+    Make sure that you are in the root directory of the application.
 
     Replace the value for `--port` with one that is available for use by the CICS region on z/OS. This sets the PORT environment variable in the generated `.profile` file. Additional variables can be set by editing this file.
 
    ```console
     zowe cics-deploy generate bundle --port 3000 --overwrite
    ```
 
-    The output will indicates the directories and files created to form a CICS bundle. For example:
+    The output indicates the directories and files that are created to form a CICS bundle. For example:
 
     <pre class="messageText">
     define : NODEJSAPP "myexpressapp" with startscript "./bin/www"
@@ -61,13 +61,13 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
 
     A progress bar is shown with status messages as the CICS bundle is deployed and the application is started. This can take a few minutes. If there are errors, retry with the `--verbose` option for more detailed output, or refer to [Troubleshooting](cdp-Troubleshooting-General).
 
-    This results in a CICS BUNDLE resource named `Express` being defined, installed and enabled in CICS. If the BUNDLE `Express` was already defined or installed in CICS, it is undeployed first. As the BUNDLE is enabled, the Node.js application is started.
+    This results in a CICS BUNDLE resource named `Express` being defined, installed, and enabled in CICS. If the BUNDLE `Express` was already defined or installed in CICS, it is undeployed first. As the BUNDLE is enabled, the Node.js application is started.
 
 6. Test the Node.js application.
 
-    You can call the application from a browser using URL [http://myzos:3000/](http://myzos:3000/), replacing _myzos_ with the host name of the z/OS system, and _3000_ with the port specified in step 4.
+    You can call the application from a browser by using URL [http://myzos:3000/](http://myzos:3000/), replacing _myzos_ with the host name of the z/OS system, and _3000_ with the port specified in step 4.
 
-    If you make changes to the application you can redeploy it by repeating step 5.
+    If you make changes to the application, you can redeploy it by repeating step 5.
 
 ### Results
 

docs/pages/cdp/cdp-Home.md

@@ -1,16 +1,16 @@
 ---
-title: Zowe CLI CICS deploy plugin
+title: Zowe CLI CICS deploy plug-in
 tags: [getting_started]
 keywords:
-summary: "The Zowe command line interface (CLI) provides a simple and streamlined way to interact with IBM z/OS. The cics-deploy plugin extends the Zowe CLI to deploy applications developed on a workstation to IBM CICS Transaction Server for z/OS (CICS)."
+summary: "The Zowe command line interface (CLI) provides a simple and streamlined way to interact with IBM z/OS. The cics-deploy plug-in extends the Zowe CLI to deploy applications developed on a workstation to IBM CICS Transaction Server for z/OS (CICS)."
 sidebar: cdp_sidebar
 permalink: index.html
 folder: cdp
 ---
 
 It provides a CICS deployment workflow for developers and CI/CD automation pipelines similar to that experienced when deploying applications to cloud environments.
 
-Before you start, and especially if you are not familiar with the world of z/OS, Zowe and CICS, it's a good idea to read about some of the key concepts, which include [Zowe](cdp-zowe-and-cli), [Zowe CLI profiles](cdp-zowe-profiles) and [CICS bundles](cdp-cics-bundles). If you're keen to get going quickly, you can jump right in and follow along with our tutorial on [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
+Before you start, and especially if you are not familiar with the world of z/OS, Zowe, and CICS, it's a good idea to read about some of the key concepts, which include [Zowe](cdp-zowe-and-cli), [Zowe CLI profiles](cdp-zowe-profiles) and [CICS bundles](cdp-cics-bundles). If you're keen to get going quickly, you can jump right in and follow along with our tutorial on [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
 
 When everything is [installed](cdp-Installing) and you have [created the Zowe CLI profiles](cdp-Creating-Zowe-CLI-profiles), you can deploy an application from your workstation to CICS in two steps:
 

docs/pages/cdp/cdp-Installing.md

@@ -2,7 +2,7 @@
 title: Installing
 tags: [getting_started]
 keywords:
-summary: "To install the Zowe CLI and cics-deploy plugin, perform the following steps. For clarity, these components are installed on your local workstation, not on z/OS."
+summary: "To install the Zowe CLI and cics-deploy plug-in, perform the following steps. For clarity, these components are installed on your local workstation, not on z/OS."
 sidebar: cdp_sidebar
 permalink: cdp-Installing.html
 folder: cdp
@@ -18,13 +18,13 @@ toc: false
     npm --version
     ```
 
-2. Install [Zowe CLI](https://zowe.github.io/docs-site/latest/user-guide/cli-installcli.html). For example to install using npm:
+2. Install [Zowe CLI](https://zowe.github.io/docs-site/latest/user-guide/cli-installcli.html). For example, to install using npm:
 
     ```console
     sudo npm install -g @zowe/cli
     ```
 
-3. Build and install the cics-deploy plugin as described in [Setting up your development environment](https://github.com/IBM/zowe-cli-cics-deploy-plugin/blob/master/docs-internal/tutorials/Setup.md). For example:
+3. Build and install the cics-deploy plug-in as described in [Setting up your development environment](https://github.com/IBM/zowe-cli-cics-deploy-plugin/blob/master/docs-internal/tutorials/Setup.md). For example:
 
     ```console
     mkdir ~/cics-deploy
@@ -37,7 +37,7 @@ toc: false
     zowe plugins install .
     ```
 
-4. Verify the plugin is installed:
+4. Verify the plug-in is installed:
 
     ```console
     zowe plugins list