diff options
| author | fanquake <fanquake@gmail.com> | 2019-06-16 09:15:05 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-06-16 09:24:48 +0800 |
| commit | 8cbeaedee00ce6037a8c82f2df5a4823f226947f (patch) | |
| tree | 8fa5d2a827c55136bcdf135ac386dd4d28271366 | |
| parent | f6f924811d5b4ae2a6c77105403747cd31d3e49d (diff) | |
| parent | fa4bc4ebf91e2bf4732063f7a374a98902436a7c (diff) | |
Merge #16213: doc: Remove explicit mention of versions from SECURITY.md
fa4bc4ebf91e2bf4732063f7a374a98902436a7c doc: Remove explicit mention of version from SECURITY.md (MarcoFalke)
Pull request description:
The repo should not contain documentation that is not tied to any release. For example meta information like a list of maintained versions of Bitcoin Core falls into this scope.
Replace the list of versions in `./SECURITY.md` with a link to the website.
ACKs for commit fa4bc4:
Empact:
ACK https://github.com/bitcoin/bitcoin/pull/16213/commits/fa4bc4ebf91e2bf4732063f7a374a98902436a7c
fanquake:
ACK https://github.com/bitcoin/bitcoin/pull/16213/commits/fa4bc4ebf91e2bf4732063f7a374a98902436a7c
laanwj:
ACK fa4bc4ebf91e2bf4732063f7a374a98902436a7c
jonatack:
ACK fa4bc4ebf91e2bf4732063f7a374a98902436a7c
Tree-SHA512: 152b5b19b3620b0bc63536f582340628019b8ea92429db44f232a01bfa1893b767735bf94ca693a683769eb046b160e92c72de6efb3da328f2b0ee9f4750f465
| -rw-r--r-- | SECURITY.md | 11 | ||||
| -rw-r--r-- | doc/release-process.md | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/SECURITY.md b/SECURITY.md index 4044722374..7ed96c7cea 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,15 +2,8 @@ ## Supported Versions -Versions of Bitcoin Core that are currently supported with security updates: - -| Version | Supported | -| ------- | ------------------ | -| 0.18 | :white_check_mark: | -| 0.17 | :white_check_mark: | -| 0.16 | :white_check_mark: | -| 0.15 | :white_check_mark: | -| < 0.15 | :x: | +See our website for versions of Bitcoin Core that are currently supported with +security updates: https://bitcoincore.org/en/lifecycle/#schedule ## Reporting a Vulnerability diff --git a/doc/release-process.md b/doc/release-process.md index 8f1222cb88..480b09ee11 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -41,12 +41,10 @@ Release Process #### After branch-off (on master) - Update the version of `contrib/gitian-descriptors/*.yml`. -- Update the versions in `SECURITY.md` as per the software lifecycle [maintenance policy](https://bitcoincore.org/en/lifecycle/#maintenance-period), generally bumping all up one major version. #### After branch-off (on the major release branch) - Update the versions and the link to the release notes draft in `doc/release-notes.md`. -- Delete `SECURITY.md`. #### Before final release @@ -325,6 +323,9 @@ bitcoin.org (see below for bitcoin.org update instructions). - bitcoincore.org blog post + - bitcoincore.org maintained versions update: + [table](https://github.com/bitcoin-core/bitcoincore.org/commits/master/_includes/posts/maintenance-table.md) + - bitcoincore.org RPC documentation update - Update packaging repo |