Permalink
Browse files

Merge remote-tracking branch 'origin/master' into 0.14

  • Loading branch information...
shaolinfry committed Jul 25, 2017
2 parents a75355e + 40ccbc4 commit 7299f6dfa8485bab5ed17e56e4d59c09fb8c8793
@@ -130,7 +130,7 @@ pull requests which attempt to do too much, are overly large, or overly complex
as this makes review difficult.
###Features
### Features
When adding a new feature, thought must be given to the long term technical debt
and maintenance that feature may require after inclusion. Before proposing a new
@@ -139,7 +139,7 @@ maintain it (including bug fixing). If features get orphaned with no maintainer
in the future, they may be removed by the Repository Maintainer.
###Refactoring
### Refactoring
Refactoring is a necessary part of any software project's evolution. The
following guidelines cover refactoring pull requests for the project.
@@ -187,7 +187,7 @@ other kinds of patches because of increased peer review and consensus building
requirements.
###Peer Review
### Peer Review
Anyone may participate in peer review which is expressed by comments in the pull
request. Typically reviewers will review the code for obvious errors, as well as
@@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
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
L3GQhtqZb+1qxg==
=/Urh
-----END PGP PUBLIC KEY BLOCK-----
@@ -1,13 +1,13 @@
dist_man1_MANS=
if BUILD_BITCOIND
dist_man1_MANS+=bitcoind.1
dist_man1_MANS+=litecoind.1
endif
if ENABLE_QT
dist_man1_MANS+=bitcoin-qt.1
dist_man1_MANS+=litecoin-qt.1
endif
if BUILD_BITCOIN_UTILS
dist_man1_MANS+=bitcoin-cli.1 bitcoin-tx.1
dist_man1_MANS+=litecoin-cli.1 litecoin-tx.1
endif
@@ -1,17 +1,17 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH BITCOIN-CLI "1" "June 2017" "bitcoin-cli v0.14.2.0" "User Commands"
.TH LITECOIN-CLI "1" "June 2017" "litecoin-cli v0.14.2.0" "User Commands"
.SH NAME
bitcoin-cli \- manual page for bitcoin-cli v0.14.2.0
litecoin-cli \- manual page for litecoin-cli v0.14.2.0
.SH DESCRIPTION
Bitcoin Core RPC client version v0.14.2.0
Litecoin Core RPC client version v0.14.2.0
.SS "Usage:"
.TP
bitcoin\-cli [options] <command> [params]
Send command to Bitcoin Core
litecoin\-cli [options] <command> [params]
Send command to Litecoin Core
.IP
bitcoin\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Bitcoin Core (with named arguments)
bitcoin\-cli [options] help List commands
bitcoin\-cli [options] help <command> Get help for a command
litecoin\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Litecoin Core (with named arguments)
litecoin\-cli [options] help List commands
litecoin\-cli [options] help <command> Get help for a command
.SH OPTIONS
.HP
\-?
@@ -20,7 +20,7 @@ This help message
.HP
\fB\-conf=\fR<file>
.IP
Specify configuration file (default: bitcoin.conf)
Specify configuration file (default: litecoin.conf)
.HP
\fB\-datadir=\fR<dir>
.IP
@@ -48,7 +48,7 @@ Send commands to node running on <ip> (default: 127.0.0.1)
.HP
\fB\-rpcport=\fR<port>
.IP
Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332)
Connect to JSON\-RPC on <port> (default: 9332 or testnet: 19332)
.HP
\fB\-rpcwait\fR
.IP
@@ -72,10 +72,11 @@ Read extra arguments from standard input, one per line until EOF/Ctrl\-D
(recommended for sensitive information such as passphrases)
.SH COPYRIGHT
Copyright (C) 2009-2017 The Bitcoin Core developers
Copyright (C) 2011-2017 The Litecoin Core developers
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.
Please contribute if you find Litecoin Core useful. Visit
<https://litecoin.org> for further information about the software.
The source code is available from <https://github.com/litecoin-project/litecoin>.
This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH BITCOIN-QT "1" "June 2017" "bitcoin-qt v0.14.2.0" "User Commands"
.TH LITECOIN-QT "1" "June 2017" "litecoin-qt v0.14.2.0" "User Commands"
.SH NAME
bitcoin-qt \- manual page for bitcoin-qt v0.14.2.0
litecoin-qt \- manual page for litecoin-qt v0.14.2.0
.SH DESCRIPTION
Bitcoin Core version v0.14.2.0 (64\-bit)
Litecoin Core version v0.14.2.0 (64\-bit)
Usage:
.IP
bitcoin\-qt [command\-line options]
litecoin\-qt [command\-line options]
.SH OPTIONS
.HP
\-?
@@ -32,13 +32,13 @@ block hash)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
00000000000000000013176bf8d7dfeab4e1db31dc93bc311b436e82ab226b90,
1673fa904a93848eca83d5ca82c7af974511a7e640e22edc2976420744f2e56a,
testnet:
00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc)
43a16a626ef2ffdbe928f2bc26dcd5475c6a1a04f9542dfc6a0a88e5fcf9bd4c)
.HP
\fB\-conf=\fR<file>
.IP
Specify configuration file (default: bitcoin.conf)
Specify configuration file (default: litecoin.conf)
.HP
\fB\-datadir=\fR<dir>
.IP
@@ -58,7 +58,7 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
.HP
\fB\-maxmempool=\fR<n>
.IP
Keep the transaction memory pool below <n> megabytes (default: 300)
Keep the transaction memory pool below <n> megabytes (default: 5)
.HP
\fB\-mempoolexpiry=\fR<n>
.IP
@@ -77,7 +77,7 @@ leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
.IP
Specify pid file (default: bitcoind.pid)
Specify pid file (default: litecoind.pid)
.HP
\fB\-prune=\fR<n>
.IP
@@ -280,17 +280,17 @@ Set key pool size to <n> (default: 100)
.HP
\fB\-fallbackfee=\fR<amt>
.IP
A fee rate (in BTC/kB) that will be used when fee estimation has
insufficient data (default: 0.0002)
A fee rate (in LTC/kB) that will be used when fee estimation has
insufficient data (default: 0.002)
.HP
\fB\-mintxfee=\fR<amt>
.IP
Fees (in BTC/kB) smaller than this are considered zero fee for
transaction creation (default: 0.00001)
Fees (in LTC/kB) smaller than this are considered zero fee for
transaction creation (default: 0.001)
.HP
\fB\-paytxfee=\fR<amt>
.IP
Fee (in BTC/kB) to add to transactions you send (default: 0.00)
Fee (in LTC/kB) to add to transactions you send (default: 0.00)
.HP
\fB\-rescan\fR
.IP
@@ -389,12 +389,12 @@ Prepend debug output with timestamp (default: 1)
.HP
\fB\-minrelaytxfee=\fR<amt>
.IP
Fees (in BTC/kB) smaller than this are considered zero fee for relaying,
mining and transaction creation (default: 0.00001)
Fees (in LTC/kB) smaller than this are considered zero fee for relaying,
mining and transaction creation (default: 0.001)
.HP
\fB\-maxtxfee=\fR<amt>
.IP
Maximum total fees (in BTC) to use in a single wallet transaction or raw
Maximum total fees (in LTC) to use in a single wallet transaction or raw
transaction; setting this too low may abort large transactions
(default: 0.10)
.HP
@@ -449,7 +449,7 @@ Set maximum size of high\-priority/low\-fee transactions in bytes
.HP
\fB\-blockmintxfee=\fR<amt>
.IP
Set lowest fee rate (in BTC/kB) for transactions to be included in block
Set lowest fee rate (in LTC/kB) for transactions to be included in block
creation. (default: 0.00001)
.PP
RPC server options:
@@ -491,8 +491,8 @@ option can be specified multiple times
.HP
\fB\-rpcport=\fR<port>
.IP
Listen for JSON\-RPC connections on <port> (default: 8332 or testnet:
18332)
Listen for JSON\-RPC connections on <port> (default: 9332 or testnet:
19332)
.HP
\fB\-rpcallowip=\fR<ip>
.IP
@@ -532,10 +532,11 @@ Show splash screen on startup (default: 1)
Reset all settings changed in the GUI
.SH COPYRIGHT
Copyright (C) 2009-2017 The Bitcoin Core developers
Copyright (C) 2011-2017 The Litecoin Core developers
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.
Please contribute if you find Litecoin Core useful. Visit
<https://litecoin.org> for further information about the software.
The source code is available from <https://github.com/litecoin-project/litecoin>.
This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
@@ -1,16 +1,16 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH BITCOIN-TX "1" "June 2017" "bitcoin-tx v0.14.2.0" "User Commands"
.TH LITECOIN-TX "1" "June 2017" "litecoin-tx v0.14.2.0" "User Commands"
.SH NAME
bitcoin-tx \- manual page for bitcoin-tx v0.14.2.0
litecoin-tx \- manual page for litecoin-tx v0.14.2.0
.SH DESCRIPTION
Bitcoin Core bitcoin\-tx utility version v0.14.2.0
Litecoin Core litecoin\-tx utility version v0.14.2.0
.SS "Usage:"
.TP
bitcoin\-tx [options] <hex\-tx> [commands]
Update hex\-encoded bitcoin transaction
litecoin\-tx [options] <hex\-tx> [commands]
Update hex\-encoded litecoin transaction
.TP
bitcoin\-tx [options] \fB\-create\fR [commands]
Create hex\-encoded bitcoin transaction
litecoin\-tx [options] \fB\-create\fR [commands]
Create hex\-encoded litecoin transaction
.SH OPTIONS
.HP
\-?
@@ -108,10 +108,11 @@ set=NAME:JSON\-STRING
Set register NAME to given JSON\-STRING
.SH COPYRIGHT
Copyright (C) 2009-2017 The Bitcoin Core developers
Copyright (C) 2011-2017 The Litecoin Core developers
Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.
Please contribute if you find Litecoin Core useful. Visit
<https://litecoin.org> for further information about the software.
The source code is available from <https://github.com/litecoin-project/litecoin>.
This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Oops, something went wrong.

0 comments on commit 7299f6d

Please sign in to comment.