Skip to content

Commit

Permalink
Merge branch '4.6.0_bump' into 'master'
Browse files Browse the repository at this point in the history
Update version in docs from 4.5.1-1 to 4.6.0

See merge request zcash-docs/zcash-docs!281
  • Loading branch information
mdr0id committed Jan 3, 2022
2 parents 4bdfa9e + ad95519 commit 4ac9011
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# The short X.Y version
version = u''
# The full version, including alpha/beta/rc tags
release = u'4.5.1-1'
release = u'4.6.0'

# -- General configuration ---------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion source/rtd_pages/Debian-Ubuntu-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.1-1
git checkout v4.6.0
./zcutil/fetch-params.sh
```

Expand Down
2 changes: 1 addition & 1 deletion source/rtd_pages/Linux-misc-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.1-1
git checkout v4.6.0
./zcutil/fetch-params.sh
```
<!--The message printed by ``git checkout`` about a "detached head" is normal and does not indicate a problem. -->
Expand Down
10 changes: 5 additions & 5 deletions source/rtd_pages/install_binary_tarball.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ Binary Tarball Download & Setup

The Electric Coin Company provides a binary tarball for download.

`Download Tarball for Debian Stretch v4.5.1-1 <https://z.cash/downloads/zcash-4.5.1-1-linux64-debian-stretch.tar.gz>`_
`Download Tarball for Debian Stretch v4.6.0 <https://z.cash/downloads/zcash-4.6.0-linux64-debian-stretch.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 Stretch:

.. code-block:: bash
sha256sum zcash-4.5.1-1-linux64-debian-stretch.tar.gz
sha256sum zcash-4.6.0-linux64-debian-stretch.tar.gz
Result: ``e60079975368754338acb9027af810bcf973c595d3e892b9ffd87b9519fea431``
Result: ``d1801e6a5a39ab8eea772eb22073f84c8fea34bfbf7236d50fe965c4b860f8a1``

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.5.1-1-linux64.tar.gz
tar -xvf zcash-4.6.0-linux64-debian-stretch.tar.gz
mv -t /usr/local/bin/ zcash-4.5.1-1/bin/*
mv -t /usr/local/bin/ zcash-4.6.0/bin/*
Now that Zcash is installed, run this command to download the parameters used to create and verify shielded transactions:

Expand Down
2 changes: 1 addition & 1 deletion source/rtd_pages/macOS-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.1-1
git checkout v4.6.0
./zcutil/fetch-params.sh
```
<!--The message printed by ``git checkout`` about a "detached head" is normal and does not indicate a problem. -->
Expand Down
4 changes: 2 additions & 2 deletions source/rtd_pages/zcashd.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ To upgrade Zcashd & Zcash-cli, fetch the latest updates:
```

Helpful tips:
* Upgrading to v4.5.1-1 requires a build; try the following:
* Upgrading to v4.6.0 requires a build; try the following:
```
git checkout v4.5.1-1
git checkout v4.6.0
./zcutil/clean.sh
./zcutil/build.sh -j$(nproc)
```
Expand Down

0 comments on commit 4ac9011

Please sign in to comment.