diff options
| author | Wouter Admiraal <wouter.admiraal@sonarsource.com> | 2019-03-28 15:34:16 +0100 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-04-08 20:21:06 +0200 |
| commit | 7635ee9ff7ae50aee2ba5292b3e0846d5d90cb14 (patch) | |
| tree | b7f23e35647346f2e5ba943a2506dafc8fa57d07 | |
| parent | 1a23c21e5fe842d3ab9b8a5fdab74f930b8a1f6d (diff) | |
| download | sonarqube-7635ee9ff7ae50aee2ba5292b3e0846d5d90cb14.tar.gz sonarqube-7635ee9ff7ae50aee2ba5292b3e0846d5d90cb14.zip | |
SONARCLOUD-543, DOCS Remove mention of global configuration in the branch overview page
| -rw-r--r-- | server/sonar-docs/src/pages/analysis/analysis-parameters.md | 2 | ||||
| -rw-r--r-- | server/sonar-docs/src/pages/branches/overview.md | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-docs/src/pages/analysis/analysis-parameters.md b/server/sonar-docs/src/pages/analysis/analysis-parameters.md index 0930afe6728..91c89492ce0 100644 --- a/server/sonar-docs/src/pages/analysis/analysis-parameters.md +++ b/server/sonar-docs/src/pages/analysis/analysis-parameters.md @@ -7,7 +7,9 @@ url: /analysis/analysis-parameters/ Parameters to configure project analysis can be set in multiple places. Here is the hierarchy of parameters: +<!-- sonarqube --> * Global analysis parameters, defined in the UI, apply to all the projects (From the top bar, go to **[Administration > Configuration > General Settings](/#sonarqube-admin#/admin/settings)**) +<!-- /sonarqube --> * Project analysis parameters, defined in the UI, override global parameters (At a project level, go to **Administration > General Settings**) * Project analysis parameters, defined in a project analysis configuration file or an analyzer configuration file, override the ones defined in the UI * Analysis / Command line parameters, defined when launching an analysis, override project analysis parameters diff --git a/server/sonar-docs/src/pages/branches/overview.md b/server/sonar-docs/src/pages/branches/overview.md index 0d52341cc91..e017c61bd3e 100644 --- a/server/sonar-docs/src/pages/branches/overview.md +++ b/server/sonar-docs/src/pages/branches/overview.md @@ -71,7 +71,7 @@ By default, TravisCI only fetches the last 50 git commits. You must use `git fet A regular expression is used to determine whether a branch is treated as long-lived or short-lived. By default, branches that have names starting with either "branch" or "release" will be treated as long-lived. -This can be updated globally in **Configuration > General > Detection** of long-lived branches or at project's level in the **Admininstration > Branches**. +This can be updated <!-- sonarqube -->globally in **Configuration > General Settings > General > Detection of long-lived branches** or <!-- /sonarqube -->at a project's level in **Admininstration > Branches & Pull requests**. Once a branch type has been set, it cannot be changed. Explicitly, you cannot transform a long-lived to short-lived branch, or vice-versa. |