aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanos Gyerik <janos.gyerik@sonarsource.com>2019-02-28 06:44:26 +0100
committerSonarTech <sonartech@sonarsource.com>2019-02-28 20:20:55 +0100
commitd614cfe573e24221010feb9b343c0c2d01a2ae99 (patch)
treef009c080f697ed678c162c0597c11fd09550fda6
parent38d1fb46dece0d6c767108f1c02759a4df6216bf (diff)
downloadsonarqube-d614cfe573e24221010feb9b343c0c2d01a2ae99.tar.gz
sonarqube-d614cfe573e24221010feb9b343c0c2d01a2ae99.zip
Fix typo: config/sonar.properties -> conf/sonar.properties
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java4
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java
index 2812c31ff26..292a4682dea 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java
@@ -72,7 +72,7 @@ public class ResetAction implements SettingsWsAction {
public void define(WebService.NewController context) {
WebService.NewAction action = context.createAction("reset")
.setDescription("Remove a setting value.<br>" +
- "The settings defined in config/sonar.properties are read-only and can't be changed.<br/>" +
+ "The settings defined in conf/sonar.properties are read-only and can't be changed.<br/>" +
"Requires one of the following permissions: " +
"<ul>" +
"<li>'Administer System'</li>" +
@@ -81,7 +81,7 @@ public class ResetAction implements SettingsWsAction {
.setSince("6.1")
.setChangelog(
new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)),
- new Change("7.1", "The settings defined in config/sonar.properties are read-only and can't be changed"))
+ new Change("7.1", "The settings defined in conf/sonar.properties are read-only and can't be changed"))
.setPost(true)
.setHandler(this);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java
index 8a1e6df9b1b..346d367a2ac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java
@@ -100,7 +100,7 @@ public class SetAction implements SettingsWsAction {
WebService.NewAction action = context.createAction("set")
.setDescription("Update a setting value.<br>" +
"Either '%s' or '%s' must be provided.<br> " +
- "The settings defined in config/sonar.properties are read-only and can't be changed.<br/>" +
+ "The settings defined in conf/sonar.properties are read-only and can't be changed.<br/>" +
"Requires one of the following permissions: " +
"<ul>" +
"<li>'Administer System'</li>" +
@@ -110,7 +110,7 @@ public class SetAction implements SettingsWsAction {
.setSince("6.1")
.setChangelog(
new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_COMPONENT)),
- new Change("7.1", "The settings defined in config/sonar.properties are read-only and can't be changed"))
+ new Change("7.1", "The settings defined in conf/sonar.properties are read-only and can't be changed"))
.setPost(true)
.setHandler(this);