Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NRF upmerge 2023_03_12 #464

Merged
merged 1 commit into from
Dec 6, 2023
Merged

NRF upmerge 2023_03_12 #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions doc/ncs_links.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
Note: This file was automatically generated.
Please modify in script file: ncs_links_update.sh

.. _nRF Connect SDK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/index.html
.. _nrf52840 DK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/config_and_build/board_support.html#boards-included-in-sdk-zephyr
.. _nrf5340 DK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/config_and_build/board_support.html#boards-included-in-sdk-zephyr
.. _Getting started with nRF52 Series: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/working_with_nrf/nrf52/gs.html
.. _Getting started with nRF53 Series: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/working_with_nrf/nrf53/nrf5340_gs.html
.. _Zephyr toolchain: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/gs_installing.html#install-a-toolchain
.. _nRF Connect SDK Getting started: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/getting_started.html
.. _nRF52840dk_nrf52840: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/zephyr/boards/arm/nrf52840dk_nrf52840/doc/index.html
.. _nrf5340dk_nrf5340: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/zephyr/boards/arm/nrf5340dk_nrf5340/doc/index.html#nrf5340dk-nrf5340
.. _Building and programming an application: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/getting_started/programming.html#gs-programming
.. _Testing and debugging an application: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/getting_started/testing.html#gs-testing
.. _Bootloader and DFU solutions for NCS: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/app_bootloaders.html
.. _Zephyr SMP Server: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/zephyr/services/device_mgmt/ota.html#smp-server
.. _NCS testing applications: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/gs_testing.html
.. _Known issues for the nRF Connect SDK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.0/nrf/releases_and_maturity/known_issues.html
.. _Release notes for the nRF Connect SDK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/releases_and_maturity/releases/release-notes-2.5.0.html
.. _nRF Connect SDK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/index.html
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

although there is no important sidewalk changes between 2.5.0 and 2.5.99-dev1, the main branch repos is based on sdk-nrf after the tag, so it's seems reasonable to use 2.5.99-dev1 links

.. _nrf52840 DK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/config_and_build/board_support.html#boards-included-in-sdk-zephyr
.. _nrf5340 DK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/config_and_build/board_support.html#boards-included-in-sdk-zephyr
.. _Getting started with nRF52 Series: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/working_with_nrf/nrf52/gs.html
.. _Getting started with nRF53 Series: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/working_with_nrf/nrf53/nrf5340_gs.html
.. _Zephyr toolchain: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/gs_installing.html#install-a-toolchain
.. _nRF Connect SDK Getting started: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/getting_started.html
.. _nRF52840dk_nrf52840: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/zephyr/boards/arm/nrf52840dk_nrf52840/doc/index.html
.. _nrf5340dk_nrf5340: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/zephyr/boards/arm/nrf5340dk_nrf5340/doc/index.html#nrf5340dk-nrf5340
.. _Building and programming an application: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/getting_started/programming.html#gs-programming
.. _Testing and debugging an application: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/getting_started/testing.html#gs-testing
.. _Bootloader and DFU solutions for NCS: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/app_bootloaders.html
.. _Zephyr SMP Server: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/zephyr/services/device_mgmt/ota.html#smp-server
.. _NCS testing applications: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/gs_testing.html
.. _Known issues for the nRF Connect SDK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.5.99-dev1/nrf/releases_and_maturity/known_issues.html
.. _Release notes for the nRF Connect SDK: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/releases_and_maturity/releases/release-notes-2.5.99-dev1.html
2 changes: 1 addition & 1 deletion internal_west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ manifest:
- name: nrf
repo-path: sdk-nrf
path: nrf
revision: ee6ce1a02cd4ede2d57997ee3e744113ae0f0464
revision: eaa0b49d48a4956d2af3abdaa7aabfef27d5d126
import: true

# West-related configuration for the sidewalk repository.
Expand Down