Mention the master branch as well

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-03-16 12:05:16 +01:00
parent a23df13e52
commit 991bbe7f5e

View File

@ -2,6 +2,9 @@
At any point in time, we have a number of maintained branches consisting of: At any point in time, we have a number of maintained branches consisting of:
- The [`master`](https://github.com/ARMmbed/mbedtls/tree/master) branch:
this always contains the latest release, including all publicly available
security fixes.
- The [`development`](https://github.com/ARMmbed/mbedtls/tree/development) branch: - The [`development`](https://github.com/ARMmbed/mbedtls/tree/development) branch:
this is where new features land, this is where new features land,
as well as bug fixes and security fixes. as well as bug fixes and security fixes.
@ -9,7 +12,7 @@ At any point in time, we have a number of maintained branches consisting of:
these only get bug fixes and security fixes. these only get bug fixes and security fixes.
We use [Semantic Versioning](https://semver.org/). In particular, we maintain We use [Semantic Versioning](https://semver.org/). In particular, we maintain
API compatibility in the development branch between major version changes. We API compatibility in the `master` branch between major version changes. We
also maintain ABI compatibility within LTS branches; see the next section for also maintain ABI compatibility within LTS branches; see the next section for
details. details.
@ -43,6 +46,7 @@ CONTRIBUTING](CONTRIBUTING.md#cackwords-compatibility).
The following branches are currently maintained: The following branches are currently maintained:
- [master](https://github.com/ARMmbed/mbedtls/tree/master)
- [`development`](https://github.com/ARMmbed/mbedtls/) - [`development`](https://github.com/ARMmbed/mbedtls/)
- [`mbedtls-2.16`](https://github.com/ARMmbed/mbedtls/tree/mbedtls-2.16) - [`mbedtls-2.16`](https://github.com/ARMmbed/mbedtls/tree/mbedtls-2.16)
maintained until at least the end of 2021, see maintained until at least the end of 2021, see