Skip to content

Commit

Permalink
Merge pull request RIOT-OS#20175 from OlegHahm/pr/contributing.md/bro…
Browse files Browse the repository at this point in the history
…ken_wiki_link

Fixing broken Wiki links
  • Loading branch information
benpicco authored Dec 13, 2023
2 parents ebf07d5 + cb7a66d commit bee6c17
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,11 @@ into the source repository.
* Try to answer reviews as quickly as possible to speed up the review process
and avoid stalled PRs.

You can find more information about RIOT development procedure on this
[wiki page][development-procedures].

[about-pull-requests]: https://help.github.com/articles/about-pull-requests/
[development-models]: https://help.github.com/articles/creating-a-pull-request-from-a-fork
[existing-pull-requests]: https://github.com/RIOT-OS/RIOT/pulls
[archived-pull-requests]: https://github.com/RIOT-OS/RIOT/pulls?q=is:pr+label:"State:+archived"
[uncrustify]: http://uncrustify.sourceforge.net
[development-procedures]: https://github.com/RIOT-OS/RIOT/wiki/Development-procedures

## Writing Documentation
[writing-documentation]: #writing-documentation
Expand Down
4 changes: 2 additions & 2 deletions tests/build_system/warn_conflict/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Using conflicting features provided by boards was invisible for the user until t
Now, existing and known conflicts can be recorded into `FEATURES_CONFLICT` for each board to inform the user on a conflict situation during compile time.

This test requires conflicting features in its `Makefile`, i.e. `FEATURES_REQUIRED = periph_dac periph_spi`.
It is expected to be presented with a warning on the conflicts with a short description message during compile time for the [stm32f4discovery](https://github.com/RIOT-OS/RIOT/wiki/Board%3A-STM32F4discovery) by now, i.e. :
It is expected to be presented with a warning on the conflicts with a short description message during compile time for the [stm32f4discovery](https://doc.riot-os.org/group__boards__stm32f4discovery.html) by now, i.e. :

```
$ make BOARD=stm32f4discovery
Expand All @@ -23,7 +23,7 @@ Whenever an application, such as this test, requires board features that match a

* Conflicting features are described in groups separated by a `:` (doublecolon) for each feature, e.g.:
`FEATURES_CONFLICT = periph_spi:periph_dac`, which states that `periph_spi` conflicts with `periph_dac`.
As seen above, this is the conflict of `SPI_DEV(0)` pinout is shared with `DAC` on the [stm32f4discovery](https://github.com/RIOT-OS/RIOT/wiki/Board%3A-STM32F4discovery) board.
As seen above, this is the conflict of `SPI_DEV(0)` pinout is shared with `DAC` on the [stm32f4discovery](https://doc.riot-os.org/group__boards__stm32f4discovery.html) board.

* Distinct groups of conflicts are whitespace separated, e.g.:
`featureA:featureB featureC:featureD`, which states that `featureA` conflicts with `featureB`, and `featureC` conflicts with `featureD`.
Expand Down

0 comments on commit bee6c17

Please sign in to comment.