Skip to content

Commit 85233ff

Browse files
Jonathan ZakJonathan Zak
Jonathan Zak
authored and
Jonathan Zak
committed
Trim configuration.md
1 parent 6ab2273 commit 85233ff

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

docs/guides/configuration.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Merlin Configuration
22

3-
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:
3+
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:
44

55
* **Inventory** is where you can setup connections from Merlin to IBM i, Jenkins, and other environments
66
* **Credentials** your user and password and/or SSH keys belong here
77
* **Templates** are used to connect a defined inventory and credentials together
88

9-
But of course, you have to register to your Merlin instance first.
9+
You can setup inventories, connections and templates by following the instructions in [Connections](./guides/platform/Manage_connections.md).
10+
<!-- But of course, you have to register to your Merlin instance first.
1011
1112
## Setting up Your Inventory (IBM i)
1213
@@ -40,8 +41,7 @@ Head to the Templates tab and select Add.
4041
4142
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.
4243
43-
![](../images/home/home-5.png)
44-
44+
![](../images/home/home-5.png) -->
4545
### Verifying the template
4646

4747
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.

0 commit comments

Comments
 (0)