diff --git a/edithtml.sh b/edithtml.sh index 6b7f92d7..4420e295 100755 --- a/edithtml.sh +++ b/edithtml.sh @@ -34,6 +34,7 @@ EOF fi sed -i.sedbak 's|||g' "$2" +sed -i.sedbak 's|<\(https:[^&]*\)>|\<\1\>|g' "$2" perl -i.sedbak -p0e 's|
\s*.?\s*([^<]*(?:[^<]*[^<]*)?)|
\3 |g' "$2" diff --git a/zip-0000.html b/zip-0000.html index 05410f1d..3cf7499b 100644 --- a/zip-0000.html +++ b/zip-0000.html @@ -139,6 +139,7 @@ Updates:

While a ZIP is in public discussions (usually during the initial Draft phase), a Discussions-To header will indicate the URL where the ZIP is being discussed. No Discussions-To header is necessary if the ZIP is being discussed privately with the Owner.

The Category header specifies the type of ZIP: Consensus, Standards Track, Informational, or Process.

The Created header records the date that the ZIP was submitted. Dates should be in yyyy-mm-dd format, e.g. 2001-08-14.

+

For ZIPs written in reStructuredText, URLs in header fields SHOULD be surrounded by < >; this ensures that the link is rendered correctly.

Auxiliary Files

ZIPs may include auxiliary files such as diagrams. Auxiliary files should be included in a subdirectory for that ZIP; that is, for any ZIP that requires more than one file, all of the files SHOULD be in a subdirectory named zip-XXXX.

diff --git a/zip-0000.rst b/zip-0000.rst index 5893b83d..fbdd4a8e 100644 --- a/zip-0000.rst +++ b/zip-0000.rst @@ -351,6 +351,9 @@ Informational, or Process. The Created header records the date that the ZIP was submitted. Dates should be in yyyy-mm-dd format, e.g. 2001-08-14. +For ZIPs written in reStructuredText, URLs in header fields SHOULD be +surrounded by ``<`` ``>``; this ensures that the link is rendered correctly. + Auxiliary Files --------------- diff --git a/zip-0032.html b/zip-0032.html index 1634955f..0cbece31 100644 --- a/zip-0032.html +++ b/zip-0032.html @@ -19,7 +19,7 @@ Category: Standards Track Created: 2018-05-22 License: MIT

- \(% This ZIP makes heavy use of mathematical markup. If you can see this, you may want to instead view the rendered version at <https://zips.z.cash/zip-0032>.\) + \(% This ZIP makes heavy use of mathematical markup. If you can see this, you may want to instead view the rendered version at https://zips.z.cash/zip-0032 .\)

Terminology

The key words "MUST", "MUST NOT", and "MAY" in this document are to be interpreted as described in RFC 2119. 1

diff --git a/zip-0032.rst b/zip-0032.rst index 5628f3b0..1a47e45c 100644 --- a/zip-0032.rst +++ b/zip-0032.rst @@ -12,7 +12,7 @@ Created: 2018-05-22 License: MIT -:math:`% This ZIP makes heavy use of mathematical markup. If you can see this, you may want to instead view the rendered version at .` +:math:`% This ZIP makes heavy use of mathematical markup. If you can see this, you may want to instead view the rendered version at https://zips.z.cash/zip-0032 .` Terminology =========== diff --git a/zip-0214.html b/zip-0214.html index 266fd41c..4d1f44b8 100644 --- a/zip-0214.html +++ b/zip-0214.html @@ -13,7 +13,7 @@ Status: Implemented (zcashd) Category: Consensus Created: 2020-02-28 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/community-sentiment-polling-results-nu4-and-draft-zip-1014/35560> +Discussions-To: <https://forum.zcashcommunity.com/t/community-sentiment-polling-results-nu4-and-draft-zip-1014/35560>

Terminology

The key words "MUST", "SHALL", "SHOULD", and "MAY" in this document are to be interpreted as described in RFC 2119. 1

The term "Zcash" in this document is to be interpreted as described in the Zcash Trademark Donation and License Agreement (6 or successor agreement).

diff --git a/zip-1001.html b/zip-1001.html index c0746d91..c491875b 100644 --- a/zip-1001.html +++ b/zip-1001.html @@ -12,8 +12,8 @@ Owner: mistfpga (zcash forums) <steve@mistfpga.net> Status: Obsolete Category: Consensus Created: 2019-08-01 -License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> -Discussions-To: <https://forum.zcashcommunity.com/t/zip-proposal-keep-the-block-distribution-as-initaly-defined-90-to-miners/33843> +License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> +Discussions-To: <https://forum.zcashcommunity.com/t/zip-proposal-keep-the-block-distribution-as-initaly-defined-90-to-miners/33843>

Terminology

The key words "MUST", "MUST NOT", "SHOULD", and "SHOULD NOT" in this document are to be interpreted as described in RFC 2119. 2

For clarity this ZIP defines these terms:

diff --git a/zip-1002.html b/zip-1002.html index 401fbd00..db1c0b93 100644 --- a/zip-1002.html +++ b/zip-1002.html @@ -12,8 +12,8 @@ Owner: mistfpga (zcash forums) <steve@mistfpga.net> Status: Obsolete Category: Standards Track Created: 2019-07-17 -License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> -Discussions-To: <https://forum.zcashcommunity.com/t/zip-proposal-a-genuine-opt-in-protocol-level-development-donation-option/33846> +License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> +Discussions-To: <https://forum.zcashcommunity.com/t/zip-proposal-a-genuine-opt-in-protocol-level-development-donation-option/33846>

Terminology

The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", and "MAY" in this document are to be interpreted as described in RFC 2119. 3

This ZIP defines these terms:

diff --git a/zip-1003.html b/zip-1003.html index 2a53d1de..d4630176 100644 --- a/zip-1003.html +++ b/zip-1003.html @@ -13,7 +13,7 @@ Status: Obsolete Category: Consensus / Process Created: 2019-06-19 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-20-split-between-the-ecc-and-the-foundation/33862> +Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-20-split-between-the-ecc-and-the-foundation/33862>

Terminology

The key words "MUST", "MUST NOT", "SHOULD", and "SHOULD NOT" in this document are to be interpreted as described in RFC 2119. 1

For clarity in this ZIP I define these terms:

diff --git a/zip-1004.html b/zip-1004.html index 55aa9a03..e5b18c90 100644 --- a/zip-1004.html +++ b/zip-1004.html @@ -13,7 +13,7 @@ Status: Obsolete Category: Consensus Created: 2019-06-19 License: public domain -Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-miner-directed-dev-fund-was-20-to-any-combination-of-ecc-zfnd-parity-or-burn/33864> +Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-miner-directed-dev-fund-was-20-to-any-combination-of-ecc-zfnd-parity-or-burn/33864>

Terminology

The key words "MUST", "SHOULD", and "MAY" in this document are to be interpreted as described in RFC 2119. 1

For clarity, this ZIP defines these terms:

diff --git a/zip-1005.html b/zip-1005.html index 54c30e35..3feb809b 100644 --- a/zip-1005.html +++ b/zip-1005.html @@ -13,7 +13,7 @@ Status: Obsolete Category: Consensus Created: 2019-06-23 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/zip-proposal-zcfs-zcash-community-funding-system/33898> +Discussions-To: <https://forum.zcashcommunity.com/t/zip-proposal-zcfs-zcash-community-funding-system/33898>

Abstract

This proposal introduces a new funding mechanism called the Zcash Community Funding System (ZCFS).

diff --git a/zip-1006.html b/zip-1006.html index b08747ba..19a0cb02 100644 --- a/zip-1006.html +++ b/zip-1006.html @@ -16,7 +16,7 @@ Status: Obsolete Category: Consensus / Process Created: 2019-08-31 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/blocktown-development-fund-proposal-10-to-a-2-of-3-multisig-with-community-involved-third-entity/34782> +Discussions-To: <https://forum.zcashcommunity.com/t/blocktown-development-fund-proposal-10-to-a-2-of-3-multisig-with-community-involved-third-entity/34782>

Terminology

The key words “MUST”, “SHOULD”, “SHOULD NOT”, and “MAY” in this document are to be interpreted as described in RFC 2119. 1

The additional terms below are to be interpreted as follows:

diff --git a/zip-1007.html b/zip-1007.html index c8ee1045..553ada4b 100644 --- a/zip-1007.html +++ b/zip-1007.html @@ -13,8 +13,8 @@ Owners: @lex-node (zcash forums) Status: Obsolete Category: Process Created: 2019-08-24 -License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> -Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-supplemental-proposal-enforce-devfund-commitments-with-legal-charter/34709> +License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> +Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-supplemental-proposal-enforce-devfund-commitments-with-legal-charter/34709>

Terminology

The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", and "MAY" in this document are to be interpreted as described in RFC 2119. 1

For clarity this ZIP defines these terms:

diff --git a/zip-1008.html b/zip-1008.html index 2c1c35a3..4e623a01 100644 --- a/zip-1008.html +++ b/zip-1008.html @@ -13,8 +13,8 @@ Owners: @kek (zcash forums) Status: Obsolete Category: Consensus Created: 2019-09-02 -License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> -Discussions-To: <https://forum.zcashcommunity.com/t/kek-s-proposal-fund-ecc-for-2-more-years/34778> +License: CC BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/> +Discussions-To: <https://forum.zcashcommunity.com/t/kek-s-proposal-fund-ecc-for-2-more-years/34778>

Terminology

The key words "MUST" and "MUST NOT" in this document are to be interpreted as described in RFC 2119. 2

For clarity this ZIP defines these terms:

@@ -48,7 +48,7 @@ Discussions-To: <https://forum.zcashcommunity.com/t/kek-s-proposal-fund-ecc-f
  • The ECC's portion of block subsidy MUST be 20%, until a block height corresponding to two years after the first halving, i.e. until October 2022.
  • A to-be-specified fraction of ECC's portion SHOULD be used to fund the Zcash Foundation.
    • -

    A previous version of this ZIP stated the following requirements: "The ECC's portion of block subsidy MUST be capped at their projected 1.1m USD costs a month." and "The ECC's portion of block subsidy MUST NOT be greater than 10% of total block subsidy of any one block." These requirements were mistakenly introduced in the process of ZIP editing; they do not reflect the intent of the original author @kek. They are also inconsistent with the summary that was posted in the Community Sentiment Collection Poll blog post at <https://www.zfnd.org/blog/community-sentiment-collection-poll/>, which stated an ECC percentage of 20%. Votes on the Community Sentiment Collection Poll, the Community Advisory Panel Helios poll, and/or the stake-weighted petition reported at <https://forum.zcashcommunity.com/t/staked-poll-on-zcash-dev-fund-debate/34846/71>, should be interpreted with care in light of this ambiguity. Also note that the 1.1m USD cap could not in any case be specified as a consensus rule since there is no on-chain oracle for the USD price.

    +

    A previous version of this ZIP stated the following requirements: "The ECC's portion of block subsidy MUST be capped at their projected 1.1m USD costs a month." and "The ECC's portion of block subsidy MUST NOT be greater than 10% of total block subsidy of any one block." These requirements were mistakenly introduced in the process of ZIP editing; they do not reflect the intent of the original author @kek. They are also inconsistent with the summary that was posted in the Community Sentiment Collection Poll blog post at <https://www.zfnd.org/blog/community-sentiment-collection-poll/>, which stated an ECC percentage of 20%. Votes on the Community Sentiment Collection Poll, the Community Advisory Panel Helios poll, and/or the stake-weighted petition reported at <https://forum.zcashcommunity.com/t/staked-poll-on-zcash-dev-fund-debate/34846/71>, should be interpreted with care in light of this ambiguity. Also note that the 1.1m USD cap could not in any case be specified as a consensus rule since there is no on-chain oracle for the USD price.

    Rationale

    Provisions that referred to specific block heights have been revised since they were inconsistent with the change in block target spacing 4 that will occur with the Blossom Network Upgrade 3; and even if recalculated, fixed block heights would potentially be inconsistent with future changes in target block spacing.

    diff --git a/zip-1009.html b/zip-1009.html index a70f450a..702d2da2 100644 --- a/zip-1009.html +++ b/zip-1009.html @@ -13,7 +13,7 @@ Status: Obsolete Category: Process Created: 2019-08-28 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-5-entity-strategic-council-approach/34801> +Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-5-entity-strategic-council-approach/34801>

    Terminology

    Key terms

    diff --git a/zip-1010.html b/zip-1010.html index 93280acb..ba6b2c22 100644 --- a/zip-1010.html +++ b/zip-1010.html @@ -19,7 +19,7 @@ Status: Obsolete Category: Consensus Created: 2019-08-31 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/a-grand-compromise-synthesis-zip-proposal/34812/> +Discussions-To: <https://forum.zcashcommunity.com/t/a-grand-compromise-synthesis-zip-proposal/34812/>

    Terminology

    The key words "MUST", "MUST NOT", "SHOULD", and "SHOULD NOT" in this document are to be interpreted as described in RFC 2119. 1

    The term "network upgrade" in this document is to be interpreted as described in ZIP 200. 2

    diff --git a/zip-1011.html b/zip-1011.html index e25c7b8c..9daecb8d 100644 --- a/zip-1011.html +++ b/zip-1011.html @@ -14,7 +14,7 @@ Status: Obsolete Category: Process Created: 2019-09-27 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/decentralizing-the-dev-fee/35252> +Discussions-To: <https://forum.zcashcommunity.com/t/decentralizing-the-dev-fee/35252>

    Abstract

    This proposal describes a structure for Zcash governance, including funding and managing new Zcash development, decentralizing those development efforts, and resolving governance hangups between the Zcash Foundation and the Electric Coin Company.

    These goals are accomplished via a 20% dev fee, enacted in NU4 and continuing for one halving period. This fee will fund a diverse group of development teams to ensure Zcash maintains best-in-class research and engineering talent while growing a robust ecosystem, funding the Zcash Foundation with 25% of the dev fee, and a newly established principal developer role with 35% of the dev fee.

    diff --git a/zip-1012.html b/zip-1012.html index 5a6ae261..ffb6251d 100644 --- a/zip-1012.html +++ b/zip-1012.html @@ -13,7 +13,7 @@ Status: Obsolete Category: Consensus / Process Created: 2019-11-10 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-dev-fund-to-ecc-zfnd-major-grants/35364> +Discussions-To: <https://forum.zcashcommunity.com/t/dev-fund-proposal-dev-fund-to-ecc-zfnd-major-grants/35364>

    Abstract

    This proposal describes a structure for a the Zcash Development Fund, to be enacted in Network Upgrade 4 and last for 4 years. This Dev Fund would consist of 20% of the block rewards, split into 3 slices:

      diff --git a/zip-1013.html b/zip-1013.html index 97a74c64..b36add85 100644 --- a/zip-1013.html +++ b/zip-1013.html @@ -13,7 +13,7 @@ Status: Obsolete Category: Consensus / Process Created: 2019-11-14 License: Public Domain -Discussions-To: <https://forum.zcashcommunity.com/t/zip-keep-it-simple-zcashers-kisz-10-to-ecc-10-to-zfnd/35425> +Discussions-To: <https://forum.zcashcommunity.com/t/zip-keep-it-simple-zcashers-kisz-10-to-ecc-10-to-zfnd/35425>

      Terminology

      The key words "MUST" and "SHOULD" in this document are to be interpreted as described in RFC 2119. 1

      The terms below are to be interpreted as follows:

      diff --git a/zip-1014.html b/zip-1014.html index 7fee838b..35181f1f 100644 --- a/zip-1014.html +++ b/zip-1014.html @@ -20,7 +20,7 @@ Status: Active Category: Consensus / Process Created: 2019-11-10 License: MIT -Discussions-To: <https://forum.zcashcommunity.com/t/community-sentiment-polling-results-nu4-and-draft-zip-1014/35560> +Discussions-To: <https://forum.zcashcommunity.com/t/community-sentiment-polling-results-nu4-and-draft-zip-1014/35560>

      Terminology

      The key words "MUST", "MUST NOT", "SHALL", "SHALL NOT", "SHOULD", and "MAY" in this document are to be interpreted as described in RFC 2119. 1

      The term "network upgrade" in this document is to be interpreted as described in ZIP 200 5 and the Zcash Trademark Donation and License Agreement (3 or successor agreement).