Skip to content

Commit 62c22dd

Browse files
committed
Merge bitcoin#29794: [25.x] Finalize 25.2
e95c484 doc: Update release notes for 25.2 final (Ava Chow) 14b85b6 doc: Update manpages for 25.2 final (Ava Chow) 1c13eae doc: Bump bips.md to 25.2 (Ava Chow) 03a568d build: Bump to 25.2 final (Ava Chow) Pull request description: Final changes for 25.2 release ACKs for top commit: glozow: utACK e95c484 fanquake: ACK e95c484 Tree-SHA512: 10a4d6d516e2bea9b4383eb174a6c7827be0359522d366746ead0a28f275e0cadf6e5e9a0e4cafe425438532a57ada0ecbfba300f02370eac411f101dd86dfe6
2 parents d5bad0d + e95c484 commit 62c22dd

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 25)
33
define(_CLIENT_VERSION_MINOR, 2)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 2)
5+
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2023)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

doc/bips.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BIPs that are implemented by Bitcoin Core (up-to-date up to **v25.0**):
1+
BIPs that are implemented by Bitcoin Core (up-to-date up to **v25.2**):
22

33
* [`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))
44
* [`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)).

doc/man/bitcoin-cli.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-CLI "1" "March 2024" "bitcoin-cli v25.2.0rc2" "User Commands"
2+
.TH BITCOIN-CLI "1" "April 2024" "bitcoin-cli v25.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-cli \- manual page for bitcoin-cli v25.2.0rc2
4+
bitcoin-cli \- manual page for bitcoin-cli v25.2.0
55
.SH SYNOPSIS
66
.B bitcoin-cli
77
[\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
1515
.B bitcoin-cli
1616
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
1717
.SH DESCRIPTION
18-
Bitcoin Core RPC client version v25.2.0rc2
18+
Bitcoin Core RPC client version v25.2.0
1919
.SH OPTIONS
2020
.HP
2121
\-?

doc/man/bitcoin-qt.1

Lines changed: 3 additions & 3 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.49.3.
2-
.TH BITCOIN-QT "1" "March 2024" "bitcoin-qt v25.2.0rc2" "User Commands"
2+
.TH BITCOIN-QT "1" "April 2024" "bitcoin-qt v25.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-qt \- manual page for bitcoin-qt v25.2.0rc2
4+
bitcoin-qt \- manual page for bitcoin-qt v25.2.0
55
.SH SYNOPSIS
66
.B bitcoin-qt
77
[\fI\,command-line options\/\fR]
88
.SH DESCRIPTION
9-
Bitcoin Core version v25.2.0rc2
9+
Bitcoin Core version v25.2.0
1010
.SH OPTIONS
1111
.HP
1212
\-?

doc/man/bitcoin-tx.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-TX "1" "March 2024" "bitcoin-tx v25.2.0rc2" "User Commands"
2+
.TH BITCOIN-TX "1" "April 2024" "bitcoin-tx v25.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-tx \- manual page for bitcoin-tx v25.2.0rc2
4+
bitcoin-tx \- manual page for bitcoin-tx v25.2.0
55
.SH SYNOPSIS
66
.B bitcoin-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
88
.br
99
.B bitcoin-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
1111
.SH DESCRIPTION
12-
Bitcoin Core bitcoin\-tx utility version v25.2.0rc2
12+
Bitcoin Core bitcoin\-tx utility version v25.2.0
1313
.SH OPTIONS
1414
.HP
1515
\-?

doc/man/bitcoin-util.1

Lines changed: 3 additions & 3 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.49.3.
2-
.TH BITCOIN-UTIL "1" "March 2024" "bitcoin-util v25.2.0rc2" "User Commands"
2+
.TH BITCOIN-UTIL "1" "April 2024" "bitcoin-util v25.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-util \- manual page for bitcoin-util v25.2.0rc2
4+
bitcoin-util \- manual page for bitcoin-util v25.2.0
55
.SH SYNOPSIS
66
.B bitcoin-util
77
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core bitcoin\-util utility version v25.2.0rc2
9+
Bitcoin Core bitcoin\-util utility version v25.2.0
1010
.SH OPTIONS
1111
.HP
1212
\-?

doc/man/bitcoin-wallet.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-WALLET "1" "March 2024" "bitcoin-wallet v25.2.0rc2" "User Commands"
2+
.TH BITCOIN-WALLET "1" "April 2024" "bitcoin-wallet v25.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-wallet \- manual page for bitcoin-wallet v25.2.0rc2
4+
bitcoin-wallet \- manual page for bitcoin-wallet v25.2.0
55
.SH DESCRIPTION
6-
Bitcoin Core bitcoin\-wallet version v25.2.0rc2
6+
Bitcoin Core bitcoin\-wallet version v25.2.0
77
.PP
88
bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
99
By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

doc/man/bitcoind.1

Lines changed: 3 additions & 3 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.49.3.
2-
.TH BITCOIND "1" "March 2024" "bitcoind v25.2.0rc2" "User Commands"
2+
.TH BITCOIND "1" "April 2024" "bitcoind v25.2.0" "User Commands"
33
.SH NAME
4-
bitcoind \- manual page for bitcoind v25.2.0rc2
4+
bitcoind \- manual page for bitcoind v25.2.0
55
.SH SYNOPSIS
66
.B bitcoind
77
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core version v25.2.0rc2
9+
Bitcoin Core version v25.2.0
1010
.SH OPTIONS
1111
.HP
1212
\-?

doc/release-notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
25.2rc2 Release Notes
1+
25.2 Release Notes
22
==================
33

4-
Bitcoin Core version 25.2rc2 is now available from:
4+
Bitcoin Core version 25.2 is now available from:
55

6-
<https://bitcoincore.org/bin/bitcoin-core-25.2/test.rc2>
6+
<https://bitcoincore.org/bin/bitcoin-core-25.2>
77

88
This release includes various bug fixes and performance
99
improvements, as well as updated translations.

0 commit comments

Comments
 (0)