Merge bitcoin/bitcoin#26309: [24.x] Bump version to 24.0rc2v24.0rc2

d68b6abeb844daa907c7d8c103efac4092de34c0 doc: Generate example bitcoin conf for 24.0rc2 (fanquake)
c349096fa26171a6753dc114252d7cecdc9df412 doc: Generate manual pages for 24.0rc2 (fanquake)
e5aec59e0f5c4e7ae1e91e0fe619eec7d8187ea8 build: 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:
    utACK d68b6abeb844daa907c7d8c103efac4092de34c0
  jarolrod:
    ACK d68b6abeb844daa907c7d8c103efac4092de34c0
  hebasto:
    ACK d68b6abeb844daa907c7d8c103efac4092de34c0, also verified the diff in `bitcoind -help` output between rc1 and rc2, and its reflection in the last commit.

Tree-SHA512: 258091f68f82b449810f3220170cbb4d22424061a753a3e99edf5df15881885dc74e07c7ba1b45f9b2623cee2dcdaabb82109b0bdce7a30b6623454d5346ddef

8 files changed, 30 insertions, 30 deletions

diff --git a/configure.ac b/configure.ac
index e60ae73c01..1156a17166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 24)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2022)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index 926bd3be83..d770c445ab 100644
--- a/doc/man/bitcoin-cli.1
+++ b/doc/man/bitcoin-cli.1
@@ -1,7 +1,7 @@
 .\" 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
-bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc1
+bitcoin-cli \- manual page for bitcoin-cli v24.0.0rc2
 .SH SYNOPSIS
 .B bitcoin-cli
 [\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
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v24.0.0rc1
+Bitcoin Core RPC client version v24.0.0rc2
 .SH OPTIONS
 .HP
 \-?
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index 90e707b6f0..196ba1e70c 100644
--- a/doc/man/bitcoin-qt.1
+++ b/doc/man/bitcoin-qt.1
@@ -1,12 +1,12 @@
 .\" 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
-bitcoin-qt \- manual page for bitcoin-qt v24.0.0rc1
+bitcoin-qt \- manual page for bitcoin-qt v24.0.0rc2
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v24.0.0rc1
+Bitcoin Core version v24.0.0rc2
 .SH OPTIONS
 .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:
 0)
 .HP
-\fB\-permitbaremultisig\fR
-.IP
-Relay non\-P2SH multisig (default: 1)
-.HP
 \fB\-port=\fR<port>
 .IP
 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
 relaying, mining and transaction creation (default: 0.00001)
 .HP
+\fB\-permitbaremultisig\fR
+.IP
+Relay non\-P2SH multisig (default: 1)
+.HP
 \fB\-whitelistforcerelay\fR
 .IP
 Add 'forcerelay' permission to whitelisted inbound peers with default
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index 0d21d63ff1..9854f87ba6 100644
--- a/doc/man/bitcoin-tx.1
+++ b/doc/man/bitcoin-tx.1
@@ -1,7 +1,7 @@
 .\" 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
-bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc1
+bitcoin-tx \- manual page for bitcoin-tx v24.0.0rc2
 .SH SYNOPSIS
 .B bitcoin-tx
 [\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
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v24.0.0rc1
+Bitcoin Core bitcoin\-tx utility version v24.0.0rc2
 .SH OPTIONS
 .HP
 \-?
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 07b1a37341..f03037a435 100644
--- a/doc/man/bitcoin-util.1
+++ b/doc/man/bitcoin-util.1
@@ -1,12 +1,12 @@
 .\" 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
-bitcoin-util \- manual page for bitcoin-util v24.0.0rc1
+bitcoin-util \- manual page for bitcoin-util v24.0.0rc2
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v24.0.0rc1
+Bitcoin Core bitcoin\-util utility version v24.0.0rc2
 .SH OPTIONS
 .HP
 \-?
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index ed1497dba1..50196be5e2 100644
--- a/doc/man/bitcoin-wallet.1
+++ b/doc/man/bitcoin-wallet.1
@@ -1,9 +1,9 @@
 .\" 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
-bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0rc1
+bitcoin-wallet \- manual page for bitcoin-wallet v24.0.0rc2
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v24.0.0rc1
+Bitcoin Core bitcoin\-wallet version v24.0.0rc2
 .PP
 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.
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index 98c9aeecdd..7e123d1500 100644
--- a/doc/man/bitcoind.1
+++ b/doc/man/bitcoind.1
@@ -1,12 +1,12 @@
 .\" 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
-bitcoind \- manual page for bitcoind v24.0.0rc1
+bitcoind \- manual page for bitcoind v24.0.0rc2
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]                     \fI\,Start Bitcoin Core\/\fR
 .SH DESCRIPTION
-Bitcoin Core version v24.0.0rc1
+Bitcoin Core version v24.0.0rc2
 .SH OPTIONS
 .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:
 0)
 .HP
-\fB\-permitbaremultisig\fR
-.IP
-Relay non\-P2SH multisig (default: 1)
-.HP
 \fB\-port=\fR<port>
 .IP
 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
 relaying, mining and transaction creation (default: 0.00001)
 .HP
+\fB\-permitbaremultisig\fR
+.IP
+Relay non\-P2SH multisig (default: 1)
+.HP
 \fB\-whitelistforcerelay\fR
 .IP
 Add 'forcerelay' permission to whitelisted inbound peers with default
diff --git a/share/examples/bitcoin.conf b/share/examples/bitcoin.conf
index ab94040283..bbbbe66404 100644
--- a/share/examples/bitcoin.conf
+++ b/share/examples/bitcoin.conf
@@ -282,9 +282,6 @@
 # 0)
 #peerbloomfilters=1
 
-# Relay non-P2SH multisig (default: 1)
-#permitbaremultisig=1
-
 # Listen for connections on <port>. Nodes not using the default ports
 # (default: 8333, testnet: 18333, signet: 38333, regtest: 18444)
 # are unlikely to get incoming connections. Not relevant for I2P
@@ -575,6 +572,9 @@
 # relaying, mining and transaction creation (default: 0.00001)
 #minrelaytxfee=<amt>
 
+# Relay non-P2SH multisig (default: 1)
+#permitbaremultisig=1
+
 # Add 'forcerelay' permission to whitelisted inbound peers with default
 # permissions. This will relay transactions even if the
 # transactions were already in the mempool. (default: 0)