aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2024-04-03 10:29:45 +0100
committerfanquake <fanquake@gmail.com>2024-04-03 10:30:24 +0100
commit62c22dd679ba479e56c133b126174234d91bc857 (patch)
treebe8bd58e0df33ebf487dd42165d46199ec51c049
parentd5bad0d2d16c2ddd6bfaeccbca2a31a30227ba2c (diff)
parente95c484f7de7fe30d5a2e87c0e7e2a5faf9c1a5f (diff)
Merge bitcoin/bitcoin#29794: [25.x] Finalize 25.2v25.2
e95c484f7de7fe30d5a2e87c0e7e2a5faf9c1a5f doc: Update release notes for 25.2 final (Ava Chow) 14b85b62760906ca73976b1ac09d8eb3bb76e3c8 doc: Update manpages for 25.2 final (Ava Chow) 1c13eae6e06fd816d190ad8a1b63fb05a5bb312b doc: Bump bips.md to 25.2 (Ava Chow) 03a568deb6dad58e1d69f0339ab7371378c986d2 build: Bump to 25.2 final (Ava Chow) Pull request description: Final changes for 25.2 release ACKs for top commit: glozow: utACK e95c484f7de7fe30d5a2e87c0e7e2a5faf9c1a5f fanquake: ACK e95c484f7de7fe30d5a2e87c0e7e2a5faf9c1a5f Tree-SHA512: 10a4d6d516e2bea9b4383eb174a6c7827be0359522d366746ead0a28f275e0cadf6e5e9a0e4cafe425438532a57ada0ecbfba300f02370eac411f101dd86dfe6
-rw-r--r--configure.ac2
-rw-r--r--doc/bips.md2
-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
9 files changed, 23 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 3d9460a1e4..dab85020b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 25)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 2)
+define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
diff --git a/doc/bips.md b/doc/bips.md
index 34a4ba4357..b5f4f1f9a9 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -1,4 +1,4 @@
-BIPs that are implemented by Bitcoin Core (up-to-date up to **v25.0**):
+BIPs that are implemented by Bitcoin Core (up-to-date up to **v25.2**):
* [`BIP 9`](https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki): The changes allowing multiple soft-forks to be deployed in parallel have been implemented since **v0.12.1** ([PR #7575](https://github.com/bitcoin/bitcoin/pull/7575))
* [`BIP 11`](https://github.com/bitcoin/bips/blob/master/bip-0011.mediawiki): Multisig outputs are standard since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index d55dfddde5..1b9bd7f563 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" "March 2024" "bitcoin-cli v25.2.0rc2" "User Commands"
+.TH BITCOIN-CLI "1" "April 2024" "bitcoin-cli v25.2.0" "User Commands"
.SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v25.2.0rc2
+bitcoin-cli \- manual page for bitcoin-cli v25.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 v25.2.0rc2
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
-Bitcoin Core RPC client version v25.2.0rc2
+Bitcoin Core RPC client version v25.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index 219fdea2ae..4de48112c4 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" "March 2024" "bitcoin-qt v25.2.0rc2" "User Commands"
+.TH BITCOIN-QT "1" "April 2024" "bitcoin-qt v25.2.0" "User Commands"
.SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v25.2.0rc2
+bitcoin-qt \- manual page for bitcoin-qt v25.2.0
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
-Bitcoin Core version v25.2.0rc2
+Bitcoin Core version v25.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index a30db47356..16bd7102dd 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" "March 2024" "bitcoin-tx v25.2.0rc2" "User Commands"
+.TH BITCOIN-TX "1" "April 2024" "bitcoin-tx v25.2.0" "User Commands"
.SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v25.2.0rc2
+bitcoin-tx \- manual page for bitcoin-tx v25.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 v25.2.0rc2
.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 v25.2.0rc2
+Bitcoin Core bitcoin\-tx utility version v25.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 92631434c5..6b642ae6b1 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" "March 2024" "bitcoin-util v25.2.0rc2" "User Commands"
+.TH BITCOIN-UTIL "1" "April 2024" "bitcoin-util v25.2.0" "User Commands"
.SH NAME
-bitcoin-util \- manual page for bitcoin-util v25.2.0rc2
+bitcoin-util \- manual page for bitcoin-util v25.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 v25.2.0rc2
+Bitcoin Core bitcoin\-util utility version v25.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index 9d21044f84..acd56b2ab3 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" "March 2024" "bitcoin-wallet v25.2.0rc2" "User Commands"
+.TH BITCOIN-WALLET "1" "April 2024" "bitcoin-wallet v25.2.0" "User Commands"
.SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v25.2.0rc2
+bitcoin-wallet \- manual page for bitcoin-wallet v25.2.0
.SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v25.2.0rc2
+Bitcoin Core bitcoin\-wallet version v25.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 3e3325e8e5..8a80418058 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" "March 2024" "bitcoind v25.2.0rc2" "User Commands"
+.TH BITCOIND "1" "April 2024" "bitcoind v25.2.0" "User Commands"
.SH NAME
-bitcoind \- manual page for bitcoind v25.2.0rc2
+bitcoind \- manual page for bitcoind v25.2.0
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
.SH DESCRIPTION
-Bitcoin Core version v25.2.0rc2
+Bitcoin Core version v25.2.0
.SH OPTIONS
.HP
\-?
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 32072de6a9..3f050ebaef 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,9 +1,9 @@
-25.2rc2 Release Notes
+25.2 Release Notes
==================
-Bitcoin Core version 25.2rc2 is now available from:
+Bitcoin Core version 25.2 is now available from:
- <https://bitcoincore.org/bin/bitcoin-core-25.2/test.rc2>
+ <https://bitcoincore.org/bin/bitcoin-core-25.2>
This release includes various bug fixes and performance
improvements, as well as updated translations.