Skip to content

Commit

Permalink
Merge bitcoin#26639: [22.x] bump version to v22.1
Browse files Browse the repository at this point in the history
8cc07f7 doc: update release notes for 22.1 (fanquake)
45355ec doc: update manual pages for 22.1 (fanquake)
99e0ccc build: bump version to 22.1 final (fanquake)

Pull request description:

  Bump version to v22.1.
  Regenerate manpages.
  Add the only change since rc2 (bitcoin#26633) to the release notes. That change does not require another rc.

ACKs for top commit:
  hebasto:
    ACK 8cc07f7, I have reviewed the changes and they look OK.

Tree-SHA512: 1d75235e41ac64f80d3b209934460cec05af1f4ddcd426bf941316374de7dc7d909de2e3dffe9716559b9422262c39724ff330cdbb3774b856e4e6bb8a10248f
  • Loading branch information
fanquake committed Dec 5, 2022
2 parents 1b05169 + 8cc07f7 commit 6fd35e2
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 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, 22)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 2)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2021)
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.2.
.TH BITCOIN-CLI "1" "November 2022" "bitcoin-cli v22.1.0rc2" "User Commands"
.TH BITCOIN-CLI "1" "December 2022" "bitcoin-cli v22.1.0" "User Commands"
.SH NAME
bitcoin-cli \- manual page for bitcoin-cli v22.1.0rc2
bitcoin-cli \- manual page for bitcoin-cli v22.1.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 v22.1.0rc2
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Bitcoin Core RPC client version v22.1.0rc2
Bitcoin Core RPC client version v22.1.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.2.
.TH BITCOIN-QT "1" "November 2022" "bitcoin-qt v22.1.0rc2" "User Commands"
.TH BITCOIN-QT "1" "December 2022" "bitcoin-qt v22.1.0" "User Commands"
.SH NAME
bitcoin-qt \- manual page for bitcoin-qt v22.1.0rc2
bitcoin-qt \- manual page for bitcoin-qt v22.1.0
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Bitcoin Core version v22.1.0rc2
Bitcoin Core version v22.1.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.2.
.TH BITCOIN-TX "1" "November 2022" "bitcoin-tx v22.1.0rc2" "User Commands"
.TH BITCOIN-TX "1" "December 2022" "bitcoin-tx v22.1.0" "User Commands"
.SH NAME
bitcoin-tx \- manual page for bitcoin-tx v22.1.0rc2
bitcoin-tx \- manual page for bitcoin-tx v22.1.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 v22.1.0rc2
Bitcoin Core bitcoin\-tx utility version v22.1.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.2.
.TH BITCOIN-UTIL "1" "November 2022" "bitcoin-util v22.1.0rc2" "User Commands"
.TH BITCOIN-UTIL "1" "December 2022" "bitcoin-util v22.1.0" "User Commands"
.SH NAME
bitcoin-util \- manual page for bitcoin-util v22.1.0rc2
bitcoin-util \- manual page for bitcoin-util v22.1.0
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
Bitcoin Core bitcoin\-util utility version v22.1.0rc2
Bitcoin Core bitcoin\-util utility version v22.1.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.2.
.TH BITCOIN-WALLET "1" "November 2022" "bitcoin-wallet v22.1.0rc2" "User Commands"
.TH BITCOIN-WALLET "1" "December 2022" "bitcoin-wallet v22.1.0" "User Commands"
.SH NAME
bitcoin-wallet \- manual page for bitcoin-wallet v22.1.0rc2
bitcoin-wallet \- manual page for bitcoin-wallet v22.1.0
.SH DESCRIPTION
Bitcoin Core bitcoin\-wallet version v22.1.0rc2
Bitcoin Core bitcoin\-wallet version v22.1.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.2.
.TH BITCOIND "1" "November 2022" "bitcoind v22.1.0rc2" "User Commands"
.TH BITCOIND "1" "December 2022" "bitcoind v22.1.0" "User Commands"
.SH NAME
bitcoind \- manual page for bitcoind v22.1.0rc2
bitcoind \- manual page for bitcoind v22.1.0
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
.SH DESCRIPTION
Bitcoin Core version v22.1.0rc2
Bitcoin Core version v22.1.0
Copyright \(co 2009\-2021 The Bitcoin Core developers
.PP
Please contribute if you find Bitcoin Core useful. Visit
Expand Down
8 changes: 5 additions & 3 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
22.1rc2 Release Notes Draft
===========================
22.1 Release Notes
==================

Bitcoin Core version 22.1rc2 is now available from:
Bitcoin Core version 22.1 is now available from:

<https://bitcoincore.org/bin/bitcoin-core-22.1/>

Expand Down Expand Up @@ -76,6 +76,7 @@ Updated settings
- #24256 build: Bump depends packages (zmq, libXau)
- #25201 windeploy: Renewed windows code signing certificate
- #25985 Revert "build: Use Homebrew's sqlite package if it is available"
- #26633 depends: update qt 5.12 url to archive location

### GUI

Expand Down Expand Up @@ -106,6 +107,7 @@ Credits
Thanks to everyone who directly contributed to this release:

- Andrew Chow
- BlackcoinDev
- Carl Dong
- Hennadii Stepanov
- Joan Karadimov
Expand Down

0 comments on commit 6fd35e2

Please sign in to comment.