SONAR-17738 Point to new documentation paths

40 files changed, 85 insertions, 77 deletions

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx
index 926fd1684e2..f9c5db9825b 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx
@@ -122,11 +122,11 @@ export function CurrentBranchLike(props: CurrentBranchLikeProps) {
             data-test="only-one-branch-like"
             links={[
               {
-                href: '/branches/overview/',
+                href: '/analyzing-source-code/branches/branch-analysis/',
                 label: translate('branch_like_navigation.only_one_branch.documentation'),
               },
               {
-                href: '/analysis/pull-request/',
+                href: '/analyzing-source-code/pull-request-analysis',
                 label: translate('branch_like_navigation.only_one_branch.pr_analysis'),
               },
               {
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap
index 513f07e8cfb..9e23ba97977 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/__snapshots__/CurrentBranchLike-test.tsx.snap
@@ -281,11 +281,11 @@ exports[`projects should render correctly when there is only one branchlike 1`]
     links={
       Array [
         Object {
-          "href": "/branches/overview/",
+          "href": "/analyzing-source-code/branches/branch-analysis/",
           "label": "branch_like_navigation.only_one_branch.documentation",
         },
         Object {
-          "href": "/analysis/pull-request/",
+          "href": "/analyzing-source-code/pull-request-analysis",
           "label": "branch_like_navigation.only_one_branch.pr_analysis",
         },
         Object {
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx
index 020395e1918..4b008eba29b 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx
@@ -37,7 +37,7 @@ export default function Header(props: Props) {
       )}
       <p className="page-description">
         {translate('background_tasks.page.description')}
-        <DocLink className="spacer-left" to="/analysis/background-tasks/">
+        <DocLink className="spacer-left" to="/analyzing-source-code/background-tasks/">
           {translate('learn_more')}
         </DocLink>
       </p>
diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx
index feba6afdb1e..48c5c236742 100644
--- a/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx
@@ -39,7 +39,7 @@ export default function AppHeader(props: AppHeaderProps) {
           id="project_baseline.page.description"
           values={{
             link: (
-              <DocLink to="/project-administration/new-code-period/">
+              <DocLink to="/project-administration/defining-new-code/">
                 {translate('project_baseline.page.description.link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/__snapshots__/AppHeader-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/__snapshots__/AppHeader-test.tsx.snap
index b9d9688d93d..5eab1023c52 100644
--- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/__snapshots__/AppHeader-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/__snapshots__/AppHeader-test.tsx.snap
@@ -18,7 +18,7 @@ exports[`should render correctly: can admin 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/project-administration/new-code-period/"
+            to="/project-administration/defining-new-code/"
           >
             project_baseline.page.description.link
           </withAppStateContext(DocLink)>,
@@ -61,7 +61,7 @@ exports[`should render correctly: cannot admin 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/project-administration/new-code-period/"
+            to="/project-administration/defining-new-code/"
           >
             project_baseline.page.description.link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx b/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx
index 1952ddcd4ff..d3ee9f8e67c 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx
@@ -154,7 +154,7 @@ export default class NewCodePeriod extends React.PureComponent<{}, State> {
                       id="settings.new_code_period.description"
                       values={{
                         link: (
-                          <DocLink to="/project-administration/new-code-period/">
+                          <DocLink to="/project-administration/defining-new-code/">
                             {translate('learn_more')}
                           </DocLink>
                         ),
diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/__snapshots__/NewCodePeriod-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/__tests__/__snapshots__/NewCodePeriod-test.tsx.snap
index d51fc151cfd..954f487a655 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/__snapshots__/NewCodePeriod-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/__snapshots__/NewCodePeriod-test.tsx.snap
@@ -30,7 +30,7 @@ exports[`should render correctly 1`] = `
                 values={
                   Object {
                     "link": <withAppStateContext(DocLink)
-                      to="/project-administration/new-code-period/"
+                      to="/project-administration/defining-new-code/"
                     >
                       learn_more
                     </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AlmBindingDefinitionBox-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AlmBindingDefinitionBox-test.tsx.snap
index afbd6543c06..f669520ace3 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AlmBindingDefinitionBox-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AlmBindingDefinitionBox-test.tsx.snap
@@ -481,7 +481,7 @@ exports[`should render correctly: success with alert 1`] = `
         values={
           Object {
             "link": <withAppStateContext(DocLink)
-              to="/analysis/github-integration/"
+              to="/devops-platform-integration/github-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
@@ -607,7 +607,7 @@ exports[`should render correctly: success with branches disabled 1`] = `
         values={
           Object {
             "link": <withAppStateContext(DocLink)
-              to="/analysis/github-integration/"
+              to="/devops-platform-integration/github-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap
index e7e4fed3d74..8b117d1933e 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap
@@ -42,7 +42,7 @@ exports[`should render correctly: create 1`] = `
         values={
           Object {
             "doc_link": <withAppStateContext(DocLink)
-              to="/analysis/azuredevops-integration/"
+              to="/devops-platform-integration/azure-devops-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
@@ -113,7 +113,7 @@ exports[`should render correctly: edit 1`] = `
         values={
           Object {
             "doc_link": <withAppStateContext(DocLink)
-              to="/analysis/azuredevops-integration/"
+              to="/devops-platform-integration/azure-devops-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap
index 23f4867930a..830ab9179ce 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap
@@ -46,7 +46,7 @@ exports[`should render correctly: default 1`] = `
       values={
         Object {
           "doc_link": <withAppStateContext(DocLink)
-            to="/analysis/bitbucket-cloud-integration/"
+            to="/devops-platform-integration/bitbucket-integration/bitbucket-cloud-integration/"
           >
             learn_more
           </withAppStateContext(DocLink)>,
@@ -131,7 +131,7 @@ exports[`should render correctly: invalid workspace ID 1`] = `
       values={
         Object {
           "doc_link": <withAppStateContext(DocLink)
-            to="/analysis/bitbucket-cloud-integration/"
+            to="/devops-platform-integration/bitbucket-integration/bitbucket-cloud-integration/"
           >
             learn_more
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
index f580668efb4..9489c049997 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
@@ -37,7 +37,7 @@ exports[`should render correctly 1`] = `
         values={
           Object {
             "doc_link": <withAppStateContext(DocLink)
-              to="/analysis/bitbucket-integration/"
+              to="/devops-platform-integration/bitbucket-integration/bitbucket-server-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
index 71a84ff7946..49e546b829a 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
@@ -44,7 +44,7 @@ exports[`should render correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/github-integration/"
+            to="/devops-platform-integration/github-integration/"
           >
             learn_more
           </withAppStateContext(DocLink)>,
@@ -147,7 +147,7 @@ exports[`should render correctly 2`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/github-integration/"
+            to="/devops-platform-integration/github-integration/"
           >
             learn_more
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap
index 7af8b68c428..532dcecbe71 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap
@@ -35,7 +35,7 @@ exports[`should render correctly 1`] = `
         values={
           Object {
             "doc_link": <withAppStateContext(DocLink)
-              to="/analysis/gitlab-integration/"
+              to="/devops-platform-integration/gitlab-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
@@ -102,7 +102,7 @@ exports[`should render correctly 2`] = `
         values={
           Object {
             "doc_link": <withAppStateContext(DocLink)
-              to="/analysis/gitlab-integration/"
+              to="/devops-platform-integration/gitlab-integration/"
             >
               learn_more
             </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/__snapshots__/AlmSpecificForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/__snapshots__/AlmSpecificForm-test.tsx.snap
index 26c43916050..d860fad3267 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/__snapshots__/AlmSpecificForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/__snapshots__/AlmSpecificForm-test.tsx.snap
@@ -803,7 +803,7 @@ exports[`should render the monorepo field when the feature is supported 1`] = `
           values={
             Object {
               "doc_link": <withAppStateContext(DocLink)
-                to="/analysis/azuredevops-integration/"
+                to="/devops-platform-integration/azure-devops-integration/"
               >
                 learn_more
               </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsSuggestions.json b/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsSuggestions.json
index af4a5bd79df..08d459b14ae 100644
--- a/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsSuggestions.json
+++ b/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsSuggestions.json
@@ -3,7 +3,7 @@
   "api_documentation": [],
   "background_tasks": [
     {
-      "link": "/analysis/background-tasks/",
+      "link": "/analyzing-source-code/background-tasks/",
       "text": "About Background Tasks"
     }
   ],
@@ -29,11 +29,11 @@
   "marketplace": [],
   "overview": [
     {
-      "link": "/analysis/pull-request/",
+      "link": "/analyzing-source-code/pull-request-analysis",
       "text": "Enable Pull Request Decoration"
     },
     {
-      "link": "/analysis/ci-integration-overview/",
+      "link": "/analyzing-source-code/ci-integration/overview/",
       "text": "Set up CI analysis"
     },
     {
@@ -41,7 +41,7 @@
       "text": "Clean as You Code"
     },
     {
-      "link": "/user-guide/connected-mode/",
+      "link": "/user-guide/sonarlint-connected-mode/",
       "text": "SonarLint Connected Mode"
     }
   ],
@@ -55,7 +55,7 @@
   "project_activity": [],
   "project_baseline": [
     {
-      "link": "/project-administration/new-code-period/",
+      "link": "/project-administration/defining-new-code/",
       "text": "Defining New Code"
     }
   ],
@@ -79,11 +79,11 @@
       "text": "Clean as You Code"
     },
     {
-      "link": "/analysis/pull-request/",
+      "link": "/analyzing-source-code/pull-request-analysis",
       "text": "Analyzing Pull Requests"
     },
     {
-      "link": "/user-guide/connected-mode/",
+      "link": "/user-guide/sonarlint-connected-mode/",
       "text": "SonarLint connected mode"
     }
   ],
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueMessageTags.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueMessageTags.tsx
index 6cc8d1599fa..4d7211d8546 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueMessageTags.tsx
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueMessageTags.tsx
@@ -74,7 +74,7 @@ export default function IssueMessageTags(props: IssueMessageTagsProps) {
           content={translate('rules.status', ruleStatus, 'help')}
           links={[
             {
-              href: '/user-guide/rules/',
+              href: '/user-guide/rules/overview/',
               label: translateWithParameters('see_x', translate('rules')),
             },
           ]}
diff --git a/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx b/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx
index c6930a6bd81..486ed4e3628 100644
--- a/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx
@@ -36,7 +36,7 @@ export function CompilationInfo({ className = 'spacer-top spacer-bottom' }: Comp
           defaultMessage={translate('onboarding.tutorial.cfamilly.compilation_database_info')}
           values={{
             link: (
-              <DocLink to="/analysis/languages/cfamily/">
+              <DocLink to="/analyzing-source-code/languages/c-family/">
                 {translate('onboarding.tutorial.cfamilly.compilation_database_info.link')}
               </DocLink>
             ),
@@ -49,7 +49,7 @@ export function CompilationInfo({ className = 'spacer-top spacer-bottom' }: Comp
           defaultMessage={translate('onboarding.tutorial.cfamilly.speed_caching')}
           values={{
             link: (
-              <DocLink to="/analysis/languages/cfamily/#analysis-cache">
+              <DocLink to="/analyzing-source-code/languages/c-family/#analysis-cache">
                 {translate('onboarding.tutorial.cfamilly.speed_caching.link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/components/ProjectTokenScopeInfo.tsx b/server/sonar-web/src/main/js/components/tutorials/components/ProjectTokenScopeInfo.tsx
index b3246dfbe01..e2411580124 100644
--- a/server/sonar-web/src/main/js/components/tutorials/components/ProjectTokenScopeInfo.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/components/ProjectTokenScopeInfo.tsx
@@ -41,7 +41,11 @@ export default function ProjectTokenScopeInfo({ className }: ProjectTokenScopeIn
               {translate('onboarding.token.text.user_account')}
             </Link>
           ),
-          doc_link: <DocLink to="/user-guide/user-token/">{translate('documentation')}</DocLink>,
+          doc_link: (
+            <DocLink to="/user-guide/user-account/generating-and-using-tokens/">
+              {translate('documentation')}
+            </DocLink>
+          ),
         }}
       />
     </Alert>
diff --git a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/__snapshots__/CompilationInfo-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/__snapshots__/CompilationInfo-test.tsx.snap
index 10463c95d30..3208fbd8d83 100644
--- a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/__snapshots__/CompilationInfo-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/__snapshots__/CompilationInfo-test.tsx.snap
@@ -14,7 +14,7 @@ exports[`should render correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/languages/cfamily/"
+            to="/analyzing-source-code/languages/c-family/"
           >
             onboarding.tutorial.cfamilly.compilation_database_info.link
           </withAppStateContext(DocLink)>,
@@ -29,7 +29,7 @@ exports[`should render correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/languages/cfamily/#analysis-cache"
+            to="/analyzing-source-code/languages/c-family/#analysis-cache"
           >
             onboarding.tutorial.cfamilly.speed_caching.link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx
index 4b10f0a2bb3..01c7bc75ecb 100644
--- a/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx
@@ -72,7 +72,7 @@ export default function PreRequisitesStep(props: PreRequisitesStepProps) {
               id="onboarding.tutorial.with.jenkins.prereqs.step_by_step_guide"
               values={{
                 link: (
-                  <DocLink to="/analysis/jenkins/">
+                  <DocLink to="/analyzing-source-code/ci-integration/jenkins-integration/">
                     {translate('onboarding.tutorial.with.jenkins.prereqs.step_by_step_guide.link')}
                   </DocLink>
                 ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/__snapshots__/PreRequisitesStep-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/__snapshots__/PreRequisitesStep-test.tsx.snap
index 474ed5565f6..da70e9fc12d 100644
--- a/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/__snapshots__/PreRequisitesStep-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/__snapshots__/PreRequisitesStep-test.tsx.snap
@@ -47,7 +47,7 @@ exports[`should render correctly: content 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/jenkins/"
+            to="/analyzing-source-code/ci-integration/jenkins-integration/"
           >
             onboarding.tutorial.with.jenkins.prereqs.step_by_step_guide.link
           </withAppStateContext(DocLink)>,
@@ -106,7 +106,7 @@ exports[`should render correctly: content for branches disabled 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/jenkins/"
+            to="/analyzing-source-code/ci-integration/jenkins-integration/"
           >
             onboarding.tutorial.with.jenkins.prereqs.step_by_step_guide.link
           </withAppStateContext(DocLink)>,
@@ -168,7 +168,7 @@ exports[`should render correctly: content for branches disabled, gitlab 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/jenkins/"
+            to="/analyzing-source-code/ci-integration/jenkins-integration/"
           >
             onboarding.tutorial.with.jenkins.prereqs.step_by_step_guide.link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/DoneNextSteps.tsx b/server/sonar-web/src/main/js/components/tutorials/other/DoneNextSteps.tsx
index 7c7ad46b40e..ef8a7f51f2b 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/DoneNextSteps.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/DoneNextSteps.tsx
@@ -51,14 +51,14 @@ export default function DoneNextSteps({ component }: DoneNextStepsProps) {
           id="onboarding.analysis.auto_refresh_after_analysis.check_these_links"
           values={{
             link_branches: (
-              <DocLink to="/branches/overview/">
+              <DocLink to="/analyzing-source-code/branches/branch-analysis/">
                 {translate(
                   'onboarding.analysis.auto_refresh_after_analysis.check_these_links.branches'
                 )}
               </DocLink>
             ),
             link_pr_analysis: (
-              <DocLink to="/analysis/pull-request/">
+              <DocLink to="/analyzing-source-code/pull-request-analysis">
                 {translate(
                   'onboarding.analysis.auto_refresh_after_analysis.check_these_links.pr_analysis'
                 )}
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/TokenStep.tsx b/server/sonar-web/src/main/js/components/tutorials/other/TokenStep.tsx
index 23ef13f14f2..878e92280c5 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/TokenStep.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/TokenStep.tsx
@@ -209,7 +209,7 @@ export default class TokenStep extends React.PureComponent<Props, State> {
                     content={translate('onboarding.token.name.help')}
                     links={[
                       {
-                        href: '/user-guide/user-token/',
+                        href: '/user-guide/user-account/generating-and-using-tokens/',
                         label: translate('learn_more'),
                       },
                     ]}
@@ -280,7 +280,7 @@ export default class TokenStep extends React.PureComponent<Props, State> {
                 content={translate('onboarding.token.use_existing_token.help')}
                 links={[
                   {
-                    href: '/user-guide/user-token/',
+                    href: '/user-guide/user-account/generating-and-using-tokens/',
                     label: translate('learn_more'),
                   },
                 ]}
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap
index 61cea6b709b..f064d59dc28 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap
@@ -26,12 +26,12 @@ exports[`should render correctly: default 1`] = `
       values={
         Object {
           "link_branches": <withAppStateContext(DocLink)
-            to="/branches/overview/"
+            to="/analyzing-source-code/branches/branch-analysis/"
           >
             onboarding.analysis.auto_refresh_after_analysis.check_these_links.branches
           </withAppStateContext(DocLink)>,
           "link_pr_analysis": <withAppStateContext(DocLink)
-            to="/analysis/pull-request/"
+            to="/analyzing-source-code/pull-request-analysis"
           >
             onboarding.analysis.auto_refresh_after_analysis.check_these_links.pr_analysis
           </withAppStateContext(DocLink)>,
@@ -68,12 +68,12 @@ exports[`should render correctly: project admin 1`] = `
       values={
         Object {
           "link_branches": <withAppStateContext(DocLink)
-            to="/branches/overview/"
+            to="/analyzing-source-code/branches/branch-analysis/"
           >
             onboarding.analysis.auto_refresh_after_analysis.check_these_links.branches
           </withAppStateContext(DocLink)>,
           "link_pr_analysis": <withAppStateContext(DocLink)
-            to="/analysis/pull-request/"
+            to="/analyzing-source-code/pull-request-analysis"
           >
             onboarding.analysis.auto_refresh_after_analysis.check_these_links.pr_analysis
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/TokenStep-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/TokenStep-test.tsx.snap
index ff1c2346c08..e4915f25caf 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/TokenStep-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/__tests__/__snapshots__/TokenStep-test.tsx.snap
@@ -50,7 +50,7 @@ exports[`generates token 1`] = `
                     links={
                       Array [
                         Object {
-                          "href": "/user-guide/user-token/",
+                          "href": "/user-guide/user-account/generating-and-using-tokens/",
                           "label": "learn_more",
                         },
                       ]
@@ -210,7 +210,7 @@ exports[`generates token 2`] = `
                     links={
                       Array [
                         Object {
-                          "href": "/user-guide/user-token/",
+                          "href": "/user-guide/user-account/generating-and-using-tokens/",
                           "label": "learn_more",
                         },
                       ]
@@ -582,7 +582,7 @@ exports[`revokes token 3`] = `
                     links={
                       Array [
                         Object {
-                          "href": "/user-guide/user-token/",
+                          "href": "/user-guide/user-account/generating-and-using-tokens/",
                           "label": "learn_more",
                         },
                       ]
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetExecute.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetExecute.tsx
index 5bd1ab253b8..ace0a6a330d 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetExecute.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetExecute.tsx
@@ -50,7 +50,7 @@ export default function DotNetExecute({ commands, component }: DotNetExecuteProp
           id="onboarding.analysis.docs"
           values={{
             link: (
-              <DocLink to="/analysis/scan/sonarscanner-for-msbuild/">
+              <DocLink to="/analyzing-source-code/scanners/sonarscanner-for-dotnet/">
                 {translate('onboarding.analysis.msbuild.docs_link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecBuildWrapper.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecBuildWrapper.tsx
index 96c5ddcacbc..c8537a20eb0 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecBuildWrapper.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecBuildWrapper.tsx
@@ -56,7 +56,7 @@ export default function ExecBuildWrapper(props: ExecBuildWrapperProps) {
           id="onboarding.analysis.build_wrapper.docs"
           values={{
             link: (
-              <DocLink to="/analysis/languages/cfamily/">
+              <DocLink to="/analyzing-source-code/languages/c-family/">
                 {translate('onboarding.analysis.build_wrapper.docs_link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecScanner.tsx
index 4402371bf11..dd50fdeb8cb 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecScanner.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/ExecScanner.tsx
@@ -65,7 +65,7 @@ export default function ExecScanner(props: ExecScannerProps) {
           id="onboarding.analysis.sq_scanner.docs"
           values={{
             link: (
-              <DocLink to="/analysis/scan/sonarscanner/">
+              <DocLink to="/analyzing-source-code/scanners/sonarscanner/">
                 {translate('onboarding.analysis.sq_scanner.docs_link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx
index 11609d1fe67..8a1da51bc33 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx
@@ -71,7 +71,9 @@ export default function JavaGradle(props: JavaGradleProps) {
             id="onboarding.analysis.java.gradle.latest_version"
             values={{
               link: (
-                <DocLink to="/analysis/scan/sonarscanner-for-gradle/">{translate('here')}</DocLink>
+                <DocLink to="/analyzing-source-code/scanners/sonarscanner-for-gradle/">
+                  {translate('here')}
+                </DocLink>
               ),
             }}
           />
@@ -87,7 +89,7 @@ export default function JavaGradle(props: JavaGradleProps) {
           id="onboarding.analysis.docs"
           values={{
             link: (
-              <DocLink to="/analysis/scan/sonarscanner-for-gradle/">
+              <DocLink to="/analyzing-source-code/scanners/sonarscanner-for-gradle/">
                 {translate('onboarding.analysis.java.gradle.docs_link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaMaven.tsx
index 1d68f2f789e..b557f9dc010 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaMaven.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaMaven.tsx
@@ -54,7 +54,7 @@ export default function JavaMaven(props: JavaMavenProps) {
           id="onboarding.analysis.docs"
           values={{
             link: (
-              <DocLink to="/analysis/scan/sonarscanner-for-maven/">
+              <DocLink to="/analyzing-source-code/scanners/sonarscanner-for-maven/">
                 {translate('onboarding.analysis.java.maven.docs_link')}
               </DocLink>
             ),
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetExecute-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetExecute-test.tsx.snap
index 03cd7a29122..60f045cd11d 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetExecute-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetExecute-test.tsx.snap
@@ -29,7 +29,7 @@ exports[`should render correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner-for-msbuild/"
+            to="/analyzing-source-code/scanners/sonarscanner-for-dotnet/"
           >
             onboarding.analysis.msbuild.docs_link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecBuildWrapper-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecBuildWrapper-test.tsx.snap
index 378ca7b16c0..b39d6bc8792 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecBuildWrapper-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecBuildWrapper-test.tsx.snap
@@ -24,7 +24,7 @@ exports[`Shoud renders for "linux" correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/languages/cfamily/"
+            to="/analyzing-source-code/languages/c-family/"
           >
             onboarding.analysis.build_wrapper.docs_link
           </withAppStateContext(DocLink)>,
@@ -59,7 +59,7 @@ exports[`Shoud renders for "mac" correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/languages/cfamily/"
+            to="/analyzing-source-code/languages/c-family/"
           >
             onboarding.analysis.build_wrapper.docs_link
           </withAppStateContext(DocLink)>,
@@ -94,7 +94,7 @@ exports[`Shoud renders for "win" correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/languages/cfamily/"
+            to="/analyzing-source-code/languages/c-family/"
           >
             onboarding.analysis.build_wrapper.docs_link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecScanner-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecScanner-test.tsx.snap
index ef9958ca68a..1af981a88ff 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecScanner-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/ExecScanner-test.tsx.snap
@@ -34,7 +34,7 @@ exports[`should render correctly for "linux" 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner/"
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
           </withAppStateContext(DocLink)>,
@@ -103,7 +103,7 @@ exports[`should render correctly for "mac" 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner/"
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
           </withAppStateContext(DocLink)>,
@@ -172,7 +172,7 @@ exports[`should render correctly for "win" 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner/"
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
           </withAppStateContext(DocLink)>,
@@ -241,7 +241,7 @@ exports[`should render correctly for cfamily 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner/"
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
           </withAppStateContext(DocLink)>,
@@ -310,7 +310,7 @@ exports[`should render correctly for remote execution 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner/"
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
index d40117206ec..6ef57829aae 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
@@ -29,7 +29,7 @@ exports[`renders correctly 1`] = `
         values={
           Object {
             "link": <withAppStateContext(DocLink)
-              to="/analysis/scan/sonarscanner-for-gradle/"
+              to="/analyzing-source-code/scanners/sonarscanner-for-gradle/"
             >
               here
             </withAppStateContext(DocLink)>,
@@ -62,7 +62,7 @@ exports[`renders correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner-for-gradle/"
+            to="/analyzing-source-code/scanners/sonarscanner-for-gradle/"
           >
             onboarding.analysis.java.gradle.docs_link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap
index c004deea92a..9d9aff4d914 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap
@@ -33,7 +33,7 @@ exports[`renders correctly 1`] = `
       values={
         Object {
           "link": <withAppStateContext(DocLink)
-            to="/analysis/scan/sonarscanner-for-maven/"
+            to="/analyzing-source-code/scanners/sonarscanner-for-maven/"
           >
             onboarding.analysis.java.maven.docs_link
           </withAppStateContext(DocLink)>,
diff --git a/server/sonar-web/src/main/js/helpers/constants.ts b/server/sonar-web/src/main/js/helpers/constants.ts
index 06901f10e62..2605ba67e5a 100644
--- a/server/sonar-web/src/main/js/helpers/constants.ts
+++ b/server/sonar-web/src/main/js/helpers/constants.ts
@@ -57,11 +57,13 @@ export const RATING_COLORS = [
 export const PROJECT_KEY_MAX_LEN = 400;
 
 export const ALM_DOCUMENTATION_PATHS = {
-  [AlmKeys.Azure]: '/analysis/azuredevops-integration/',
-  [AlmKeys.BitbucketServer]: '/analysis/bitbucket-integration/',
-  [AlmKeys.BitbucketCloud]: '/analysis/bitbucket-cloud-integration/',
-  [AlmKeys.GitHub]: '/analysis/github-integration/',
-  [AlmKeys.GitLab]: '/analysis/gitlab-integration/',
+  [AlmKeys.Azure]: '/devops-platform-integration/azure-devops-integration/',
+  [AlmKeys.BitbucketServer]:
+    '/devops-platform-integration/bitbucket-integration/bitbucket-server-integration/',
+  [AlmKeys.BitbucketCloud]:
+    '/devops-platform-integration/bitbucket-integration/bitbucket-cloud-integration/',
+  [AlmKeys.GitHub]: '/devops-platform-integration/github-integration/',
+  [AlmKeys.GitLab]: '/devops-platform-integration/gitlab-integration/',
 };
 
 export const IMPORT_COMPATIBLE_ALMS = [
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameOutput.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameOutput.java
index c0b7c077eff..d7d512da5b1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameOutput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameOutput.java
@@ -134,7 +134,7 @@ class DefaultBlameOutput implements BlameOutput {
         LOG.warn("  * " + f);
       }
       LOG.warn("This may lead to missing/broken features in SonarQube");
-      String link = "/documentation/analysis/scm-integration/";
+      String link = "/documentation/analyzing-source-code/scm-integration/";
       analysisWarnings.addUnique(String.format("Missing blame information for %d %s. This may lead to some features not working correctly. " +
         "Please check the analysis logs and refer to <a href=\"%s\" target=\"_blank\">the documentation</a>.",
         allFilesToBlame.size(),
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java
index 68d1049aeae..aec033458e7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java
@@ -95,7 +95,7 @@ public class GitScmProvider extends ScmProvider {
     this.analysisWarnings = analysisWarnings;
     this.gitIgnoreCommand = gitIgnoreCommand;
     this.system2 = system2;
-    this.documentationLink = "/documentation/analysis/scm-integration/";
+    this.documentationLink = "/documentation/analyzing-source-code/scm-integration/";
   }
 
   @Override
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
index 3059ae57a96..5e1972b4b80 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
@@ -50,7 +50,7 @@ public class DefaultBlameOutputTest {
     new DefaultBlameOutput(null, analysisWarnings, singletonList(file)).finish(true);
     assertThat(analysisWarnings.warnings()).extracting(DefaultAnalysisWarnings.Message::getText)
       .containsOnly("Missing blame information for 1 file. This may lead to some features not working correctly. " +
-        "Please check the analysis logs and refer to <a href=\"/documentation/analysis/scm-integration/\" target=\"_blank\">the documentation</a>.");
+        "Please check the analysis logs and refer to <a href=\"/documentation/analyzing-source-code/scm-integration/\" target=\"_blank\">the documentation</a>.");
   }
 
   @Test
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
index 2a5252d7603..e8e2d7bcebe 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
@@ -648,7 +648,7 @@ public class GitScmProviderTest {
 
     String warning = refNotFound
       + ". You may see unexpected issues and changes. Please make sure to fetch this ref before pull request analysis"
-      + " and refer to <a href=\"/documentation/analysis/scm-integration/\" target=\"_blank\">the documentation</a>.";
+      + " and refer to <a href=\"/documentation/analyzing-source-code/scm-integration/\" target=\"_blank\">the documentation</a>.";
     verify(analysisWarnings).addUnique(warning);
   }