Skip to content

Commit 2cd1bec

Browse files
gmarullanangl
authored andcommitted
doc: upmerge fixes
- Upgrade to latest Sphinx - Fix some references - Fix Zephyr docset required env vars Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent 07d7dae commit 2cd1bec

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: doc/nrf/releases_and_maturity/releases/release-notes-1.4.1.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Zephyr changes incorporated into |NCS|
9292

9393
This section contains changes in Zephyr that were cherry-picked into |NCS| for this release.
9494

95-
* Added support for the :ref:`zephyr:actinius_icarus` board.
95+
* Added support for the :zephyr:board:`actinius_icarus` board.
9696

9797
Bluetooth Host
9898
~~~~~~~~~~~~~~

Diff for: doc/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PyYAML # | X | | | | |
1414
pykwalify # | | | | | | | X |
1515
pytest # | | | | | | | X |
1616
recommonmark # | | | X | X | | | |
17-
sphinx~=7.4 # | X | X | X | X | X | X | X |
17+
sphinx~=8.1 # | X | X | X | X | X | X | X |
1818
sphinx-autobuild # | X | X | X | X | X | X | X |
1919
sphinx-copybutton # | X | | | | | | X |
2020
sphinx-ncs-theme<1.1 # | X | | | | | | |

Diff for: doc/zephyr/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# Import all Zephyr configuration, override as needed later
2929
os.environ["ZEPHYR_BASE"] = str(ZEPHYR_BASE)
30-
os.environ["ZEPHYR_BUILD"] = str(utils.get_builddir() / "zephyr")
30+
os.environ["OUTPUT_DIR"] = str(utils.get_builddir() / "html" / "zephyr")
3131

3232
conf = eval_config_file(str(ZEPHYR_BASE / "doc" / "conf.py"), tags)
3333
locals().update(conf)

0 commit comments

Comments
 (0)