SONAR-17732 Remove all usage of redirect.sonarsource.com

23 files changed, 82 insertions, 109 deletions

diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
index d85692edfca..53de21f364d 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
@@ -80,13 +80,9 @@ export function GlobalFooter({ hideLoggedInInfo, appState }: GlobalFooterProps)
           <DocLink to="/">{translate('footer.documentation')}</DocLink>
         </li>
         <li className="page-footer-menu-item">
-          <a
-            href="https://redirect.sonarsource.com/doc/plugin-library.html"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
+          <DocLink to="/instance-administration/plugin-version-matrix/">
             {translate('footer.plugins')}
-          </a>
+          </DocLink>
         </li>
         {!hideLoggedInInfo && (
           <li className="page-footer-menu-item">
diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
index d9f37661358..492e71658d2 100644
--- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
@@ -53,13 +53,11 @@ exports[`should display the sq version 1`] = `
     <li
       className="page-footer-menu-item"
     >
-      <a
-        href="https://redirect.sonarsource.com/doc/plugin-library.html"
-        rel="noopener noreferrer"
-        target="_blank"
+      <withAppStateContext(DocLink)
+        to="/instance-administration/plugin-version-matrix/"
       >
         footer.plugins
-      </a>
+      </withAppStateContext(DocLink)>
     </li>
     <li
       className="page-footer-menu-item"
@@ -117,13 +115,11 @@ exports[`should not render the only logged in information 1`] = `
     <li
       className="page-footer-menu-item"
     >
-      <a
-        href="https://redirect.sonarsource.com/doc/plugin-library.html"
-        rel="noopener noreferrer"
-        target="_blank"
+      <withAppStateContext(DocLink)
+        to="/instance-administration/plugin-version-matrix/"
       >
         footer.plugins
-      </a>
+      </withAppStateContext(DocLink)>
     </li>
   </ul>
 </div>
@@ -182,13 +178,11 @@ exports[`should render the only logged in information 1`] = `
     <li
       className="page-footer-menu-item"
     >
-      <a
-        href="https://redirect.sonarsource.com/doc/plugin-library.html"
-        rel="noopener noreferrer"
-        target="_blank"
+      <withAppStateContext(DocLink)
+        to="/instance-administration/plugin-version-matrix/"
       >
         footer.plugins
-      </a>
+      </withAppStateContext(DocLink)>
     </li>
     <li
       className="page-footer-menu-item"
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 e5ec9c61143..589b1219abb 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
@@ -96,7 +96,7 @@ export function CurrentBranchLike(props: CurrentBranchLikeProps) {
             data-test="branches-support-disabled"
             links={[
               {
-                href: 'https://redirect.sonarsource.com/editions/developer.html',
+                href: 'https://www.sonarsource.com/plans-and-pricing/developer/',
                 label: translate('learn_more'),
                 doc: false,
               },
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 cd1a4b69ed6..8026ce65c2b 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
@@ -128,7 +128,7 @@ exports[`projects should render correctly when branches support is disabled: alm
       [
         {
           "doc": false,
-          "href": "https://redirect.sonarsource.com/editions/developer.html",
+          "href": "https://www.sonarsource.com/plans-and-pricing/developer/",
           "label": "learn_more",
         },
       ]
@@ -171,7 +171,7 @@ exports[`projects should render correctly when branches support is disabled: alm
       [
         {
           "doc": false,
-          "href": "https://redirect.sonarsource.com/editions/developer.html",
+          "href": "https://www.sonarsource.com/plans-and-pricing/developer/",
           "label": "learn_more",
         },
       ]
@@ -214,7 +214,7 @@ exports[`projects should render correctly when branches support is disabled: def
       [
         {
           "doc": false,
-          "href": "https://redirect.sonarsource.com/editions/developer.html",
+          "href": "https://www.sonarsource.com/plans-and-pricing/developer/",
           "label": "learn_more",
         },
       ]
diff --git a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
index a502a866b69..c19d1712d63 100644
--- a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx
@@ -228,7 +228,10 @@ export default class App extends React.PureComponent<Props, State> {
                     values={{
                       link: (
                         <Link
-                          to="https://redirect.sonarsource.com/doc/upgrading.html"
+                          // We cannot use <DocLink> here, as it relies on AppState. However, the maintenance
+                          // app is a special app that can run in a "downgraded" environment, where the AppState
+                          // may not yet be fully loaded. Hence, we link to this documentation page directly.
+                          to="https://docs.sonarqube.org/latest/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
                           target="_blank"
                         >
                           {translate('maintenance.sonarqube_is_under_maintenance_link.2')}
diff --git a/server/sonar-web/src/main/js/apps/marketplace/__tests__/__snapshots__/EditionBoxes-test.tsx.snap b/server/sonar-web/src/main/js/apps/marketplace/__tests__/__snapshots__/EditionBoxes-test.tsx.snap
index 41180da2051..9e68295f6e4 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/__tests__/__snapshots__/EditionBoxes-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/__tests__/__snapshots__/EditionBoxes-test.tsx.snap
@@ -9,7 +9,7 @@ exports[`should display the available edition boxes correctly 1`] = `
     edition={
       {
         "downloadProperty": "downloadDeveloperUrl",
-        "homeUrl": "https://redirect.sonarsource.com/editions/developer.html",
+        "homeUrl": "https://www.sonarsource.com/plans-and-pricing/developer/",
         "key": "developer",
         "name": "Developer Edition",
       }
@@ -21,7 +21,7 @@ exports[`should display the available edition boxes correctly 1`] = `
     edition={
       {
         "downloadProperty": "downloadEnterpriseUrl",
-        "homeUrl": "https://redirect.sonarsource.com/editions/enterprise.html",
+        "homeUrl": "https://www.sonarsource.com/plans-and-pricing/enterprise/",
         "key": "enterprise",
         "name": "Enterprise Edition",
       }
@@ -33,7 +33,7 @@ exports[`should display the available edition boxes correctly 1`] = `
     edition={
       {
         "downloadProperty": "downloadDatacenterUrl",
-        "homeUrl": "https://redirect.sonarsource.com/editions/datacenter.html",
+        "homeUrl": "https://www.sonarsource.com/plans-and-pricing/data-center/",
         "key": "datacenter",
         "name": "Data Center Edition",
       }
@@ -52,7 +52,7 @@ exports[`should display the datacenter edition box only 1`] = `
     edition={
       {
         "downloadProperty": "downloadDatacenterUrl",
-        "homeUrl": "https://redirect.sonarsource.com/editions/datacenter.html",
+        "homeUrl": "https://www.sonarsource.com/plans-and-pricing/data-center/",
         "key": "datacenter",
         "name": "Data Center Edition",
       }
@@ -71,7 +71,7 @@ exports[`should display the enterprise and datacenter edition boxes 1`] = `
     edition={
       {
         "downloadProperty": "downloadEnterpriseUrl",
-        "homeUrl": "https://redirect.sonarsource.com/editions/enterprise.html",
+        "homeUrl": "https://www.sonarsource.com/plans-and-pricing/enterprise/",
         "key": "enterprise",
         "name": "Enterprise Edition",
       }
@@ -83,7 +83,7 @@ exports[`should display the enterprise and datacenter edition boxes 1`] = `
     edition={
       {
         "downloadProperty": "downloadDatacenterUrl",
-        "homeUrl": "https://redirect.sonarsource.com/editions/datacenter.html",
+        "homeUrl": "https://www.sonarsource.com/plans-and-pricing/data-center/",
         "key": "datacenter",
         "name": "Data Center Edition",
       }
diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap
index 544953e04d3..f239229c3d1 100644
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap
@@ -74,7 +74,7 @@ exports[`should display the edition 1`] = `
   >
     <ForwardRef(Link)
       target="_blank"
-      to="https://redirect.sonarsource.com/editions/developer.html?ncloc=1000&serverId=serverId&sourceEdition=community"
+      to="https://www.sonarsource.com/plans-and-pricing/developer/?ncloc=1000&serverId=serverId&sourceEdition=community"
     >
       marketplace.request_free_trial
     </ForwardRef(Link)>
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 e31673bf7f0..f72efa1d911 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
@@ -564,7 +564,7 @@ exports[`should render correctly: success with branches disabled 1`] = `
               values={
                 {
                   "link": <a
-                    href="https://redirect.sonarsource.com/editions/developer.html?sourceEdition=community"
+                    href="https://www.sonarsource.com/plans-and-pricing/developer/?sourceEdition=community"
                     rel="noopener noreferrer"
                     target="_blank"
                   >
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/CreationTooltip-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/CreationTooltip-test.tsx.snap
index c9564f6cefe..59011f44397 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/CreationTooltip-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/CreationTooltip-test.tsx.snap
@@ -11,7 +11,7 @@ exports[`should render correctly 1`] = `
         {
           "alm": "alm.azure",
           "link": <a
-            href="https://redirect.sonarsource.com/editions/enterprise.html?sourceEdition=community"
+            href="https://www.sonarsource.com/plans-and-pricing/enterprise/?sourceEdition=community"
             rel="noopener noreferrer"
             target="_blank"
           >
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetFramework.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetFramework.tsx
index 6936b2ff3ab..1bd7580cd0b 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetFramework.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/DotNetFramework.tsx
@@ -20,7 +20,7 @@
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { translate } from '../../../../helpers/l10n';
-import Link from '../../../common/Link';
+import DocLink from '../../../common/DocLink';
 import { DotNetProps } from './DotNet';
 import DotNetExecute from './DotNetExecute';
 
@@ -46,12 +46,9 @@ export default function DotNetFramework(props: DotNetProps) {
             values={{
               code: <code>%PATH%</code>,
               link: (
-                <Link
-                  to="https://redirect.sonarsource.com/doc/download-scanner-msbuild.html"
-                  target="_blank"
-                >
+                <DocLink to="/analyzing-source-code/scanners/sonarscanner-for-dotnet/">
                   {translate('onboarding.analysis.msbuild.docs_link')}
-                </Link>
+                </DocLink>
               ),
             }}
           />
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/DownloadScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/DownloadScanner.tsx
index 448319f9413..482ee6e9bce 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/DownloadScanner.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/DownloadScanner.tsx
@@ -21,7 +21,7 @@ import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { translate } from '../../../../helpers/l10n';
 import CodeSnippet from '../../../common/CodeSnippet';
-import Link from '../../../common/Link';
+import DocLink from '../../../common/DocLink';
 import { ClipboardButton } from '../../../controls/clipboard';
 import { OSs } from '../../types';
 
@@ -46,12 +46,9 @@ export default function DownloadScanner(props: DownloadScannerProps) {
               dir: <code>bin</code>,
               env_var: <code>{os === OSs.Windows ? '%PATH%' : 'PATH'}</code>,
               link: (
-                <Link
-                  to="https://redirect.sonarsource.com/doc/download-scanner.html"
-                  target="_blank"
-                >
+                <DocLink to="/analyzing-source-code/scanners/sonarscanner/">
                   {translate('onboarding.analysis.sq_scanner.docs_link')}
-                </Link>
+                </DocLink>
               ),
             }}
           />
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetFramework-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetFramework-test.tsx.snap
index 89e1ed7cfc4..3145cee5f66 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetFramework-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DotNetFramework-test.tsx.snap
@@ -19,12 +19,11 @@ exports[`should render correctly 1`] = `
             "code": <code>
               %PATH%
             </code>,
-            "link": <ForwardRef(Link)
-              target="_blank"
-              to="https://redirect.sonarsource.com/doc/download-scanner-msbuild.html"
+            "link": <withAppStateContext(DocLink)
+              to="/analyzing-source-code/scanners/sonarscanner-for-dotnet/"
             >
               onboarding.analysis.msbuild.docs_link
-            </ForwardRef(Link)>,
+            </withAppStateContext(DocLink)>,
           }
         }
       />
diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DownloadScanner-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DownloadScanner-test.tsx.snap
index 5d1b5bb5e7e..d935a1644b4 100644
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DownloadScanner-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/DownloadScanner-test.tsx.snap
@@ -21,12 +21,11 @@ exports[`should render correctly for "linux": local 1`] = `
           "env_var": <code>
             PATH
           </code>,
-          "link": <ForwardRef(Link)
-            target="_blank"
-            to="https://redirect.sonarsource.com/doc/download-scanner.html"
+          "link": <withAppStateContext(DocLink)
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
-          </ForwardRef(Link)>,
+          </withAppStateContext(DocLink)>,
         }
       }
     />
@@ -111,12 +110,11 @@ exports[`should render correctly for "mac": local 1`] = `
           "env_var": <code>
             PATH
           </code>,
-          "link": <ForwardRef(Link)
-            target="_blank"
-            to="https://redirect.sonarsource.com/doc/download-scanner.html"
+          "link": <withAppStateContext(DocLink)
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
-          </ForwardRef(Link)>,
+          </withAppStateContext(DocLink)>,
         }
       }
     />
@@ -201,12 +199,11 @@ exports[`should render correctly for "win": local 1`] = `
           "env_var": <code>
             %PATH%
           </code>,
-          "link": <ForwardRef(Link)
-            target="_blank"
-            to="https://redirect.sonarsource.com/doc/download-scanner.html"
+          "link": <withAppStateContext(DocLink)
+            to="/analyzing-source-code/scanners/sonarscanner/"
           >
             onboarding.analysis.sq_scanner.docs_link
-          </ForwardRef(Link)>,
+          </withAppStateContext(DocLink)>,
         }
       }
     />
diff --git a/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx b/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx
index 126cdd51211..d2bf2e935d3 100644
--- a/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx
+++ b/server/sonar-web/src/main/js/components/upgrade/SystemUpgradeItem.tsx
@@ -27,6 +27,7 @@ import {
 import { translate, translateWithParameters } from '../../helpers/l10n';
 import { EditionKey } from '../../types/editions';
 import { SystemUpgrade } from '../../types/system';
+import DocLink from '../common/DocLink';
 import Link from '../common/Link';
 import DateFormatter from '../intl/DateFormatter';
 import SystemUpgradeIntermediate from './SystemUpgradeIntermediate';
@@ -99,13 +100,9 @@ export default function SystemUpgradeItem(props: SystemUpgradeItemProps) {
         >
           {translateWithParameters('system.download_x', lastUpgrade.version)}
         </a>
-        <Link
-          className="spacer-left"
-          to="https://redirect.sonarsource.com/doc/upgrading.html"
-          target="_blank"
-        >
+        <DocLink className="spacer-left" to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/">
           {translate('system.how_to_upgrade')}
-        </Link>
+        </DocLink>
       </div>
     </div>
   );
diff --git a/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap b/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap
index 59c5067e0d4..2ab2d84ff4d 100644
--- a/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/upgrade/__tests__/__snapshots__/SystemUpgradeItem-test.tsx.snap
@@ -89,13 +89,12 @@ exports[`should display correctly 1`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
@@ -189,13 +188,12 @@ exports[`should display correctly 2`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
@@ -282,13 +280,12 @@ exports[`should display correctly 3`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
@@ -382,13 +379,12 @@ exports[`should display correctly 4`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
@@ -482,13 +478,12 @@ exports[`should display correctly 5`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
@@ -582,13 +577,12 @@ exports[`should display correctly 6`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
@@ -663,13 +657,12 @@ exports[`should display correctly 7`] = `
     >
       system.download_x.5.6.7
     </a>
-    <ForwardRef(Link)
+    <withAppStateContext(DocLink)
       className="spacer-left"
-      target="_blank"
-      to="https://redirect.sonarsource.com/doc/upgrading.html"
+      to="/setup-and-upgrade/upgrade-the-server/upgrade-guide/"
     >
       system.how_to_upgrade
-    </ForwardRef(Link)>
+    </withAppStateContext(DocLink)>
   </div>
 </div>
 `;
diff --git a/server/sonar-web/src/main/js/helpers/editions.ts b/server/sonar-web/src/main/js/helpers/editions.ts
index b85ee1f18e3..79d52d9a2a4 100644
--- a/server/sonar-web/src/main/js/helpers/editions.ts
+++ b/server/sonar-web/src/main/js/helpers/editions.ts
@@ -25,25 +25,25 @@ const EDITIONS: { [x in EditionKey]: Edition } = {
   community: {
     key: EditionKey.community,
     name: 'Community Edition',
-    homeUrl: 'https://redirect.sonarsource.com/editions/community.html',
+    homeUrl: 'https://www.sonarsource.com/open-source-editions/',
     downloadProperty: 'downloadUrl',
   },
   developer: {
     key: EditionKey.developer,
     name: 'Developer Edition',
-    homeUrl: 'https://redirect.sonarsource.com/editions/developer.html',
+    homeUrl: 'https://www.sonarsource.com/plans-and-pricing/developer/',
     downloadProperty: 'downloadDeveloperUrl',
   },
   enterprise: {
     key: EditionKey.enterprise,
     name: 'Enterprise Edition',
-    homeUrl: 'https://redirect.sonarsource.com/editions/enterprise.html',
+    homeUrl: 'https://www.sonarsource.com/plans-and-pricing/enterprise/',
     downloadProperty: 'downloadEnterpriseUrl',
   },
   datacenter: {
     key: EditionKey.datacenter,
     name: 'Data Center Edition',
-    homeUrl: 'https://redirect.sonarsource.com/editions/datacenter.html',
+    homeUrl: 'https://www.sonarsource.com/plans-and-pricing/data-center/',
     downloadProperty: 'downloadDatacenterUrl',
   },
 };
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterVerification.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterVerification.java
index be43c8b2e27..20a94de2e8c 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterVerification.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterVerification.java
@@ -49,7 +49,7 @@ public class ClusterVerification implements Startable {
     }
     if (feature == null || !feature.isEnabled()) {
       throw MessageException.of(
-        "Cluster mode can't be enabled. Please install the Data Center Edition. More details at https://redirect.sonarsource.com/editions/datacenter.html.");
+        "Cluster mode can't be enabled. Please install the Data Center Edition. More details at https://www.sonarsource.com/plans-and-pricing/data-center/.");
     }
   }
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java
index c7df0c4f441..62e2d6164a3 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.when;
 
 public class ClusterVerificationTest {
 
-  private static final String ERROR_MESSAGE = "Cluster mode can't be enabled. Please install the Data Center Edition. More details at https://redirect.sonarsource.com/editions/datacenter.html.";
+  private static final String ERROR_MESSAGE = "Cluster mode can't be enabled. Please install the Data Center Edition. More details at https://www.sonarsource.com/plans-and-pricing/data-center/.";
 
 
   private NodeInformation nodeInformation = mock(NodeInformation.class);
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index f2f723b1785..dcbb6bb240c 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -10,7 +10,7 @@
 # - be overridden by environment variables. The name of the corresponding environment variable is the
 #   upper-cased name of the property where all the dot ('.') and dash ('-') characters are replaced by
 #   underscores ('_'). For example, to override 'sonar.web.systemPasscode' use 'SONAR_WEB_SYSTEMPASSCODE'.
-# - be encrypted. See https://redirect.sonarsource.com/doc/settings-encryption.html
+# - be encrypted. See https://docs.sonarqube.org/latest/instance-administration/security/#settings-encryption
 
 #--------------------------------------------------------------------------------------------------
 # DATABASE
diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt
index c3d67e9c173..54e11ac42f5 100644
--- a/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt
+++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt
@@ -1,2 +1,2 @@
-Please copy an Oracle JDBC driver in this directory. See compatible versions at https://redirect.sonarsource.com/doc/requirements.html.
-Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available.
\ No newline at end of file
+Please copy an Oracle JDBC driver in this directory. See compatible versions at https://docs.sonarqube.org/latest/requirements/prerequisites-and-overview/.
+Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available.
diff --git a/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java b/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java
index fb258d09054..ea2fb1ab7de 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java
@@ -30,7 +30,7 @@ import static org.sonar.api.PropertyType.INTEGER;
 
 public class ScannerProperties {
 
-  public static final String BRANCHES_DOC_LINK = "https://redirect.sonarsource.com/doc/branches.html";
+  public static final String BRANCHES_DOC_LINK = "https://docs.sonarqube.org/latest/analyzing-source-code/branches/branch-analysis/";
 
   public static final String BRANCH_NAME = "sonar.branch.name";
   @Deprecated
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java
index c5d38375188..0dc9d6adce5 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java
@@ -346,7 +346,7 @@ public class SpringProjectScanContainer extends SpringComponentContainer {
 
     properties.get("sonar.branch").ifPresent(deprecatedBranch -> {
       throw MessageException.of("The 'sonar.branch' parameter is no longer supported. You should stop using it. " +
-        "Branch analysis is available in Developer Edition and above. See https://redirect.sonarsource.com/editions/developer.html for more information.");
+        "Branch analysis is available in Developer Edition and above. See https://www.sonarsource.com/plans-and-pricing/developer/ for more information.");
     });
 
     BranchConfiguration branchConfig = getComponentByType(BranchConfiguration.class);
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/branch/DeprecatedBranchMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/branch/DeprecatedBranchMediumTest.java
index c5a23959ed2..8dff5b1055d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/branch/DeprecatedBranchMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/branch/DeprecatedBranchMediumTest.java
@@ -83,6 +83,6 @@ public class DeprecatedBranchMediumTest {
       .execute())
       .isInstanceOf(MessageException.class)
       .hasMessage("The 'sonar.branch' parameter is no longer supported. You should stop using it. " +
-        "Branch analysis is available in Developer Edition and above. See https://redirect.sonarsource.com/editions/developer.html for more information.");
+        "Branch analysis is available in Developer Edition and above. See https://www.sonarsource.com/plans-and-pricing/developer/ for more information.");
   }
 }