diff options
author | glozow <gloriajzhao@gmail.com> | 2024-07-03 15:45:00 +0100 |
---|---|---|
committer | glozow <gloriajzhao@gmail.com> | 2024-07-03 16:49:43 +0100 |
commit | 7b7041019ba5e7df7bde1416aa6916414a04f3db (patch) | |
tree | a8c8f0c506762e2e082801fac25f4cf3c88b4997 | |
parent | 6bbfdcfb6d6a620216eb8cdb50c238113cd77e6e (diff) | |
parent | eef5dbc21b3fd52069f2f0855fb76a13234ebbf3 (diff) |
Merge bitcoin/bitcoin#30376: 26.2 final changesv26.2
eef5dbc21b3fd52069f2f0855fb76a13234ebbf3 [doc] update release notes 26.2 (glozow)
00f0267ac0fcb8aa08ce4f04274499697335998d [doc] update manpages 26.2 (glozow)
29cbec45ddb0497bf6d5a641e0f5c3800ed1427a [build] bump copyright year (glozow)
fe8dee826d48a7476c3f77b6adca8a843f06e38e [build] bump version to 26.2 (glozow)
Pull request description:
bins were uploaded 2 weeks ago on June 18
website PR: https://github.com/bitcoin-core/bitcoincore.org/pull/1039
ACKs for top commit:
stickies-v:
ACK eef5dbc21b3fd52069f2f0855fb76a13234ebbf3
fanquake:
ACK eef5dbc21b3fd52069f2f0855fb76a13234ebbf3 If you want, you could also backport the changes to get the ASAN job running again, but that isn't blocking here.
theStack:
ACK eef5dbc21b3fd52069f2f0855fb76a13234ebbf3
Tree-SHA512: 7c9e97231fd51784f1cc78a9b7b07b8a201ad7f54715fab6dd3243244e9f52831f57883966f2061cbff7a68018b4345de27e3953c50d7ec801d1a61f216907d1
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | doc/man/bitcoin-cli.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-qt.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-tx.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-util.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoin-wallet.1 | 8 | ||||
-rw-r--r-- | doc/man/bitcoind.1 | 8 | ||||
-rw-r--r-- | doc/release-notes.md | 6 |
8 files changed, 29 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 847c747b90..2e8911242a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,9 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 26) define(_CLIENT_VERSION_MINOR, 2) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 1) +define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2023) +define(_COPYRIGHT_YEAR, 2024) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]]) AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/]) diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index ac1a92f11f..66127a6995 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.1. -.TH BITCOIN-CLI "1" "June 2024" "bitcoin-cli v26.2.0rc1" "User Commands" +.TH BITCOIN-CLI "1" "July 2024" "bitcoin-cli v26.2.0" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v26.2.0rc1 +bitcoin-cli \- manual page for bitcoin-cli v26.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 v26.2.0rc1 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v26.2.0rc1 +Bitcoin Core RPC client version v26.2.0 .SH OPTIONS .HP \-? @@ -170,7 +170,7 @@ network seed node(s)) .IP Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR. .SH COPYRIGHT -Copyright (C) 2009-2023 The Bitcoin Core developers +Copyright (C) 2009-2024 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index bb5c6d57d6..6b3571f898 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.1. -.TH BITCOIN-QT "1" "June 2024" "bitcoin-qt v26.2.0rc1" "User Commands" +.TH BITCOIN-QT "1" "July 2024" "bitcoin-qt v26.2.0" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v26.2.0rc1 +bitcoin-qt \- manual page for bitcoin-qt v26.2.0 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v26.2.0rc1 +Bitcoin Core version v26.2.0 .SH OPTIONS .HP \-? @@ -811,7 +811,7 @@ Reset all settings changed in the GUI .IP Show splash screen on startup (default: 1) .SH COPYRIGHT -Copyright (C) 2009-2023 The Bitcoin Core developers +Copyright (C) 2009-2024 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index dd6028097a..7facc0d8ce 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.1. -.TH BITCOIN-TX "1" "June 2024" "bitcoin-tx v26.2.0rc1" "User Commands" +.TH BITCOIN-TX "1" "July 2024" "bitcoin-tx v26.2.0" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v26.2.0rc1 +bitcoin-tx \- manual page for bitcoin-tx v26.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 v26.2.0rc1 .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.2.0rc1 +Bitcoin Core bitcoin\-tx utility version v26.2.0 .SH OPTIONS .HP \-? @@ -134,7 +134,7 @@ set=NAME:JSON\-STRING .IP Set register NAME to given JSON\-STRING .SH COPYRIGHT -Copyright (C) 2009-2023 The Bitcoin Core developers +Copyright (C) 2009-2024 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index cee727e0e9..8c946e4292 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.1. -.TH BITCOIN-UTIL "1" "June 2024" "bitcoin-util v26.2.0rc1" "User Commands" +.TH BITCOIN-UTIL "1" "July 2024" "bitcoin-util v26.2.0" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v26.2.0rc1 +bitcoin-util \- manual page for bitcoin-util v26.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 v26.2.0rc1 +Bitcoin Core bitcoin\-util utility version v26.2.0 .SH OPTIONS .HP \-? @@ -54,7 +54,7 @@ grind .IP Perform proof of work on hex header string .SH COPYRIGHT -Copyright (C) 2009-2023 The Bitcoin Core developers +Copyright (C) 2009-2024 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index 5855f364fc..ac665511da 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.1. -.TH BITCOIN-WALLET "1" "June 2024" "bitcoin-wallet v26.2.0rc1" "User Commands" +.TH BITCOIN-WALLET "1" "July 2024" "bitcoin-wallet v26.2.0" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v26.2.0rc1 +bitcoin-wallet \- manual page for bitcoin-wallet v26.2.0 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v26.2.0rc1 +Bitcoin Core bitcoin\-wallet version v26.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. @@ -110,7 +110,7 @@ salvage Attempt to recover private keys from a corrupt wallet. Warning: \&'salvage' is experimental. .SH COPYRIGHT -Copyright (C) 2009-2023 The Bitcoin Core developers +Copyright (C) 2009-2024 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index fd2554ae0f..02e5c03e10 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.1. -.TH BITCOIND "1" "June 2024" "bitcoind v26.2.0rc1" "User Commands" +.TH BITCOIND "1" "July 2024" "bitcoind v26.2.0" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v26.2.0rc1 +bitcoind \- manual page for bitcoind v26.2.0 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v26.2.0rc1 +Bitcoin Core version v26.2.0 .SH OPTIONS .HP \-? @@ -789,7 +789,7 @@ subject to empty whitelists. .IP Accept command line and JSON\-RPC commands .SH COPYRIGHT -Copyright (C) 2009-2023 The Bitcoin Core developers +Copyright (C) 2009-2024 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. diff --git a/doc/release-notes.md b/doc/release-notes.md index 92194a9a2d..67d8512dd0 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,9 @@ -26.2rc1 Release Notes +26.2 Release Notes ================== -Bitcoin Core version 26.2rc1 is now available from: +Bitcoin Core version 26.2 is now available from: - <https://bitcoincore.org/bin/bitcoin-core-26.2/test.rc1/> + <https://bitcoincore.org/bin/bitcoin-core-26.2/> This release includes new features, various bug fixes and performance improvements, as well as updated translations. |