Merge pull request #100528 from openshift-cherrypick-robot/cherry-pick-100523-to-enterprise-4.17

[enterprise-4.17] OSDOCS-15650-418: manual CP

Author: ShaunaDiaz

_attributes/attributes-microshift.adoc

@@ -12,6 +12,8 @@
 :microshift-short: MicroShift
 //gitops version for 4.17-4.19
 :gitops-ver: 1.16
+:gitops-title: Red{nbsp}Hat OpenShift GitOps
+:gitops-shortname: GitOps
 :product-registry: OpenShift image registry
 :product-version: 4.17
 :rhel-major: rhel-9

microshift_install_rpm_opt/microshift-install-optional-rpms.adoc

@@ -1,36 +1,24 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="microshift-install-optional-rpms"]
 = Installing optional RPM packages
+
 include::_attributes/attributes-microshift.adoc[]
 :context: microshift-install-optional-rpm
 
 toc::[]
 
-You can install optional RPM packages with {microshift-short} to provide additional node and application services.
-
-[id="microshift-install-rpm-add-ons"]
-== Installing optional packages
-
-When you install {microshift-short}, optional RPM packages can be added. Examples of optional RPMs include those designed to expand your network, add and manage operators, and manage applications. Use the following procedures to add the packages that you need.
-
-include::modules/microshift-install-rpms-olm.adoc[leveloffset=+2]
-
-//additional resources for installing OLM
-[role="_additional-resources"]
-.Additional resources
-* xref:../microshift_running_apps/microshift_operators/microshift-operators-olm.adoc#microshift-operators-olm[Using Operator Lifecycle Manager with {microshift-short}]
+[role="_abstract"]
+When you install {microshift-short}, you can add optional RPM packages to help manage your deployments. Examples of optional RPMs include those designed to expand your network, add and manage Operators, and manage applications. Use the following procedures to add the packages that you need.
 
-include::modules/microshift-install-rpms-gitops.adoc[leveloffset=+2]
+include::modules/microshift-install-rpms-gitops.adoc[leveloffset=+1]
 
-//additional resources for installing GitOps
-[role="_additional-resources"]
-.Additional resources
-* xref:../microshift_running_apps/microshift-gitops.adoc#microshift-gitops[Automating application management with the GitOps controller]
+include::modules/microshift-install-multus-rpm.adoc[leveloffset=+1]
 
-include::modules/microshift-install-multus-rpm.adoc[leveloffset=+2]
+include::modules/microshift-install-rpms-olm.adoc[leveloffset=+1]
 
-//additional resources for installing Multus
+[id="additional-resources_microshift-install-optional-rpms"]
 [role="_additional-resources"]
-.Additional resources
+== Additional resources
+* xref:../microshift_running_apps/microshift-gitops.adoc#microshift-gitops[Automating application management with the {gitops-shortname} controller]
 * xref:../microshift_networking/microshift_multiple_networks/microshift-cni-multus.adoc#microshift-cni-multus[About using multiple networks]
-
+* xref:../microshift_running_apps/microshift_operators/microshift-operators-olm.adoc#microshift-operators-olm[Using Operator Lifecycle Manager with {microshift-short}]

modules/microshift-install-multus-rpm.adoc

@@ -6,7 +6,8 @@
 [id="microshift-installing-multus_{context}"]
 = Installing the multiple networks plugin
 
-Use this procedure to install the {microshift-short} Multus CNI plugin alongside a new {microshift-short} installation. The {microshift-short} Multus Container Network Interface (CNI) plugin is not installed by default. If you want to attach additional networks to a pod for high-performance network configurations, install the `microshift-multus` RPM package.
+[role="_abstract"]
+You can install the {microshift-short} Multus Container Network Interface (CNI) plugin alongside a new {microshift-short} installation. If you want to attach additional networks to a pod for high-performance network configurations, install the `microshift-multus` RPM package.
 
 [IMPORTANT]
 ====
@@ -28,10 +29,8 @@ If you create your custom resources (CRs) while you are completing your installa
 ====
 
 .Next steps
-. Continue with your new {microshift-short} installation, including any add-ons.
 
-. Create the custom resources (CRs) needed for your {microshift-short} Multus CNI plugin.
-
-. Configure other networking CNIs as needed.
-
-. After you have finished installing all of the RPMs that you want to include, start the {microshift-short} service. The {microshift-short} Multus CNI plugin is automatically deployed.
+* Continue with your new {microshift-short} installation, including any add-ons.
+* Create the custom resources (CRs) needed for your {microshift-short} Multus CNI plugin.
+* Configure other networking CNIs as needed.
+* After you have finished installing all of the RPMs that you want to include, start the {microshift-short} service. The {microshift-short} Multus CNI plugin is automatically deployed.

modules/microshift-install-rpms-gitops.adoc

@@ -1,16 +1,17 @@
 // Module included in the following assemblies:
 //
-// microshift/microshift-install-rpm.adoc
+// microshift/microshift-install-optional-rpms.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="microshift-installing-rpms-for-gitops_{context}"]
-= Installing the GitOps Argo CD manifests from an RPM package
+= Installing the {gitops-shortname} Argo CD manifests from an RPM package
 
-You can use a lightweight version of OpenShift GitOps with {microshift-short} to help manage your applications by installing the `microshift-gitops` RPM package. The `microshift-gitops` RPM package includes the necessary manifests to run core Argo CD.
+[role="_abstract"]
+You can use a lightweight version of {gitops-title} with {microshift-short} to help manage your applications by installing the `microshift-gitops` RPM package. You can consistently configure and deploy Kubernetes-based infrastructure and applications across node and development lifecycles by using the declarative {gitops-shortname} engine. The `microshift-gitops` RPM package includes the necessary manifests to run core Argo CD.
 
 [IMPORTANT]
 ====
-The Argo CD CLI is not available on {microshift-short}. This process installs basic GitOps functions.
+The Argo CD CLI is not available on {microshift-short}. This process installs basic {gitops-shortname} functions.
 ====
 
 .Prerequisites
@@ -20,14 +21,14 @@ The Argo CD CLI is not available on {microshift-short}. This process installs ba
 
 .Procedure
 
-. Enable the GitOps repository with the subscription manager by running the following command:
+. Enable the {gitops-shortname} repository with the subscription manager by running the following command:
 +
 [source,terminal,subs="attributes+"]
 ----
 $ sudo subscription-manager repos --enable=gitops-{gitops-ver}-for-{rhel-major}-$(uname -m)-rpms
 ----
 
-. Install the {microshift-short} GitOps package by running the following command:
+. Install the {microshift-short} {gitops-shortname} package by running the following command:
 +
 [source,terminal]
 ----

modules/microshift-install-rpms-olm.adoc

@@ -6,7 +6,8 @@
 [id="microshift-installing-with-olm-from-rpm-package_{context}"]
 = Installing the Operator Lifecycle Manager (OLM) from an RPM package
 
-When you install {microshift-short}, the Operator Lifecycle Manager (OLM) package is not installed by default. You can install the OLM on your {microshift-short} instance by using an RPM package.
+[role="_abstract"]
+When you install {microshift-short}, the Operator Lifecycle Manager (OLM) package is not installed by default. You can install the OLM on your {microshift-short} instance by using an RPM package. OLM helps you install, update, and manage the lifecycle of Kubernetes native applications (Operators) and their associated services running in each {microshift-short} node.
 
 .Procedure
 
@@ -22,4 +23,4 @@ $ sudo dnf install microshift-olm
 [source,terminal]
 ----
 $ sudo systemctl restart microshift
-----
+----