From 7635ee9ff7ae50aee2ba5292b3e0846d5d90cb14 Mon Sep 17 00:00:00 2001 From: Wouter Admiraal Date: Thu, 28 Mar 2019 15:34:16 +0100 Subject: [PATCH] SONARCLOUD-543, DOCS Remove mention of global configuration in the branch overview page --- server/sonar-docs/src/pages/analysis/analysis-parameters.md | 2 ++ server/sonar-docs/src/pages/branches/overview.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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: + * 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)**) + * 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 globally in **Configuration > General Settings > General > Detection of long-lived branches** or 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. -- 2.39.5