aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2023-12-04 10:21:33 +0000
committerfanquake <fanquake@gmail.com>2023-12-04 10:45:21 +0000
commit44d8b13c81e5276eb610c99f227a4d090cc532f6 (patch)
tree94e75c185ce8453316ff9d79a355e0214afce131
parente4fef4ae65c68ebd34774700dc4801c24313d469 (diff)
parentb1d350c78b0a26e3c514a79b928578727df70538 (diff)
Merge bitcoin/bitcoin#28959: [26.0] Finalize or rc4v26.0
b1d350c78b0a26e3c514a79b928578727df70538 doc: update release notes for 26.0 (fanquake) b0546bc907edc4e6b7ab1baaf1f9400bd8315bf3 doc: update manual pages for 26.0 (fanquake) 9ce1766d206d3ef607d659d6d0759b8c02a02f60 build: bump version to v26.0 final (fanquake) Pull request description: Final changes for 26.0. Assuming no further backports. rc3 was done in #28872. ACKs for top commit: achow101: ACK b1d350c78b0a26e3c514a79b928578727df70538 hebasto: ACK b1d350c78b0a26e3c514a79b928578727df70538, I have reviewed the code and it looks OK. Tree-SHA512: 8b1bfa9e9d6c5ccf8305335eba503c02a76043b2752e2302da84cb574078889ddb761b9efd14ef97f68bbae154b00ac54f531e2e33eba6baf8d703aa98ef5175
-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.md4
8 files changed, 21 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index c60322434d..01636ab872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index 33ddf36a3b..d84d39367f 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" "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
@@ -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
\-?
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index 1e074e3ee1..a059ff6c95 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" "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
\-?
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index d9020b4685..16a1a2a614 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" "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
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v26.0.0rc3
.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
\-?
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 5ba672b010..bfc750b1d4 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" "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
\-?
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index 5bf09f1db4..c45ca71a54 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" "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.
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index 01b2ea4858..ec69d800f0 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" "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
\-?
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 23bdfd7dd6..b30dadf62b 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,5 +1,5 @@
-26.0 rc3 Release Notes
-======================
+26.0 Release Notes
+==================
Bitcoin Core version 26.0 is now available from: