diff options
| author | Tom Rini <trini@konsulko.com> | 2024-08-26 10:49:54 -0600 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-09-12 18:14:49 +0200 |
| commit | 8002b1c07c2146afd907f2cad6a0c053c5d061c8 (patch) | |
| tree | 8b72456418a48e680f9e042e7e14a53d74179c0f | |
| parent | 19fac2b1d0d3ffeeb71e6ee6ca0b88b8bf6beb52 (diff) | |
| download | u-boot-8002b1c07c2146afd907f2cad6a0c053c5d061c8.tar.gz u-boot-8002b1c07c2146afd907f2cad6a0c053c5d061c8.tar.bz2 u-boot-8002b1c07c2146afd907f2cad6a0c053c5d061c8.zip | |
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>
| -rw-r--r-- | doc/develop/process.rst | 5 | ||||
| -rw-r--r-- | doc/develop/version.rst | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/develop/process.rst b/doc/develop/process.rst index 0542b3fc12..0c6fb31e87 100644 --- a/doc/develop/process.rst +++ b/doc/develop/process.rst @@ -23,9 +23,8 @@ Management Summary Phases of the Development Process --------------------------------- -U-Boot development takes place in `Release Cycles -<https://www.denx.de/wiki/U-Boot/ReleaseCycle>`_. A Release Cycle lasts -normally for three months. +U-Boot development takes place in a :doc:`release_cycle`. A Release Cycle +lasts normally for three months. The first three weeks of each Release Cycle are called *Merge Window*. diff --git a/doc/develop/version.rst b/doc/develop/version.rst index 5c9046aa17..de11836af4 100644 --- a/doc/develop/version.rst +++ b/doc/develop/version.rst @@ -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 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 VERSION, PATCHLEVEL and EXTRAVERSION defined at the top of 'Makefile'. There is |