aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-docs/src/pages/analysis
diff options
context:
space:
mode:
authormichaelbirnstiehl <michael.birnstiehl@sonarsource.com>2020-01-08 14:19:49 -0600
committerSonarTech <sonartech@sonarsource.com>2020-02-10 20:46:15 +0100
commit5ac4c80c8438a31aca58b0ac377a0ec948d68ded (patch)
tree35ea1b56007b09cf00a5d75bd483384e8e8fcf74 /server/sonar-docs/src/pages/analysis
parent04237dba5156dca631d687c4ce6b88de60eef14b (diff)
downloadsonarqube-5ac4c80c8438a31aca58b0ac377a0ec948d68ded.tar.gz
sonarqube-5ac4c80c8438a31aca58b0ac377a0ec948d68ded.zip
SONAR-12905 Update paths in the docs for new projects UI
Diffstat (limited to 'server/sonar-docs/src/pages/analysis')
-rw-r--r--server/sonar-docs/src/pages/analysis/analysis-parameters.md4
-rw-r--r--server/sonar-docs/src/pages/analysis/background-tasks.md2
-rw-r--r--server/sonar-docs/src/pages/analysis/pr-decoration.md8
-rw-r--r--server/sonar-docs/src/pages/analysis/scm-integration.md2
4 files changed, 8 insertions, 8 deletions
diff --git a/server/sonar-docs/src/pages/analysis/analysis-parameters.md b/server/sonar-docs/src/pages/analysis/analysis-parameters.md
index 9800271a562..b8bb944e1d7 100644
--- a/server/sonar-docs/src/pages/analysis/analysis-parameters.md
+++ b/server/sonar-docs/src/pages/analysis/analysis-parameters.md
@@ -8,7 +8,7 @@ Project analysis settings can be configured in multiple places. Here is the hier
<!-- sonarqube -->
* Global properties, defined in the UI, apply to all projects (From the top bar, go to **[Administration > Configuration > General Settings](/#sonarqube-admin#/admin/settings)**)
<!-- /sonarqube -->
-* Project properties, defined in the UI, override global property values (At a project level, go to **Administration > General Settings**)
+* Project properties, defined in the UI, override global property values (At a project level, go to **Project Settings > 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 (with `-D` on the command line), override project analysis parameters
@@ -25,7 +25,7 @@ For language-specific parameters related to external issue reports, see [Externa
### Server
Key | Description | Default
---|----|---
-`sonar.host.url`| the server URL | <!-- sonarqube -->http://localhost:9000<!-- /sonarqube --><!-- sonarcloud -->https://sonarcloud.io<!-- /sonarcloud -->
+`sonar.host.url`| the server URL | http://localhost:9000
### Project Configuration
Key | Description | Default
diff --git a/server/sonar-docs/src/pages/analysis/background-tasks.md b/server/sonar-docs/src/pages/analysis/background-tasks.md
index 63c1af4b9d1..9a2e99ff848 100644
--- a/server/sonar-docs/src/pages/analysis/background-tasks.md
+++ b/server/sonar-docs/src/pages/analysis/background-tasks.md
@@ -14,7 +14,7 @@ Analysis is not complete until the relevant Background Task has been completed.
At the Project level, when there is a pending Analysis Report waiting to be consumed, you have a "Pending" notification in the header, next to the date of the most recent completed analysis.
-Global Administrators can view the current queue at **[Administration > Projects > Background Tasks](/#sonarqube-admin#/admin/background_tasks)**. Project administrators can see the tasks for a project at **Administration > Background Tasks**.
+Global Administrators can view the current queue at **[Administration > Projects > Background Tasks](/#sonarqube-admin#/admin/background_tasks)**. Project administrators can see the tasks for a project at **Project Settings > Background Tasks**.
## How do I know when analysis report processing fails?
Background tasks usually succeed, but sometimes unusual circumstances cause processing to fail. Examples include:
diff --git a/server/sonar-docs/src/pages/analysis/pr-decoration.md b/server/sonar-docs/src/pages/analysis/pr-decoration.md
index e23bca9fa3e..0e89b22c981 100644
--- a/server/sonar-docs/src/pages/analysis/pr-decoration.md
+++ b/server/sonar-docs/src/pages/analysis/pr-decoration.md
@@ -50,7 +50,7 @@ Click your ALM provider below to expand the instructions on decorating your Pull
|
| ### Setting your project settings
|
-| Go to **Administration > General Settings > Pull Request Decoration**, select your **Configuration Name**, and set your **Repository identifier**.
+| Go to **Project Settings > General Settings > Pull Request Decoration**, select your **Configuration Name**, and set your **Repository identifier**.
[[collapse]]
| ## Bitbucket Server
@@ -71,7 +71,7 @@ Click your ALM provider below to expand the instructions on decorating your Pull
|
| ### Setting your project settings
|
-| Go to **Administration > General Settings > Pull Request Decoration**, select your **Configuration name**, and set your **Project Key** and **Repo Slug**.
+| Go to **Project Settings > General Settings > Pull Request Decoration**, select your **Configuration name**, and set your **Project Key** and **Repo Slug**.
[[collapse]]
| ## Azure DevOps Server
@@ -90,7 +90,7 @@ Click your ALM provider below to expand the instructions on decorating your Pull
|
| ### Setting your project settings
|
-| Go to **Administration > General Settings > Pull Request Decoration** and select your **Configuration name**.
+| Go to **Project Settings > General Settings > Pull Request Decoration** and select your **Configuration name**.
[[collapse]]
| ## GitLab Self-Managed and GitLab.com
@@ -111,7 +111,7 @@ Click your ALM provider below to expand the instructions on decorating your Pull
|
| ### Setting your project settings
|
-| Go to **Administration > General Settings > Pull Request Decoration** and select your **Configuration name**.
+| Go to **Project Settings > General Settings > Pull Request Decoration** and select your **Configuration name**.
## Multiple ALM instances
diff --git a/server/sonar-docs/src/pages/analysis/scm-integration.md b/server/sonar-docs/src/pages/analysis/scm-integration.md
index e2ddf58b21f..7e41ad5698d 100644
--- a/server/sonar-docs/src/pages/analysis/scm-integration.md
+++ b/server/sonar-docs/src/pages/analysis/scm-integration.md
@@ -11,7 +11,7 @@ Collecting SCM data during code analysis can unlock a number of SonarQube featur
SCM integration requires support for your individual SCM provider. Git and SVN are supported by default. <!-- sonarqube -->For other SCM providers, see the Marketplace.<!-- /sonarqube -->
-If need be, you can toggle it off at global/project level via administration settings.
+If need be, you can toggle it off at global level via administration settings and at a project level via project settings.
## Git
[Git](http://www.git-scm.com/) integration is supported out of the box with a pure Java implementation so there's no need to have Git command line tool installed on the machine where analysis is performed.