Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp
This commit is contained in:
jl777
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions

View File

@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH ZCASH-CLI "1" "March 2017" "zcash-cli v1.0.8" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "February 2018" "zcash-cli v1.0.15" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v1.0.8
zcash-cli \- manual page for zcash-cli v1.0.15
.SH DESCRIPTION
Zcash RPC client version v1.0.8
Zcash RPC client version v1.0.15
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
please see <https://z.cash/support/security/>.
.SS "Usage:"
.TP
zcash\-cli [options] <command> [params]
@@ -66,6 +66,10 @@ Password for JSON\-RPC connections
Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
900)
.SH COPYRIGHT
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Copyright (C) 2009-2017 The Bitcoin Core Developers
Copyright (C) 2015-2017 The Zcash Developers
@@ -76,4 +80,4 @@ or <http://www.opensource.org/licenses/mit-license.php>.
This product includes software developed by the OpenSSL Project for use in the
OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
by Eric Young and UPnP software written by Thomas Bernard.
by Eric Young.