diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 4bfa24729f9f..42bba2bab36e 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -481,7 +481,7 @@ public boolean hasUpdates() { /** * Exposed to get rid of hardcoding of the URL that serves up update-center.json - * in Javascript. + * in JavaScript. */ @Exported public String getUrl() { diff --git a/core/src/main/java/jenkins/diagnostics/RootUrlNotSetMonitor.java b/core/src/main/java/jenkins/diagnostics/RootUrlNotSetMonitor.java index ebf97fbd080d..e364f2389369 100644 --- a/core/src/main/java/jenkins/diagnostics/RootUrlNotSetMonitor.java +++ b/core/src/main/java/jenkins/diagnostics/RootUrlNotSetMonitor.java @@ -34,7 +34,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; /** - * Jenkins root URL is required for a lot of operations in both core and plugins. + * Jenkins URL is required for a lot of operations in both core and plugins. * There is a default behavior (infer the URL from the request object), but inaccurate in some scenarios. * Normally this root URL is set during SetupWizard phase, this monitor is there to ensure that behavior. * Potential exceptions are the dev environment, if someone disable the wizard or diff --git a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java index a39175b4ed4e..48dcfb05f318 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java +++ b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java @@ -128,7 +128,7 @@ private FormValidation checkUrl(String resourceRootUrlString, boolean allowOnlin return FormValidation.error(Messages.ResourceDomainConfiguration_SameAsJenkinsRoot()); } } catch (Exception ex) { - LOGGER.log(Level.CONFIG, "Failed to create URL from the existing Jenkins root URL", ex); + LOGGER.log(Level.CONFIG, "Failed to create URL from the existing Jenkins URL", ex); return FormValidation.error(Messages.ResourceDomainConfiguration_InvalidRootURL(ex.getMessage())); } diff --git a/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.properties b/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.properties index d1153159c74f..67b69b8fc3c4 100644 --- a/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.properties +++ b/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.properties @@ -1,6 +1,6 @@ -urlIsNull=Jenkins root URL is empty but is required for the proper operation of many Jenkins features like email notifications, \ +urlIsNull=Jenkins URL is empty but is required for the proper operation of many Jenkins features like email notifications, \ PR status update, and environment variables such as BUILD_URL. -urlIsInvalid=Jenkins root URL seems to be invalid. It is required for the proper operation of many Jenkins features like email notifications, \ +urlIsInvalid=Jenkins URL seems to be invalid. It is required for the proper operation of many Jenkins features like email notifications, \ PR status update, and environment variables such as BUILD_URL. actionToTake=Please provide an accurate value in {0}. actionUrlContent=Jenkins configuration diff --git a/core/src/main/resources/jenkins/security/Messages.properties b/core/src/main/resources/jenkins/security/Messages.properties index 858ddd789ea3..0ab32ad884e5 100644 --- a/core/src/main/resources/jenkins/security/Messages.properties +++ b/core/src/main/resources/jenkins/security/Messages.properties @@ -33,18 +33,18 @@ QueueItemAuthenticatorMonitor.DisplayName=Access Control for Builds Token.Created.on=Token created on {0} ResourceDomainConfiguration.DisplayName=Resource Domain Recommendation -ResourceDomainConfiguration.NeedsRootURL=Can only set resource root URL if regular root URL is set. -ResourceDomainConfiguration.InvalidRootURL=Jenkins root URL is set to an invalid value, please report a bug: {0} -ResourceDomainConfiguration.Empty=Without a resource root URL, resources will be served from the main domain with Content-Security-Policy set. +ResourceDomainConfiguration.NeedsRootURL=Can only set resource root URL if Jenkins URL is set. +ResourceDomainConfiguration.InvalidRootURL=Jenkins URL is set to an invalid value, please report a bug: {0} +ResourceDomainConfiguration.Empty=Without a resource root URL, resources will be served from the Jenkins URL with Content-Security-Policy set. ResourceDomainConfiguration.NotJenkins=The specified URL does not appear to point to a Jenkins instance. ResourceDomainConfiguration.ThisJenkins=The specified URL is a valid resource root URL candidate. ResourceDomainConfiguration.OtherJenkins=The specified URL points to a different Jenkins instance. -ResourceDomainConfiguration.SomeJenkins=The specified URL points to a Jenkins instance, but failed to determine whether it is this or another instance. -ResourceDomainConfiguration.ResourceResponse=The specified URL points to a previously set up Jenkins resource URL. +ResourceDomainConfiguration.SomeJenkins=The specified URL points to a Jenkins instance, but could not determine whether it is this or another instance. +ResourceDomainConfiguration.ResourceResponse=The specified URL points to a previously set up resource root URL. ResourceDomainConfiguration.FailedIdentityCheck=An error occurred when checking the instance identity at that URL: {0} {1} ResourceDomainConfiguration.Exception=An exception occurred with the URL: {0} ResourceDomainConfiguration.IOException=Failed to connect: {0} ResourceDomainConfiguration.Invalid=Not a valid URL. -ResourceDomainConfiguration.SameAsJenkinsRoot=Cannot use the same host name for both Jenkins root URL and resource root URL. +ResourceDomainConfiguration.SameAsJenkinsRoot=Cannot use the same host name for both Jenkins URL and resource root URL. ResourceDomainConfiguration.SameAsCurrent=You are currently accessing Jenkins through a URL similar to the proposed resource root URL. Saving this URL might remove your access to Jenkins. diff --git a/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/config.jelly b/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/config.jelly index a28d4dc3c2ee..6114d2ca35a6 100644 --- a/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/config.jelly +++ b/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/config.jelly @@ -25,7 +25,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/help-url.html b/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/help-url.html index 99de4fdfa43c..602ef4fc43ea 100644 --- a/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/help-url.html +++ b/core/src/main/resources/jenkins/security/ResourceDomainConfiguration/help-url.html @@ -6,12 +6,12 @@

If the resource root URL is defined, Jenkins will instead redirect requests for user-created resource files to URLs starting with the URL configured here. - These URLs will not set the CSP header, allowing Javascript and similar features to work. + These URLs will not set the CSP header, allowing JavaScript and similar features to work. For this option to work as expected, the following constraints and considerations apply: