update man pages

26 files changed, 495 insertions, 446 deletions

diff --git a/man/taler-auditor-dbinit.1 b/man/taler-auditor-dbinit.1
index a5754dc4..fec025ef 100644
--- a/man/taler-auditor-dbinit.1
+++ b/man/taler-auditor-dbinit.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR-DBINIT" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-AUDITOR-DBINIT" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-auditor-dbinit \- setup auditor database
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-auditor\-dbinit\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-g\fP\ |\ \fB––gc\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-R\fP\ |\ \fB––reset\fP]
-[\fB\-r\fP\ |\ \fB––restart\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-g\fP\ |\ \fB\-\-gc\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-R\fP\ |\ \fB\-\-reset\fP]
+[\fB\-r\fP\ |\ \fB\-\-restart\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-dbinit\fP is a command\-line tool to initialize the Taler
@@ -50,32 +50,32 @@ Taler exchange to operate.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-g\fP | \fB––gc\fP
+\fB\-g\fP | \fB\-\-gc\fP
 Garbage collect database. Deletes all unnecessary data in the
 database.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-R\fP | \fB––reset\fP
+\fB\-R\fP | \fB\-\-reset\fP
 Drop tables. Dangerous, will delete all existing data in the database.
 .TP
-\fB\-r\fP | \fB––restart\fP
+\fB\-r\fP | \fB\-\-restart\fP
 Restart all auditors from the beginning. Useful for
 testing.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-auditor-exchange.1 b/man/taler-auditor-exchange.1
index b41ad692..04e3385a 100644
--- a/man/taler-auditor-exchange.1
+++ b/man/taler-auditor-exchange.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR-EXCHANGE" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-AUDITOR-EXCHANGE" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-auditor-exchange \- add or remove exchange from auditor’s list
 .
@@ -33,12 +33,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-auditor\-exchange\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-m\fP\ \fIMASTERKEY\fP\ |\ \fB––exchange\-key=\fP‌\fIMASTERKEY\fP]
-[\fB\-r\fP\ |\ \fB––remove\fP]
-[\fB\-u\fP\ \fIEXCHANGE_URL\fP\ |\ \fB––auditor\-url=\fP‌\fIEXCHANGE_URL\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-m\fP\ \fIMASTERKEY\fP\ |\ \fB\-\-exchange\-key=\fP‌\fIMASTERKEY\fP]
+[\fB\-r\fP\ |\ \fB\-\-remove\fP]
+[\fB\-u\fP\ \fIEXCHANGE_URL\fP\ |\ \fB\-\-auditor\-url=\fP‌\fIEXCHANGE_URL\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-auditor\-exchange\fP is a command\-line tool to be used by an
@@ -49,27 +49,27 @@ taler\-auditor or taler\-wire\-auditor. Afterwards the exchange will be
 visible via the /exchanges API of the taler\-auditor\-httpd.
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-m\fP \fIMASTERKEY\fP | \fB––exchange\-key=\fP‌\fIMASTERKEY\fP
+\fB\-m\fP \fIMASTERKEY\fP | \fB\-\-exchange\-key=\fP‌\fIMASTERKEY\fP
 Public key of the exchange in Crockford base32 encoding, for example
 as generated by \fBtaler\-auditor\-offline setup\fP\&.
 .TP
-\fB\-r\fP | \fB––remove\fP
+\fB\-r\fP | \fB\-\-remove\fP
 Instead of adding the exchange, remove it. Note that this will drop
 ALL data associated with that exchange, including existing auditing
 information. So use with extreme care!
 .TP
-\fB\-u\fP \fIEXCHANGE_URL\fP | \fB––auditor\-url=\fP‌\fIEXCHANGE_URL\fP
+\fB\-u\fP \fIEXCHANGE_URL\fP | \fB\-\-auditor\-url=\fP‌\fIEXCHANGE_URL\fP
 URL of the exchange. The exchange’s HTTP API must be available at
 this address.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH DIAGNOSTICS
diff --git a/man/taler-auditor-httpd.1 b/man/taler-auditor-httpd.1
index ed1c3eb2..d4f876b9 100644
--- a/man/taler-auditor-httpd.1
+++ b/man/taler-auditor-httpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR-HTTPD" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-AUDITOR-HTTPD" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-auditor-httpd \- HTTP server providing a RESTful API to access a Taler auditor
 .
@@ -33,13 +33,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-auditor\-httpd\fP
-[\fB\-C\fP\ |\ \fB––connection\-close\fP]
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-t\fP\ \fISECONDS\fP\ |\ \fB––timeout\fP\fISECONDS\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-C\fP\ |\ \fB\-\-connection\-close\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-t\fP\ \fISECONDS\fP\ |\ \fB\-\-timeout\fP\fISECONDS\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-auditor\-httpd\fP is a command\-line tool to run the Taler auditor
@@ -48,30 +48,30 @@ before running this command.
 .SH OPTIONS
 .INDENT 0.0
 .TP
-\fB\-C\fP | \fB––connection\-close\fP
+\fB\-C\fP | \fB\-\-connection\-close\fP
 Force each HTTP connection to be closed after each request
 (useful in combination with \-f to avoid having to wait for nc to
 time out).
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP\fIFILENAME\fP
 Use the configuration and other resources for the auditor to
 operate from FILENAME.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-t\fP \fISECONDS\fP | \fB––timeout=\fP\fISECONDS\fP
+\fB\-t\fP \fISECONDS\fP | \fB\-\-timeout=\fP\fISECONDS\fP
 Specifies the number of \fISECONDS\fP after which the HTTPD should close
 (idle) HTTP connections.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SIGNALS
diff --git a/man/taler-auditor-offline.1 b/man/taler-auditor-offline.1
index 79ed11cf..fa892f7b 100644
--- a/man/taler-auditor-offline.1
+++ b/man/taler-auditor-offline.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR-OFFLINE" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-AUDITOR-OFFLINE" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-auditor-offline \- Taler auditor certifies that it audits a Taler exchange
 .
@@ -33,11 +33,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-auditor\-offline\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 [subcommand ...]
 .SH DESCRIPTION
 .sp
@@ -68,21 +68,21 @@ and if not consumed the final output is printed to \fBstdout\fP\&.
 The general options for \fBtaler\-auditor\-offline\fP are:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH CONFIGURATION
diff --git a/man/taler-auditor.1 b/man/taler-auditor.1
index 3c7b9ce7..7e7e8491 100644
--- a/man/taler-auditor.1
+++ b/man/taler-auditor.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-AUDITOR" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-auditor \- audit exchange
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-auditor\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-i**_|_\fP––internal**]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIMASTER_KEY\fP\ |\ \fB––exchange\-key=\fP‌\fIMASTER_KEY\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-i**_|_\fP\-\-internal**]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIMASTER_KEY\fP\ |\ \fB\-\-exchange\-key=\fP‌\fIMASTER_KEY\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-auditor\fP is a command\-line tool to be used by an auditor to
@@ -54,36 +54,36 @@ incoming and outgoing wire transfers that the bank claims to have
 matches the exchange’s database. Its options are as follows.
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––internal\fP
+\fB\-i\fP | \fB\-\-internal\fP
 Run additional checks that can only performed on the exchange\-internal
 database and not the "safe" replicated database at the auditor.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIKEY\fP | \fB––exchange\-key=\fP‌\fIKEY\fP
+\fB\-m\fP \fIKEY\fP | \fB\-\-exchange\-key=\fP‌\fIKEY\fP
 Public master key of the exchange in Crockford base32 encoding, for
 example as generated by \fBtaler\-auditor\-offline setup\fP\&. If this option is missing,
 taler\-auditor will use the MASTER_PUBLIC_KEY value from the
 “exchange” section of the configuration.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-aggregator.1 b/man/taler-exchange-aggregator.1
index f1ac00a6..ac4e684b 100644
--- a/man/taler-exchange-aggregator.1
+++ b/man/taler-exchange-aggregator.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-AGGREGATOR" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-AGGREGATOR" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-aggregator \- aggregate deposits into wire transfers
 .
@@ -33,13 +33,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-aggregator\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel\fP\fIUSEC\fP]
-[\fB\-t\fP\ |\ \fB––test\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel\fP\fIUSEC\fP]
+[\fB\-t\fP\ |\ \fB\-\-test\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-aggregator\fP is a command\-line tool to run aggregate deposits
@@ -47,29 +47,29 @@ to the same merchant into larger wire transfers. The actual transfers are then
 done by \fBtaler\-exchange\-transfer\fP\&.
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP | \fB––test\fP
+\fB\-t\fP | \fB\-\-test\fP
 Run in test mode and exit when idle.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-benchmark.1 b/man/taler-exchange-benchmark.1
index 3fd342ed..6859ed1a 100644
--- a/man/taler-exchange-benchmark.1
+++ b/man/taler-exchange-benchmark.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-BENCHMARK" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-BENCHMARK" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-benchmark \- measure exchange performance
 .
@@ -33,19 +33,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-benchmark\fP
-[\fB\-c\fP\ \fICONFIG_FILENAME\fP\ |\ \fB––config=\fP‌\fICONFIG_FILENAME\fP]
-[\fB\-F\fP\ |\ \fB––reserves\-first\fP]
-[\fB\-f\fP\ |\ \fB––fakebank\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-K\fP\ |\ \fB––linger\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––log\-level=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIMODE\fP\ |\ \fB––mode=\fP\fIMODE\fP]
-[\fB\-n\fP\ \fIHOWMANY_COINS\fP\ |\ \fB––coins\-number=\fP‌\fIHOWMANY_COINS\fP]
-[\fB\-p\fP\ \fINPROCS\fP\ |\ \fB––parallelism=\fP\fINPROCS\fP]
-[\fB\-R\fP\ \fIRATE\fP\ |\ \fB––refresh\-rate=\fP\fIRATE\fP]
-[\fB\-r\fP\ \fIN\fP\ |\ \fB––reserves=\fP\fIN\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fICONFIG_FILENAME\fP\ |\ \fB\-\-config=\fP‌\fICONFIG_FILENAME\fP]
+[\fB\-F\fP\ |\ \fB\-\-reserves\-first\fP]
+[\fB\-f\fP\ |\ \fB\-\-fakebank\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-K\fP\ |\ \fB\-\-linger\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-log\-level=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIMODE\fP\ |\ \fB\-\-mode=\fP\fIMODE\fP]
+[\fB\-n\fP\ \fIHOWMANY_COINS\fP\ |\ \fB\-\-coins\-number=\fP‌\fIHOWMANY_COINS\fP]
+[\fB\-p\fP\ \fINPROCS\fP\ |\ \fB\-\-parallelism=\fP\fINPROCS\fP]
+[\fB\-R\fP\ \fIRATE\fP\ |\ \fB\-\-refresh\-rate=\fP\fIRATE\fP]
+[\fB\-r\fP\ \fIN\fP\ |\ \fB\-\-reserves=\fP\fIN\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-benchmark\fP is a command\-line tool to measure the time
@@ -56,50 +56,50 @@ Nginx. Moreover, the benchmark runs on a “volatile” database, that means
 that table are always erased during a single benchmark run.
 .INDENT 0.0
 .TP
-\fB\-c\fP \fICONFIG_FILENAME\fP | \fB––config=\fP‌\fICONFIG_FILENAME\fP
+\fB\-c\fP \fICONFIG_FILENAME\fP | \fB\-\-config=\fP‌\fICONFIG_FILENAME\fP
 (Mandatory) Use CONFIG_FILENAME.
 .TP
-\fB\-F\fP | \fB––reserves\-first\fP
+\fB\-F\fP | \fB\-\-reserves\-first\fP
 Create all reserves first, before starting normal operations.
 .TP
-\fB\-f\fP | \fB––fakebank\fP
+\fB\-f\fP | \fB\-\-fakebank\fP
 Launch a fakebank instead of the Python bank. Only meaningful if the
 mode is to launch more than just a client.  Note that using the
 fakebank will cause the benchmark application to reset all databases
 as the fakebank is stateless and thus previous database state would
 inherently cause trouble.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Prints a compiled\-in help text.
 .TP
-\fB\-K\fP | \fB––linger\fP
+\fB\-K\fP | \fB\-\-linger\fP
 Linger around until keypress after the benchmark is done.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––log\-level=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-log\-level=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIMODE\fP | \fB––mode=\fP\fIMODE\fP
+\fB\-m\fP \fIMODE\fP | \fB\-\-mode=\fP\fIMODE\fP
 Mode of operation. Accepted values are: \fBexchange\fP, \fBclients\fP, \fBboth\fP\&.
 .TP
-\fB\-n\fP \fIHOWMANY_COINS\fP | \fB––coins\-number=\fP‌\fIHOWMANY_COINS\fP
+\fB\-n\fP \fIHOWMANY_COINS\fP | \fB\-\-coins\-number=\fP‌\fIHOWMANY_COINS\fP
 Defaults to 1. Specifies how many coins this benchmark should
 withdraw and spend. After being spent, each coin will be refreshed
 with a probability RATE (see option \fB\-\-refresh\-rate\fP).
 .TP
-\fB\-p\fP \fINPROCS\fP | \fB––parallelism=\fP\fINPROCS\fP
+\fB\-p\fP \fINPROCS\fP | \fB\-\-parallelism=\fP\fINPROCS\fP
 Run with \fINPROCS\fP client processes.
 .TP
-\fB\-R\fP \fIRATE\fP | \fB––refresh\-rate=\fP\fIRATE\fP
+\fB\-R\fP \fIRATE\fP | \fB\-\-refresh\-rate=\fP\fIRATE\fP
 Defaults to 10.  Probability of refresh per coin (0\-100).
 .TP
-\fB\-r\fP \fIN\fP | \fB––reserves=\fP\fIN\fP
+\fB\-r\fP \fIN\fP | \fB\-\-reserves=\fP\fIN\fP
 Create \fIN\fP reserves per client.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-closer.1 b/man/taler-exchange-closer.1
index dbc268d9..79181b9a 100644
--- a/man/taler-exchange-closer.1
+++ b/man/taler-exchange-closer.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-CLOSER" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-CLOSER" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-closer \- close idle reserves
 .
@@ -33,13 +33,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-closer\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-t\fP\ |\ \fB––test\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-t\fP\ |\ \fB\-\-test\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-closer\fP is a command\-line tool to run close
@@ -47,29 +47,29 @@ reserves that have been idle for too long, causing transfers
 to the originating bank account to be scheduled.
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP | \fB––test\fP
+\fB\-t\fP | \fB\-\-test\fP
 Run in test mode and exit when idle.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-dbinit.1 b/man/taler-exchange-dbinit.1
index 2220abca..4925867b 100644
--- a/man/taler-exchange-dbinit.1
+++ b/man/taler-exchange-dbinit.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-DBINIT" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-DBINIT" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-dbinit \- initialize Taler exchange database
 .
@@ -33,13 +33,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-dbinit\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-g\fP\ |\ \fB––gc\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-r\fP\ |\ \fB––reset\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-g\fP\ |\ \fB\-\-gc\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-r\fP\ |\ \fB\-\-reset\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-dbinit\fP is a command\-line tool to initialize the Taler
@@ -49,25 +49,25 @@ Taler exchange to operate.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-g\fP | \fB––gc\fP
+\fB\-g\fP | \fB\-\-gc\fP
 Garbage collect database. Deletes all unnecessary data in the
 database.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-r\fP | \fB––reset\fP
+\fB\-r\fP | \fB\-\-reset\fP
 Drop tables. Dangerous, will delete all existing data in the database
 before creating the tables.
 .TP
diff --git a/man/taler-exchange-httpd.1 b/man/taler-exchange-httpd.1
index 1936b3b3..47ff1ab8 100644
--- a/man/taler-exchange-httpd.1
+++ b/man/taler-exchange-httpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-HTTPD" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-HTTPD" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-httpd \- run Taler exchange (with RESTful API)
 .
@@ -33,17 +33,17 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-httpd\fP
-[\fB\-a\fP\ |\ \fB––allow\-timetravel\fP]
-[\fB\-C\fP\ |\ \fB––connection\-close\fP]
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-f\fP\ \fIFILENAME\fP\ |\ \fB––file\-input=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-n\fP\ \fIN\fP\ |\ \fB––num\-threads=\fP\fIN\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-t\fP\ \fISECONDS\fP\ |\ \fB––timeout=\fP‌\fISECONDS\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-a\fP\ |\ \fB\-\-allow\-timetravel\fP]
+[\fB\-C\fP\ |\ \fB\-\-connection\-close\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-f\fP\ \fIFILENAME\fP\ |\ \fB\-\-file\-input=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-n\fP\ \fIN\fP\ |\ \fB\-\-num\-threads=\fP\fIN\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-t\fP\ \fISECONDS\fP\ |\ \fB\-\-timeout=\fP‌\fISECONDS\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-httpd\fP is a command\-line tool to run the Taler
@@ -53,23 +53,24 @@ must exist before running this command.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-a\fP | \fB––allow\-timetravel\fP
+\fB\-a\fP | \fB\-\-allow\-timetravel\fP
 Allow clients to request /keys for arbitrary timestamps.
 This should only be enabled for testing and development,
 as clients could abuse this in denial of service attacks,
 as it makes the /keys response generation much more expensive.
 .TP
-\fB\-C\fP | \fB––connection\-close\fP
+\fB\-C\fP | \fB\-\-connection\-close\fP
 Force each HTTP connection to be closed after each request (useful in
-combination with \fB\-f\fP to avoid having to wait for nc to time out).
+combination with \fB\-f\fP to avoid having to wait for
+netcat (nc) to time out).
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from FILENAME.
 .TP
-\fB\-f\fP \fIFILENAME\fP | \fB––file\-input=\fP‌\fIFILENAME\fP
+\fB\-f\fP \fIFILENAME\fP | \fB\-\-file\-input=\fP‌\fIFILENAME\fP
 This option is only available if the exchange was compiled with the
-configure option ––enable\-developer\-mode. It is used for generating
+configure option \-\-enable\-developer\-mode. It is used for generating
 test cases against the exchange using AFL. When this option is
 present, the HTTP server will
 .INDENT 7.0
@@ -87,29 +88,29 @@ input from an HTTP client and then immediately exit. This is useful
 to test taler\-exchange\-httpd against many different possible inputs
 in a controlled way.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-n\fP \fIN\fP | \fB––num\-threads=\fP\fIN\fP
+\fB\-n\fP \fIN\fP | \fB\-\-num\-threads=\fP\fIN\fP
 Use \fIN\fP threads in the thread pool.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP \fISECONDS\fP | \fB––timeout=\fP‌\fISECONDS\fP
+\fB\-t\fP \fISECONDS\fP | \fB\-\-timeout=\fP‌\fISECONDS\fP
 Specifies the number of SECONDS after which the HTTPD should close
 (idle) HTTP connections.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SIGNALS
@@ -117,10 +118,6 @@ Print version information.
 \fBtaler\-exchange\-httpd\fP responds to the following signals:
 .INDENT 0.0
 .TP
-.B \fBSIGUSR1\fP
-Sending a SIGUSR1 to the process will cause it to reload denomination
-and signing keys.
-.TP
 .B \fBSIGTERM\fP
 Sending a SIGTERM to the process will cause it to shutdown cleanly.
 .TP
diff --git a/man/taler-exchange-offline.1 b/man/taler-exchange-offline.1
index 63d4a074..bf8eb119 100644
--- a/man/taler-exchange-offline.1
+++ b/man/taler-exchange-offline.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-OFFLINE" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-OFFLINE" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-offline \- operations using the offline key of a Taler exchange
 .
@@ -33,11 +33,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-offline\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 [subcommand ...]
 .SH DESCRIPTION
 .sp
@@ -48,12 +48,15 @@ the exchange’s long\-term offline signing key and should be run in a secure
 subcommands as arguments which are then processed sequentially.
 .sp
 The tool includes two subcommands to interact \fIonline\fP with the exchange\(aqs
-REST APIs.  The \fBdownload\fP subcommand downloads the future public keys from the
-running exchange.  The resulting data serves as input to the \fBsign\fP and \fBshow\fP
-subcommands.  The \fBupload\fP subcommand uploads the signatures created with the
-private master key to the exchange.  It handles the output of all subcommands
-(except \fBdownload\fP).  The \fBdownload\fP and \fBupload\fP subcommands must naturally be
-run "online" and do not require access to the offline key.
+REST APIs.  To determine how to talk to the exchange, these two subcommands
+rely on the \fBBASE_URL\fP configuration option from the \fB[exchange]\fP section
+of the configuration file.  The \fBdownload\fP subcommand downloads the future
+public keys from the running exchange.  The resulting data serves as input to
+the \fBsign\fP and \fBshow\fP subcommands.  The \fBupload\fP subcommand uploads the
+signatures created with the private master key to the exchange.  It handles
+the output of all subcommands (except \fBdownload\fP).  The \fBdownload\fP and
+\fBupload\fP subcommands must naturally be run "online" and do not require
+access to the offline key.
 .sp
 All other subcommands are intended to be run "offline". However, especially
 when testing, it is of course possible to run the subcommands online as well.
@@ -65,21 +68,21 @@ and if not consumed the final output is printed to \fBstdout\fP\&.
 The general options for \fBtaler\-exchange\-offline\fP are:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH CONFIGURATION
@@ -256,6 +259,55 @@ The subcommand takes no inputs from \fBstdin\fP or other subcommands.
 .sp
 It outputs the signature affirming the wire fees, in a format suitable for the
 \fBupload\fP subcommand.
+.SS enable\-partner
+.sp
+This subcommand informs an exchange about the wad fee and frequency to apply
+to a partner exchange.  The arguments provided must include:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP 1. 3
+Partner exchange base URL.
+.IP 2. 3
+Partner exchange master public key.
+.IP 3. 3
+Calendar year for which the fee applies, \(aqnow\(aq for the current year.
+.IP 4. 3
+Wad frequency, in minutes (for example, \(aq30\(aq).
+.IP 5. 3
+Wad fee (for example, \(aqKUDOS:0.1\(aq).
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SS p2p\-fees
+.sp
+This subcommand configures fees related to wallet\-to\-wallet payments. If this configuration is not provided, wallet\-to\-wallet payments will be disabled by the exchange.
+.sp
+The arguments provided must include:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP 1. 3
+Calendar year for which the fee applies, \(aqnow\(aq for the current year.
+.IP 2. 3
+KYC timeout. How long does the exchange keep a reserve open that is waiting for the KYC.
+.IP 3. 3
+KYC fee. How much will the exchange charge for performing KYC.
+.IP 4. 3
+Purse timeout. How long does the exchange keep information about a purse around after it expired or was successfully merged?
+.IP 5. 3
+Purse fee. How much will the exchange charge for an abandoned purse. Also the minimum amount that can be in a purse that is not associated with an account.
+.IP 6. 3
+Number of free purses per account.
+.IP 7. 3
+Annual fee charged to an open account.
+.IP 8. 3
+How long will the exchange preserve an account history.
+.IP 9. 3
+History fee charged when inquiring about non\-recent account history.
+.UNINDENT
+.UNINDENT
+.UNINDENT
 .SS upload
 .sp
 This subcommand uploads outputs from other subcommands (except \fBdownload\fP and \fBshow\fP)
diff --git a/man/taler-exchange-secmod-eddsa.1 b/man/taler-exchange-secmod-eddsa.1
index c8c7cde5..15720827 100644
--- a/man/taler-exchange-secmod-eddsa.1
+++ b/man/taler-exchange-secmod-eddsa.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-SECMOD-EDDSA" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-SECMOD-EDDSA" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-secmod-eddsa \- handle private EDDSA key operations for a Taler exchange
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-secmod\-eddsa\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-p\fP\ \fIN\fP\ |\ ,**––parallelism=**\fIN\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-t\fP\ \fITIMESTAMP\fP\ |\ \fB––time=\fP\fITIMESTAMP\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-p\fP\ \fIN\fP\ |\ ,**\-\-parallelism=**\fIN\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-t\fP\ \fITIMESTAMP\fP\ |\ \fB\-\-time=\fP\fITIMESTAMP\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-secmod\-eddsa\fP is a command\-line tool to
@@ -51,33 +51,33 @@ FIXME: More details.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fBp\fP \fIN\fP | \fB––parallelism=\fP\fIN\fP
+\fBp\fP \fIN\fP | \fB\-\-parallelism=\fP\fIN\fP
 Run with \fIN\fP worker threads.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP \fITIMESTAMP\fP | \fB––time=\fP\fITIMESTAMP\fP
+\fB\-t\fP \fITIMESTAMP\fP | \fB\-\-time=\fP\fITIMESTAMP\fP
 Pretend it is \fITIMESTAMP\fP for the update.
 \fITIMESTAMP\fP is a human\-readable string (e.g., \fBYYYY\-MM\-DD HH:MM:SS\fP).
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-secmod-rsa.1 b/man/taler-exchange-secmod-rsa.1
index c1720b11..e6727176 100644
--- a/man/taler-exchange-secmod-rsa.1
+++ b/man/taler-exchange-secmod-rsa.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-SECMOD-RSA" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-SECMOD-RSA" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-secmod-rsa \- handle private RSA key operations for a Taler exchange
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-secmod\-rsa\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-p\fP\ \fIN\fP\ |\ ,**––parallelism=**\fIN\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-t\fP\ \fITIMESTAMP\fP\ |\ \fB––time=\fP\fITIMESTAMP\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-p\fP\ \fIN\fP\ |\ ,**\-\-parallelism=**\fIN\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-t\fP\ \fITIMESTAMP\fP\ |\ \fB\-\-time=\fP\fITIMESTAMP\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-secmod\-rsa\fP is a command\-line tool to
@@ -51,33 +51,33 @@ FIXME: More details.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fBp\fP \fIN\fP | \fB––parallelism=\fP\fIN\fP
+\fBp\fP \fIN\fP | \fB\-\-parallelism=\fP\fIN\fP
 Run with \fIN\fP worker threads.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP \fITIMESTAMP\fP | \fB––time=\fP\fITIMESTAMP\fP
+\fB\-t\fP \fITIMESTAMP\fP | \fB\-\-time=\fP\fITIMESTAMP\fP
 Pretend it is \fITIMESTAMP\fP for the update.
 \fITIMESTAMP\fP is a human\-readable string (e.g., \fBYYYY\-MM\-DD HH:MM:SS\fP).
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-transfer.1 b/man/taler-exchange-transfer.1
index 6291ec89..8f03dd01 100644
--- a/man/taler-exchange-transfer.1
+++ b/man/taler-exchange-transfer.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-TRANSFER" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-TRANSFER" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-transfer \- execute wire transfers
 .
@@ -33,42 +33,42 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-transfer\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel\fP\fIUSEC\fP]
-[\fB\-t\fP\ |\ \fB––test\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel\fP\fIUSEC\fP]
+[\fB\-t\fP\ |\ \fB\-\-test\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-transfer\fP is a command\-line tool to actually execute scheduled wire transfers (using the bank/wire gateway).
 The transfers are prepared by the \fBtaler\-exchange\-aggregator\fP and \fBtaler\-exchange\-closer\fP tools.
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP | \fB––test\fP
+\fB\-t\fP | \fB\-\-test\fP
 Run in test mode and exit when idle.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-wire-gateway-client.1 b/man/taler-exchange-wire-gateway-client.1
index 9fec8eda..3b784125 100644
--- a/man/taler-wire-gateway-client.1
+++ b/man/taler-exchange-wire-gateway-client.1
@@ -1,8 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-WIRE-GATEWAY-CLIENT" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-WIRE-GATEWAY-CLIENT" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
-taler-wire-gateway-client \- trigger a transfer at the bank
+taler-exchange-wire-gateway-client \- trigger a transfer at the bank
 .
 .nr rst2man-indent-level 0
 .
@@ -32,26 +32,26 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .SH SYNOPSIS
 .sp
-\fBtaler\-wire\-gateway\-client\fP
-[\fB\-a\fP\ \fIVALUE\fP\ |\ \fB––amount=\fP‌\fIVALUE\fP]
-[\fB\-b\fP\ \fIURL\fP\ |\ \fB––bank=\fP‌\fIURL\fP]
-[\fB\-C\fP\ \fIACCOUNT\fP\ |\ \fB––credit=\fP‌\fIACCOUNT\fP]
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-D\fP\ \fIACCOUNT\fP\ |\ \fB––debit=\fP‌\fIACCOUNT\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-i\fP\ |\ \fB––credit\-history\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-o\fP\ |\ \fB––debit\-history\fP]
-[\fB\-p\fP\ \fIPASSPHRASE\fP\ |\ \fB––pass=\fP‌\fIPASSPHRASE\fP]
-[\fB\-S\fP\ \fISTRING\fP\ |\ \fB––subject=\fP‌\fISTRING\fP]
-[\fB\-s\fP\ \fIACCOUNT\-SECTION\fP\ |\ \fB––section=\fP‌\fIACCOUNT\-SECTION\fP]
-[\fB\-u\fP\ \fIUSERNAME\fP\ |\ \fB––user=\fP‌\fIUSERNAME\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
-[\fB\-w\fP\ \fIROW\fP\ |\ \fB––since\-when=\fP‌\fIROW\fP]
+\fBtaler\-exchange\-wire\-gateway\-client\fP
+[\fB\-a\fP\ \fIVALUE\fP\ |\ \fB\-\-amount=\fP‌\fIVALUE\fP]
+[\fB\-b\fP\ \fIURL\fP\ |\ \fB\-\-bank=\fP‌\fIURL\fP]
+[\fB\-C\fP\ \fIACCOUNT\fP\ |\ \fB\-\-credit=\fP‌\fIACCOUNT\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-D\fP\ \fIACCOUNT\fP\ |\ \fB\-\-debit=\fP‌\fIACCOUNT\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-i\fP\ |\ \fB\-\-credit\-history\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-o\fP\ |\ \fB\-\-debit\-history\fP]
+[\fB\-p\fP\ \fIPASSPHRASE\fP\ |\ \fB\-\-pass=\fP‌\fIPASSPHRASE\fP]
+[\fB\-S\fP\ \fISTRING\fP\ |\ \fB\-\-subject=\fP‌\fISTRING\fP]
+[\fB\-s\fP\ \fIACCOUNT\-SECTION\fP\ |\ \fB\-\-section=\fP‌\fIACCOUNT\-SECTION\fP]
+[\fB\-u\fP\ \fIUSERNAME\fP\ |\ \fB\-\-user=\fP‌\fIUSERNAME\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
+[\fB\-w\fP\ \fIROW\fP\ |\ \fB\-\-since\-when=\fP‌\fIROW\fP]
 .SH DESCRIPTION
 .sp
-\fBtaler\-wire\-gateway\-client\fP is a command\-line tool to trigger bank transfers or
+\fBtaler\-exchange\-wire\-gateway\-client\fP is a command\-line tool to trigger bank transfers or
 inspect wire transfers for exchange accounts using the wire API.  The tool is
 expected to be used during testing or for diagnostics.
 .sp
@@ -77,58 +77,58 @@ on transaction history operations.
 .SH OPTIONS
 .INDENT 0.0
 .TP
-\fB\-a\fP \fIVALUE\fP | \fB––amount=\fP‌\fIVALUE\fP
+\fB\-a\fP \fIVALUE\fP | \fB\-\-amount=\fP‌\fIVALUE\fP
 Amount to transfer. Given in the Taler\-typical format of
 CURRENCY:VALUE.FRACTION.
 .TP
-\fB\-b\fP \fIURL\fP | \fB––bank=\fP‌\fIURL\fP
+\fB\-b\fP \fIURL\fP | \fB\-\-bank=\fP‌\fIURL\fP
 URL at which the bank is operation.  Conflicts with \fB\-s\fP\&.
 .TP
-\fB\-C\fP \fIACCOUNT\fP | \fB––credit=\fP‌\fIACCOUNT\fP
+\fB\-C\fP \fIACCOUNT\fP | \fB\-\-credit=\fP‌\fIACCOUNT\fP
 When doing a wire transfer from the exchange, the money should be credited to \fIACCOUNT\fP\&.
 Specifies the payto:// URI of the account.  Can also be used as a filter by credit
 account when looking at transaction histories.
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the given configuration file.
 .TP
-\fB\-D\fP \fIACCOUNT\fP | \fB––debit=\fP‌\fIACCOUNT\fP
+\fB\-D\fP \fIACCOUNT\fP | \fB\-\-debit=\fP‌\fIACCOUNT\fP
 When doing a wire transfer to the exchange, the \fIACCOUNT\fP is to be debited.
 Specifies the payto:// URI of the account.  Can also be used as a filter by debit
 account when looking at transaction histories.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––credit\-history\fP
+\fB\-i\fP | \fB\-\-credit\-history\fP
 Obtain credit history of the exchange. Conflicts with \fB\-o\fP\&.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-o\fP | \fB––debit\-history\fP
+\fB\-o\fP | \fB\-\-debit\-history\fP
 Obtain debit history of the exchange. Conflicts with \fB\-i\fP\&.
 .TP
-\fB\-p\fP \fIPASSPHRASE\fP | \fB––pass=\fP‌\fIPASSPHRASE\fP
+\fB\-p\fP \fIPASSPHRASE\fP | \fB\-\-pass=\fP‌\fIPASSPHRASE\fP
 Specifies the pass phrase for authentication.  Conflicts with \fB\-s\fP\&.
 .TP
-\fB\-S\fP \fISUBJECT\fP | \fB––subject=\fP‌\fISUBJECT\fP
+\fB\-S\fP \fISUBJECT\fP | \fB\-\-subject=\fP‌\fISUBJECT\fP
 Use \fISUBJECT\fP for the wire transfer subject.  Must be a reserve public key for credit operations and a wire transfer identifier for debit operations. If not specified, a random value will be generated instead.
 .TP
-\fB\-s\fP \fIACCOUNT_SECTION\fP | \fB––section=\fP‌\fIACCOUNT\-SECTION\fP
+\fB\-s\fP \fIACCOUNT_SECTION\fP | \fB\-\-section=\fP‌\fIACCOUNT\-SECTION\fP
 Obtain exchange account information from the \fIACCOUNT\-SECTION\fP of the configuration. Conflicts with \fB\-u\fP, \fB\-p\fP and \fB\-b\fP\&.  Note that either \fB\-b\fP or \fB\-s\fP must be specified.
 .TP
-\fB\-u\fP \fIUSERNAME\fP | \fB––user=\fP‌\fIUSERNAME\fP
+\fB\-u\fP \fIUSERNAME\fP | \fB\-\-user=\fP‌\fIUSERNAME\fP
 Specifies the username for authentication.  Optional and conflicts with \fB\-s\fP\&. If neither \fB\-u\fP nor \fB\-s\fP are used, we will attempt to talk to the bank without authentication.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .TP
-\fB\-w\fP \fIROW\fP | \fB––since\-when=\fP‌\fIROW\fP
+\fB\-w\fP \fIROW\fP | \fB\-\-since\-when=\fP‌\fIROW\fP
 Specifies a \fIROW\fP from which the history should be obtained. If not given, the 10 youngest transactions are returned.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-exchange-wirewatch.1 b/man/taler-exchange-wirewatch.1
index 281dd348..381a53a5 100644
--- a/man/taler-exchange-wirewatch.1
+++ b/man/taler-exchange-wirewatch.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-WIREWATCH" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-EXCHANGE-WIREWATCH" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-exchange-wirewatch \- watch for incoming wire transfers
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-wirewatch\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-r\fP\ |\ \fB––reset\fP]
-[\fB\-T\fP\ |\ \fB––test\fP]
-[\fB\-t\fP\ \fIPLUGINNAME\fP\ |\ \fB––type=\fP‌\fIPLUGINNAME\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-r\fP\ |\ \fB\-\-reset\fP]
+[\fB\-T\fP\ |\ \fB\-\-test\fP]
+[\fB\-t\fP\ \fIPLUGINNAME\fP\ |\ \fB\-\-type=\fP‌\fIPLUGINNAME\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-wirewatch\fP is a command\-line tool to import wire
@@ -49,33 +49,33 @@ transactions into the Taler exchange database.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-r\fP | \fB––reset\fP
+\fB\-r\fP | \fB\-\-reset\fP
 Ignore our own database and start with transactions from the
 beginning of time.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-t\fP | \fB––test\fP
+\fB\-t\fP | \fB\-\-test\fP
 Run in test mode and exit when idle.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-helper-auditor-aggregation.1 b/man/taler-helper-auditor-aggregation.1
index 960d1294..5e9bc251 100644
--- a/man/taler-helper-auditor-aggregation.1
+++ b/man/taler-helper-auditor-aggregation.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-HELPER-AUDITOR-AGGREGATION" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-AGGREGATION" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-helper-auditor-aggregation \- audit Taler exchange aggregation activity
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-helper\-auditor\-aggregation\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fBi\fP\ |\ \fB––internal\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIKEY\fP\ |\ \fB––exchange\-key=\fP\fIKEY\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fBi\fP\ |\ \fB\-\-internal\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIKEY\fP\ |\ \fB\-\-exchange\-key=\fP\fIKEY\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-helper\-auditor\-aggregation\fP is a command\-line tool to
@@ -51,32 +51,32 @@ FIXME: More detail.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the auditor to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––internal\fP
+\fB\-i\fP | \fB\-\-internal\fP
 Perform checks only applicable for exchange\-internal audits.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIKEY\fP | \fB––exchange\-key=\fP\fIKEY\fP
+\fB\-m\fP \fIKEY\fP | \fB\-\-exchange\-key=\fP\fIKEY\fP
 Use \fIKEY\fP (Crockford base32 encoded) as the public key of the exchange.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-helper-auditor-coins.1 b/man/taler-helper-auditor-coins.1
index 7fd7b74b..c334d325 100644
--- a/man/taler-helper-auditor-coins.1
+++ b/man/taler-helper-auditor-coins.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-HELPER-AUDITOR-COINS" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-COINS" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-helper-auditor-coins \- audit Taler coin processing
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-helper\-auditor\-coins\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fBi\fP\ |\ \fB––internal\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIKEY\fP\ |\ \fB––exchange\-key=\fP\fIKEY\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fBi\fP\ |\ \fB\-\-internal\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIKEY\fP\ |\ \fB\-\-exchange\-key=\fP\fIKEY\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-helper\-auditor\-coins\fP is a command\-line tool to
@@ -51,32 +51,32 @@ FIXME: More detail.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the auditor to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––internal\fP
+\fB\-i\fP | \fB\-\-internal\fP
 Perform checks only applicable for exchange\-internal audits.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIKEY\fP | \fB––exchange\-key=\fP\fIKEY\fP
+\fB\-m\fP \fIKEY\fP | \fB\-\-exchange\-key=\fP\fIKEY\fP
 Use \fIKEY\fP (Crockford base32 encoded) as the public key of the exchange.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-helper-auditor-deposits.1 b/man/taler-helper-auditor-deposits.1
index ecf31a72..569cfd72 100644
--- a/man/taler-helper-auditor-deposits.1
+++ b/man/taler-helper-auditor-deposits.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-HELPER-AUDITOR-DEPOSITS" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-DEPOSITS" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-helper-auditor-deposits \- audit Taler exchange database for deposit confirmation consistency
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-helper\-auditor\-deposits\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fBi\fP\ |\ \fB––internal\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIKEY\fP\ |\ \fB––exchange\-key=\fP\fIKEY\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fBi\fP\ |\ \fB\-\-internal\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIKEY\fP\ |\ \fB\-\-exchange\-key=\fP\fIKEY\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-helper\-auditor\-deposits\fP is a command\-line tool to
@@ -51,32 +51,32 @@ FIXME: More detail.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the auditor to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––internal\fP
+\fB\-i\fP | \fB\-\-internal\fP
 Perform checks only applicable for exchange\-internal audits.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIKEY\fP | \fB––exchange\-key=\fP\fIKEY\fP
+\fB\-m\fP \fIKEY\fP | \fB\-\-exchange\-key=\fP\fIKEY\fP
 Use \fIKEY\fP (Crockford base32 encoded) as the public key of the exchange.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-helper-auditor-reserves.1 b/man/taler-helper-auditor-reserves.1
index a2261792..db88d62e 100644
--- a/man/taler-helper-auditor-reserves.1
+++ b/man/taler-helper-auditor-reserves.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-HELPER-AUDITOR-RESERVES" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-RESERVES" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-helper-auditor-reserves \- audit Taler exchange reserve handling
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-helper\-auditor\-reserves\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fBi\fP\ |\ \fB––internal\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIKEY\fP\ |\ \fB––exchange\-key=\fP\fIKEY\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fBi\fP\ |\ \fB\-\-internal\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIKEY\fP\ |\ \fB\-\-exchange\-key=\fP\fIKEY\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-helper\-auditor\-reserves\fP is a command\-line tool to
@@ -51,32 +51,32 @@ FIXME: More detail.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the auditor to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––internal\fP
+\fB\-i\fP | \fB\-\-internal\fP
 Perform checks only applicable for exchange\-internal audits.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIKEY\fP | \fB––exchange\-key=\fP\fIKEY\fP
+\fB\-m\fP \fIKEY\fP | \fB\-\-exchange\-key=\fP\fIKEY\fP
 Use \fIKEY\fP (Crockford base32 encoded) as the public key of the exchange.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-helper-auditor-wire.1 b/man/taler-helper-auditor-wire.1
index f3c71569..cddd6623 100644
--- a/man/taler-helper-auditor-wire.1
+++ b/man/taler-helper-auditor-wire.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-HELPER-AUDITOR-WIRE" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-WIRE" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-helper-auditor-wire \- audit exchange database for consistency with the bank's wire transfers
 .
@@ -33,14 +33,14 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-helper\-auditor\-wire\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fBi\fP\ |\ \fB––internal\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIKEY\fP\ |\ \fB––exchange\-key=\fP\fIKEY\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel=\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fBi\fP\ |\ \fB\-\-internal\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIKEY\fP\ |\ \fB\-\-exchange\-key=\fP\fIKEY\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel=\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-helper\-auditor\-wire\fP is a command\-line tool to
@@ -51,32 +51,32 @@ FIXME: More detail.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the auditor to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB––internal\fP
+\fB\-i\fP | \fB\-\-internal\fP
 Perform checks only applicable for exchange\-internal audits.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIKEY\fP | \fB––exchange\-key=\fP\fIKEY\fP
+\fB\-m\fP \fIKEY\fP | \fB\-\-exchange\-key=\fP\fIKEY\fP
 Use \fIKEY\fP (Crockford base32 encoded) as the public key of the exchange.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-merchant-benchmark.1 b/man/taler-merchant-benchmark.1
index 70f4f8bb..d00325a1 100644
--- a/man/taler-merchant-benchmark.1
+++ b/man/taler-merchant-benchmark.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-MERCHANT-BENCHMARK" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-MERCHANT-BENCHMARK" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-merchant-benchmark \- generate Taler-style benchmarking payments
 .
@@ -46,10 +46,10 @@ default instance) and aggregated by the exchange.  Takes the following
 options.
 .INDENT 7.0
 .TP
-\fB\-p\fP \fIPN\fP | \fB––payments\-number=\fP\fIPN\fP
+\fB\-p\fP \fIPN\fP | \fB\-\-payments\-number=\fP\fIPN\fP
 Perform PN many payments, defaults to 1.
 .TP
-\fB\-t\fP \fITN\fP | \fB––tracks\-number=\fP\fITN\fP
+\fB\-t\fP \fITN\fP | \fB\-\-tracks\-number=\fP\fITN\fP
 Perform TN many tracking operations, defaults to 1.
 .UNINDENT
 .TP
@@ -59,11 +59,11 @@ leaving payments unaggregated, or using a non\-default merchant
 instance.  Takes the following options.
 .INDENT 7.0
 .TP
-\fB\-t\fP \fITC\fP | \fB––two\-coins=\fP\fITC\fP
+\fB\-t\fP \fITC\fP | \fB\-\-two\-coins=\fP\fITC\fP
 Perform TC many payments that use two coins (normally, all the
 payments use only one coin).  TC defaults to 1.
 .TP
-\fB\-u\fP \fIUN\fP | \fB––unaggregated\-number=\fP\fIUN\fP
+\fB\-u\fP \fIUN\fP | \fB\-\-unaggregated\-number=\fP\fIUN\fP
 Generate UN payments that will be left unaggregated.  Note that
 subsequent invocations of the generator may pick those
 unaggregated payments and actually aggregated them.
@@ -75,7 +75,7 @@ unaggregated payments and actually aggregated them.
 \fB\-a\fP \fIAPIKEY\fP | \fB\-\-apikey=\fP\fIAPIKEY\fP
 HTTP \(aqAuthorization\(aq header to send to the merchant.
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP\fIFILENAME\fP
 Use the configuration and other resources for the merchant to
 operate from FILENAME.
 .TP
@@ -83,17 +83,17 @@ operate from FILENAME.
 Mandatory.
 Configuration \fISECTION\fP specifying the exchange account to use.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler-merchant-dbinit.1 b/man/taler-merchant-dbinit.1
index b0bd2761..3a491e72 100644
--- a/man/taler-merchant-dbinit.1
+++ b/man/taler-merchant-dbinit.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-MERCHANT-DBINIT" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-MERCHANT-DBINIT" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-merchant-dbinit \- initialize Taler merchant database
 .
@@ -33,12 +33,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-merchant\-dbinit\fP
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP‌\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-r\fP\ |\ \fB––reset\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-r\fP\ |\ \fB\-\-reset\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-merchant\-dbinit\fP is a command\-line tool to initialize the Taler
@@ -48,21 +48,21 @@ Taler merchant to operate.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the merchant to operate
 from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-r\fP | \fB––reset\fP
+\fB\-r\fP | \fB\-\-reset\fP
 Drop tables. Dangerous, will delete all existing data in the database
 before creating the tables.
 .TP
diff --git a/man/taler-merchant-httpd.1 b/man/taler-merchant-httpd.1
index d0cf9cce..60597ce2 100644
--- a/man/taler-merchant-httpd.1
+++ b/man/taler-merchant-httpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-MERCHANT-HTTPD" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-MERCHANT-HTTPD" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-merchant-httpd \- run Taler merchant backend (with RESTful API)
 .
@@ -33,13 +33,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-merchant\-httpd\fP
-[\fB\-C\fP\ |\ \fB––connection\-close\fP]
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB––timetravel\fP\fIUSEC\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-C\fP\ |\ \fB\-\-connection\-close\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-T\fP\ \fIUSEC\fP\ |\ \fB\-\-timetravel\fP\fIUSEC\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-merchant\-httpd\fP is a command\-line tool to run the Taler merchant
@@ -48,10 +48,10 @@ before running this command.
 .SH OPTIONS
 .INDENT 0.0
 .TP
-\fB\-a\fP \fITOKEN\fP | \fB––auth=\fP\fITOKEN\fP
+\fB\-a\fP \fITOKEN\fP | \fB\-\-auth=\fP\fITOKEN\fP
 Use TOKEN for initial access control to the merchant backend. The value
 given in TOKEN must appear in backoffice requests to the default instance
-of the merchant, i.e. "Authorization: secret\-token:TOKEN" to obtain
+of the merchant, i.e. "Authorization: Bearer secret\-token:TOKEN" to obtain
 access to the merchant backend.  Note that setting a passphrase for the
 default instance by any means will block future access via TOKEN.  This
 is basically a way to reset the passphrase protecting access.  TOKEN
@@ -61,31 +61,31 @@ Instead of using the command\-line, which exposes TOKEN to users on the
 system, you may want to consider setting the
 TALER_MERCHANT_TOKEN environment variable instead.
 .TP
-\fB\-C\fP | \fB––connection\-close\fP
+\fB\-C\fP | \fB\-\-connection\-close\fP
 Force each HTTP connection to be closed after each request
 (useful in combination with \-f to avoid having to wait for nc to
 time out).
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP\fIFILENAME\fP
 Use the configuration and other resources for the merchant to
 operate from FILENAME.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-T\fP \fIUSEC\fP | \fB––timetravel=\fP\fIUSEC\fP
+\fB\-T\fP \fIUSEC\fP | \fB\-\-timetravel=\fP\fIUSEC\fP
 Modify the system time by \fIUSEC\fP microseconds.
 \fIUSEC\fP may be prefixed with \fB+\fP or \fB\-\fP (e.g. \fB\-T +300\fP).
 This option is intended for debugging/testing only.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SIGNALS
diff --git a/man/taler-merchant-setup-reserve.1 b/man/taler-merchant-setup-reserve.1
index 5f4892c1..f748f683 100644
--- a/man/taler-merchant-setup-reserve.1
+++ b/man/taler-merchant-setup-reserve.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-MERCHANT-SETUP-RESERVE" "1" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER-MERCHANT-SETUP-RESERVE" "1" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler-merchant-setup-reserve \- setup reserve for tipping at a Taler merchant backend
 .
@@ -33,20 +33,20 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-merchant\-setup\-reserve\fP
-[\fB\-A\fP\ \fIUSERNAME:PASSWORD\fP\ |\ \fB––auth=\fP\fIUSERNAME:PASSWORD\fP]
-[\fB\-a\fP\ \fIVALUE\fP\ |\ \fB––amount=\fP\fIVALUE\fP]
-[\fB\-C\fP\ \fICERTFILE\fP\ |\ \fB––cert=\fP\fICERTFILE\fP]
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB––config=\fP\fIFILENAME\fP]
-[\fB\-e\fP\ \fIURL\fP\ |\ \fB––exchange\-url=\fP\fIURL\fP]
-[\fB\-h\fP\ |\ \fB––help\fP]
-[\fB\-k\fP\ \fIKEYFILE\fP\ |\ \fB––key=\fP\fIKEYFILE\fP]
-[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB––loglevel=\fP‌\fILOGLEVEL\fP]
-[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB––logfile=\fP‌\fIFILENAME\fP]
-[\fB\-m\fP\ \fIURL\fP\ |\ \fB––merchant\-url=\fP\fIURL\fP]
-[\fB\-p\fP\ \fIKEYFILEPASSPHRASE\fP\ |\ \fB––pass=\fP\fIKEYFILEPASSPHRASE\fP]
-[\fB\-t\fP\ \fICERTTYPE\fP\ |\ \fB––type=\fP\fICERTTYPE\fP]
-[\fB\-w\fP\ \fIMETHOD\fP\ |\ \fB––wire\-method=\fP\fIMETHOD\fP]
-[\fB\-v\fP\ |\ \fB––version\fP]
+[\fB\-A\fP\ \fIUSERNAME:PASSWORD\fP\ |\ \fB\-\-auth=\fP\fIUSERNAME:PASSWORD\fP]
+[\fB\-a\fP\ \fIVALUE\fP\ |\ \fB\-\-amount=\fP\fIVALUE\fP]
+[\fB\-C\fP\ \fICERTFILE\fP\ |\ \fB\-\-cert=\fP\fICERTFILE\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP\fIFILENAME\fP]
+[\fB\-e\fP\ \fIURL\fP\ |\ \fB\-\-exchange\-url=\fP\fIURL\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-k\fP\ \fIKEYFILE\fP\ |\ \fB\-\-key=\fP\fIKEYFILE\fP]
+[\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
+[\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
+[\fB\-m\fP\ \fIURL\fP\ |\ \fB\-\-merchant\-url=\fP\fIURL\fP]
+[\fB\-p\fP\ \fIKEYFILEPASSPHRASE\fP\ |\ \fB\-\-pass=\fP\fIKEYFILEPASSPHRASE\fP]
+[\fB\-t\fP\ \fICERTTYPE\fP\ |\ \fB\-\-type=\fP\fICERTTYPE\fP]
+[\fB\-w\fP\ \fIMETHOD\fP\ |\ \fB\-\-wire\-method=\fP\fIMETHOD\fP]
+[\fB\-v\fP\ |\ \fB\-\-version\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-merchant\-setup\-reserve\fP is a command\-line tool to setup a reserve
@@ -55,68 +55,68 @@ from the exchange needed to fill the reserve.
 .SH OPTIONS
 .INDENT 0.0
 .TP
-\fB\-A\fP \fIUSERNAME:PASSWORD\fP | \fB––auth=\fP\fIUSERNAME:PASSWORD\fP
+\fB\-A\fP \fIUSERNAME:PASSWORD\fP | \fB\-\-auth=\fP\fIUSERNAME:PASSWORD\fP
 Use \fBUSERNAME\fP and \fBPASSWORD\fP for HTTP client authentication.
 The ":" must be present as a separator.
 Note that this form of authentication has nothing to do with the TLS client
 certificate authentication supported with the \fB\-C\fP, \fB\-k\fP and \fB\-p\fP options.
 The \fBPASSWORD\fP given to this option is given to the server!
 .TP
-\fB\-a\fP \fIVALUE\fP | \fB––amount=\fP\fIVALUE\fP
+\fB\-a\fP \fIVALUE\fP | \fB\-\-amount=\fP\fIVALUE\fP
 Mandatory.
 Amount to be transferred to the reserve.
 .TP
-\fB\-C\fP \fICERTFILE\fP | \fB––cert=\fP\fICERTFILE\fP
+\fB\-C\fP \fICERTFILE\fP | \fB\-\-cert=\fP\fICERTFILE\fP
 The specified \fBCERTFILE\fP contains a TLS client certificate to be used to
 authenticate the client. See also \fB\-t\fP\&.
 .TP
-\fB\-c\fP \fIFILENAME\fP | \fB––config=\fP\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP\fIFILENAME\fP
 Use the configuration and other resources for the merchant to
 operate from \fBFILENAME\fP\&.
 .TP
-\fB\-e\fP \fIURL\fP | \fB––exchange\-url=\fP\fIURL\fP
+\fB\-e\fP \fIURL\fP | \fB\-\-exchange\-url=\fP\fIURL\fP
 Mandatory.
 Use \fBURL\fP for the exchange base URL.
 This is the exchange where the reserve will be created.
 The currency used in the amount specification must be offered by this exchange.
 .TP
-\fB\-h\fP | \fB––help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .TP
-\fB\-k\fP \fIKEYFILE\fP | \fB––key=\fP\fIKEYFILE\fP
+\fB\-k\fP \fIKEYFILE\fP | \fB\-\-key=\fP\fIKEYFILE\fP
 The specified \fBKEYFILE\fP contains a TLS client private key to be used to
 authenticate the client. See also \fB\-p\fP and \fB\-C\fP\&.
 .TP
-\fB\-L\fP \fILOGLEVEL\fP | \fB––loglevel=\fP‌\fILOGLEVEL\fP
+\fB\-L\fP \fILOGLEVEL\fP | \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP
 Specifies the log level to use. Accepted values are: \fBDEBUG\fP, \fBINFO\fP,
 \fBWARNING\fP, \fBERROR\fP\&.
 .TP
-\fB\-l\fP \fIFILENAME\fP | \fB––logfile=\fP‌\fIFILENAME\fP
+\fB\-l\fP \fIFILENAME\fP | \fB\-\-logfile=\fP‌\fIFILENAME\fP
 Send logging output to \fIFILENAME\fP\&.
 .TP
-\fB\-m\fP \fIURL\fP | \fB––merchant\-url=\fP\fIURL\fP
+\fB\-m\fP \fIURL\fP | \fB\-\-merchant\-url=\fP\fIURL\fP
 Mandatory.
 Use \fBURL\fP as the merchant base URL.
 Should include the path to the instance if the reserve is to be
 created for a non\-default instance.
 .TP
-\fB\-p\fP \fIKEYFILEPASSPHRASE\fP | \fB––pass=\fP\fIKEYFILEPASSPHRASE\fP
+\fB\-p\fP \fIKEYFILEPASSPHRASE\fP | \fB\-\-pass=\fP\fIKEYFILEPASSPHRASE\fP
 The specified \fBKEYFILEPASSPHRASE\fP is to be used to decrypt the KEYFILE.
 See also \fB\-k\fP\&. Not to be confused with \fB\-A\fP\&.
 The \fBKEYFILEPASSPHRASE\fP given here is only used locally to decrypt the KEYFILE.
 .TP
-\fB\-t\fP \fICERTTYPE\fP | \fB––type=\fP\fICERTTYPE\fP
+\fB\-t\fP \fICERTTYPE\fP | \fB\-\-type=\fP\fICERTTYPE\fP
 The specified CERTFILE contains a TLS client certificate of \fBCERTTYPE\fP\&.
 Default is \fBPEM\fP\&. See also \fB\-C\fP\&.
 .TP
-\fB\-w\fP \fIMETHOD\fP | \fB––wire\-method=\fP\fIMETHOD\fP
+\fB\-w\fP \fIMETHOD\fP | \fB\-\-wire\-method=\fP\fIMETHOD\fP
 Mandatory.
 Which wire method should be used.
 Needed to select the wire transfer method of the exchange.
 The method must be supported by the exchange.
 Typical values would be \fBiban\fP or \fBx\-taler\-bank\fP\&.
 .TP
-\fB\-v\fP | \fB––version\fP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
 .UNINDENT
 .SH SEE ALSO
diff --git a/man/taler.conf.5 b/man/taler.conf.5
index b7dfca03..b4a26ee6 100644
--- a/man/taler.conf.5
+++ b/man/taler.conf.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER.CONF" "5" "Apr 28, 2021" "0.8" "GNU Taler"
+.TH "TALER.CONF" "5" "Aug 03, 2021" "0.8" "GNU Taler"
 .SH NAME
 taler.conf \- Taler configuration file
 .