Skip to content

Commit

Permalink
Merge bitcoin#28959: [26.0] Finalize or rc4
Browse files Browse the repository at this point in the history
b1d350c doc: update release notes for 26.0 (fanquake)
b0546bc doc: update manual pages for 26.0 (fanquake)
9ce1766 build: bump version to v26.0 final (fanquake)

Pull request description:

  Final changes for 26.0. Assuming no further backports. rc3 was done in bitcoin#28872.

ACKs for top commit:
  achow101:
    ACK b1d350c
  hebasto:
    ACK b1d350c, I have reviewed the code and it looks OK.

Tree-SHA512: 8b1bfa9e9d6c5ccf8305335eba503c02a76043b2752e2302da84cb574078889ddb761b9efd14ef97f68bbae154b00ac54f531e2e33eba6baf8d703aa98ef5175
  • Loading branch information
fanquake committed Dec 4, 2023
2 parents e4fef4a + b1d350c commit 44d8b13
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 26)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 3)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-cli.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-CLI "1" "November 2023" "bitcoin-cli v26.0.0rc3" "User Commands"
.TH BITCOIN-CLI "1" "November 2023" "bitcoin-cli v26.0.0" "User Commands"
.SH NAME
bitcoin-cli \- manual page for bitcoin-cli v26.0.0rc3
bitcoin-cli \- manual page for bitcoin-cli v26.0.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 v26.0.0rc3
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Bitcoin Core RPC client version v26.0.0rc3
Bitcoin Core RPC client version v26.0.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-qt.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-QT "1" "November 2023" "bitcoin-qt v26.0.0rc3" "User Commands"
.TH BITCOIN-QT "1" "November 2023" "bitcoin-qt v26.0.0" "User Commands"
.SH NAME
bitcoin-qt \- manual page for bitcoin-qt v26.0.0rc3
bitcoin-qt \- manual page for bitcoin-qt v26.0.0
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Bitcoin Core version v26.0.0rc3
Bitcoin Core version v26.0.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-tx.1
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-TX "1" "November 2023" "bitcoin-tx v26.0.0rc3" "User Commands"
.TH BITCOIN-TX "1" "November 2023" "bitcoin-tx v26.0.0" "User Commands"
.SH NAME
bitcoin-tx \- manual page for bitcoin-tx v26.0.0rc3
bitcoin-tx \- manual page for bitcoin-tx v26.0.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 v26.0.0rc3
Bitcoin Core bitcoin\-tx utility version v26.0.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-util.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-UTIL "1" "November 2023" "bitcoin-util v26.0.0rc3" "User Commands"
.TH BITCOIN-UTIL "1" "November 2023" "bitcoin-util v26.0.0" "User Commands"
.SH NAME
bitcoin-util \- manual page for bitcoin-util v26.0.0rc3
bitcoin-util \- manual page for bitcoin-util v26.0.0
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
Bitcoin Core bitcoin\-util utility version v26.0.0rc3
Bitcoin Core bitcoin\-util utility version v26.0.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/bitcoin-wallet.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-WALLET "1" "November 2023" "bitcoin-wallet v26.0.0rc3" "User Commands"
.TH BITCOIN-WALLET "1" "November 2023" "bitcoin-wallet v26.0.0" "User Commands"
.SH NAME
bitcoin-wallet \- manual page for bitcoin-wallet v26.0.0rc3
bitcoin-wallet \- manual page for bitcoin-wallet v26.0.0
.SH DESCRIPTION
Bitcoin Core bitcoin\-wallet version v26.0.0rc3
Bitcoin Core bitcoin\-wallet version v26.0.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
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIND "1" "November 2023" "bitcoind v26.0.0rc3" "User Commands"
.TH BITCOIND "1" "November 2023" "bitcoind v26.0.0" "User Commands"
.SH NAME
bitcoind \- manual page for bitcoind v26.0.0rc3
bitcoind \- manual page for bitcoind v26.0.0
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
.SH DESCRIPTION
Bitcoin Core version v26.0.0rc3
Bitcoin Core version v26.0.0
.SH OPTIONS
.HP
\-?
Expand Down
4 changes: 2 additions & 2 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
26.0 rc3 Release Notes
======================
26.0 Release Notes
==================

Bitcoin Core version 26.0 is now available from:

Expand Down

0 comments on commit 44d8b13

Please sign in to comment.