diff options
author | glozow <gloriajzhao@gmail.com> | 2024-06-12 12:56:42 +0100 |
---|---|---|
committer | glozow <gloriajzhao@gmail.com> | 2024-06-12 13:06:12 +0100 |
commit | d10cf127e576a8066a417aa77d49a6c726cb16af (patch) | |
tree | f055008d698ade109321a407b588f43bc56f0a4b /doc | |
parent | 6d7a1e3670675fe4bcdd9b2df9bce7979ecd90fc (diff) | |
parent | 7ca424f8e651707effe1380aaf72d9ad0e97aa18 (diff) |
Merge bitcoin/bitcoin#30260: [26.x] backports and final changes for 26.2rc1v26.2rc1
7ca424f8e651707effe1380aaf72d9ad0e97aa18 [doc] update release notes for 26.2rc1 (glozow)
03a91a0142ceaec369154151fba928b56aae6f08 [doc] manpages for 26.2rc1 (glozow)
4c824bbe03e61dab5665f59903d368ce3cc514d2 [build] bump to version 26.2rc1 (glozow)
b99229737d2416983136a91b8cf93c5af53ab924 qt: 26.2rc1 translations update (Hennadii Stepanov)
7b2489f57ff76dd6f25713e10deed0529a0d2111 depends: Fetch miniupnpc sources from an alternative website (Hennadii Stepanov)
Pull request description:
Backports + release notes for:
- #30151
And final changes for 26.2rc1:
- build changes
- manpages
- non-removal translations updates
ACKs for top commit:
stickies-v:
ACK 7ca424f8e651707effe1380aaf72d9ad0e97aa18
fanquake:
ACK 7ca424f8e651707effe1380aaf72d9ad0e97aa18
Tree-SHA512: 881697eb6fb78261e3deb5064d6f38227b449049add810c7da999a1f22fad60b9dd32057c626bbfaa7e461d53635cd2f7a9fb225eba0f6fb503afd4f1ef6c46d
Diffstat (limited to 'doc')
-rw-r--r-- | doc/man/bitcoin-cli.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-qt.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-tx.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-util.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-wallet.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoind.1 | 6 | ||||
-rw-r--r-- | doc/release-notes.md | 2 |
7 files changed, 20 insertions, 18 deletions
diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index d07e853e9e..ac1a92f11f 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.1. -.TH BITCOIN-CLI "1" "March 2024" "bitcoin-cli v26.1.0" "User Commands" +.TH BITCOIN-CLI "1" "June 2024" "bitcoin-cli v26.2.0rc1" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v26.1.0 +bitcoin-cli \- manual page for bitcoin-cli v26.2.0rc1 .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 v26.1.0 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v26.1.0 +Bitcoin Core RPC client version v26.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index 7f5185415e..bb5c6d57d6 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.1. -.TH BITCOIN-QT "1" "March 2024" "bitcoin-qt v26.1.0" "User Commands" +.TH BITCOIN-QT "1" "June 2024" "bitcoin-qt v26.2.0rc1" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v26.1.0 +bitcoin-qt \- manual page for bitcoin-qt v26.2.0rc1 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v26.1.0 +Bitcoin Core version v26.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index aa863d4b90..dd6028097a 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.1. -.TH BITCOIN-TX "1" "March 2024" "bitcoin-tx v26.1.0" "User Commands" +.TH BITCOIN-TX "1" "June 2024" "bitcoin-tx v26.2.0rc1" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v26.1.0 +bitcoin-tx \- manual page for bitcoin-tx v26.2.0rc1 .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 v26.1.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 v26.1.0 +Bitcoin Core bitcoin\-tx utility version v26.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index d7db89571b..cee727e0e9 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.1. -.TH BITCOIN-UTIL "1" "March 2024" "bitcoin-util v26.1.0" "User Commands" +.TH BITCOIN-UTIL "1" "June 2024" "bitcoin-util v26.2.0rc1" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v26.1.0 +bitcoin-util \- manual page for bitcoin-util v26.2.0rc1 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v26.1.0 +Bitcoin Core bitcoin\-util utility version v26.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index af59992b9f..5855f364fc 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.1. -.TH BITCOIN-WALLET "1" "March 2024" "bitcoin-wallet v26.1.0" "User Commands" +.TH BITCOIN-WALLET "1" "June 2024" "bitcoin-wallet v26.2.0rc1" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v26.1.0 +bitcoin-wallet \- manual page for bitcoin-wallet v26.2.0rc1 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v26.1.0 +Bitcoin Core bitcoin\-wallet version v26.2.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 e2b3c54046..fd2554ae0f 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.1. -.TH BITCOIND "1" "March 2024" "bitcoind v26.1.0" "User Commands" +.TH BITCOIND "1" "June 2024" "bitcoind v26.2.0rc1" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v26.1.0 +bitcoind \- manual page for bitcoind v26.2.0rc1 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v26.1.0 +Bitcoin Core version v26.2.0rc1 .SH OPTIONS .HP \-? diff --git a/doc/release-notes.md b/doc/release-notes.md index 127d14f4ce..27b8172b1b 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -60,6 +60,7 @@ Notable changes - #29747: depends: fix mingw-w64 Qt DEBUG=1 build - #29985: depends: Fix build of Qt for 32-bit platforms with recent glibc +- #30151: depends: Fetch miniupnpc sources from an alternative website ### Misc @@ -78,6 +79,7 @@ Thanks to everyone who directly contributed to this release: - dergoegge - fanquake - glozow +- Hennadii Stepanov - Jameson Lopp - jonatack - laanwj |