zos trademarks

Signed-off-by: Natasha Mckenzie-Kelly <[email protected]>

Author: tasha-m-k

docs/pages/cdp/cdp-Common-Errors.md

@@ -13,14 +13,14 @@ folder: cdp
 If you experience errors while using the cics-deploy plug-in, check the following potential causes before investigating further:
 
 * CICS® must be authorized to read the bundle directory `META-INF`.
-* The port specified by the `--port` argument of the `cics-deploy generate bundle` command *must* be free on z/OS before you attempt to deploy an application.
+* The port specified by the `--port` argument of the `cics-deploy generate bundle` command *must* be free on z/OS® before you attempt to deploy an application.
 * If you set a `WORK_DIR` in the CICS® Node.js application profile, such as `nodejsapps/<your application name>.profile`, it must be *writeable* by CICS®.
 
 ## Deployment errors
 
 {% include note.html content="For further troubleshooting steps, see [Troubleshooting Node.js applications](https://www.ibm.com/support/knowledgecenter/en/SSGMCP_5.5.0/troubleshooting/node/node-troubleshooting.html)." %}
 
-{% include important.html content="To definitively diagnose a problem based on the suggested symptoms, you might need to refer to one or more [system logs and traces](cdp-Log-and-trace-files) particularly the STDERR Node.js log and the file assigned the MSGUSR DD name in the relevant CICS® job. Depending on your familiarity with z/OS and CICS®, and your system privileges, you may also need to consult a CICS® systems administrator to get to the bottom of certain problems." %}
+{% include important.html content="To definitively diagnose a problem based on the suggested symptoms, you might need to refer to one or more [system logs and traces](cdp-Log-and-trace-files) particularly the STDERR Node.js log and the file assigned the MSGUSR DD name in the relevant CICS® job. Depending on your familiarity with z/OS® and CICS®, and your system privileges, you may also need to consult a CICS® systems administrator to get to the bottom of certain problems." %}
 
 ### Application incorrectly deploys in a DISABLED state
 
@@ -37,13 +37,8 @@ If you experience errors while using the cics-deploy plug-in, check the followin
 
 ### Command error: DFHDPLOY stopped processing due to an error
 
-<<<<<<< HEAD
-*Possible causes*:
-* The `--scope` and/or `--cicsplex` settings for the current deploy profile are wrong, and don't correctly identify a current CICS® system, CICS® System Group and/or a correct CICSPlex respectively.
-=======
 *Possible causes:*
-* The `--scope` and/or `--cicsplex` settings for the current deploy profile are wrong, and don't correctly identify a current CICS system, CICS System Group and/or a correct CICSPlex respectively.
->>>>>>> 0756169330262b1a362a12c4d130ffc377eb0283
+* The `--scope` and/or `--cicsplex` settings for the current deploy profile are wrong, and don't correctly identify a current CICS® system, CICS® System Group and/or a correct CICSPlex respectively.
 * The CMAS for the current CICSPlex is inactive.
 * CPSM is not functioning correctly.
 

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

@@ -19,7 +19,7 @@ Therefore by creating and setting options in the following profiles, they will b
 
 The CICS® deploy plug-in makes use of the following profiles:
 
-| Profile | Used by command | Connects to z/OS server |
+| Profile | Used by command | Connects to z/OS® server |
 | --- | --- | --- |
 | [z/OSMF profile](#zosmf-profile) | **zowe cics-deploy ...** <br /> zowe console ... <br />  zowe zos-files ... <br />  zowe zos-jobs ... <br />  zowe zos-tso ... <br />  zowe zos-workflows ... <br />  zowe zosmf ... <br />  zowe provisioing ... | z/OSMF |
 | [SSH profile](#ssh-profile) | **zowe cics-deploy push ...** <br />  zowe zos-uss ... | SSH |
@@ -28,7 +28,7 @@ The CICS® deploy plug-in makes use of the following profiles:
 
 ### z/OSMF profile
 
-The z/OSMF profile defines the options 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 options 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 |
 | --- | --- |
@@ -59,7 +59,7 @@ zowe zosmf check status
 
 ### SSH profile
 
-The SSH profile defines the options 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 options needed to connect to the SSH server on z/OS. You need to know the following from your z/OS® system administrator:
 
 | Option | Description |
 | --- | --- |
@@ -90,7 +90,7 @@ zowe zos-uss issue ssh 'uname -a'
 
 ### CICS® deploy profile
 
-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:
+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 |
 | --- | --- |
@@ -100,7 +100,7 @@ The cics-deploy profile identifies the CICS® environment for deployment. An exa
 | scope | CPSM scope to identify the CICS® region or group of regions to deploy your application. |
 | csd-group or res-group | CICS® CSD group name or CPSM BAS resource group name into which the bundle is defined. If not specified, BUNDLE resources are defined in CPSM BAS for installation and then removed. |
 | job-card | JCL jobcard to use when submitting JCL that will run the CICS® utility DFHDPLOY. If not specified, a default job card will be used. |
-| target-directory | Target directory on z/OS to which CICS® bundles should be uploaded. |
+| target-directory | Target directory on z/OS® to which CICS® bundles should be uploaded. |
 
 For example to create a cics-deploy profile:
 

docs/pages/cdp/cdp-Deploying-a-nodejs-application.md

@@ -53,7 +53,7 @@ CICS® TS V5.5 introduced support to run Node.js applications and is required by
    create : META-INF/cics.xml
    CICS Bundle generated with bundleid "myexpressapp"</pre>
 
-5. Confirm that the Node.js version installed on z/OS is suitable for your application.
+5. Confirm that the Node.js version installed on z/OS® is suitable for your application.
 
    ```text
    zowe zos-uss issue ssh "node --version"
@@ -82,7 +82,7 @@ CICS® TS V5.5 introduced support to run Node.js applications and is required by
 
 7. Test the application.
 
-   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.
+   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.
 

docs/pages/cdp/cdp-Deploying-using-individual-actions.md

@@ -31,13 +31,13 @@ Alternatively, if you want to disable the CICS® bundle, but to not discard it:
 zowe cics-deploy undeploy bundle --name Express --target-state disabled
 ```
 
-{% include note.html content="This command does not remove the CICS® bundle from the z/OS directory." %}
+{% include note.html content="This command does not remove the CICS® bundle from the z/OS® directory." %}
 
 ### Upload a CICS® bundle to z/OS
 
 Before uploading the CICS® bundle to z/OS, you need to ensure the target directory is empty in order to prevent merging with a previously deployed version of the CICS® bundle.
 
-There are several ways to run shell commands and scripts on z/OS, such as SSH, batch jobs, and Zowe. When using Zowe, an SSH connection is established using information in the Zowe ssh profile, and the shell .profile for the user is run to setup the environment. The command is then run in z/OS in the directory specified by the `--cwd` option. The return code from the command is used to set the Zowe CLI return code, enabling you to take action in your script in error scenarios.
+There are several ways to run shell commands and scripts on z/OS, such as SSH, batch jobs, and Zowe. When using Zowe, an SSH connection is established using information in the Zowe ssh profile, and the shell .profile for the user is run to setup the environment. The command is then run in z/OS® in the directory specified by the `--cwd` option. The return code from the command is used to set the Zowe CLI return code, enabling you to take action in your script in error scenarios.
 
 For example, to remove the target directory:
 
@@ -47,7 +47,7 @@ zowe zos-uss issue ssh "rm -Rv *" --cwd "/var/cicsts/bundles/myexpressapp_1.0.0"
 
 {% include tip.html content="You can run several commands in one request using the syntax described in [sh — Invoke a shell](https://www.ibm.com/support/knowledgecenter/en/SSLTBW_2.3.0/com.ibm.zos.v2r3.bpxa500/sh.htm)." %}
 
-When uploading the CICS® bundle to z/OS, you may need to upload some files as binary, some as text, and exclude others that are not required to run the application. In addition, it is best practice to tag files on z/OS as binary or with their text codepage to allow for correct codepage translation by editors and environments such as Node.js and Java. You can specify these requirements in a `.zosattributes` file and use the Zowe CLI to upload and tag files in a single command.
+When uploading the CICS® bundle to z/OS, you may need to upload some files as binary, some as text, and exclude others that are not required to run the application. In addition, it is best practice to tag files on z/OS® as binary or with their text codepage to allow for correct codepage translation by editors and environments such as Node.js and Java. You can specify these requirements in a `.zosattributes` file and use the Zowe CLI to upload and tag files in a single command.
 
 For example, create file **~/myExpressApp/.zosattributes** in the CICS® bundle:
 
@@ -80,7 +80,7 @@ zowe zos-files upload dir-to-uss ~/myExpressApp/ "/var/cicsts/bundles/myexpressa
 
 ### Resolve Node.js application dependencies on z/OS
 
-A Node.js application typically depends on packages that are described in `package.json`. The dependencies can be installed by running `npm install` in the z/OS directory containing `package.json`, for example:
+A Node.js application typically depends on packages that are described in `package.json`. The dependencies can be installed by running `npm install` in the z/OS® directory containing `package.json`, for example:
 
 ```console
 zowe zos-uss issue ssh "npm install" --cwd "/var/cicsts/bundles/myexpressapp_1.0.0"

docs/pages/cdp/cdp-Log-and-trace-files.md

@@ -2,7 +2,7 @@
 title: Log and trace files
 tags: [troubleshooting]
 keywords:
-summary: "When you use Zowe, log and trace files are written on both your local workstation and z/OS."
+summary: "When you use Zowe, log and trace files are written on both your local workstation and z/OS®."
 sidebar: cdp_sidebar
 permalink: cdp-Log-and-trace-files.html
 folder: cdp
@@ -39,7 +39,7 @@ You can use the following command to display messages written to the log file as
 
 ### Node.js logs
 
-By default, CICS® writes Node.js log files on z/OS to the `/tmp` directory. However, the `generate bundle` command creates a number of files including `nodejsapps/<my app name>.profile` (often referred to as the Node.js profile), which you can edit to specify a more convenient log file location. Such logs get written to the directory referenced by the environment variable `WORK_DIR`. For example, you might edit your Node.js profile so that it includes the line:
+By default, CICS® writes Node.js log files on z/OS® to the `/tmp` directory. However, the `generate bundle` command creates a number of files including `nodejsapps/<my app name>.profile` (often referred to as the Node.js profile), which you can edit to specify a more convenient log file location. Such logs get written to the directory referenced by the environment variable `WORK_DIR`. For example, you might edit your Node.js profile so that it includes the line:
 
 ```properties
 WORK_DIR=/u/<your user id>/nodelogs
@@ -60,6 +60,6 @@ They can all be useful when identifying the cause of an error, especially STDERR
 
 ### JES job logs
 
-If you are familiar with the z/OS environment, you can often find some useful diagnostics by accessing the JES job log associated with the CICS® region you deployed to.  The `cics-deploy push` command outputs the job IDs for all the CICS® regions in the scope after a deployment.  The MSGUSR, SYSPRINT, SYSOUT and JESMSGLG spool files can all provide useful information.   If you are not so fluent with the world of z/OS, you may need to discuss your needs with one of your organization's CICS® system administrators.
+If you are familiar with the z/OS® environment, you can often find some useful diagnostics by accessing the JES job log associated with the CICS® region you deployed to.  The `cics-deploy push` command outputs the job IDs for all the CICS® regions in the scope after a deployment.  The MSGUSR, SYSPRINT, SYSOUT and JESMSGLG spool files can all provide useful information.   If you are not so fluent with the world of z/OS, you may need to discuss your needs with one of your organization's CICS® system administrators.
 
 {% include note.html content="If you use [Visual Studio Code](https://code.visualstudio.com/) as your editor, there is a [Zowe extension](https://marketplace.visualstudio.com/items?itemName=Zowe.vscode-extension-for-zowe) that enables you to interact with USS files and examine JES job logs from your local workstation." %}

docs/pages/cdp/cdp-Preparing-a-zOS-PT-image.md

@@ -9,7 +9,7 @@ folder: cdp
 toc: true
 ---
 
-The [z/OS Provisioning Toolkit](https://developer.ibm.com/mainframe/products/zospt/) (z/OS PT) provides a command line utility and z/OSMF workflows to provision CICS® regions and other development environments on z/OS. This tutorial requires z/OS PT version 1.1.5 or above to be installed on z/OS, and your user `.profile` file on z/OS configured to run z/OS PT.
+The [z/OS Provisioning Toolkit](https://developer.ibm.com/mainframe/products/zospt/) (z/OS PT) provides a command line utility and z/OSMF workflows to provision CICS® regions and other development environments on z/OS. This tutorial requires z/OS PT version 1.1.5 or above to be installed on z/OS, and your user `.profile` file on z/OS® configured to run z/OS PT.
 
 z/OS PT uses configuration and files in an *image* as input to z/OSMF workflows to provision a CICS® region. The image is typically prepared by a CICS® system administrator. This tutorial provides two alternative approaches to preparing a z/OS PT image:
 
@@ -34,7 +34,7 @@ Run the following commands on your workstation.
 
 3. Setup environment variables for the name of your image, and paths for the image source on the workstation and z/OS.
 
-   Update these values to be suitable for your workstation and z/OS environments.
+   Update these values to be suitable for your workstation and z/OS® environments.
 
    ```text
    export IMAGE="cics_55_nodejs"
@@ -115,7 +115,7 @@ Run the following commands on your workstation.
 
 4. Setup environment variables for the name of your image, and paths for the image source on the workstation and z/OS.
 
-   Update these value for to be suitable for your workstation and z/OS environments.
+   Update these value for to be suitable for your workstation and z/OS® environments.
 
    ```text
    export APP_DIR=$HOME/myExpressApp
@@ -164,4 +164,4 @@ Run the following commands on your workstation.
 
 The image is now ready for developers to use to provision their own CICS® region. The Node.js application will be provisioned and started together the CICS® region. The image source can be stored and shared with the application using a source code management system. When your application is updated, you will need to prepare a new image by repeating steps 3, 4 and 5.
 
-For further details on including applications in z/OS images see [Including a CICS® bundle in your image](https://www.ibm.com/support/knowledgecenter/en/SSXH44E_1.0.0/zospt/cics/zospt-cics-bundles.html).
+For further details on including applications in z/OS® images see [Including a CICS® bundle in your image](https://www.ibm.com/support/knowledgecenter/en/SSXH44E_1.0.0/zospt/cics/zospt-cics-bundles.html).

docs/pages/cdp/cdp-Provisioning-a-CICS-region.md

@@ -68,7 +68,7 @@ Before you can provision a CICS® region, a z/OS PT image needs to be created an
    zowe zos-uss issue ssh "zospt inspect my_cics_region"
    ```
 
-   The output is in JSON format and includes values for the CICS® region application ID, and the z/OS directory within which your CICS® bundles can be uploaded. For example:
+   The output is in JSON format and includes values for the CICS® region application ID, and the z/OS® directory within which your CICS® bundles can be uploaded. For example:
 
    <pre class="messageText">
     "DFH_REGION_APPLID": "CICPY000",
@@ -106,7 +106,7 @@ zowe zos-uss issue ssh "zospt stop my_cics_region"
 
 ### Start your CICS® region
 
-The CICS® region can be started after it was previously stopped, for example due to the z/OS system being restarted, by using the following command:
+The CICS® region can be started after it was previously stopped, for example due to the z/OS® system being restarted, by using the following command:
 
 ```console
 zowe zos-uss issue ssh "zospt start my_cics_region"