Skip to content

Commit 7b70410

Browse files
glozowglozow
committed
Merge bitcoin#30376: 26.2 final changes
eef5dbc [doc] update release notes 26.2 (glozow) 00f0267 [doc] update manpages 26.2 (glozow) 29cbec4 [build] bump copyright year (glozow) fe8dee8 [build] bump version to 26.2 (glozow) Pull request description: bins were uploaded 2 weeks ago on June 18 website PR: bitcoin-core/bitcoincore.org#1039 ACKs for top commit: stickies-v: ACK eef5dbc fanquake: ACK eef5dbc If you want, you could also backport the changes to get the ASAN job running again, but that isn't blocking here. theStack: ACK eef5dbc Tree-SHA512: 7c9e97231fd51784f1cc78a9b7b07b8a201ad7f54715fab6dd3243244e9f52831f57883966f2061cbff7a68018b4345de27e3953c50d7ec801d1a61f216907d1
2 parents 6bbfdcf + eef5dbc commit 7b70410

8 files changed

+29
-29
lines changed

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 26)
33
define(_CLIENT_VERSION_MINOR, 2)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 1)
5+
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
7-
define(_COPYRIGHT_YEAR, 2023)
7+
define(_COPYRIGHT_YEAR, 2024)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])
99
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
1010
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/])

‎doc/man/bitcoin-cli.1

+4-4
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.1.
2-
.TH BITCOIN-CLI "1" "June 2024" "bitcoin-cli v26.2.0rc1" "User Commands"
2+
.TH BITCOIN-CLI "1" "July 2024" "bitcoin-cli v26.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-cli \- manual page for bitcoin-cli v26.2.0rc1
4+
bitcoin-cli \- manual page for bitcoin-cli v26.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 v26.2.0rc1
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 v26.2.0rc1
18+
Bitcoin Core RPC client version v26.2.0
1919
.SH OPTIONS
2020
.HP
2121
\-?
@@ -170,7 +170,7 @@ network seed node(s))
170170
.IP
171171
Use the test chain. Equivalent to \fB\-chain\fR=\fI\,test\/\fR.
172172
.SH COPYRIGHT
173-
Copyright (C) 2009-2023 The Bitcoin Core developers
173+
Copyright (C) 2009-2024 The Bitcoin Core developers
174174

175175
Please contribute if you find Bitcoin Core useful. Visit
176176
<https://bitcoincore.org/> for further information about the software.

‎doc/man/bitcoin-qt.1

+4-4
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.1.
2-
.TH BITCOIN-QT "1" "June 2024" "bitcoin-qt v26.2.0rc1" "User Commands"
2+
.TH BITCOIN-QT "1" "July 2024" "bitcoin-qt v26.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-qt \- manual page for bitcoin-qt v26.2.0rc1
4+
bitcoin-qt \- manual page for bitcoin-qt v26.2.0
55
.SH SYNOPSIS
66
.B bitcoin-qt
77
[\fI\,command-line options\/\fR]
88
.SH DESCRIPTION
9-
Bitcoin Core version v26.2.0rc1
9+
Bitcoin Core version v26.2.0
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -811,7 +811,7 @@ Reset all settings changed in the GUI
811811
.IP
812812
Show splash screen on startup (default: 1)
813813
.SH COPYRIGHT
814-
Copyright (C) 2009-2023 The Bitcoin Core developers
814+
Copyright (C) 2009-2024 The Bitcoin Core developers
815815

816816
Please contribute if you find Bitcoin Core useful. Visit
817817
<https://bitcoincore.org/> for further information about the software.

‎doc/man/bitcoin-tx.1

+4-4
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.1.
2-
.TH BITCOIN-TX "1" "June 2024" "bitcoin-tx v26.2.0rc1" "User Commands"
2+
.TH BITCOIN-TX "1" "July 2024" "bitcoin-tx v26.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-tx \- manual page for bitcoin-tx v26.2.0rc1
4+
bitcoin-tx \- manual page for bitcoin-tx v26.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 v26.2.0rc1
12+
Bitcoin Core bitcoin\-tx utility version v26.2.0
1313
.SH OPTIONS
1414
.HP
1515
\-?
@@ -134,7 +134,7 @@ set=NAME:JSON\-STRING
134134
.IP
135135
Set register NAME to given JSON\-STRING
136136
.SH COPYRIGHT
137-
Copyright (C) 2009-2023 The Bitcoin Core developers
137+
Copyright (C) 2009-2024 The Bitcoin Core developers
138138

139139
Please contribute if you find Bitcoin Core useful. Visit
140140
<https://bitcoincore.org/> for further information about the software.

‎doc/man/bitcoin-util.1

+4-4
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.1.
2-
.TH BITCOIN-UTIL "1" "June 2024" "bitcoin-util v26.2.0rc1" "User Commands"
2+
.TH BITCOIN-UTIL "1" "July 2024" "bitcoin-util v26.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-util \- manual page for bitcoin-util v26.2.0rc1
4+
bitcoin-util \- manual page for bitcoin-util v26.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 v26.2.0rc1
9+
Bitcoin Core bitcoin\-util utility version v26.2.0
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -54,7 +54,7 @@ grind
5454
.IP
5555
Perform proof of work on hex header string
5656
.SH COPYRIGHT
57-
Copyright (C) 2009-2023 The Bitcoin Core developers
57+
Copyright (C) 2009-2024 The Bitcoin Core developers
5858

5959
Please contribute if you find Bitcoin Core useful. Visit
6060
<https://bitcoincore.org/> for further information about the software.

‎doc/man/bitcoin-wallet.1

+4-4
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.1.
2-
.TH BITCOIN-WALLET "1" "June 2024" "bitcoin-wallet v26.2.0rc1" "User Commands"
2+
.TH BITCOIN-WALLET "1" "July 2024" "bitcoin-wallet v26.2.0" "User Commands"
33
.SH NAME
4-
bitcoin-wallet \- manual page for bitcoin-wallet v26.2.0rc1
4+
bitcoin-wallet \- manual page for bitcoin-wallet v26.2.0
55
.SH DESCRIPTION
6-
Bitcoin Core bitcoin\-wallet version v26.2.0rc1
6+
Bitcoin Core bitcoin\-wallet version v26.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.
@@ -110,7 +110,7 @@ salvage
110110
Attempt to recover private keys from a corrupt wallet. Warning:
111111
\&'salvage' is experimental.
112112
.SH COPYRIGHT
113-
Copyright (C) 2009-2023 The Bitcoin Core developers
113+
Copyright (C) 2009-2024 The Bitcoin Core developers
114114

115115
Please contribute if you find Bitcoin Core useful. Visit
116116
<https://bitcoincore.org/> for further information about the software.

‎doc/man/bitcoind.1

+4-4
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.1.
2-
.TH BITCOIND "1" "June 2024" "bitcoind v26.2.0rc1" "User Commands"
2+
.TH BITCOIND "1" "July 2024" "bitcoind v26.2.0" "User Commands"
33
.SH NAME
4-
bitcoind \- manual page for bitcoind v26.2.0rc1
4+
bitcoind \- manual page for bitcoind v26.2.0
55
.SH SYNOPSIS
66
.B bitcoind
77
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core version v26.2.0rc1
9+
Bitcoin Core version v26.2.0
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -789,7 +789,7 @@ subject to empty whitelists.
789789
.IP
790790
Accept command line and JSON\-RPC commands
791791
.SH COPYRIGHT
792-
Copyright (C) 2009-2023 The Bitcoin Core developers
792+
Copyright (C) 2009-2024 The Bitcoin Core developers
793793

794794
Please contribute if you find Bitcoin Core useful. Visit
795795
<https://bitcoincore.org/> for further information about the software.

‎doc/release-notes.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
26.2rc1 Release Notes
1+
26.2 Release Notes
22
==================
33

4-
Bitcoin Core version 26.2rc1 is now available from:
4+
Bitcoin Core version 26.2 is now available from:
55

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

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

0 commit comments

Comments
 (0)