Skip to content

Commit 6e17754

Browse files
authored
Merge pull request #64 from IBM/merlin-204-updates
merlin 204 updates
2 parents e45b3ae + 2a6c037 commit 6e17754

4 files changed

+5
-5
lines changed

docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ IBM i Modernization Engine for Lifecycle Integration (Merlin) is a set of tools
66

77
See the [announcement](https://www.ibm.com/docs/en/announcements/i-modernization-engine-lifecycle-integration-merlin-20) for Version 2.0 details.
88

9-
**News**: Version 2.0.3 is available!
9+
**News**: Version 2.0.4 is available! New PTFs required for debugging: 7.4 PTF SJ03026, 7.5 PTF SJ03030!
1010

1111
#### Getting started videos
1212

docs/guides/ide/debug.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Debugging
22

3-
The IBM i Debugger for Merlin consists of a host component called **IBM i Debug Service**, and a client **IBM i Debug** extension included in the IDE. IBM i Debug Service is delivered as host [PTFs](../platform/ManageIBMiServer.md#running-actions-on-the-ibm-i-server) on the 7.3, 7.4, and 7.5 release levels. A Java 11 JRE is required to run IBM i Debug Service.
3+
The IBM i Debugger for Merlin consists of a host component called **IBM i Debug Service**, and a client **IBM i Debug** extension included in the IDE. IBM i Debug Service is delivered as host [PTFs](../platform/ManageIBMiServer.md#running-actions-on-the-ibm-i-server). A Java 11 JRE is required to run IBM i Debug Service on the host.
44

55
- Run **Validate the dependent PTFs** action on a template from **Connections** to verify the required PTFs are applied.
66
- Run **Enable IBM i debug service** action on a template from **Connections** to start the debug service on the IBM i.

docs/guides/platform/Install_IBM_i_Modernization_Engine_for_Lifecycle_Integration.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ IBM i: 7.4, 7.5
1919
- IBM i 7.5 PTFs: SI79659, SI81047, SI81049, SI83058
2020
- IBM i 7.4 PTFs: SI76101, SI81006, SI81023, SI83048
2121
- 5770SS1:
22-
- IBM i 7.5 PTFs: SI80368, SI81035, SI86076, SI84164, SJ00293, SI86229
23-
- IBM i 7.4 PTFs: SI80364, SI81031, SJ00267, SI86178
22+
- IBM i 7.5 PTFs: SI80368, SI81035, SI86076, SI84164, SJ00293, SI86229, SJ03030
23+
- IBM i 7.4 PTFs: SI80364, SI81031, SJ00267, SI86178, SJ03026
2424

2525
Note: Japanese CCSIDs 5026 and 290 are not supported
2626

docs/guides/platform/ManageIBMiServer.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ before running these actions.
3131
Merlin provides the following actions.
3232
![IBM i Templates Action](../../images/guides/IAction.png)
3333
- For the **Enable Ansible environment** action that will help to initiate the yum, python, and Ansible packages, etc. If the server has not run any task before, this action should run at the first step.
34-
- For the **Validate the dependent PTFs** action that will help to validate if the dependent PTFs have been installed in the IBM i server. See [Supported product versions](./guides/platform/Install_IBM_i_Modernization_Engine_for_Lifecycle_Integration.md).
34+
- For the **Validate the dependent PTFs** action that will help to validate if the dependent PTFs have been installed in the IBM i server. See [Supported product versions](./Install_IBM_i_Modernization_Engine_for_Lifecycle_Integration.md).
3535
- For the **Install the Merlin Certificate on IBM i** action that will help to initialize the trust store configuration and enable the certificate for the https services. This will configure TLS on the ADMIN5 Liberty server on port 2012.
3636
- For the **Enable IBM i developer environment** action that will help to set up the IBM i developer environment on the specific IBM i server.
3737
- For the **Enable IBM i debug service** action that will start the debug service on the specific IBM i server.

0 commit comments

Comments
 (0)