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

Jump to bottom

doc: pull latest changes from Zephyr #11961

Merged
merged 6 commits into from
Aug 11, 2023
Merged

doc: pull latest changes from Zephyr #11961

merged 6 commits into from
Aug 11, 2023

Conversation

gmarull
Copy link
Member

@gmarull gmarull commented Aug 4, 2023 •
edited
Loading

  • Improve user experience by using -W --keep-going and -T options by default
  • Move doc requirements to doc/ folder
  • Create a unified doc requirements file, update stale dependency tables

@github-actions github-actions bot added ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. doc-required PR must not be merged without tech writer approval. manifest labels Aug 4, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 4, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@c9d01d0 nrfconnect/sdk-zephyr@80493dd (main) nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@gmarull gmarull force-pushed the import-doc-changes branch 2 times, most recently from 7d54640 to 549d447 Compare August 11, 2023 08:17
@github-actions github-actions bot removed the ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. label Aug 11, 2023
@gmarull gmarull marked this pull request as ready for review August 11, 2023 08:59
@gmarull gmarull added the CI-disable Disable CI for this PR label Aug 11, 2023
@NordicBuilder
Copy link
Contributor

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-fw-nrfconnect-ble X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nfc X
test-fw-nrfconnect-nrf-iot_lwm2m X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-tfm X
test-fw-nrfconnect-thread X
test-sdk-find-my X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@gmarull gmarull force-pushed the import-doc-changes branch 2 times, most recently from c21229c to cf98883 Compare August 11, 2023 09:45
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@gmarull
manifest: pull some upstream documentation infrastructure updates
ea98715 
To be prepared for the next upmerge, and improve user experience.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull
doc: move requirements to doc/ folder
8b69a6c 
Align with Zephyr new order.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull
doc: align Sphinx options with Zephyr
984b415 
- SPHINXOPTS/SPHINXOPTS_EXTRA
- -W + --keep-going is now the default, except for DODGY builds
- -T is default (to ease debugging extension crashes)

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull
doc: nrfxlib is a dodgy docset
601e93f 
It generates lots of warnings, so it needs to run in _dodgy_ mode.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull
doc: extensions: ncs_tool_versions: allow trailing comments
5d1fa81 
Allow trailing comments on each version line, e.g.

```
mypackage # some comments
```

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull
doc: provide a unified requirements file
ea90036 
To ease maintenance and keeping track of which docset requires what.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@NordicBuilder NordicBuilder removed the DNM label Aug 11, 2023
@gmarull gmarull merged commit b612c1d into nrfconnect:main Aug 11, 2023
12 of 13 checks passed
@gmarull gmarull deleted the import-doc-changes branch August 11, 2023 11:19
@umapraseeda umapraseeda mentioned this pull request Aug 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gautesl gautesl gautesl approved these changes

@umapraseeda umapraseeda umapraseeda approved these changes

@SebastianBoe SebastianBoe Awaiting requested review from SebastianBoe

@carlescufi carlescufi Awaiting requested review from carlescufi

@b-gent b-gent Awaiting requested review from b-gent

@michaeljones michaeljones Awaiting requested review from michaeljones

@tejlmand tejlmand Awaiting requested review from tejlmand

@grho grho Awaiting requested review from grho

@shanthanordic shanthanordic Awaiting requested review from shanthanordic

@ihansse ihansse Awaiting requested review from ihansse

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-disable Disable CI for this PR doc-required PR must not be merged without tech writer approval. manifest manifest-nrfxlib manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gmarull @NordicBuilder @gautesl @umapraseeda