Merge pull request #41 from IBM/doc-updates-jun14

Doc updates jun14

Author: eric-simpson

docs/guides/configuration.md

@@ -1,12 +1,13 @@
 #  Merlin Configuration
 
-Before you can make serious use of Merlin, you have to setup a number of things. When using the IBM i Developer and IBM i CI/CD support within Merlin, you have to have all endpoints (IBM i, Jenkin servers) pre-defined including the credentials that are to be used. This setup process is accomplished with the following:
+Before you can make serious use of Merlin, you have to setup a number of things. When using the IBM i Developer and IBM i CI/CD support within Merlin, you have to have all endpoints (IBM i, Jenkins servers) pre-defined including the credentials that are to be used. This setup process is accomplished with the following:
 
 * **Inventory** is where you can setup connections from Merlin to IBM i, Jenkins, and other environments
 * **Credentials** your user and password and/or SSH keys belong here
 * **Templates** are used to connect a defined inventory and credentials together
 
-But of course, you have to register to your Merlin instance first.
+You can setup inventories, credentials and templates by following the instructions in [Connections](./guides/platform/Manage_connections.md).
+<!-- But of course, you have to register to your Merlin instance first.
 
 ## Setting up Your Inventory (IBM i)
 
@@ -40,9 +41,8 @@ Head to the Templates tab and select Add.
 
 Fill out the required fields. The Inventory and Credential dropdowns only show you the items you have access to. You can give this Template another unique name, as well as custom description.
 
-![](../images/home/home-5.png)
-
-### Verifying the template
+![](../images/home/home-5.png) -->
+### Configuring IBM i server
 
 After an IBM i template has been created, the provided Ansible playbooks should be run to ensure the IBM i has the required software to allow for smooth interaction with Merlin.
 

docs/guides/openshift/merlininstall.md

@@ -1,6 +1,10 @@
 
 This guide assumes RedHat OpenShift is running, which will allow for the install of IBM i Merlin.
 
+## Supported product versions and OpenShift requirements
+
+See [Supported product versions and OpenShift requirements](./guides/platform/Install_IBM_i_Modernization_Engine_for_Lifecycle_Integration.md).
+
 ## Creating the Project
 
 First, ensure the entitlement key and CatalogSource has been [setup correctly](./guides/openshift/entitlement.md).

docs/sidebar.md

@@ -10,14 +10,14 @@
       - [Moving into git](./guides/git/moving-source.md)
       - [ARCAD initialisation](./guides/git/moving-source-arcad.md)
    - Installation (admin)
-      - [Requirements](./guides/openshift/merlin-reqs.md)
+      <!-- - [Requirements](./guides/openshift/merlin-reqs.md) -->
       - [Entitlement](./guides/openshift/entitlement.md)
-      - [Local (testing only)](./guides/openshift/local.md)
+      <!-- - [Local (testing only)](./guides/openshift/local.md) -->
       - [Installing Merlin](./guides/openshift/merlininstall.md)
-      - [Browser Certificates](./guides/openshift/merlin-certs.md)
+      <!-- - [Browser Certificates](./guides/openshift/merlin-certs.md) -->
       - [Upgrade Strategy](./guides/openshift/merlin-updates.md)
    - Configuration (admin)
-      - [App Installation](./guides/appinstall.md)
+      - [Tool Installation](./guides/appinstall.md)
       - [Configuration](./guides/configuration.md)
    - Merlin IDE
       - [Usage](./guides/crw/main.md)