aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2022-12-05 15:24:03 +0000
committerfanquake <fanquake@gmail.com>2022-12-05 15:26:10 +0000
commit6fd35e2cb18d325221644a33b058c109aed3e767 (patch)
tree61d31cd11c342e2162c1e4809035363c07145278
parent1b05169c321d5210ca06cb9699e8af0376bb21d7 (diff)
parent8cc07f7fffa3d642d90614af20a47c0a2a229e40 (diff)
Merge bitcoin/bitcoin#26639: [22.x] bump version to v22.1v22.1
8cc07f7fffa3d642d90614af20a47c0a2a229e40 doc: update release notes for 22.1 (fanquake) 45355ec10b361cfccc4d1d616edf1dca216c10e2 doc: update manual pages for 22.1 (fanquake) 99e0ccc7426935d5680bc982f25eef368bd53875 build: bump version to 22.1 final (fanquake) Pull request description: Bump version to v22.1. Regenerate manpages. Add the only change since rc2 (https://github.com/bitcoin/bitcoin/pull/26633) to the release notes. That change does not require another rc. ACKs for top commit: hebasto: ACK 8cc07f7fffa3d642d90614af20a47c0a2a229e40, I have reviewed the changes and they look OK. Tree-SHA512: 1d75235e41ac64f80d3b209934460cec05af1f4ddcd426bf941316374de7dc7d909de2e3dffe9716559b9422262c39724ff330cdbb3774b856e4e6bb8a10248f
-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.md8
8 files changed, 24 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index 24aca42cea..1bfa60eafa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
index 58eeb8e23b..3bd0bc9caf 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.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
@@ -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
\-?
diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1
index a622701651..f5aac39149 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.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
\-?
diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
index ab2bc8eafa..b29794dd8f 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.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
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v22.1.0rc2
.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
\-?
diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1
index 15a33e81d3..eb705ccb54 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.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
\-?
diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1
index 4a0c19f5b0..dd0450a749 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.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.
diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
index c27d118ac2..376dfd1130 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.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
diff --git a/doc/release-notes.md b/doc/release-notes.md
index d21ae16723..d304b7e57a 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -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/>
@@ -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
@@ -106,6 +107,7 @@ Credits
Thanks to everyone who directly contributed to this release:
- Andrew Chow
+- BlackcoinDev
- Carl Dong
- Hennadii Stepanov
- Joan Karadimov