doc: Update doc/bips.md with recent changes in master #17370

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:1911-docBips changing 1 files +5 −1

MarcoFalke commented at 9:13 PM on November 4, 2019: member

Follow-up to #17165
fanquake added the label Docs on Nov 4, 2019

in doc/bips.md:22 in fa431bf922 outdated

  18 | @@ -19,7 +19,7 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.19.0**):
  19 |  * [`BIP 65`](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki): The CHECKLOCKTIMEVERIFY softfork was merged in **v0.12.0** ([PR #6351](https://github.com/bitcoin/bitcoin/pull/6351)), and backported to **v0.11.2** and **v0.10.4**. Mempool-only CLTV was added in [PR #6124](https://github.com/bitcoin/bitcoin/pull/6124).
  20 |  * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)).
  21 |  * [`BIP 68`](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki): Sequence locks have been implemented as of **v0.12.1**  ([PR #7184](https://github.com/bitcoin/bitcoin/pull/7184)), and have been *buried* since **v0.19.0** ([PR #16060](https://github.com/bitcoin/bitcoin/pull/16060)).
  22 | -* [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)). Support can be optionally disabled at build time since **v0.18.0** ([PR 14451](https://github.com/bitcoin/bitcoin/pull/14451)), and is disabled by default at build time since **v0.19.0** ([PR #15584](https://github.com/bitcoin/bitcoin/pull/15584)).
  23 | +* [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)). Support can be optionally disabled at build time since **v0.18.0** ([PR 14451](https://github.com/bitcoin/bitcoin/pull/14451)), and is disabled by default at build time since **v0.19.0** ([PR #15584](https://github.com/bitcoin/bitcoin/pull/15584)). It has been completely removed as of **v0.20.0** ([PR 17165](https://github.com/bitcoin/bitcoin/pull/17165)).

jonatack commented at 8:51 AM on November 5, 2019:

Perhaps replace "It has been completely removed" with "It has been removed" (no need for "completely") or "Payment Protocol support has been removed".

Given the two sentences before use the present tense I was going to suggest the same ("Support is removed"), but saw that the verb tenses vary in this document between present tense and various forms of past tense.

jonatack commented at 8:53 AM on November 5, 2019:

nit: Unrelated, but "14451)), and" should be "14451)) and" (no comma) or "14451)), and it" (comma followed by an independant clause)

MarcoFalke commented at 3:21 PM on November 5, 2019:

Thx. Fixed

jonatack commented at 8:55 AM on November 5, 2019: member

ACK with a couple nits below.
emilengler commented at 1:19 PM on November 5, 2019: contributor

ACK
doc: Update doc/bips.md with recent changes in master fa7f5a4d2a
MarcoFalke force-pushed on Nov 5, 2019
jonatack commented at 5:59 PM on November 5, 2019: member

ACK fa7f5a4d2a2581cc25125311892a80efc2c494e2. Verified markdown view at https://github.com/MarcoFalke/bitcoin-core/blob/1911-docBips/doc/bips.md and the urls in the links. Some of the PRs are indicated with # and some without, but this is the case over the whole document.
laanwj commented at 11:17 PM on November 5, 2019: member

ACK fa7f5a4d2a2581cc25125311892a80efc2c494e2
fanquake approved
fanquake commented at 2:36 AM on November 6, 2019: member

ACK fa7f5a4d2a2581cc25125311892a80efc2c494e2
fanquake referenced this in commit 4e21f72980 on Nov 6, 2019
fanquake merged this on Nov 6, 2019
fanquake closed this on Nov 6, 2019
MarcoFalke deleted the branch on Nov 6, 2019
sidhujag referenced this in commit f5be3f374b on Nov 7, 2019
sidhujag referenced this in commit 98c9ba6d69 on Nov 10, 2020
MarcoFalke locked this on Dec 16, 2021

Contributors

Labels

Linked (view graph)

#17165 Remove BIP70 support