doc: Update rST to not reference the old wiki

In two places we had references to the old wiki pages instead of links
to the relevant part of our documentation. Update (and slightly reword)
these spots.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2024-08-26 10:49:54 -06:00 committed by Heinrich Schuchardt
parent 19fac2b1d0
commit 8002b1c07c
2 changed files with 3 additions and 4 deletions

View file

@ -23,9 +23,8 @@ Management Summary
Phases of the Development Process Phases of the Development Process
--------------------------------- ---------------------------------
U-Boot development takes place in `Release Cycles U-Boot development takes place in a :doc:`release_cycle`. A Release Cycle
<https://www.denx.de/wiki/U-Boot/ReleaseCycle>`_. A Release Cycle lasts lasts normally for three months.
normally for three months.
The first three weeks of each Release Cycle are called *Merge Window*. The first three weeks of each Release Cycle are called *Merge Window*.

View file

@ -9,7 +9,7 @@ release that came out in October 2020. Release candidates are tagged every few
weeks as the project heads to the next release. So 2020.10-rc1 was the first weeks as the project heads to the next release. So 2020.10-rc1 was the first
release candidate (RC), tagged soon after 2020.07 was released. release candidate (RC), tagged soon after 2020.07 was released.
See https://www.denx.de/wiki/view/U-Boot/ReleaseCycle for full details. See :doc:`release_cycle` for full details.
Within the build system, various Makefile variables are created, making use of Within the build system, various Makefile variables are created, making use of
VERSION, PATCHLEVEL and EXTRAVERSION defined at the top of 'Makefile'. There is VERSION, PATCHLEVEL and EXTRAVERSION defined at the top of 'Makefile'. There is