From 21b524c87f9e317eae946b7ac043c938fa6421fb Mon Sep 17 00:00:00 2001
From: Priyanka Abel <pabel@redhat.com>
Date: Wed, 6 Nov 2024 17:34:52 +0530
Subject: [PATCH] PR-607 redone to avoid merge conflicts

---
 artifacts/attributes.adoc                           |  1 -
 .../tekton/tekton-plugin-admin.adoc                 |  4 ++--
 .../tekton/tekton-plugin-readme.adoc                |  4 ++--
 modules/admin/proc-rhdh-monitoring-logging-aks.adoc |  4 ++--
 modules/admin/proc-using-azure-auth-provider.adoc   | 13 +++++++------
 ...roc-mounting-the-policy-csv-file-using-helm.adoc |  3 +--
 ...ting-the-policy-csv-file-using-the-operator.adoc |  4 ++--
 .../proc-rbac-send-request-rbac-rest-api.adoc       |  4 ++--
 .../proc-customize-rhdh-homepage.adoc               |  8 ++++----
 .../proc-customize-rhdh-learning-paths.adoc         |  8 ++++----
 .../proc-customize-rhdh-tech-radar-page.adoc        |  8 ++++----
 ...roc-enable-servicenow-custom-actions-plugin.adoc |  5 +++--
 modules/installation/proc-enable-signin.adoc        |  4 ++--
 modules/upgrade/proc-upgrade-rhdh-operator.adoc     |  3 +--
 14 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/artifacts/attributes.adoc b/artifacts/attributes.adoc
index de42c71474..705869c6ea 100644
--- a/artifacts/attributes.adoc
+++ b/artifacts/attributes.adoc
@@ -80,7 +80,6 @@
 :installing-and-viewing-dynamic-plugins-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_and_viewing_dynamic_plugins/index
 :installing-and-viewing-dynamic-plugins-title: Installing and viewing dynamic plugins
 
-
 :authentication-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authentication/index
 :authentication-book-title: Authentication
 
diff --git a/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.adoc b/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.adoc
index 2e5d8bba25..0ab178302b 100644
--- a/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.adoc
+++ b/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.adoc
@@ -8,8 +8,8 @@ You can use the Tekton plugin to visualize the results of CI/CD pipeline runs on
 
 .Prerequsites
 * You have installed and configured the `@backstage/plugin-kubernetes` and `@backstage/plugin-kubernetes-backend` dynamic plugins.
-//For more information about installing dynamic plugins, see xref:rhdh-installing-dynamic-plugins[].
-//Cannot xref across titles. Convert xref to a link.
+
+For more information about installing dynamic plugins, see xref:{installing-and-viewing-dynamic-plugins-url}[installing-and-viewing-dynamic-plugins-title].
 
 * You have configured the Kubernetes plugin to connect to the cluster using a `ServiceAccount`.
 
diff --git a/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc b/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc
index 010180df3b..0c41690241 100644
--- a/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc
+++ b/artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc
@@ -10,8 +10,8 @@ You can use the Tekton plugin to visualize the results of CI/CD pipeline runs on
 
 .Prerequsites
 * You have installed and configured the `@backstage/plugin-kubernetes` and `@backstage/plugin-kubernetes-backend` dynamic plugins.
-//For more information about installing dynamic plugins, see xref:rhdh-installing-dynamic-plugins[].
-//Cannot xref across titles. Convert xref to a link.
+
+For more information about installing dynamic plugins, see xref:{installing-and-viewing-dynamic-plugins-url}[installing-and-viewing-dynamic-plugins-title].
 
 * You have configured the Kubernetes plugin to connect to the cluster using a `ServiceAccount`.
 
diff --git a/modules/admin/proc-rhdh-monitoring-logging-aks.adoc b/modules/admin/proc-rhdh-monitoring-logging-aks.adoc
index 4992b46169..83d5bed36f 100644
--- a/modules/admin/proc-rhdh-monitoring-logging-aks.adoc
+++ b/modules/admin/proc-rhdh-monitoring-logging-aks.adoc
@@ -23,8 +23,8 @@ You can access live data logs generated by Kubernetes objects and collect log da
 .Prerequisites
 
 * You have deployed {product-short} on {aks-short}.
-//For more information, see xref:proc-rhdh-deploy-aks_{context}[].
-//replace with a link to the installation guide.
+
+For more information, see xref:{installing-on-aks-book-url}#assembly-install-rhdh-aks[{installing-on-aks-book-title}].
 
 .Procedure
 
diff --git a/modules/admin/proc-using-azure-auth-provider.adoc b/modules/admin/proc-using-azure-auth-provider.adoc
index 7c9da009fc..47d24b7374 100644
--- a/modules/admin/proc-using-azure-auth-provider.adoc
+++ b/modules/admin/proc-using-azure-auth-provider.adoc
@@ -6,15 +6,16 @@ The `core-plugin-api` package in {product-short} comes integrated with Microsoft
 
 .Prerequisites
 * You have deployed {product-short} on AKS.
-//For more information, see xref:proc-rhdh-deploy-aks_{context}[].
-//replace with a link to the installation guide.
+
+For more information, see xref:{installing-on-aks-book-url}#assembly-install-rhdh-aks[Installing Red Hat Developer Hub on Azure Kubernetes Service (AKS)].
+
 * You have created registered your application in Azure portal. For more information, see https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app[Register an application with the Microsoft identity platform].
 
 == Using Microsoft Azure as an authentication provider in Helm deployment
 
 You can use Microsoft Azure as an authentication provider in {product}, when installed using the Helm Chart.
-//For more information, see xref:proc-rhdh-deploy-aks-helm_{context}[].
-//replace with a link to the installation guide.
+
+For more information, see xref:{installing-on-aks-book-url}#proc-rhdh-deploy-aks-helm_assembly-install-rhdh-aks[Deploying {product-short} on {aks-short} with the Helm chart].
 
 .Procedure
 
@@ -113,8 +114,8 @@ kubectl -n <your_namespace> delete pods -l backstage.io/app=backstage-<your-rhdh
 == Using Microsoft Azure as an authentication provider in Operator-backed deployment
 
 You can use Microsoft Azure as an authentication provider in {product}, when installed using the Operator.
-//For more information, see xref:proc-install-rhdh-ocp-operator_{context}[].
-//replace with a link to the installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#proc-install-operator_assembly-install-rhdh-ocp-operator[Installing {product} on {ocp-short} with the Operator].
 
 .Procedure
 
diff --git a/modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc b/modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc
index 1d75250ea7..7de237a0d9 100644
--- a/modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc
+++ b/modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc
@@ -10,8 +10,7 @@ You can add your `policy.csv` file to the {product-short} Helm Chart by creating
 * You are logged in to your {ocp-short} account using the {ocp-short} web console.
 * {product} is installed and deployed using Helm Chart.
 +
-//For more information about installing the {product} on {ocp-short} using Helm Chart, see xref:proc-install-rhdh-ocp-helm_{context}[].
-//replace with a link to the installation guide.
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp-helm[Installing {product} on {ocp-short} with the Helm chart].
 
 .Procedure
 
diff --git a/modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc b/modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc
index 617d41a187..3e897d30c0 100644
--- a/modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc
+++ b/modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc
@@ -9,8 +9,8 @@ When the {product} is deployed with the Operator, you can add your `policy.csv`
 * {product} is installed and deployed using the Operator.
 * You have added a custom configuration file to {ocp-short}. For more information, see link:{LinkAdminGuide}[Adding a custom configuration file to {ocp-short}].
 +
-//For more information about installing the {product} on {ocp-short} using the Operator, see xref:proc-install-rhdh-ocp-operator_{context}[].
-//replace with a link to the installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#proc-install-operator_assembly-install-rhdh-ocp-operator[Installing {product} on {ocp-short} with the Operator].
 
 .Procedure
 
diff --git a/modules/authorization/proc-rbac-send-request-rbac-rest-api.adoc b/modules/authorization/proc-rbac-send-request-rbac-rest-api.adoc
index 21054b1d82..7311f6c276 100644
--- a/modules/authorization/proc-rbac-send-request-rbac-rest-api.adoc
+++ b/modules/authorization/proc-rbac-send-request-rbac-rest-api.adoc
@@ -6,8 +6,8 @@ The RBAC REST API enables you to interact with the permission policies and roles
 .Prerequisites
 
 * {product} is installed and running.
-//For more information about installing {product}, see xref:proc-install-rhdh-ocp-helm_{context}[].
-//replace with a link to the installation guide.
+
+For more information about installing {product}, see link:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp-helm[Installing {product} on {ocp-short} with the Helm chart].
 
 * You have access to the {product-short}.
 
diff --git a/modules/getting-started/proc-customize-rhdh-homepage.adoc b/modules/getting-started/proc-customize-rhdh-homepage.adoc
index 39d4c6ddb4..e8029b1ac1 100644
--- a/modules/getting-started/proc-customize-rhdh-homepage.adoc
+++ b/modules/getting-started/proc-customize-rhdh-homepage.adoc
@@ -11,8 +11,8 @@ To access the Home page in {product}, the base URL must include the `/developer-
 .Prerequisites
 
 You have installed {product} by using either the Operator or Helm chart.
-//For more information, see xref:proc-install-rhdh_rhdh-getting-started[].
-//replace with link to installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp[{installing-on-ocp-book-title}].
 
 
 .Procedure
@@ -49,8 +49,8 @@ When using a dedicated service, you can do the following:
 .Prerequisites
 
 * You have installed the {product} using Helm Chart.
-//For more information, see xref:proc-install-rhdh_{context}[].
-//replace with link to the installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp-helm[Installing {product} on {ocp-short} with the Helm chart].
 
 .Procedure
 
diff --git a/modules/getting-started/proc-customize-rhdh-learning-paths.adoc b/modules/getting-started/proc-customize-rhdh-learning-paths.adoc
index 4a0c0ed124..cbb9c4642a 100644
--- a/modules/getting-started/proc-customize-rhdh-learning-paths.adoc
+++ b/modules/getting-started/proc-customize-rhdh-learning-paths.adoc
@@ -20,8 +20,8 @@ You can provide data to the Learning Path from the following sources:
 .Prerequisites
 
 You have installed {product} by using either the Operator or Helm chart.
-//For more information, see xref:proc-install-rhdh_rhdh-getting-started[].
-//replace with link to installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp[{installing-on-ocp-book-title}].
 
 .Procedure
 
@@ -54,8 +54,8 @@ When using a dedicated service, you can do the following:
 .Prerequisites
 
 * You have installed the {product} using Helm chart.
-//For more information, see xref:proc-install-rhdh_rhdh-getting-started[].
-//replace with link to installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp[{installing-on-ocp-book-title}].
 
 .Procedure
 
diff --git a/modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc b/modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
index 3919a26626..2d204bcc2d 100644
--- a/modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
+++ b/modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
@@ -22,8 +22,8 @@ You can provide data to the Tech Radar page from the following sources:
 .Prerequisites
 
 You have installed {product} by using either the Operator or Helm chart.
-//For more information, see xref:proc-install-rhdh_rhdh-getting-started[].
-//replace with link to installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp[{installing-on-ocp-book-title}].
 
 .Procedure
 
@@ -61,8 +61,8 @@ When using a dedicated service, you can do the following:
 .Prerequisites
 
 * You have installed the {product} using Helm Chart.
-//For more information, see xref:proc-install-rhdh_{context}[].
-//replace with link to the installation guide.
+
+For more information, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp-helm[{installing-on-ocp-book-title} with the Helm chart].
 
 .Procedure
 
diff --git a/modules/getting-started/proc-enable-servicenow-custom-actions-plugin.adoc b/modules/getting-started/proc-enable-servicenow-custom-actions-plugin.adoc
index a7ad3c1562..7964410fcf 100644
--- a/modules/getting-started/proc-enable-servicenow-custom-actions-plugin.adoc
+++ b/modules/getting-started/proc-enable-servicenow-custom-actions-plugin.adoc
@@ -6,8 +6,9 @@ In {product}, the ServiceNow custom actions are provided as a pre-loaded plugin,
 .Prerequisites
 
 * {product} is installed and running.
-//For more information about installing the {product-short}, see xref:proc-install-rhdh_{context}[].
-//replace with link to the installation guide.
+
+For more information about installing the {product-short}, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp-helm[{installing-on-ocp-book-title} with the Helm chart].
+
 * You have created a project in the {product-short}.
 
 .Procedure
diff --git a/modules/installation/proc-enable-signin.adoc b/modules/installation/proc-enable-signin.adoc
index cddd178b1c..19a697eaec 100644
--- a/modules/installation/proc-enable-signin.adoc
+++ b/modules/installation/proc-enable-signin.adoc
@@ -63,8 +63,8 @@ The {product} supports the following authentication providers:
 .Prerequisites
 
 * You have installed the {product-short}.
-//For more information about installation, see xref:proc-install-rhdh_{context}[].
-//replace with link to the installation guide.
+
+For more information about installation, see xref:{installing-on-ocp-book-url}#assembly-install-rhdh-ocp-helm[{installing-on-ocp-book-title} with the Helm chart].
 
 .Procedure
 
diff --git a/modules/upgrade/proc-upgrade-rhdh-operator.adoc b/modules/upgrade/proc-upgrade-rhdh-operator.adoc
index 382cb52f63..4784c2ab7a 100644
--- a/modules/upgrade/proc-upgrade-rhdh-operator.adoc
+++ b/modules/upgrade/proc-upgrade-rhdh-operator.adoc
@@ -37,6 +37,5 @@ If there is no upgrade available, the *Upgrade status* field value is *Up to dat
 [role="_additional-resources"]
 .Additional resources
 
-//* xref:proc-install-rhdh-ocp-operator_{context}[Deploying {product} on {ocp-short} with the Operator]
-//replace with a link to the installation guide.
+* link:{installing-on-ocp-book-url}#proc-install-operator_assembly-install-rhdh-ocp-operator[Installing {product} on {ocp-short} with the Operator].
 * link:https://docs.openshift.com/container-platform/{ocp-version}/operators/admin/olm-adding-operators-to-cluster.html#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]