Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30376: 26.2 final changes
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@glozow
glozow committed Jul 3, 2024
2 parents 6bbfdcf + eef5dbc commit 7b70410
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/])
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-cli.1
View file
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.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
Expand All @@ -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
\-?
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-qt.1
View file
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.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
\-?
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-tx.1
View file
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.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
.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.2.0rc1
Bitcoin Core bitcoin\-tx utility version v26.2.0
.SH OPTIONS
.HP
\-?
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-util.1
View file
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.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
\-?
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-wallet.1
View file
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.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.
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoind.1
View file
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.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
\-?
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions doc/release-notes.md
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 7b70410

Please sign in to comment.