From 0a719f229744d69560b6733757b8b4038a8e8670 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 6 Nov 2019 14:32:30 +0100
Subject: [PATCH] SONAR-12680 Explicit authentication support on GitHub.com and
 GitHub Enterprise

---
 .../src/main/java/org/sonar/auth/github/GitHubSettings.java   | 4 ++--
 sonar-core/src/main/resources/org/sonar/l10n/core.properties  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
index df8a8eb9de5..272f2ed19c5 100644
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
@@ -138,7 +138,7 @@ public class GitHubSettings {
         .build(),
       PropertyDefinition.builder(API_URL)
         .name("The API url for a GitHub instance.")
-        .description("The API url for a GitHub instance. https://api.github.com/ for github.com, https://github.company.com/api/v3/ when using Github Enterprise")
+        .description("The API url for a GitHub instance. https://api.github.com/ for Github.com, https://github.company.com/api/v3/ when using Github Enterprise")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)
         .type(STRING)
@@ -148,7 +148,7 @@ public class GitHubSettings {
       PropertyDefinition.builder(WEB_URL)
         .name("The WEB url for a GitHub instance.")
         .description("The WEB url for a GitHub instance. " +
-          "https://github.com/ for github.com, https://github.company.com/ when using GitHub Enterprise.")
+          "https://github.com/ for Github.com, https://github.company.com/ when using GitHub Enterprise.")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)
         .type(STRING)
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 9988c8e1082..5f2bf7f50df 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -987,7 +987,7 @@ property.category.organizations=Organizations
 property.category.security=Security
 property.category.security.encryption=Encryption
 property.category.security.github=GitHub
-property.category.security.github.description=In order to enable GitHub authentication:<ul><li>SonarQube must be publicly accessible through HTTPS only</li><li>The property 'sonar.core.serverBaseURL' must be set to this public HTTPS URL</li><li>In your GitHub profile, you need to create a Developer Application for which the 'Authorization callback URL' must be set to <code>'&lt;value_of_sonar.core.serverBaseURL_property&gt;/oauth2/callback'</code>.</li></ul>
+property.category.security.github.description=In order to enable authentication on GitHub.com or GitHub Enterprise:<ul><li>SonarQube must be publicly accessible through HTTPS only</li><li>The property 'sonar.core.serverBaseURL' must be set to this public HTTPS URL</li><li>In your GitHub profile, you need to create a Developer Application for which the 'Authorization callback URL' must be set to <code>'&lt;value_of_sonar.core.serverBaseURL_property&gt;/oauth2/callback'</code>.</li></ul>
 property.category.security.gitlab=Gitlab
 property.category.security.gitlab.description=In order to enable Gitlab authentication, the property 'sonar.core.serverBaseURL' must be set to the public URL
 property.category.security.saml=SAML
-- 
2.39.5