Skip to content

Commit

Permalink
Merge #29794: [25.x] Finalize 25.2
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake committed Apr 3, 2024
2 parents d5bad0d + e95c484 commit 62c22dd
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion 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)).
Expand Down
6 changes: 3 additions & 3 deletions 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
Expand All @@ -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
\-?
Expand Down
6 changes: 3 additions & 3 deletions 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
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-tx.1
@@ -1,15 +1,15 @@
.\" 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
.br
.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
\-?
Expand Down
6 changes: 3 additions & 3 deletions 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
\-?
Expand Down
6 changes: 3 additions & 3 deletions 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.
Expand Down
6 changes: 3 additions & 3 deletions 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
\-?
Expand Down
6 changes: 3 additions & 3 deletions 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.
Expand Down

0 comments on commit 62c22dd

Please sign in to comment.