From b63309c58a71eb7e34b0bcab0d57199ac025daeb Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 1 Nov 2022 08:36:45 +0000 Subject: [PATCH 1/3] build: Bump version to 22.1.0rc1 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 317b3949a0c09..44adc433d896d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 22) -define(_CLIENT_VERSION_MINOR, 0) +define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 0) +define(_CLIENT_VERSION_RC, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) From 54e89eed9eb9c6877c1a8bed3d2f224721fc49f3 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 1 Nov 2022 08:47:13 +0000 Subject: [PATCH 2/3] doc: Update manual pages for 22.1.0rc1 --- doc/man/bitcoin-cli.1 | 8 ++++---- doc/man/bitcoin-qt.1 | 8 ++++---- doc/man/bitcoin-tx.1 | 8 ++++---- doc/man/bitcoin-util.1 | 8 ++++---- doc/man/bitcoin-wallet.1 | 8 ++++---- doc/man/bitcoind.1 | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index f38951cd16f12..ee4c14f4cd046 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.47.13. -.TH BITCOIN-CLI "1" "September 2021" "bitcoin-cli v22.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-CLI "1" "November 2022" "bitcoin-cli v22.1.0rc1" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v22.0.0 +bitcoin-cli \- manual page for bitcoin-cli v22.1.0rc1 .SH SYNOPSIS .B bitcoin-cli [\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v22.0.0 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v22.0.0 +Bitcoin Core RPC client version v22.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index 8cd2ae6b77706..6fd887ee06f56 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.47.13. -.TH BITCOIN-QT "1" "September 2021" "bitcoin-qt v22.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-QT "1" "November 2022" "bitcoin-qt v22.1.0rc1" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v22.0.0 +bitcoin-qt \- manual page for bitcoin-qt v22.1.0rc1 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v22.0.0 +Bitcoin Core version v22.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index 6f1a9bdbab93f..7c26372595762 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.47.13. -.TH BITCOIN-TX "1" "September 2021" "bitcoin-tx v22.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-TX "1" "November 2022" "bitcoin-tx v22.1.0rc1" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v22.0.0 +bitcoin-tx \- manual page for bitcoin-tx v22.1.0rc1 .SH SYNOPSIS .B bitcoin-tx [\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR @@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v22.0.0 .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.0.0 +Bitcoin Core bitcoin\-tx utility version v22.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index ce4d045f8c530..e0f0b41f020f5 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.47.13. -.TH BITCOIN-UTIL "1" "September 2021" "bitcoin-util v22.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-UTIL "1" "November 2022" "bitcoin-util v22.1.0rc1" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v22.0.0 +bitcoin-util \- manual page for bitcoin-util v22.1.0rc1 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v22.0.0 +Bitcoin Core bitcoin\-util utility version v22.1.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index 0a13f35556778..ecb832ba6022d 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.47.13. -.TH BITCOIN-WALLET "1" "September 2021" "bitcoin-wallet v22.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIN-WALLET "1" "November 2022" "bitcoin-wallet v22.1.0rc1" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v22.0.0 +bitcoin-wallet \- manual page for bitcoin-wallet v22.1.0rc1 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v22.0.0 +Bitcoin Core bitcoin\-wallet version v22.1.0rc1 .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 888c143fc31ae..7b5e514f2f14b 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.47.13. -.TH BITCOIND "1" "September 2021" "bitcoind v22.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BITCOIND "1" "November 2022" "bitcoind v22.1.0rc1" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v22.0.0 +bitcoind \- manual page for bitcoind v22.1.0rc1 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v22.0.0 +Bitcoin Core version v22.1.0rc1 Copyright \(co 2009\-2021 The Bitcoin Core developers .PP Please contribute if you find Bitcoin Core useful. Visit From 3343ec5a4f604b4b1798d0c8265c57d89bd738ce Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 1 Nov 2022 08:54:58 +0000 Subject: [PATCH 3/3] doc: update version number in bips.md to v22.1 --- doc/bips.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bips.md b/doc/bips.md index 45954bcfd8f05..63ff92d25fd35 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -1,4 +1,4 @@ -BIPs that are implemented by Bitcoin Core (up-to-date up to **v22.0**): +BIPs that are implemented by Bitcoin Core (up-to-date up to **v22.1**): * [`BIP 9`](https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki): The changes allowing multiple soft-forks to be deployed in parallel have been implemented since **v0.12.1** ([PR #7575](https://github.com/bitcoin/bitcoin/pull/7575)) * [`BIP 11`](https://github.com/bitcoin/bips/blob/master/bip-0011.mediawiki): Multisig outputs are standard since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)).