From c5fdd27d4000b5de51a72291f80a89fc98004c7b Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 25 Sep 2016 13:35:15 +0200 Subject: [PATCH] Merge #8743: Remove old manpages from contrib/debian in favour of doc/man b194872 Remove old manpages from contrib/debian (fanquake) --- contrib/debian/bitcoin-qt.manpages | 1 + contrib/debian/bitcoin-tx.manpages | 1 + contrib/debian/copyright | 4 ---- contrib/debian/dashd.manpages | 5 ++--- contrib/debian/manpages/dash-cli.1 | 21 -------------------- contrib/debian/manpages/dash-qt.1 | 13 ------------- contrib/debian/manpages/dash.conf.5 | 19 ------------------ contrib/debian/manpages/dashd.1 | 30 ----------------------------- contrib/debian/rules | 3 --- doc/release-process.md | 3 +++ 10 files changed, 7 insertions(+), 93 deletions(-) create mode 100644 contrib/debian/bitcoin-qt.manpages create mode 100644 contrib/debian/bitcoin-tx.manpages delete mode 100644 contrib/debian/manpages/dash-cli.1 delete mode 100644 contrib/debian/manpages/dash-qt.1 delete mode 100644 contrib/debian/manpages/dash.conf.5 delete mode 100644 contrib/debian/manpages/dashd.1 diff --git a/contrib/debian/bitcoin-qt.manpages b/contrib/debian/bitcoin-qt.manpages new file mode 100644 index 0000000000..9a3cc31c09 --- /dev/null +++ b/contrib/debian/bitcoin-qt.manpages @@ -0,0 +1 @@ +doc/man/bitcoin-qt.1 diff --git a/contrib/debian/bitcoin-tx.manpages b/contrib/debian/bitcoin-tx.manpages new file mode 100644 index 0000000000..861d49d070 --- /dev/null +++ b/contrib/debian/bitcoin-tx.manpages @@ -0,0 +1 @@ +doc/man/bitcoin-tx.1 diff --git a/contrib/debian/copyright b/contrib/debian/copyright index eca0c5dd3e..9b9d0da47d 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -15,10 +15,6 @@ Copyright: 2010-2011, Jonas Smedegaard 2011, Matt Corallo License: GPL-2+ -Files: debian/manpages/* -Copyright: Micah Anderson -License: GPL-3+ - Files: src/qt/res/icons/add.png src/qt/res/icons/address-book.png src/qt/res/icons/chevron.png diff --git a/contrib/debian/dashd.manpages b/contrib/debian/dashd.manpages index 42d160ad5c..f6f01896f3 100644 --- a/contrib/debian/dashd.manpages +++ b/contrib/debian/dashd.manpages @@ -1,3 +1,2 @@ -debian/manpages/dashd.1 -debian/manpages/dash.conf.5 -debian/manpages/dash-cli.1 +manpages/dashd.1 +manpages/dash-cli.1 diff --git a/contrib/debian/manpages/dash-cli.1 b/contrib/debian/manpages/dash-cli.1 deleted file mode 100644 index ced0ab1286..0000000000 --- a/contrib/debian/manpages/dash-cli.1 +++ /dev/null @@ -1,21 +0,0 @@ -.TH DASH-CLI "1" "June 2016" "dash-cli 0.12" -.SH NAME -dash-cli \- a remote procedure call client for Dash Core. -.SH SYNOPSIS -dash-cli [options] [params] \- Send command to Dash Core. -.TP -dash-cli [options] help \- Asks Dash Core for a list of supported commands. -.SH DESCRIPTION -This manual page documents the dash-cli program. dash-cli is an RPC client used to send commands to Dash Core. - -.SH OPTIONS -.TP -\fB\-?\fR -Show possible options. - -.SH "SEE ALSO" -\fBdashd\fP, \fBdash.conf\fP -.SH AUTHOR -This manual page was written by Ciemon Dunville . Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License. - -The complete text of the MIT License can be found on the web at \fIhttp://opensource.org/licenses/MIT\fP. diff --git a/contrib/debian/manpages/dash-qt.1 b/contrib/debian/manpages/dash-qt.1 deleted file mode 100644 index 4e3d821181..0000000000 --- a/contrib/debian/manpages/dash-qt.1 +++ /dev/null @@ -1,13 +0,0 @@ -.TH DASH-QT "1" "June 2016" "dash-qt 0.12" -.SH NAME -dash-qt \- peer-to-peer network based digital currency -.SH DESCRIPTION -.SS "Usage:" -.IP -dash\-qt [command\-line options] -.SH OPTIONS -.TP -\-? -List options. -.SH "SEE ALSO" -dashd(1) diff --git a/contrib/debian/manpages/dash.conf.5 b/contrib/debian/manpages/dash.conf.5 deleted file mode 100644 index 062c42ac08..0000000000 --- a/contrib/debian/manpages/dash.conf.5 +++ /dev/null @@ -1,19 +0,0 @@ -.TH DASH.CONF "5" "June 2016" "dash.conf 0.12" -.SH NAME -dash.conf \- Dash Core configuration file -.SH SYNOPSIS -All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. -.TP -The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to dashd(1) for a up to date list of valid options. -.TP -The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, dashd(1) will look for a file named dash.conf(5) in the Dash Core data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments. -.SH LOCATION -dash.conf should be located in $HOME/.dashcore - -.SH "SEE ALSO" -dashd(1) -.SH AUTHOR -This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. - -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. - diff --git a/contrib/debian/manpages/dashd.1 b/contrib/debian/manpages/dashd.1 deleted file mode 100644 index c92e707692..0000000000 --- a/contrib/debian/manpages/dashd.1 +++ /dev/null @@ -1,30 +0,0 @@ -.TH DASHD "1" "June 2016" "dashd 0.12" -.SH NAME -dashd \- peer-to-peer network based digital currency -.SH SYNOPSIS -dashd [options] [params] -.TP -dashd [options] help \- Get help for a command -.SH DESCRIPTION -This manual page documents the dashd program. Dash is an experimental new digital currency that enables anonymous, instant payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Dash Core is the name of the open source software which enables the use of this currency. - -.SH OPTIONS -.TP -\-? -List of possible options. -.SH COMMANDS -.TP -\fBhelp\fR -List commands. - -.TP -\fBhelp 'command'\fR -Get help for a command. - -.SH "SEE ALSO" -dash.conf(5) -.SH AUTHOR -This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. - -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. - diff --git a/contrib/debian/rules b/contrib/debian/rules index df23a96d67..533fcd787c 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -5,9 +5,6 @@ #build/dashd:: # $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_dash) -DEB_INSTALL_EXAMPLES_dashd += debian/examples/* -DEB_INSTALL_MANPAGES_dashd += debian/manpages/* - %: dh --with bash-completion $@ diff --git a/doc/release-process.md b/doc/release-process.md index a1789c4257..1dee8408b8 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -2,6 +2,9 @@ Release Process ==================== * Update translations, see [translation_process.md](https://github.com/dashpay/dash/blob/master/doc/translation_process.md#synchronising-translations). + +* Update manpages, see [gen-manpages.sh](https://github.com/dashpay/dash/blob/master/contrib/devtools/README.md#gen-manpagessh). + * Update hardcoded [seeds](/contrib/seeds) * * *