aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2023-10-23 10:22:32 +0100
committerfanquake <fanquake@gmail.com>2023-10-23 10:26:40 +0100
commitd3a352256064d62a3e2e2d054ffa0faecb49dd71 (patch)
treec0d176503b5187d8df18d52864d6bfbb77bf4989
parent0dfbe965839684b57556847fc63dafa1c03c1b88 (diff)
parentb01a5bea7dd278ee2e6a7b46119d09860c5580af (diff)
Merge bitcoin/bitcoin#28668: [24.2] Final Changesv24.2
b01a5bea7dd278ee2e6a7b46119d09860c5580af doc: update release notes for 24.2 (fanquake) 1343f43518d8f57547a5ecce8d6986db182caedd doc: update manual pages for 24.2 (fanquake) db244c63429b4a8c4c60f66f4b76c0b0dee73365 build: bump version to 24.2 final (fanquake) Pull request description: Final changes for v24.2. PR for bitcoincore.org is here: https://github.com/bitcoin-core/bitcoincore.org/pull/993. 24.2rc1 tag: https://github.com/bitcoin/bitcoin/releases/tag/v24.2rc1 rc1 bins available for ~1 week: https://bitcoincore.org/bin/bitcoin-core-24.2/test.rc1/. ACKs for top commit: josibake: ACK https://github.com/bitcoin/bitcoin/pull/28668/commits/b01a5bea7dd278ee2e6a7b46119d09860c5580af stickies-v: ACK b01a5bea7dd278ee2e6a7b46119d09860c5580af Tree-SHA512: 339466ace2d3401a690e1bbd7f7636a9905f379870a06a38151a745d0df4f1c9a532acecd38cade608e417343c6ac20563e42eae5fbd42128cb81802e3212340
-rw-r--r--configure.ac2
-rw-r--r--doc/man/bitcoin-cli.16
-rw-r--r--doc/man/bitcoin-qt.16
-rw-r--r--doc/man/bitcoin-tx.16
-rw-r--r--doc/man/bitcoin-util.16
-rw-r--r--doc/man/bitcoin-wallet.16
-rw-r--r--doc/man/bitcoind.16
-rw-r--r--doc/release-notes.md6
8 files changed, 22 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index ec93c36e11..6e435cc1c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 24)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 0)
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 d2d4ccde04..cc44c65560 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.3.
-.TH BITCOIN-CLI "1" "October 2023" "bitcoin-cli v24.2.0rc1" "User Commands"
+.TH BITCOIN-CLI "1" "October 2023" "bitcoin-cli v24.2.0" "User Commands"
.SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v24.2.0rc1
+bitcoin-cli \- manual page for bitcoin-cli v24.2.0
.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.2.0rc1
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
-Bitcoin Core RPC client version v24.2.0rc1
+Bitcoin Core RPC client version v24.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index bb767a5991..c9924afbbb 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.3.
-.TH BITCOIN-QT "1" "October 2023" "bitcoin-qt v24.2.0rc1" "User Commands"
+.TH BITCOIN-QT "1" "October 2023" "bitcoin-qt v24.2.0" "User Commands"
.SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v24.2.0rc1
+bitcoin-qt \- manual page for bitcoin-qt v24.2.0
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
-Bitcoin Core version v24.2.0rc1
+Bitcoin Core version v24.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index ac1cb8661a..3fbb6f4c55 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.3.
-.TH BITCOIN-TX "1" "October 2023" "bitcoin-tx v24.2.0rc1" "User Commands"
+.TH BITCOIN-TX "1" "October 2023" "bitcoin-tx v24.2.0" "User Commands"
.SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v24.2.0rc1
+bitcoin-tx \- manual page for bitcoin-tx v24.2.0
.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.2.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.2.0rc1
+Bitcoin Core bitcoin\-tx utility version v24.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 3b705af897..c02c1e32e9 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.3.
-.TH BITCOIN-UTIL "1" "October 2023" "bitcoin-util v24.2.0rc1" "User Commands"
+.TH BITCOIN-UTIL "1" "October 2023" "bitcoin-util v24.2.0" "User Commands"
.SH NAME
-bitcoin-util \- manual page for bitcoin-util v24.2.0rc1
+bitcoin-util \- manual page for bitcoin-util v24.2.0
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v24.2.0rc1
+Bitcoin Core bitcoin\-util utility version v24.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index f2babf9f20..e75d98f010 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.3.
-.TH BITCOIN-WALLET "1" "October 2023" "bitcoin-wallet v24.2.0rc1" "User Commands"
+.TH BITCOIN-WALLET "1" "October 2023" "bitcoin-wallet v24.2.0" "User Commands"
.SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v24.2.0rc1
+bitcoin-wallet \- manual page for bitcoin-wallet v24.2.0
.SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v24.2.0rc1
+Bitcoin Core bitcoin\-wallet version v24.2.0
.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 052bbb9a25..66dc7986fd 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.3.
-.TH BITCOIND "1" "October 2023" "bitcoind v24.2.0rc1" "User Commands"
+.TH BITCOIND "1" "October 2023" "bitcoind v24.2.0" "User Commands"
.SH NAME
-bitcoind \- manual page for bitcoind v24.2.0rc1
+bitcoind \- manual page for bitcoind v24.2.0
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
.SH DESCRIPTION
-Bitcoin Core version v24.2.0rc1
+Bitcoin Core version v24.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 56a6f92b5d..059ab51872 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,9 +1,9 @@
-24.2rc1 Release Notes
+24.2 Release Notes
==================
-Bitcoin Core version 24.2rc1 is now available from:
+Bitcoin Core version 24.2 is now available from:
- <https://bitcoincore.org/bin/bitcoin-core-24.2/test.rc1/>
+ <https://bitcoincore.org/bin/bitcoin-core-24.2/>
This release includes various bug fixes and performance
improvements, as well as updated translations.