Merge branch 'v4.6.0-2' into 'master'

update docs to remove stretch & bump v4.6.0-2 See merge request zcash-docs/zcash-docs!288
Electric-Coin-Company · Apr 5, 2022 · bf9ff09 · bf9ff09
2 parents 8b77d25 + 1431cab
commit bf9ff09
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 24 deletions.
diff --git a/source/rtd_pages/Debian-Ubuntu-build.md b/source/rtd_pages/Debian-Ubuntu-build.md
@@ -30,7 +30,7 @@ There are multiple ways to download dependencies and build Zcashd & Zcash-cli. W
     ```
      git clone https://github.com/zcash/zcash.git
      cd zcash/
-     git checkout v4.6.0-1
+     git checkout v4.6.0-2
      ./zcutil/fetch-params.sh
     ```
 

diff --git a/source/rtd_pages/Linux-misc-build.md b/source/rtd_pages/Linux-misc-build.md
@@ -41,7 +41,7 @@ Currently, the only way to install Zcashd & Zcash-cli on Linux is to build from
     ```
      git clone https://github.com/zcash/zcash.git
      cd zcash/
-     git checkout v4.6.0-1
+     git checkout v4.6.0-2
      ./zcutil/fetch-params.sh
      ```
      <!--The message printed by ``git checkout`` about a "detached head" is normal and does not indicate a problem. --> 

diff --git a/source/rtd_pages/install_binary_tarball.rst b/source/rtd_pages/install_binary_tarball.rst
@@ -7,39 +7,29 @@ Binary Tarball Download & Setup
 
 The Electric Coin Company provides a binary tarball for download.
 
-`Download Tarball for Debian Stretch v4.6.0-1 <https://z.cash/downloads/zcash-4.6.0-1-linux64-debian-stretch.tar.gz>`_
+As of v4.6.0-2, we are no longer supporting Debian 9(Stretch) packages in apt.
 
-After downloading but before extracting, verify that the checksum of the tarball matches the hash below for the version of the binary you downloaded:
-
-Debian Stretch:
-
-.. code-block:: bash
-
-   sha256sum zcash-4.6.0-1-linux64-debian-stretch.tar.gz
-
-Result: ``1f8c918244f72ae67ecfd688d640d57b146b6e50292c243f46175e4697a8ecb3``
-
-`Download Tarball for Debian Buster v4.6.0-1 <https://z.cash/downloads/zcash-4.6.0-1-linux64-debian-buster.tar.gz>`_
+`Download Tarball for Debian Buster v4.6.0-2 <https://z.cash/downloads/zcash-4.6.0-2-linux64-debian-buster.tar.gz>`_
 
 After downloading but before extracting, verify that the checksum of the tarball matches the hash below for the version of the binary you downloaded:
 
 Debian Buster:
 
 .. code-block:: bash
 
-   sha256sum zcash-4.6.0-1-linux64-debian-buster.tar.gz
+   sha256sum zcash-4.6.0-2-linux64-debian-buster.tar.gz
 
-Result: ``9de9c71cf837900175ff7889ceb84fcea6e854e6d739fb6aa3c9d12d5a128dc7``
+Result: ``9e18ded3b25cbc38f8189a7d276d2fefbeb122f1ac4d578404bbdf960c1b16e2``
 
 This checksum was generated from our gitian deterministic build process. `View all gitian signatures <https://github.com/zcash/gitian.sigs/tree/master>`_.
 
 Once you've verified that it matches, extract the files and move the binaries into your executables $PATH: 
 
 .. code-block:: bash
 
-    tar -xvf zcash-4.6.0-linux64-debian-stretch.tar.gz
+    tar -xvf zcash-4.6.0-2-linux64-debian-buster.tar.gz
 
-    mv -t /usr/local/bin/ zcash-4.6.0/bin/*
+    mv -t /usr/local/bin/ zcash-4.6.0-2/bin/*
 
 Now that Zcash is installed, run this command to download the parameters used to create and verify shielded transactions:
 

diff --git a/source/rtd_pages/install_debian_bin_packages.rst b/source/rtd_pages/install_debian_bin_packages.rst
@@ -27,7 +27,7 @@ Add the repository to your sources:
 
 .. code-block:: bash
 
-   echo "deb [arch=amd64] https://apt.z.cash/ stretch main" | sudo tee /etc/apt/sources.list.d/zcash.list
+   echo "deb [arch=amd64] https://apt.z.cash/ buster main" | sudo tee /etc/apt/sources.list.d/zcash.list
 
 Update the cache of sources and install Zcash:
 
@@ -153,7 +153,7 @@ Re-get the apt info:
 
 .. code-block:: bash
 
-    echo "deb [arch=amd64] https://apt.z.cash/ stretch main" | sudo tee /etc/apt/sources.list.d/zcash.list
+    echo "deb [arch=amd64] https://apt.z.cash/ buster main" | sudo tee /etc/apt/sources.list.d/zcash.list
 
 Then update the list again:
 

diff --git a/source/rtd_pages/macOS-build.md b/source/rtd_pages/macOS-build.md
@@ -34,7 +34,7 @@ Currently, the only way to install Zcashd & Zcash-cli on macOS is to build from
     ```
      git clone https://github.com/zcash/zcash.git
      cd zcash/
-     git checkout v4.6.0-1
+     git checkout v4.6.0-2
      ./zcutil/fetch-params.sh
      ```
      <!--The message printed by ``git checkout`` about a "detached head" is normal and does not indicate a problem. --> 

diff --git a/source/rtd_pages/raspi-build.md b/source/rtd_pages/raspi-build.md
@@ -55,7 +55,7 @@ The first step is to prepare the prequisite software for the zcashd compile.
     ```
     git clone https://github.com/zcash/zcash.git
     cd zcash/
-    git checkout v4.6.0-1
+    git checkout v4.6.0-2
     ./zcutil/fetch-params.sh
     ```
 

diff --git a/source/rtd_pages/zcashd.md b/source/rtd_pages/zcashd.md
@@ -76,9 +76,9 @@ To upgrade Zcashd & Zcash-cli, fetch the latest updates:
   ```
 
 Helpful tips: 
-* Upgrading to v4.6.0-1 requires a build; try the following: 
+* Upgrading to v4.6.0-2 requires a build; try the following: 
   ```
-  git checkout v4.6.0-1
+  git checkout v4.6.0-2
    ./zcutil/clean.sh
    ./zcutil/build.sh -j$(nproc)
   ```