doc: Update doc versions for 2.6 release

Update doc versions for 2.6 release
Minor update to the nRF Desktop application.

Signed-off-by: divya pillai <divya.pillai@nordicsemi.no>

Author: divipillai

applications/nrf_desktop/integration.rst

@@ -7,7 +7,7 @@ nRF Desktop: Integrating your own hardware
    :local:
    :depth: 2
 
-This section describes how to adapt the nRF Desktop application to different hardware, and lists the steps required for adding a new board.
+This page describes how to adapt the nRF Desktop application to different hardware and lists the required steps.
 
 .. tip::
    Make sure to get familiar with the :ref:`nrf_desktop_configuration` section before porting the application to a new board.

doc/matter/conf.py

@@ -23,7 +23,7 @@
 project = "Matter SDK"
 copyright = "2020-2024, Matter Contributors"
 author = "Matter Contributors"
-version = "1.1.0"
+version = "1.2.0"
 
 sys.path.insert(0, str(ZEPHYR_BASE / "doc" / "_extensions"))
 sys.path.insert(0, str(NRF_BASE / "doc" / "_extensions"))

doc/mcuboot/conf.py

@@ -24,7 +24,7 @@
 
 project = "MCUboot"
 copyright = "2019-2024, Nordic Semiconductor"
-version = release = "1.10.0"
+version = release = "2.0.99"
 
 sys.path.insert(0, str(ZEPHYR_BASE / "doc" / "_extensions"))
 sys.path.insert(0, str(NRF_BASE / "doc" / "_extensions"))

doc/nrf/conf.py

@@ -28,7 +28,7 @@
 project = "nRF Connect SDK"
 copyright = "2019-2024, Nordic Semiconductor"
 author = "Nordic Semiconductor"
-version = release = "2.5.99"
+version = release = "2.6.0"
 
 sys.path.insert(0, str(ZEPHYR_BASE / "doc" / "_extensions"))
 sys.path.insert(0, str(NRF_BASE / "doc" / "_extensions"))

doc/nrf/dev_model_and_contributions/adding_code.rst

@@ -162,7 +162,7 @@ This is demonstrated by the following code, that would be placed somewhere in yo
        - name: nrf
          repo-path: sdk-nrf
          remote: ncs
-         revision: v2.5.2
+         revision: v2.6.0
          import: true
      self:
        path: application
@@ -189,7 +189,7 @@ For example:
      projects:
        - name: nrf
          remote: ncs
-         revision: v2.5.2
+         revision: v2.6.0
          import: true
        # Example for how to override a repository in the nRF Connect SDK with your own:
        - name: mcuboot

doc/nrf/shortcuts.txt

@@ -1,8 +1,8 @@
 .. |NCS| replace:: nRF Connect SDK
 
-.. |release| replace:: v2.5.2
-.. |release_tt| replace:: ``v2.5.2``
-.. |release_number_tt| replace:: ``2.5.2``
+.. |release| replace:: v2.6.0
+.. |release_tt| replace:: ``v2.6.0``
+.. |release_number_tt| replace:: ``2.6.0``
 
 .. ### Config shortcuts
 

doc/nrfxlib/conf.py

@@ -26,7 +26,7 @@
 project = "nrfxlib"
 copyright = "2019-2024, Nordic Semiconductor"
 author = "Nordic Semiconductor"
-version = release = "2.5.99"
+version = release = "2.6.0"
 
 sys.path.insert(0, str(ZEPHYR_BASE / "doc" / "_extensions"))
 sys.path.insert(0, str(NRF_BASE / "doc" / "_extensions"))

doc/tfm/conf.py

@@ -25,7 +25,7 @@
 project = "Trusted Firmware-M"
 copyright = "2017-2021, ARM CE-OSS"
 author = "ARM CE-OSS"
-version = "1.8.0"
+version = "2.0.0"
 
 sys.path.insert(0, str(ZEPHYR_BASE / "doc" / "_extensions"))
 sys.path.insert(0, str(NRF_BASE / "doc" / "_extensions"))

doc/versions.json

@@ -1,8 +1,7 @@
 [
-    "2.5.99",
+    "2.6.0",
     "2.5.2",
     "2.5.1",
-    "2.5.99-dev1",
     "2.5.0",
     "2.4.3",
     "2.4.2",

west.yml

@@ -142,7 +142,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: v2.6.0-rc2
+      revision: 13cd978b22d192447537a60f7fae5fe092930dc4
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m