Skip to content

Commit e756eca

Browse files
author
MarcoFalke
committed
Merge #15054: Update copyright headers to 2018
1a49a0e Bump manpages (DrahtBot) 06ba779 Update copyright headers to 2018 (DrahtBot) Pull request description: * `./contrib/devtools/copyright_header.py update ./` * `./contrib/devtools/gen-manpages.sh` Tree-SHA512: ca0dc5e97f4c33814d4ccd17769bbf2d23a99a71d62534fe1064fedfe47de3b5c30caf9b6deb0d70bf125e08c7ae6335ac4fcded918049d6b63b13b319d798e3
2 parents cc07f9c + 1a49a0e commit e756eca

File tree

16 files changed

+117
-106
lines changed

16 files changed

+117
-106
lines changed

contrib/macdeploy/custom_dsstore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2013-2017 The Bitcoin Core developers
2+
# Copyright (c) 2013-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
import biplist

doc/man/bitcoin-cli.1

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
2-
.TH BITCOIN-CLI "1" "July 2018" "bitcoin-cli v0.16.99.0" "User Commands"
2+
.TH BITCOIN-CLI "1" "December 2018" "bitcoin-cli v0.17.99.0" "User Commands"
33
.SH NAME
4-
bitcoin-cli \- manual page for bitcoin-cli v0.16.99.0
4+
bitcoin-cli \- manual page for bitcoin-cli v0.17.99.0
5+
.SH SYNOPSIS
6+
.B bitcoin-cli
7+
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
8+
.br
9+
.B bitcoin-cli
10+
[\fI\,options\/\fR] \fI\,-named <command> \/\fR[\fI\,name=value\/\fR]... \fI\,Send command to Bitcoin Core (with named arguments)\/\fR
11+
.br
12+
.B bitcoin-cli
13+
[\fI\,options\/\fR] \fI\,help List commands\/\fR
14+
.br
15+
.B bitcoin-cli
16+
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
517
.SH DESCRIPTION
6-
Bitcoin Core RPC client version v0.16.99.0
7-
.SS "Usage:"
8-
.TP
9-
bitcoin\-cli [options] <command> [params]
10-
Send command to Bitcoin Core
11-
.IP
12-
bitcoin\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Bitcoin Core (with named arguments)
13-
bitcoin\-cli [options] help List commands
14-
bitcoin\-cli [options] help <command> Get help for a command
18+
Bitcoin Core RPC client version v0.17.99.0
1519
.SH OPTIONS
1620
.HP
1721
\-?
@@ -59,7 +63,8 @@ Password for JSON\-RPC connections
5963
.HP
6064
\fB\-rpcport=\fR<port>
6165
.IP
62-
Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332)
66+
Connect to JSON\-RPC on <port> (default: 8332, testnet: 18332, regtest:
67+
18443)
6368
.HP
6469
\fB\-rpcuser=\fR<user>
6570
.IP
@@ -72,20 +77,20 @@ Wait for RPC server to start
7277
\fB\-rpcwallet=\fR<walletname>
7378
.IP
7479
Send RPC for non\-default wallet on RPC server (needs to exactly match
75-
corresponding \fB\-wallet\fR option passed to bitcoind)
80+
corresponding \fB\-wallet\fR option passed to bitcoind). This changes
81+
the RPC endpoint used, e.g.
82+
http://127.0.0.1:8332/wallet/<walletname>
7683
.HP
7784
\fB\-stdin\fR
7885
.IP
7986
Read extra arguments from standard input, one per line until EOF/Ctrl\-D
80-
(recommended for sensitive information such as passphrases).
81-
When combined with \fB\-stdinrpcpass\fR, the first line from standard
82-
input is used for the RPC password.
87+
(recommended for sensitive information such as passphrases). When
88+
combined with \fB\-stdinrpcpass\fR, the first line from standard input
89+
is used for the RPC password.
8390
.HP
8491
\fB\-stdinrpcpass\fR
85-
.TP
86-
Read RPC password from standard input as a single line.
87-
When combined
8892
.IP
93+
Read RPC password from standard input as a single line. When combined
8994
with \fB\-stdin\fR, the first line from standard input is used for the
9095
RPC password.
9196
.HP

doc/man/bitcoin-qt.1

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
2-
.TH BITCOIN-QT "1" "July 2018" "bitcoin-qt v0.16.99.0" "User Commands"
2+
.TH BITCOIN-QT "1" "December 2018" "bitcoin-qt v0.17.99.0" "User Commands"
33
.SH NAME
4-
bitcoin-qt \- manual page for bitcoin-qt v0.16.99.0
4+
bitcoin-qt \- manual page for bitcoin-qt v0.17.99.0
5+
.SH SYNOPSIS
6+
.B bitcoin-qt
7+
[\fI\,command-line options\/\fR]
58
.SH DESCRIPTION
6-
Bitcoin Core version v0.16.99.0 (64\-bit)
7-
Usage:
8-
.IP
9-
bitcoin\-qt [command\-line options]
9+
Bitcoin Core version v0.17.99.0 (64\-bit)
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -23,9 +23,9 @@ long fork (%s in cmd is replaced by message)
2323
If this block is in the chain assume that it and its ancestors are valid
2424
and potentially skip their script verification (0 to verify all,
2525
default:
26-
0000000000000000005214481d2d96f898e3d5416e43359c145944a909d242e0,
26+
0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8,
2727
testnet:
28-
0000000002e9e7b00e1f6dc5123a04aad68dd0f0968d8c7aa45f6640795c37b1)
28+
0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75)
2929
.HP
3030
\fB\-blocknotify=\fR<cmd>
3131
.IP
@@ -61,7 +61,8 @@ Set database cache size in megabytes (4 to 16384, default: 450)
6161
\fB\-debuglogfile=\fR<file>
6262
.IP
6363
Specify location of debug log file. Relative paths will be prefixed by a
64-
net\-specific datadir location. (0 to disable; default: debug.log)
64+
net\-specific datadir location. (\fB\-nodebuglogfile\fR to disable;
65+
default: debug.log)
6566
.HP
6667
\fB\-includeconf=\fR<file>
6768
.IP
@@ -108,7 +109,7 @@ blocks if a target size in MiB is provided. This mode is
108109
incompatible with \fB\-txindex\fR and \fB\-rescan\fR. Warning: Reverting this
109110
setting requires re\-downloading the entire blockchain. (default:
110111
0 = disable pruning blocks, 1 = allow manual pruning via RPC,
111-
>550 = automatically prune block files to stay under the
112+
>=550 = automatically prune block files to stay under the
112113
specified target size in MiB)
113114
.HP
114115
\fB\-reindex\fR
@@ -117,7 +118,9 @@ Rebuild chain state and block index from the blk*.dat files on disk
117118
.HP
118119
\fB\-reindex\-chainstate\fR
119120
.IP
120-
Rebuild chain state from the currently indexed blocks
121+
Rebuild chain state from the currently indexed blocks. When in pruning
122+
mode or if blocks on disk might be corrupted, use full \fB\-reindex\fR
123+
instead.
121124
.HP
122125
\fB\-sysperms\fR
123126
.IP
@@ -157,7 +160,7 @@ for IPv6
157160
.HP
158161
\fB\-connect=\fR<ip>
159162
.IP
160-
Connect only to the specified node; \fB\-connect\fR=\fI\,0\/\fR disables automatic
163+
Connect only to the specified node; \fB\-noconnect\fR disables automatic
161164
connections (the rules for this peer are the same as for
162165
\fB\-addnode\fR). This option can be specified multiple times to connect
163166
to multiple nodes.
@@ -178,7 +181,7 @@ unless \fB\-connect\fR used)
178181
.HP
179182
\fB\-enablebip61\fR
180183
.IP
181-
Send reject messages per BIP61 (default: 1)
184+
Send reject messages per BIP61 (default: 0)
182185
.HP
183186
\fB\-externalip=\fR<ip>
184187
.IP
@@ -221,8 +224,8 @@ Tries to keep outbound traffic under the given target (in MiB per 24h),
221224
.HP
222225
\fB\-onion=\fR<ip:port>
223226
.IP
224-
Use separate SOCKS5 proxy to reach peers via Tor hidden services
225-
(default: \fB\-proxy\fR)
227+
Use separate SOCKS5 proxy to reach peers via Tor hidden services, set
228+
\fB\-noonion\fR to disable (default: \fB\-proxy\fR)
226229
.HP
227230
\fB\-onlynet=\fR<net>
228231
.IP
@@ -242,11 +245,13 @@ Relay non\-P2SH multisig (default: 1)
242245
.HP
243246
\fB\-port=\fR<port>
244247
.IP
245-
Listen for connections on <port> (default: 8333 or testnet: 18333)
248+
Listen for connections on <port> (default: 8333, testnet: 18333,
249+
regtest: 18444)
246250
.HP
247251
\fB\-proxy=\fR<ip:port>
248252
.IP
249-
Connect through SOCKS5 proxy
253+
Connect through SOCKS5 proxy, set \fB\-noproxy\fR to disable (default:
254+
disabled)
250255
.HP
251256
\fB\-proxyrandomize\fR
252257
.IP
@@ -393,8 +398,7 @@ Send transactions with full\-RBF opt\-in enabled (RPC only, default: 0)
393398
.IP
394399
Delete all wallet transactions and only recover those parts of the
395400
blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
396-
account owner and payment request information, 2 = drop tx meta
397-
data)
401+
payment request information, 2 = drop tx meta data)
398402
.PP
399403
ZeroMQ notification options:
400404
.HP
@@ -418,7 +422,7 @@ Debugging/Testing options:
418422
.HP
419423
\fB\-debug=\fR<category>
420424
.IP
421-
Output debugging information (default: 0, supplying <category> is
425+
Output debugging information (default: \fB\-nodebug\fR, supplying <category> is
422426
optional). If <category> is not supplied or if <category> = 1,
423427
output all debugging information. <category> can be: net, tor,
424428
mempool, http, bench, zmq, db, rpc, estimatefee, addrman,
@@ -433,7 +437,7 @@ or more specified categories.
433437
.HP
434438
\fB\-help\-debug\fR
435439
.IP
436-
Show all debugging options (usage: \fB\-\-help\fR \fB\-help\-debug\fR)
440+
Print help message with debugging options and exit
437441
.HP
438442
\fB\-logips\fR
439443
.IP
@@ -452,7 +456,7 @@ transaction; setting this too low may abort large transactions
452456
\fB\-printtoconsole\fR
453457
.IP
454458
Send trace/debug info to console (default: 1 when no \fB\-daemon\fR. To disable
455-
logging to file, set debuglogfile=0)
459+
logging to file, set \fB\-nodebuglogfile\fR)
456460
.HP
457461
\fB\-shrinkdebugfile\fR
458462
.IP
@@ -529,21 +533,21 @@ option can be specified multiple times
529533
.HP
530534
\fB\-rpcauth=\fR<userpw>
531535
.IP
532-
Username and hashed password for JSON\-RPC connections. The field
533-
<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
536+
Username and HMAC\-SHA\-256 hashed password for JSON\-RPC connections. The
537+
field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
534538
canonical python script is included in share/rpcauth. The client
535539
then connects normally using the
536540
rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This
537541
option can be specified multiple times
538542
.HP
539543
\fB\-rpcbind=\fR<addr>[:port]
540544
.IP
541-
Bind to given address to listen for JSON\-RPC connections. This option is
542-
ignored unless \fB\-rpcallowip\fR is also passed. Port is optional and
543-
overrides \fB\-rpcport\fR. Use [host]:port notation for IPv6. This
544-
option can be specified multiple times (default: 127.0.0.1 and
545-
::1 i.e., localhost, or if \fB\-rpcallowip\fR has been specified,
546-
0.0.0.0 and :: i.e., all addresses)
545+
Bind to given address to listen for JSON\-RPC connections. Do not expose
546+
the RPC server to untrusted networks such as the public internet!
547+
This option is ignored unless \fB\-rpcallowip\fR is also passed. Port is
548+
optional and overrides \fB\-rpcport\fR. Use [host]:port notation for
549+
IPv6. This option can be specified multiple times (default:
550+
127.0.0.1 and ::1 i.e., localhost)
547551
.HP
548552
\fB\-rpccookiefile=\fR<loc>
549553
.IP
@@ -556,8 +560,8 @@ Password for JSON\-RPC connections
556560
.HP
557561
\fB\-rpcport=\fR<port>
558562
.IP
559-
Listen for JSON\-RPC connections on <port> (default: 8332 or testnet:
560-
18332)
563+
Listen for JSON\-RPC connections on <port> (default: 8332, testnet:
564+
18332, regtest: 18443)
561565
.HP
562566
\fB\-rpcserialversion\fR
563567
.IP

doc/man/bitcoin-tx.1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
2-
.TH BITCOIN-TX "1" "July 2018" "bitcoin-tx v0.16.99.0" "User Commands"
2+
.TH BITCOIN-TX "1" "December 2018" "bitcoin-tx v0.17.99.0" "User Commands"
33
.SH NAME
4-
bitcoin-tx \- manual page for bitcoin-tx v0.16.99.0
4+
bitcoin-tx \- manual page for bitcoin-tx v0.17.99.0
5+
.SH SYNOPSIS
6+
.B bitcoin-tx
7+
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
8+
.br
9+
.B bitcoin-tx
10+
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
511
.SH DESCRIPTION
6-
Bitcoin Core bitcoin\-tx utility version v0.16.99.0
7-
.SS "Usage:"
8-
.TP
9-
bitcoin\-tx [options] <hex\-tx> [commands]
10-
Update hex\-encoded bitcoin transaction
11-
.TP
12-
bitcoin\-tx [options] \fB\-create\fR [commands]
13-
Create hex\-encoded bitcoin transaction
12+
Bitcoin Core bitcoin\-tx utility version v0.17.99.0
1413
.SH OPTIONS
1514
.HP
1615
\-?

0 commit comments

Comments
 (0)