Merge branch 'update-09-14-2020' into 'master'

Funding clarification and updates to EOS statement See merge request zcash-docs/zcash-docs!211
Electric-Coin-Company · Sep 17, 2020 · 297b1eb · 297b1eb
2 parents b369cac + f7ef6ae
commit 297b1eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/rtd_pages/funding.md b/source/rtd_pages/funding.md
@@ -2,7 +2,7 @@
 
 We're building a decentralized collaborative community around Zcash, and paying contributors helps strengthen the project (even if they are not part of the two Zcash official entities). 
 
-Currently, we're using ZF Grants to fund community contributions. After the Canopy upgrade in Nov 2020, we'll be moving to the Major Grants system. 
+Currently, ZF Grants are used to fund community contributions. After the Canopy upgrade in Nov 2020, additional funds will be available via the Major Grants system.
 
 ## ZF Grants 
 

diff --git a/source/rtd_pages/zcashd.md b/source/rtd_pages/zcashd.md
@@ -60,7 +60,7 @@ If you're running Zcashd for development, configure Zcashd to run on testnet, wh
 <!--If you're on a Debian-based distribution, you can follow the :ref:`install-debian-bin-packages-guide` to install Zcash on your system. --> 
 If you use zcashd but have not upgraded within 16 weeks of a release, it will reach the end-of-support (EOS) halt and exit with an error message. See the [release cycle](https://z.cash/support/schedule/) for details. 
 
-The node gives a warning two weeks in advance if you have the metrics screen enabled. A getinfo and getdeprecationinfo rpc call will also return the date at which the node will halt. 
+The node gives a warning two weeks in advance if you have the metrics screen enabled (and if there are no other overriding errors). A getdeprecationinfo RPC call will also return the block height at which the node will halt.
 
 To upgrade Zcashd & Zcash-cli, fetch the latest updates:
   ```