From e2e67e62074ce25d0ca66806a65c07977a842543 Mon Sep 17 00:00:00 2001
From: ivinokur <ivinokur@redhat.com>
Date: Wed, 29 Nov 2023 15:41:28 +0200
Subject: [PATCH 1/2] improve the GitHub Server subdomain isolation config
 description

---
 .../partials/proc_applying-the-github-oauth-app-secret.adoc   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc b/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc
index 1ab3aa5388..09b3a644fd 100644
--- a/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc
+++ b/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc
@@ -36,7 +36,7 @@ metadata:
   annotations:
     che.eclipse.org/oauth-scm-server: github
     che.eclipse.org/scm-server-endpoint: __<github_server_url>__ <2>
-    che.eclipse.org/scm-github-disable-subdomain-isolation: "__<true_or_false>__" <3>
+    che.eclipse.org/scm-github-disable-subdomain-isolation: true <3>
 type: Opaque
 stringData:
   id: __<GitHub_OAuth_Client_ID>__ <4>
@@ -44,7 +44,7 @@ stringData:
 ----
 <1> The {prod-short} namespace. The default is `{prod-namespace}`.
 <2> This depends on the GitHub product your organization is using: When hosting repositories on GitHub.com or GitHub Enterprise Cloud, omit this line or enter the default `https://github.com`. When hosting repositories on GitHub Enterprise Server, enter the GitHub Enterprise Server URL.
-<3> This line is only added for GitHub Enterprise Server. To disable subdomain isolation, set this to `"true"`. To enable subdomain isolation, set this to `"false"`.
+<3> This line is only added for GitHub Enterprise Server with disabled https://docs.github.com/en/enterprise-server/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation#about-subdomain-isolation[subdomain isolation] option. If the https://docs.github.com/en/enterprise-server/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation#about-subdomain-isolation[subdomain isolation] option is enabled on GitHub Enterprise Server, this annotation must be either omitted or set to `false`.
 <4> The *GitHub OAuth Client ID*.
 <5> The *GitHub OAuth Client Secret*.
 

From 768dc88eb46a54969059bc7f4fe7786ed37dfcb0 Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@redhat.com>
Date: Thu, 30 Nov 2023 10:09:04 +0200
Subject: [PATCH 2/2] Update
 modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc

Co-authored-by: Jana Vrbkova <jvrbkova@redhat.com>
---
 .../partials/proc_applying-the-github-oauth-app-secret.adoc     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc b/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc
index 09b3a644fd..28107f10a6 100644
--- a/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc
+++ b/modules/administration-guide/partials/proc_applying-the-github-oauth-app-secret.adoc
@@ -44,7 +44,7 @@ stringData:
 ----
 <1> The {prod-short} namespace. The default is `{prod-namespace}`.
 <2> This depends on the GitHub product your organization is using: When hosting repositories on GitHub.com or GitHub Enterprise Cloud, omit this line or enter the default `https://github.com`. When hosting repositories on GitHub Enterprise Server, enter the GitHub Enterprise Server URL.
-<3> This line is only added for GitHub Enterprise Server with disabled https://docs.github.com/en/enterprise-server/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation#about-subdomain-isolation[subdomain isolation] option. If the https://docs.github.com/en/enterprise-server/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation#about-subdomain-isolation[subdomain isolation] option is enabled on GitHub Enterprise Server, this annotation must be either omitted or set to `false`.
+<3> This line is only added for GitHub Enterprise Server with disabled link:https://docs.github.com/en/enterprise-server/admin/configuration/hardening-security-for-your-enterprise/enabling-subdomain-isolation#about-subdomain-isolation[subdomain isolation] option. If the subdomain isolation option is enabled on GitHub Enterprise Server, you must either omit this annotation or set it to `false`.
 <4> The *GitHub OAuth Client ID*.
 <5> The *GitHub OAuth Client Secret*.