From dea91256208b24ef121146f06e3c7ffd224d8da9 Mon Sep 17 00:00:00 2001 From: Glenn Willen Date: Wed, 3 Aug 2022 12:23:48 -0700 Subject: [PATCH] Fixes to manpage generation; regenerate manpages --- doc/man/Makefile.am | 2 +- doc/man/bitcoin-util.1 | 5 ----- doc/man/elements-cli.1 | 6 +++--- doc/man/elements-qt.1 | 6 +++--- doc/man/elements-tx.1 | 6 +++--- doc/man/elements-util.1 | 8 ++++---- doc/man/elements-wallet.1 | 6 +++--- doc/man/elementsd.1 | 9 +++++---- src/bitcoin-util.cpp | 4 ++-- 9 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 doc/man/bitcoin-util.1 diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 51566a72a8..e93760341b 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -18,7 +18,7 @@ if BUILD_BITCOIN_TX endif if BUILD_BITCOIN_UTIL - dist_man1_MANS+=bitcoin-util.1 + dist_man1_MANS+=elements-util.1 endif if ENABLE_WALLET diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 deleted file mode 100644 index 5c733c6e21..0000000000 --- a/doc/man/bitcoin-util.1 +++ /dev/null @@ -1,5 +0,0 @@ -.TH BITCOIN-UTIL "1" -.SH NAME -bitcoin-util \- manual page for bitcoin-util - -This is a placeholder file. Please follow the instructions in \fIcontrib/devtools/README.md\fR to generate the manual pages after a release. diff --git a/doc/man/elements-cli.1 b/doc/man/elements-cli.1 index c17b99263d..3ae9ebe98b 100644 --- a/doc/man/elements-cli.1 +++ b/doc/man/elements-cli.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH ELEMENTS-CLI "1" "August 2022" "elements-cli v22.0.0rc2" "User Commands" +.TH ELEMENTS-CLI "1" "August 2022" "elements-cli elements" "User Commands" .SH NAME -elements-cli \- manual page for elements-cli v22.0.0rc2 +elements-cli \- manual page for elements-cli elements .SH SYNOPSIS .B elements-cli [\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Elements Core\/\fR @@ -15,7 +15,7 @@ elements-cli \- manual page for elements-cli v22.0.0rc2 .B elements-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Elements Core RPC client version v22.0.0rc2 +Elements Core RPC client version elements\-22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-qt.1 b/doc/man/elements-qt.1 index a352c78f0a..389d751e54 100644 --- a/doc/man/elements-qt.1 +++ b/doc/man/elements-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH ELEMENTS-QT "1" "August 2022" "elements-qt v22.0.0rc2" "User Commands" +.TH ELEMENTS-QT "1" "August 2022" "elements-qt elements" "User Commands" .SH NAME -elements-qt \- manual page for elements-qt v22.0.0rc2 +elements-qt \- manual page for elements-qt elements .SH SYNOPSIS .B elements-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Elements Core version v22.0.0rc2 +Elements Core version elements\-22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-tx.1 b/doc/man/elements-tx.1 index 7f18743d28..096e117023 100644 --- a/doc/man/elements-tx.1 +++ b/doc/man/elements-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH ELEMENTS-TX "1" "August 2022" "elements-tx v22.0.0rc2" "User Commands" +.TH ELEMENTS-TX "1" "August 2022" "elements-tx elements" "User Commands" .SH NAME -elements-tx \- manual page for elements-tx v22.0.0rc2 +elements-tx \- manual page for elements-tx elements .SH SYNOPSIS .B elements-tx [\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded Elements transaction\/\fR @@ -9,7 +9,7 @@ elements-tx \- manual page for elements-tx v22.0.0rc2 .B elements-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded Elements transaction\/\fR .SH DESCRIPTION -Elements Core elements\-tx utility version v22.0.0rc2 +Elements Core elements\-tx utility version elements\-22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-util.1 b/doc/man/elements-util.1 index eba277c03b..0781dbbffc 100644 --- a/doc/man/elements-util.1 +++ b/doc/man/elements-util.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH ELEMENTS-UTIL "1" "August 2022" "elements-util v22.0.0rc2" "User Commands" +.TH ELEMENTS-UTIL "1" "August 2022" "elements-util elements" "User Commands" .SH NAME -elements-util \- manual page for elements-util v22.0.0rc2 +elements-util \- manual page for elements-util elements .SH SYNOPSIS -.B bitcoin-util +.B elements-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Elements Core bitcoin\-util utility version v22.0.0rc2 +Elements Core elements\-util utility version elements\-22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-wallet.1 b/doc/man/elements-wallet.1 index 056f8de3c8..d54909746d 100644 --- a/doc/man/elements-wallet.1 +++ b/doc/man/elements-wallet.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH ELEMENTS-WALLET "1" "August 2022" "elements-wallet v22.0.0rc2" "User Commands" +.TH ELEMENTS-WALLET "1" "August 2022" "elements-wallet elements" "User Commands" .SH NAME -elements-wallet \- manual page for elements-wallet v22.0.0rc2 +elements-wallet \- manual page for elements-wallet elements .SH DESCRIPTION -Elements Core elements\-wallet version v22.0.0rc2 +Elements Core elements\-wallet version elements\-22.0.0 .PP elements\-wallet is an offline tool for creating and interacting with Elements Core wallet files. By default elements\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/elementsd.1 b/doc/man/elementsd.1 index 0235b54fa7..a260f7f65e 100644 --- a/doc/man/elementsd.1 +++ b/doc/man/elementsd.1 @@ -1,18 +1,19 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH ELEMENTSD "1" "August 2022" "elementsd v22.0.0rc2" "User Commands" +.TH ELEMENTSD "1" "August 2022" "elementsd elements" "User Commands" .SH NAME -elementsd \- manual page for elementsd v22.0.0rc2 +elementsd \- manual page for elementsd elements .SH SYNOPSIS .B elementsd [\fI\,options\/\fR] \fI\,Start Elements Core\/\fR .SH DESCRIPTION -Elements Core version v22.0.0rc2 +Elements Core version elements\-22.0.0 Copyright \(co 2009\-2021 The Elements Project developers Copyright \(co 2009\-2021 The Bitcoin Core developers .PP Please contribute if you find Elements Core useful. Visit for further information about the software. -The source code is available from . +The source code is available from +. .PP This is experimental software. Distributed under the MIT software license, see the accompanying file COPYING diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp index f534aecc19..88ed70c408 100644 --- a/src/bitcoin-util.cpp +++ b/src/bitcoin-util.cpp @@ -52,10 +52,10 @@ static int AppInitUtil(ArgsManager& args, int argc, char* argv[]) if (HelpRequested(args) || args.IsArgSet("-version")) { // First part of help message is specific to this utility - std::string strUsage = PACKAGE_NAME " bitcoin-util utility version " + FormatFullVersion() + "\n"; + std::string strUsage = PACKAGE_NAME " elements-util utility version " + FormatFullVersion() + "\n"; if (!args.IsArgSet("-version")) { strUsage += "\n" - "Usage: bitcoin-util [options] [commands] Do stuff\n"; + "Usage: elements-util [options] [commands] Do stuff\n"; strUsage += "\n" + args.GetHelpMessage(); }