mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-20 02:48:27 +01:00
Merge bitcoin/bitcoin#26309: [24.x] Bump version to 24.0rc2
d68b6abeb8doc: Generate example bitcoin conf for 24.0rc2 (fanquake)c349096fa2doc: Generate manual pages for 24.0rc2 (fanquake)e5aec59e0fbuild: Bump version to 24.0rc2 (fanquake) Pull request description: We are due for an rc2. Bump version. Regen manpages. Regen exmaple bitcoin.conf. ACKs for top commit: LarryRuane: utACKd68b6abeb8jarolrod: ACKd68b6abeb8hebasto: ACKd68b6abeb8, also verified the diff in `bitcoind -help` output between rc1 and rc2, and its reflection in the last commit. Tree-SHA512: 258091f68f82b449810f3220170cbb4d22424061a753a3e99edf5df15881885dc74e07c7ba1b45f9b2623cee2dcdaabb82109b0bdce7a30b6623454d5346ddef
This commit is contained in:
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
|
|||||||
define(_CLIENT_VERSION_MAJOR, 24)
|
define(_CLIENT_VERSION_MAJOR, 24)
|
||||||
define(_CLIENT_VERSION_MINOR, 0)
|
define(_CLIENT_VERSION_MINOR, 0)
|
||||||
define(_CLIENT_VERSION_BUILD, 0)
|
define(_CLIENT_VERSION_BUILD, 0)
|
||||||
define(_CLIENT_VERSION_RC, 1)
|
define(_CLIENT_VERSION_RC, 2)
|
||||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||||
define(_COPYRIGHT_YEAR, 2022)
|
define(_COPYRIGHT_YEAR, 2022)
|
||||||
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
||||||
.TH BITCOIN-CLI "1" "September 2022" "bitcoin-cli v24.0.0rc1" "User Commands"
|
.TH BITCOIN-CLI "1" "October 2022" "bitcoin-cli v24.0.0rc2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc1
|
bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc2
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B bitcoin-cli
|
.B bitcoin-cli
|
||||||
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
|
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
|
||||||
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc1
|
|||||||
.B bitcoin-cli
|
.B bitcoin-cli
|
||||||
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
|
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Bitcoin Core RPC client version v24.0.0rc1
|
Bitcoin Core RPC client version v24.0.0rc2
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
.HP
|
.HP
|
||||||
\-?
|
\-?
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
||||||
.TH BITCOIN-QT "1" "September 2022" "bitcoin-qt v24.0.0rc1" "User Commands"
|
.TH BITCOIN-QT "1" "October 2022" "bitcoin-qt v24.0.0rc2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
bitcoin-qt \- manual page for bitcoin-qt v24.0.0rc1
|
bitcoin-qt \- manual page for bitcoin-qt v24.0.0rc2
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B bitcoin-qt
|
.B bitcoin-qt
|
||||||
[\fI\,command-line options\/\fR]
|
[\fI\,command-line options\/\fR]
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Bitcoin Core version v24.0.0rc1
|
Bitcoin Core version v24.0.0rc2
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
.HP
|
.HP
|
||||||
\-?
|
\-?
|
||||||
@@ -339,10 +339,6 @@ Serve compact block filters to peers per BIP 157 (default: 0)
|
|||||||
Support filtering of blocks and transaction with bloom filters (default:
|
Support filtering of blocks and transaction with bloom filters (default:
|
||||||
0)
|
0)
|
||||||
.HP
|
.HP
|
||||||
\fB\-permitbaremultisig\fR
|
|
||||||
.IP
|
|
||||||
Relay non\-P2SH multisig (default: 1)
|
|
||||||
.HP
|
|
||||||
\fB\-port=\fR<port>
|
\fB\-port=\fR<port>
|
||||||
.IP
|
.IP
|
||||||
Listen for connections on <port>. Nodes not using the default ports
|
Listen for connections on <port>. Nodes not using the default ports
|
||||||
@@ -683,6 +679,10 @@ signaling (default: 0)
|
|||||||
Fees (in BTC/kvB) smaller than this are considered zero fee for
|
Fees (in BTC/kvB) smaller than this are considered zero fee for
|
||||||
relaying, mining and transaction creation (default: 0.00001)
|
relaying, mining and transaction creation (default: 0.00001)
|
||||||
.HP
|
.HP
|
||||||
|
\fB\-permitbaremultisig\fR
|
||||||
|
.IP
|
||||||
|
Relay non\-P2SH multisig (default: 1)
|
||||||
|
.HP
|
||||||
\fB\-whitelistforcerelay\fR
|
\fB\-whitelistforcerelay\fR
|
||||||
.IP
|
.IP
|
||||||
Add 'forcerelay' permission to whitelisted inbound peers with default
|
Add 'forcerelay' permission to whitelisted inbound peers with default
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
||||||
.TH BITCOIN-TX "1" "September 2022" "bitcoin-tx v24.0.0rc1" "User Commands"
|
.TH BITCOIN-TX "1" "October 2022" "bitcoin-tx v24.0.0rc2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc1
|
bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc2
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B bitcoin-tx
|
.B bitcoin-tx
|
||||||
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
|
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
|
||||||
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc1
|
|||||||
.B bitcoin-tx
|
.B bitcoin-tx
|
||||||
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
|
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Bitcoin Core bitcoin\-tx utility version v24.0.0rc1
|
Bitcoin Core bitcoin\-tx utility version v24.0.0rc2
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
.HP
|
.HP
|
||||||
\-?
|
\-?
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
||||||
.TH BITCOIN-UTIL "1" "September 2022" "bitcoin-util v24.0.0rc1" "User Commands"
|
.TH BITCOIN-UTIL "1" "October 2022" "bitcoin-util v24.0.0rc2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
bitcoin-util \- manual page for bitcoin-util v24.0.0rc1
|
bitcoin-util \- manual page for bitcoin-util v24.0.0rc2
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B bitcoin-util
|
.B bitcoin-util
|
||||||
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
|
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Bitcoin Core bitcoin\-util utility version v24.0.0rc1
|
Bitcoin Core bitcoin\-util utility version v24.0.0rc2
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
.HP
|
.HP
|
||||||
\-?
|
\-?
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
||||||
.TH BITCOIN-WALLET "1" "September 2022" "bitcoin-wallet v24.0.0rc1" "User Commands"
|
.TH BITCOIN-WALLET "1" "October 2022" "bitcoin-wallet v24.0.0rc2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0rc1
|
bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0rc2
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Bitcoin Core bitcoin\-wallet version v24.0.0rc1
|
Bitcoin Core bitcoin\-wallet version v24.0.0rc2
|
||||||
.PP
|
.PP
|
||||||
bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
|
bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
|
||||||
By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
|
By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
|
||||||
.TH BITCOIND "1" "September 2022" "bitcoind v24.0.0rc1" "User Commands"
|
.TH BITCOIND "1" "October 2022" "bitcoind v24.0.0rc2" "User Commands"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
bitcoind \- manual page for bitcoind v24.0.0rc1
|
bitcoind \- manual page for bitcoind v24.0.0rc2
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B bitcoind
|
.B bitcoind
|
||||||
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
|
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Bitcoin Core version v24.0.0rc1
|
Bitcoin Core version v24.0.0rc2
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
.HP
|
.HP
|
||||||
\-?
|
\-?
|
||||||
@@ -339,10 +339,6 @@ Serve compact block filters to peers per BIP 157 (default: 0)
|
|||||||
Support filtering of blocks and transaction with bloom filters (default:
|
Support filtering of blocks and transaction with bloom filters (default:
|
||||||
0)
|
0)
|
||||||
.HP
|
.HP
|
||||||
\fB\-permitbaremultisig\fR
|
|
||||||
.IP
|
|
||||||
Relay non\-P2SH multisig (default: 1)
|
|
||||||
.HP
|
|
||||||
\fB\-port=\fR<port>
|
\fB\-port=\fR<port>
|
||||||
.IP
|
.IP
|
||||||
Listen for connections on <port>. Nodes not using the default ports
|
Listen for connections on <port>. Nodes not using the default ports
|
||||||
@@ -683,6 +679,10 @@ signaling (default: 0)
|
|||||||
Fees (in BTC/kvB) smaller than this are considered zero fee for
|
Fees (in BTC/kvB) smaller than this are considered zero fee for
|
||||||
relaying, mining and transaction creation (default: 0.00001)
|
relaying, mining and transaction creation (default: 0.00001)
|
||||||
.HP
|
.HP
|
||||||
|
\fB\-permitbaremultisig\fR
|
||||||
|
.IP
|
||||||
|
Relay non\-P2SH multisig (default: 1)
|
||||||
|
.HP
|
||||||
\fB\-whitelistforcerelay\fR
|
\fB\-whitelistforcerelay\fR
|
||||||
.IP
|
.IP
|
||||||
Add 'forcerelay' permission to whitelisted inbound peers with default
|
Add 'forcerelay' permission to whitelisted inbound peers with default
|
||||||
|
|||||||
@@ -282,9 +282,6 @@
|
|||||||
# 0)
|
# 0)
|
||||||
#peerbloomfilters=1
|
#peerbloomfilters=1
|
||||||
|
|
||||||
# Relay non-P2SH multisig (default: 1)
|
|
||||||
#permitbaremultisig=1
|
|
||||||
|
|
||||||
# Listen for connections on <port>. Nodes not using the default ports
|
# Listen for connections on <port>. Nodes not using the default ports
|
||||||
# (default: 8333, testnet: 18333, signet: 38333, regtest: 18444)
|
# (default: 8333, testnet: 18333, signet: 38333, regtest: 18444)
|
||||||
# are unlikely to get incoming connections. Not relevant for I2P
|
# are unlikely to get incoming connections. Not relevant for I2P
|
||||||
@@ -575,6 +572,9 @@
|
|||||||
# relaying, mining and transaction creation (default: 0.00001)
|
# relaying, mining and transaction creation (default: 0.00001)
|
||||||
#minrelaytxfee=<amt>
|
#minrelaytxfee=<amt>
|
||||||
|
|
||||||
|
# Relay non-P2SH multisig (default: 1)
|
||||||
|
#permitbaremultisig=1
|
||||||
|
|
||||||
# Add 'forcerelay' permission to whitelisted inbound peers with default
|
# Add 'forcerelay' permission to whitelisted inbound peers with default
|
||||||
# permissions. This will relay transactions even if the
|
# permissions. This will relay transactions even if the
|
||||||
# transactions were already in the mempool. (default: 0)
|
# transactions were already in the mempool. (default: 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user