zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Say that Canopy activated. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2021-04-05 20:30:33 +01:00
parent db3b2f72d4
commit e4cc1f7f82
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -42,8 +42,8 @@ and double-check the generated ``draft-*.html`` file before filing a Pull Reques
Canopy ZIPs
-----------
This is the list of ZIPs included in Canopy (Network Upgrade 4), due to activate on
mainnet in mid-November 2020:
This is the list of ZIPs that were included in `Canopy (Network Upgrade 4) <https://z.cash/upgrade/canopy/>`_,
which activated on mainnet on November 18, 2020.
- `ZIP 207: Funding Streams <zip-0207.rst>`__
- `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool <zip-0211.rst>`__

4
README.template
View File

@ -42,8 +42,8 @@ and double-check the generated ``draft-*.html`` file before filing a Pull Reques
Canopy ZIPs
-----------
This is the list of ZIPs included in Canopy (Network Upgrade 4), due to activate on
mainnet in mid-November 2020:
This is the list of ZIPs that were included in `Canopy (Network Upgrade 4) <https://z.cash/upgrade/canopy/>`_,
which activated on mainnet on November 18, 2020.
- `ZIP 207: Funding Streams <zip-0207.rst>`__
- `ZIP 211: Disabling Addition of New Value to the Sprout Value Pool <zip-0211.rst>`__

2
index.html
View File

@ -25,7 +25,7 @@
<p>For example, if using reStructuredText, use a filename matching <code>draft-*.rst</code>. Use <code>make</code> to check that you are using correct <a href="https://docutils.sourceforge.io/rst.html">reStructuredText</a> or <a href="https://pandoc.org/MANUAL.html#pandocs-markdown">Markdown</a> syntax, and double-check the generated <code>draft-*.html</code> file before filing a Pull Request.</p>
</section>
<section id="canopy-zips"><h2><span class="section-heading">Canopy ZIPs</span><span class="section-anchor"> <a rel="bookmark" href="#canopy-zips"><img width="24" height="24" src="assets/images/section-anchor.png" alt=""></a></span></h2>
<p>This is the list of ZIPs included in Canopy (Network Upgrade 4), due to activate on mainnet in mid-November 2020:</p>
<p>This is the list of ZIPs that were included in <a href="https://z.cash/upgrade/canopy/">Canopy (Network Upgrade 4)</a>, which activated on mainnet on November 18, 2020.</p>
<ul>
<li><a href="zip-0207">ZIP 207: Funding Streams</a></li>
<li><a href="zip-0211">ZIP 211: Disabling Addition of New Value to the Sprout Value Pool</a></li>