resolve merge conflicts

Signed-off-by: Sanjula Ganepola <[email protected]>

Author: SanjulaGanepola

docs/guides/appinstall.md

@@ -22,7 +22,7 @@ First, head over to the Projects tab and select Create.
 
 ![](../images/appinst/appinst-1.png)
 
-This gives you a name and a desciption to fill out. I named this project `company-system`.
+This gives you a name and a description to fill out. I named this project `company-system`.
 
 ![](../images/appinst/appinst-2.png)
 
@@ -39,12 +39,12 @@ Applications only get installed once into a project. Future developers using thi
 
 To install a tool, head to the **Catalog** and see what tools are available. If you right click on IBM i Developer, have two options:
 
-1. **View Details** which gives you a desciption of the tool
+1. **View Details** which gives you a description of the tool
 2. **Install the Application** which installs it into a chosen project in the next steps
 
 ![](../images/appinst/appinst-3.png)
 
-After you select 'Install the Application', there is a prompt to review and accept a licence agreement.
+After you select 'Install the Application', there is a prompt to review and accept a license agreement.
 
 ![](../images/appinst/appinst-4.png)
 

docs/guides/flows.md

@@ -20,10 +20,10 @@ ARCAD builder has a specific way it fetches source code from a repository before
 
 In order for ARCAD Builder to successfully clone from the 'External source code Management' URL defined in the ARCAD application, the user profile that is running the ARCAD Builder job needs access to the repository URL.
 
-* The `AGENSSHKEY` can be used to generate the keypair for the user running the ARCAD Builder job on IBM i. The standard directory for the public key is `/home/<user>/.ssh/id_rsa.pub`.
+* The `AGENSSHKEY` can be used to generate the key pair for the user running the ARCAD Builder job on IBM i. The standard directory for the public key is `/home/<user>/.ssh/id_rsa.pub`.
 * The generated public key must be added to a GitHub/Azure/BitBucket account that has access to the repository being used.
 * The user who runs the ARCAD Builder job can be changed with the `CHGAFSSVR` command.
 
-It is also possible to override the user used for the clone. If you head to the ARCAD Builder Web Interface and navigate to the application, under the build model it is possible to define a 'Build' login and password (an IBM i user profile) which will be used for this application. The user profile provided also needs an SSH keypair setup.
+It is also possible to override the user used for the clone. If you head to the ARCAD Builder Web Interface and navigate to the application, under the build model it is possible to define a 'Build' login and password (an IBM i user profile) which will be used for this application. The user profile provided also needs an SSH key pair setup.
 
 ![](../images/cicd/cicd-14-b.png)

docs/guides/ide/debug.md

@@ -166,7 +166,7 @@ You need to restart the debug service after changing a port number.
 **Answer**: The Service Entry Points are removed from the debug client after the connection is terminated. However, the SEPs are still saved in the running host debug service job. The SEPs will be restored in the client if you connect to the same host again.
 
 **Question**: Service entry point without a condition works for me but conditional service entry point does not work. The program appears to be hung from a 5250 session when a conditional service entry point is hit.  
-**Answer**: It may be an authority issue with your debug user profile. Your debug user profile need to have *USE authority to the profile that owns  the QB5ROUTER job and also its job description. Suppose the owner of the QB5ROUTER job is USR1 and your debug user profile is USR2, and the job description of the USR1 profile is QGPL/USR1, you can use the following commands from a terminal session to grant additional authority to your debug user profile:  
+**Answer**: It may be an authority issue with your debug user profile. Your debug user profile need to have *USE authority to the profile that owns the QB5ROUTER job and also its job description. Suppose the owner of the QB5ROUTER job is USR1 and your debug user profile is USR2, and the job description of the USR1 profile is QGPL/USR1, you can use the following commands from a terminal session to grant additional authority to your debug user profile:  
 
     GRTOBJAUT OBJ(QGPL/USR1) OBJTYPE(*ALL) USER(USR2) AUT(*USE)  
     GRTOBJAUT OBJ(USR1) OBJTYPE(*USRPRF) USER(USR2) AUT(*USE)  

docs/guides/openshift/local.md

@@ -10,25 +10,8 @@ This guide exists for users who potentially have hardware available for OpenShif
 
 ## System requirements
 
-Red Hat OpenShift Local at present is only supported on AMD64 and Intel 64 processor architectures. It has the following minimum hardware requirements:
+Please see the official Red Hat documentation regarding system requirements: [Openshift Local System Requirements](https://access.redhat.com/documentation/en-us/red_hat_openshift_local/2.5/html/release_notes_and_known_issues/minimum-system-requirements_rn-ki)
 
-- 4 physical CPU cores
-- 9 GB of free memory
-- 35 GB of storage space
-
-And the following operating system requirements:
-
-- Microsoft Windows 10 Fall Creators Update (version 1709) or later
-- macOS 11 Big Sur or later
-- The latest two Red Hat Enterprise Linux/CentOS 7, 8 and 9 minor releases and on the latest two stable Fedora releases.
-
-**Note:**
-
-The OpenShift Local requires these (above) minimum hardware resources to run the smallest OpenShift Container Platform. Some workloads may require more resources. We recommend the following resources for running OpenShift Local:
-
-- 8 physical CPU cores
-- 64 GB of free memory
-- 256 GB of storage space
 
 ## Install Red Hat OpenShift Local
 
@@ -247,7 +230,7 @@ From OpenShift web console, locate the Merlin namespace, open the postgres pod t
 * In the psql session, run the following command to create an empty merlindb database:
     * `DROP DATABASE IF EXISTS merlindb WITH (FORCE);`
     * `CREATE DATABASE merlindb;`
-* Run `\q` to quit the psql sesison.
+* Run `\q` to quit the psql session.
 * In the Terminal, run `psql -f /tmp/merlindb_dumpfile -d merlindb` to restore the merlindb database.
    
 Now, you can use admin user and password to access Merlin GUI and use the vault secret and token to unseal vault which you had already written down. 

docs/guides/openshift/merlin-reqs.md

@@ -13,7 +13,7 @@ See [Supported product versions](./guides/platform/Install_IBM_i_Modernization_E
 | Merlin               | 2.5         | 5         | 7Gi            | 15Gi         |                                   |
 | IBM i Developer Tool | 1.3         | 6.6       | 1.2Gi          | 9Gi          | The resource is per each instance |
 | IBM i CI/CD          | 0.5         | 1         | 1Gi            | 2Gi          | The resource is per each instance |
-| IDE workspace        | 0.08        | 1.4       | 320Mi          | 3.25Gi       | The resource is per user          |
+| Developer workspace        | 0.08        | 1.4       | 320Mi          | 3.25Gi       | The resource is per user          |
 
 > **Meaning of a instance for IBM i Developer and IBM i CI/CD tools:** If admin installs one of these two tools in a OpenShift project, that means one instance.\
 > **Unit of CPU:** CPU is measured in units called millicores. If a node has 2 cores, the node’s CPU capacity would be represented as 2000m.\

docs/guides/openshift/merlininstall.md

@@ -102,7 +102,7 @@ The admin user can be used to log in to the Merlin instance for first time setup
 
 ## Initializing the Vault
 
-After Merlin has been installed, an admin will need to initialise the vault. The vault is used to securely store credentials and important information securely. When you initialise the vault, **be sure to store** the secrets and token that are provided by the UI. **These are required** during Merlin upgrades and any time the vault needs to be unsealed.
+After Merlin has been installed, an admin will need to initialize the vault. The vault is used to securely store credentials and important information securely. When you initialize the vault, **be sure to store** the secrets and token that are provided by the UI. **These are required** during Merlin upgrades and any time the vault needs to be unsealed.
 
 ![](../../images/osc/osc-20.png)
 

docs/guides/overview/sandbox.md

@@ -1,6 +1,6 @@
 # Merlin Test Drive
 
-It is now possible to try Merlin (and all components) for a limited timeframe.  Please reach out to your Seller to be nominated for participation.
+It is now possible to try Merlin (and all components) for a limited timeframe.  Please reach out to your seller to be nominated for participation.
 
 The Merlin Test Drive environment provides access to:
 
@@ -16,7 +16,7 @@ With access to the Merlin Test Drive environment, this hands-on documentation ca
 * A [self-guided tour](./workshop/readme.md) and sample code are provided
 * Leverage, test, and / or demonstrate IBM i Merlin.
 * The user is provided an OpenShift Merlin Workspace and a dedicated IBM i partition
-* IBM Client Engineering for Systems team provides the infrastructure, IBM i Development provides the Merlin expertise, and you test-drive Merlin
+* IBM Client Engineering for Systems team provides the infrastructure. IBM i Development provides the Merlin expertise. And you test-drive Merlin
 
 #### Limitations
 
@@ -29,5 +29,5 @@ With access to the Merlin Test Drive environment, this hands-on documentation ca
 * BP or IBM Sellers can engage with the submission of a Deal Support Request against a pre-sales opportunity.
 * Clients should reach out to your Seller to be nominated for participation.  Your Seller will submit a Deal Support Request for `Power IBM i Merlin TestDrive` via the Client Engineering engagement process.
 
-For general inqueries, contact us at [email protected].
+For general inquiries, contact us at [email protected].