aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/sonar-docs/src/pages/user-guide/user-account.md2
-rw-r--r--server/sonar-docs/src/pages/user-guide/user-token.md8
-rw-r--r--server/sonar-docs/static/SonarQubeNavigationTree.json34
-rw-r--r--server/sonar-docs/static/StaticNavigationTree.json34
4 files changed, 49 insertions, 29 deletions
diff --git a/server/sonar-docs/src/pages/user-guide/user-account.md b/server/sonar-docs/src/pages/user-guide/user-account.md
index bdeef3cf68d..3e06f1facf1 100644
--- a/server/sonar-docs/src/pages/user-guide/user-account.md
+++ b/server/sonar-docs/src/pages/user-guide/user-account.md
@@ -1,5 +1,5 @@
---
-title: User Account
+title: Overview
url: /user-guide/user-account/
---
diff --git a/server/sonar-docs/src/pages/user-guide/user-token.md b/server/sonar-docs/src/pages/user-guide/user-token.md
index a610837f7b4..553d84f907d 100644
--- a/server/sonar-docs/src/pages/user-guide/user-token.md
+++ b/server/sonar-docs/src/pages/user-guide/user-token.md
@@ -1,9 +1,9 @@
---
-title: User Token
+title: Generating and Using Tokens
url: /user-guide/user-token/
---
-Each user has the ability to generate tokens that can be used to run analyses or invoke web services without access to the user's actual credentials.
+Each user can generate tokens that can be used to run analyses or invoke web services without access to the user's actual credentials.
## How to Generate a Token
@@ -13,9 +13,9 @@ The form at the bottom of the page allows you to generate new tokens. Once you c
## How to Use a Token
-User tokens have to be used as a replacement of your usual login:
+User tokens must replace your normal login process in the following scenarios:
* when running analyses on your code: replace your login by the token in the `sonar.login` property.
* when invoking web services: just pass the token instead of your login while doing the basic authentication.
-In both cases, you don't need to provide a password (so when running analyses on your code, the property `sonar.password` is optional).
+In both cases, you don't need to provide a password (so when running analyses on your code, the property `sonar.password` is optional). \ No newline at end of file
diff --git a/server/sonar-docs/static/SonarQubeNavigationTree.json b/server/sonar-docs/static/SonarQubeNavigationTree.json
index 27a3c7844c4..3ba71a1a213 100644
--- a/server/sonar-docs/static/SonarQubeNavigationTree.json
+++ b/server/sonar-docs/static/SonarQubeNavigationTree.json
@@ -92,24 +92,34 @@
{
"title": "User Guide",
"children": [
+ "/user-guide/concepts/",
"/user-guide/clean-as-you-code/",
- "/user-guide/project-page/",
- "/user-guide/applications/",
- "/user-guide/portfolios/",
+ "/user-guide/metric-definitions/",
+ "/user-guide/quality-gates/",
+ {
+ "title": "Rules",
+ "children": [
+ "/user-guide/rules/",
+ "/user-guide/security-rules/",
+ "/user-guide/built-in-rule-tags/"
+ ]
+ },
+ {
+ "title": "User Account",
+ "children": [
+ "/user-guide/user-account/",
+ "/user-guide/user-token/"
+ ]
+ },
"/user-guide/issues/",
"/user-guide/security-hotspots/",
- "/user-guide/rules/",
- "/user-guide/security-rules/",
- "/user-guide/built-in-rule-tags/",
- "/user-guide/quality-gates/",
- "/user-guide/metric-definitions/",
- "/user-guide/concepts/",
+ "/user-guide/portfolios/",
+ "/user-guide/applications/",
+ "/user-guide/security-reports/",
"/user-guide/activity-history/",
+ "/user-guide/project-page/",
"/user-guide/visualizations/",
"/user-guide/sonarlint-notifications/",
- "/user-guide/security-reports/",
- "/user-guide/user-account/",
- "/user-guide/user-token/",
"/user-guide/keyboard-shortcuts/"
]
},
diff --git a/server/sonar-docs/static/StaticNavigationTree.json b/server/sonar-docs/static/StaticNavigationTree.json
index 7c869407a00..6aaf3b97164 100644
--- a/server/sonar-docs/static/StaticNavigationTree.json
+++ b/server/sonar-docs/static/StaticNavigationTree.json
@@ -113,24 +113,34 @@
{
"title": "User Guide",
"children": [
+ "/user-guide/concepts/",
"/user-guide/clean-as-you-code/",
- "/user-guide/project-page/",
- "/user-guide/applications/",
- "/user-guide/portfolios/",
+ "/user-guide/metric-definitions/",
+ "/user-guide/quality-gates/",
+ {
+ "title": "Rules",
+ "children": [
+ "/user-guide/rules/",
+ "/user-guide/security-rules/",
+ "/user-guide/built-in-rule-tags/"
+ ]
+ },
+ {
+ "title": "User Account",
+ "children": [
+ "/user-guide/user-account/",
+ "/user-guide/user-token/"
+ ]
+ },
"/user-guide/issues/",
"/user-guide/security-hotspots/",
- "/user-guide/rules/",
- "/user-guide/security-rules/",
- "/user-guide/built-in-rule-tags/",
- "/user-guide/quality-gates/",
- "/user-guide/metric-definitions/",
- "/user-guide/concepts/",
+ "/user-guide/portfolios/",
+ "/user-guide/applications/",
+ "/user-guide/security-reports/",
"/user-guide/activity-history/",
+ "/user-guide/project-page/",
"/user-guide/visualizations/",
"/user-guide/sonarlint-notifications/",
- "/user-guide/security-reports/",
- "/user-guide/user-account/",
- "/user-guide/user-token/",
"/user-guide/keyboard-shortcuts/"
]
},