Skip to content

Commit 7c9b39a

Browse files
committed
Resolve merge conflicts
1 parent 90c5e45 commit 7c9b39a

File tree

10 files changed

+24
-2
lines changed

10 files changed

+24
-2
lines changed

artifacts/attributes.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@
8686
:authorization-book-url: https://docs.redhat.com/documentation/en-us/red_hat_developer_hub/{product-version}/html-single/authorization/index
8787
:authorization-book-title: Authorization
8888

89-
:installing-on-ocp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html/installing_red_hat_developer_hub_on_openshift_container_platform/index
89+
:installing-on-osd-on-gcp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_openshift_dedicated_on_google_cloud_platform/index
90+
:installing-on-osd-on-gcp-book-title: Installing {product} on {gcp-brand-name} on {gcp-brand-name}
91+
92+
:installing-on-ocp-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_openshift_container_platform/index
9093
:installing-on-ocp-book-title: Installing {product} on {ocp-short}
9194

95+
:installing-on-gke-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/installing_red_hat_developer_hub_on_google_kubernetes_engine/index
96+
:installing-on-gke-book-title: Installing {product} on {gke-brand-name}
97+
9298
:installing-on-eks-book-url: https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html/installing_red_hat_developer_hub_on_amazon_elastic_kubernetes_service/index
9399
:installing-on-eks-book-title: Installing {product} on {eks-brand-name}
94100

assemblies/assembly-about-rhdh.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ This platform is driven by a centralized software catalog, providing efficiency
1919
Use {product} to simplify decision-making through a selection of internally approved tools, programming languages, and developer resources within a self-managed portal.
2020

2121

22-
include::modules/discover/con-benefits-of-rhdh.adoc[leveloffset=+1]
22+
include::modules/about/con-benefits-of-rhdh.adoc[leveloffset=+1]
23+
include::modules/about/ref-supported-platforms.adoc[leveloffset=+1]
File renamed without changes.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:_newdoc-version: 2.18.3
2+
:_template-generated: 2024-11-08
3+
4+
:_mod-docs-content-type: REFERENCE
5+
6+
[id="supported-platforms_{context}"]
7+
= Supported platforms
8+
9+
{product} runs on {ocp-short} {ocp-version-min}-{ocp-version} on supported architectures and providers, such as:
10+
11+
* link:{installing-on-ocp-book-url}[{ocp-brand-name} {ocp-version-min}-{ocp-version}]
12+
* link:{installing-on-eks-book-url}[{eks-brand-name}]
13+
* link:{installing-on-aks-book-url}[{aks-brand-name}]
14+
* link:{installing-on-osd-on-gcp-book-url}[{gcp-brand-name}]
15+
* link:{installing-on-gke-book-url}[{gke-brand-name}]
File renamed without changes.

0 commit comments

Comments
 (0)