man update

19 files changed, 467 insertions, 136 deletions

diff --git a/man/taler-auditor-dbinit.1 b/man/taler-auditor-dbinit.1
new file mode 100644
index 00000000..169a9626
--- /dev/null
+++ b/man/taler-auditor-dbinit.1
@@ -0,0 +1,80 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "TALER-AUDITOR-DBINIT" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
+.SH NAME
+taler-auditor-dbinit \- setup auditor database
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBtaler\-auditor\-dbinit\fP
+[\fB\-h\fP\ |\ \fB–help\fP] [\fB\-g\fP\ |\ \fB–gc\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
+exchange database. It creates the necessary tables and indices for the
+Taler exchange to operate.
+.sp
+Its options are as follows:
+.INDENT 0.0
+.TP
+\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
+Print short help on options.
+.TP
+\fB\-g\fP | \fB–gc\fP
+Garbage collect database. Deletes all unnecessary data in the
+database.
+.TP
+\fB\-R\fP | \fB–reset\fP
+Drop tables. Dangerous, will delete all existing data in the database.
+.TP
+\fB\-r\fP | \fB\-\-restart\fP
+Restart all auditors from the beginning. Useful for
+testing.
+.TP
+\fB\-v\fP | \fB–version\fP
+Print version information.
+.UNINDENT
+.SH SEE ALSO
+.sp
+taler\-auditor\-httpd(1), taler\-auditor(1), taler.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://bugs.gnunet.org\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014, 2015, 2016 Florian Dold, Benedikt Muller, Sree Harsha Totakura, Christian Grothoff, Marcello Stanisci (GPLv3+ or GFDL 1.3+)
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/taler-auditor-exchange.1 b/man/taler-auditor-exchange.1
index cb36bb24..2e9706e8 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-AUDITOR-EXCHANGE" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-auditor-exchange \- add or remove exchange from auditor’s list
 .
@@ -61,6 +61,9 @@ 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!
 .UNINDENT
+.SH DIAGNOSTICS
+.sp
+\fBtaler\-auditor\-exchange\fP will return 0 on success, 1 on usage errors, 3 on problems interacting with the database backend, 4 if exchange entry to be added is already in the database (or already missing when used with \fB\-r\fP).
 .SH SEE ALSO
 .sp
 gnunet\-ecc(1), taler\-auditor\-sign(1), taler.conf(5)
diff --git a/man/taler-auditor-sign.1 b/man/taler-auditor-sign.1
index 41e450ea..5e56ee5c 100644
--- a/man/taler-auditor-sign.1
+++ b/man/taler-auditor-sign.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR-SIGN" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-AUDITOR-SIGN" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-auditor-sign \- sign exchange denomination as auditor
 .
diff --git a/man/taler-auditor.1 b/man/taler-auditor.1
index 7a1c9654..1e492b34 100644
--- a/man/taler-auditor.1
+++ b/man/taler-auditor.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-AUDITOR" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-AUDITOR" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-auditor \- audit exchange
 .
@@ -34,9 +34,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBtaler\-auditor\fP \- audit exchange
 .SH SYNOPSIS
 .sp
-\fBtaler\-auditor\fP [\fB\-h\fP\ |\ \fB–help\fP]
-[\fB\-m\fP\ \fIMASTER_KEY\fP\ |\ \fB–exchange\-key=\fP‌\fIMASTER_KEY\fP]
-[\fB\-r\fP\ |\ \fB–reset\fP]
+\fBtaler\-auditor\fP [\fB\-h\fP\ |\ \fB\-\-help\fP]
+[\fB\-m\fP\ \fIMASTER_KEY\fP\ |\ \fB\-\-exchange\-key=\fP‌\fIMASTER_KEY\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-auditor\fP is a command line tool to be used by an auditor to
@@ -50,24 +49,18 @@ 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\-h\fP | \fB–help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .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 gnunet\-ecc \-p. If this option is missing,
 taler\-auditor will use the MASTER_PUBLIC_KEY value from the
 “exchange” section of the configuration.
-.TP
-\fB\-r\fP | \fB–reset\fP
-Reset the audit, starts everything from the beginning. Useful for
-testing and required for the first audit to setup auditor’s tables.
-Note that if (just) the exchange key changes, the \fB\-r\fP option
-should not be used again.
 .UNINDENT
 .SH SEE ALSO
 .sp
-gnunet\-ecc(1), taler\-auditor\-sign(1), taler.conf(5)
+gnunet\-ecc(1), taler\-auditor\-sign(1), taler.conf(5), taler\-auditor\-dbinit(1)
 .SH BUGS
 .sp
 Report bugs by using \fI\%https://bugs.gnunet.org\fP or by sending electronic
diff --git a/man/taler-bank-transfer.1 b/man/taler-bank-transfer.1
index 6a380995..dac66037 100644
--- a/man/taler-bank-transfer.1
+++ b/man/taler-bank-transfer.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-BANK-TRANSFER" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-BANK-TRANSFER" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-bank-transfer \- trigger a transfer at the bank
 .
@@ -32,57 +32,99 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .SH SYNOPSIS
 .sp
-\fBtaler\-bank\-transfer\fP [\fB\-a\fP\ \fIVALUE\fP\ |\ \fB–amount=\fP‌\fIVALUE\fP]
-[\fB\-b\fP\ \fIURL\fP\ |\ \fB–bank=\fP‌\fIURL\fP]
-[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB–config=\fP‌\fIFILENAME\fP] [\fB\-h\fP\ |\ \fB–help\fP]
-[\fB\-D\fP\ \fIACCOUNT\fP\ |\ \fB–debit=\fP‌\fIACCOUNT\fP]
-[\fB\-C\fP\ \fIACCOUNT\fP\ |\ \fB–credit=\fP‌\fIACCOUNT\fP]
-[\fB\-s\fP\ \fISTRING\fP\ |\ \fB–subject=\fP‌\fISTRING\fP]
-[\fB\-u\fP\ \fIUSERNAME\fP\ |\ \fB–user=\fP‌\fIUSERNAME\fP]
-[\fB\-p\fP\ \fIPASSPHRASE\fP\ |\ \fB–pass=\fP‌\fIPASSPHRASE\fP]
-[\fB\-v\fP\ |\ \fB–version\fP]
+\fBtaler\-bank\-transfer\fP
+[\fB\-a\fP\ \fIVALUE\fP\ |\ \fB\-\-amount=\fP‌\fIVALUE\fP]
+[\fB\-b\fP\ \fIURL\fP\ |\ \fB\-\-bank=\fP‌\fIURL\fP]
+[\fB\-c\fP\ \fIFILENAME\fP\ |\ \fB\-\-config=\fP‌\fIFILENAME\fP]
+[\fB\-C\fP\ \fIACCOUNT\fP\ |\ \fB\-\-credit=\fP‌\fIACCOUNT\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\-o\fP\ |\ \fB\-\-debit\-history\fP]
+[\fB\-p\fP\ \fIPASSPHRASE\fP\ |\ \fB\-\-pass=\fP‌\fIPASSPHRASE\fP]
+[\fB\-s\fP\ \fIACCOUNT\-SECTION\fP\ |\ \fB\-\-section=\fP‌\fIACCOUNT\-SECTION\fP]
+[\fB\-S\fP\ \fISTRING\fP\ |\ \fB\-\-subject=\fP‌\fISTRING\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\-bank\-transfer\fP is a command line tool to trigger bank
-transfers.
+\fBtaler\-bank\-transfer\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
+You can do one of the following four operations during one invocation.
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP 1. 3
+Execute wire transfer from the exchange to consumer account (\fB\-C\fP).
+.IP 2. 3
+Execute wire transfer from consumer account to the exchange (\fB\-D\fP).
+.IP 3. 3
+Inspect credit history of the exchange (\fB\-i\fP).
+.IP 4. 3
+Inspect debit history of the exchange (\fB\-o\fP).
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+Doing more than one of these at a time will result in an error.  Note,
+however, that the \fB\-C\fP and \fB\-D\fP options also can be used to act as filters
+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
+CURRENCY:VALUE.FRACTION.
 .TP
-\fB\-b\fP \fIURL\fP | \fB–bank=\fP‌\fIURL\fP
-URL at which the bank is operation.
+\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 \fIFILENAME\fP | \fB–config=\fP‌\fIFILENAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB\-\-config=\fP‌\fIFILENAME\fP
 Use the given configuration file.
 .TP
-\fB\-h\fP | \fB–help\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\-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
 Print short help on options.
 .TP
-\fB\-D\fP \fIACCOUNT\fP | \fB–debit=\fP‌\fIACCOUNT\fP
-The money should be debited from ACCOUNT. Specifies the number of the
-account.
+\fB\-i\fP | \fB\-\-credit\-history\fP
+Obtain credit history of the exchange. Conflicts with \fB\-o\fP\&.
 .TP
-\fB\-C\fP \fIACCOUNT\fP | \fB–credit=\fP‌\fIACCOUNT\fP
-The money should be credited to ACCOUNT. Specifies the number of the
-account.
+\fB\-o\fP | \fB\-\-debit\-history\fP
+Obtain debit history of the exchange. Conflicts with \fB\-i\fP\&.
 .TP
-\fB\-s\fP \fISTRING\fP | \fB–subject=\fP‌\fISTRING\fP
-Use STRING for the wire transfer subject.
+\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\-u\fP \fIUSERNAME\fP | \fB–user=\fP‌\fIUSERNAME\fP
-Specifies the username for authentication.
+\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\-p\fP \fIPASSPHRASE\fP | \fB–pass=\fP‌\fIPASSPHRASE\fP
-Specifies the pass phrase for authentication.
+\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\-p\fP \fIPASSPHRASE\fP | \fB\-\-pass=\fP‌\fIPASSPHRASE\fP
+Specifies the pass phrase for authentication.  Conflicts with \fB\-s\fP\&.
+.TP
+\fB\-v\fP | \fB\-\-version\fP
 Print version information.
+.TP
+\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
 .sp
-taler\-bank\-manage(1), taler.conf(5)
+taler\-bank\-manage(1), taler.conf(5), \fI\%https://docs.taler.net/core/api\-wire.html#wire\-transfer\-test\-apis\fP
 .SH BUGS
 .sp
 Report bugs by using \fI\%https://gnunet.org/bugs/\fP or by sending electronic
diff --git a/man/taler-config-generate.1 b/man/taler-config-generate.1
index 3fcf8bd2..ede2585a 100644
--- a/man/taler-config-generate.1
+++ b/man/taler-config-generate.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-CONFIG-GENERATE" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-CONFIG-GENERATE" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-config-generate \- tool to simplify Taler configuration generation
 .
diff --git a/man/taler-exchange-aggregator.1 b/man/taler-exchange-aggregator.1
index 4d3773e6..fe0aed2f 100644
--- a/man/taler-exchange-aggregator.1
+++ b/man/taler-exchange-aggregator.1
@@ -1,8 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-AGGREGATOR" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-AGGREGATOR" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
-taler-exchange-aggregator \- aggregate and execute exchange transactions
+taler-exchange-aggregator \- aggregate deposits into wire transfers
 .
 .nr rst2man-indent-level 0
 .
@@ -33,30 +33,30 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-aggregator\fP
-[\fB\-d\fP\ \fIDIRNAME\fP\ |\ \fB–exchange\-dir=\fP‌\fIDIRNAME\fP]
-[\fB\-h\fP\ |\ \fB–help\fP] [\fB\-t\fP\ |\ \fB–test\fP] [\fB\-v\fP\ |\ \fB–version\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\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 pending
-transactions from the Taler exchange.
+\fBtaler\-exchange\-aggregator\fP is a command line tool to run aggregate deposits
+to the same merchant into larger wire transfers. The actual transfers are then
+done by \fBtaler\-exchange\-transfer\fP\&.
 .INDENT 0.0
 .TP
-\fB\-d\fP \fIDIRNAME\fP | \fB–exchange\-dir=\fP‌\fIDIRNAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB–config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
-from \fIDIRNAME\fP\&.
+from \fIFILENAME\fP\&.
 .TP
-\fB\-h\fP | \fB–help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
 .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
 .sp
-taler\-exchange\-dbinit(1), taler\-exchange\-keyup(1),
+taler\-exchange\-transfer(1), taler\-exchange\-closer(1),
 taler\-exchange\-httpd(1), taler.conf(5).
 .SH BUGS
 .sp
diff --git a/man/taler-exchange-benchmark.1 b/man/taler-exchange-benchmark.1
index b4c4debd..7b2a9d28 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-BENCHMARK" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-benchmark \- measure exchange performance
 .
@@ -33,11 +33,11 @@ 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\-b\fP\ \fIBANK_URL\fP\ |\ \fB—bank\-url=\fP‌\fIBANK_URL\fP]
-[\fB\-n\fP\ \fIHOWMANY_COINS\fP\ |\ \fB–coins\-number=\fP‌\fIHOWMANY_COINS\fP]
-[\fB\-l\fP\ \fILOGLEVEL\fP\ |\ \fB–log\-level=\fP‌\fILOGLEVEL\fP]
-[\fB\-h\fP\ |\ \fB–help\fP]
+[\fB\-c\fP\ \fICONFIG_FILENAME\fP\ |\ \fB\-\-config=\fP‌\fICONFIG_FILENAME\fP]
+[\fB\-b\fP\ \fIBANK_URL\fP\ |\ \fB—bank\-url=\fP‌\fIBANK_URL\fP] [\-f] [\-K]
+[\fB\-n\fP\ \fIHOWMANY_COINS\fP\ |\ \fB\-\-coins\-number=\fP‌\fIHOWMANY_COINS\fP]
+[\fB\-l\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-log\-level=\fP‌\fILOGLEVEL\fP]
+[\fB\-h\fP\ |\ \fB\-\-help\fP]
 .SH DESCRIPTION
 .sp
 \fBtaler\-exchange\-benchmark\fP is a command line tool to measure the time
@@ -48,29 +48,39 @@ 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\-b\fP \fIBANK_URL\fP | \fB—bank\-url=\fP‌\fIBANK_URL\fP
 (Mandatory) The URL where the fakebank listens at. Must match the
 host component in the exchange’s escrow account “payto” URL.
 .TP
-\fB\-n\fP \fIHOWMANY_COINS\fP | \fB–coins\-number=\fP‌\fIHOWMANY_COINS\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\-K\fP | \fB\-\-linger\fP
+Linger around until keypress after the benchmark is done.
+.TP
+\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 REFRESH_PROBABILITY probability, which is (hardcoded as) 0.1;
 future versions of this tool should offer this parameter as a CLI
 option.
 .TP
-\fB\-l\fP \fILOGLEVEL\fP | \fB–log\-level=\fP‌\fILOGLEVEL\fP
+\fB\-l\fP \fILOGLEVEL\fP | \fB\-\-log\-level=\fP‌\fILOGLEVEL\fP
 GNUnet\-compatible log level, takes values “ERROR/WARNING/INFO/DEBUG”
 .TP
-\fB\-h\fP | \fB–help\fP
+\fB\-h\fP | \fB\-\-help\fP
 Prints a compiled\-in help text.
 .UNINDENT
 .SH SEE ALSO
 .sp
-taler\-exchange\-dbinit(1), taler\-exchange\-keyup(1),
+taler\-exchange\-dbinit(1), taler\-exchange\-keyup(1), taler\-merchant\-benchmark(1),
 taler\-exchange\-httpd(1), taler.conf(5)
 .SH BUGS
 .sp
diff --git a/man/taler-exchange-closer.1 b/man/taler-exchange-closer.1
new file mode 100644
index 00000000..eebbfad7
--- /dev/null
+++ b/man/taler-exchange-closer.1
@@ -0,0 +1,69 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "TALER-EXCHANGE-CLOSER" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
+.SH NAME
+taler-exchange-closer \- close idle reserves
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBtaler\-exchange\-closer\fP
+[\fB\-h\fP\ |\ \fB\-\-help\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
+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
+Use the configuration and other resources for the exchange to operate
+from \fIFILENAME\fP\&.
+.TP
+\fB\-h\fP | \fB\-\-help\fP
+Print short help on options.
+.TP
+\fB\-t\fP | \fB\-\-test\fP
+Run in test mode and exit when idle.
+.TP
+\fB\-v\fP | \fB\-\-version\fP
+Print version information.
+.UNINDENT
+.SH SEE ALSO
+.sp
+taler\-exchange\-transfer(1), taler\-exchange\-httpd(1), taler.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://gnunet.org/bugs/\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014, 2015, 2016 Florian Dold, Benedikt Muller, Sree Harsha Totakura, Christian Grothoff, Marcello Stanisci (GPLv3+ or GFDL 1.3+)
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/taler-exchange-dbinit.1 b/man/taler-exchange-dbinit.1
index 284e648e..f504add2 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-DBINIT" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-dbinit \- initialize Taler exchange database
 .
@@ -33,7 +33,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-dbinit\fP
-[\fB\-d\fP\ \fIDIRNAME\fP\ |\ \fB–exchange\-dir=\fP‌\fIDIRNAME\fP]
 [\fB\-h\fP\ |\ \fB–help\fP] [\fB\-g\fP\ |\ \fB–gc\fP] [\fB\-r\fP\ |\ \fB–reset\fP]
 [\fB\-v\fP\ |\ \fB–version\fP]
 .SH DESCRIPTION
@@ -45,9 +44,9 @@ Taler exchange to operate.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-d\fP \fIDIRNAME\fP | \fB–exchange\-dir=\fP‌\fIDIRNAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB–config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
-from \fIDIRNAME\fP\&.
+from \fIFILENAME\fP\&.
 .TP
 \fB\-h\fP | \fB–help\fP
 Print short help on options.
diff --git a/man/taler-exchange-httpd.1 b/man/taler-exchange-httpd.1
index 13dd886a..3de4d6de 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-HTTPD" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-httpd \- run Taler exchange (with RESTful API)
 .
@@ -35,7 +35,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBtaler\-exchange\-httpd\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\-i\fP\ |\ \fB–init\-db\fP]
+[\fB\-h\fP\ |\ \fB–help\fP]
 [\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB–loglevel=\fP‌\fILOGLEVEL\fP]
 [\fB\-t\fP\ \fISECONDS\fP\ |\ \fB–timeout=\fP‌\fISECONDS\fP] [\fB\-v\fP\ |\ \fB–version\fP]
 .SH DESCRIPTION
@@ -47,6 +47,12 @@ must exist before running this command.
 Its options are as follows:
 .INDENT 0.0
 .TP
+\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
 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).
@@ -58,9 +64,6 @@ from FILENAME.
 \fB\-h\fP | \fB–help\fP
 Print short help on options.
 .TP
-\fB\-i\fP | \fB–init\-db\fP
-Initialize the database by creating tables and indices if necessary.
-.TP
 \fB\-v\fP | \fB–version\fP
 Print version information.
 .TP
diff --git a/man/taler-exchange-keycheck.1 b/man/taler-exchange-keycheck.1
index e8172140..f91efe86 100644
--- a/man/taler-exchange-keycheck.1
+++ b/man/taler-exchange-keycheck.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-KEYCHECK" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-KEYCHECK" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-keycheck \- check validity of Taler signing and denomination keys
 .
@@ -33,7 +33,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-keycheck\fP
-[\fB\-d\fP\ \fIDIRNAME\fP\ |\ \fB–exchange\-dir=\fP‌\fIDIRNAME\fP]
 [\fB\-h\fP\ |\ \fB–help\fP] [\fB\-v\fP\ |\ \fB–version\fP]
 .SH DESCRIPTION
 .sp
@@ -45,13 +44,20 @@ that the files are correct.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-d\fP \fIDIRNAME\fP | \fB–exchange\-dir=\fP‌\fIDIRNAME\fP
+\fB\-c\fP \fIFILENAME\fP | \fB–config=\fP‌\fIFILENAME\fP
 Use the configuration and other resources for the exchange to operate
-from \fIDIRNAME\fP\&.
+from \fIFILENAME\fP\&.
 .TP
 \fB\-h\fP | \fB–help\fP
 Print short help on options.
 .TP
+\fB\-i\fP \fIAMOUNT\fP | \fB–denomination\-info\-hash=\fP‌\fIAMOUNT\fP
+Output the full denomination key hashes and the validity starting times of all denomination keys for the given \fIAMOUNT\fP\&.  Useful to identify hashes when revoking keys.
+.TP
+\fB\-L\fP \fILOGLEVEL\fP | \fB–loglevel=\fP‌\fILOGLEVEL\fP
+Specifies the log level to use. Accepted values are: DEBUG, INFO,
+WARNING, ERROR.
+.TP
 \fB\-v\fP | \fB–version\fP
 Print version information.
 .UNINDENT
diff --git a/man/taler-exchange-keyup.1 b/man/taler-exchange-keyup.1
index 77e43add..50621d88 100644
--- a/man/taler-exchange-keyup.1
+++ b/man/taler-exchange-keyup.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-KEYUP" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-KEYUP" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-keyup \- set up Taler exchange denomination and signing
 .
@@ -33,7 +33,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH SYNOPSIS
 .sp
 \fBtaler\-exchange\-keyup\fP
-[\fB\-d\fP\ \fIDIRNAME\fP\ |\ \fB–exchange\-dir=\fP‌\fIDIRNAME\fP]
 [\fB\-h\fP\ |\ \fB–help\fP] [\fB\-m\fP\ \fIFILE\fP\ |\ \fB–master\-key=\fP‌\fIFILE\fP]
 [\fB\-o\fP\ \fIFILE\fP\ |\ \fB–output=\fP‌\fIFILE\fP]
 [\fB\-r\fP\ \fIDKH\fP\ |\ \fB–revoke=\fP‌\fIDKH\fP]
@@ -51,15 +50,28 @@ operates.
 Its options are as follows:
 .INDENT 0.0
 .TP
-\fB\-d\fP \fIDIRNAME\fP | \fB–exchange\-dir=\fP‌\fIDIRNAME\fP
-Use the configuration and other resources for the exchange to operate
-from \fIDIRNAME\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 \fIDIRNAME\fP | \fB–feedir=\fP‌\fIDIRNAME\fP
+Directory where to write the wire transfer fee structure. If not given,
+the one from the main configuration will be used.
 .TP
 \fB\-h\fP | \fB–help\fP
 Print short help on options.
 .TP
+\fB\-L\fP \fILOGLEVEL\fP | \fB–loglevel=\fP‌\fILOGLEVEL\fP
+Specifies the log level to use. Accepted values are: DEBUG, INFO,
+WARNING, ERROR.
+.TP
+\fB\-k\fP \fIBITS\fP | \fB–replacement\-keysize=\fP‌\fIBITS\fP
+When revoke an active denomination key (see \fB\-\-r\fP option), use
+\fIBITS\fP bit for the replacement denomination key. Default is 2048 (bits).
+.TP
 \fB\-m\fP \fIFILE\fP | \fB–master\-key=\fP‌\fIFILE\fP
-Location of the private EdDSA offline master key of the exchange.
+Location of the private EdDSA offline master key of the exchange. If not
+given, the location given in the configuration file will be used.
 .TP
 \fB\-o\fP \fIFILE\fP | \fB–output=\fP‌\fIFILE\fP
 Where to write a denomination key signing request file to be given to
@@ -69,6 +81,9 @@ the auditor.
 Revoke the denomination key where the denomination public key’s hash
 is DKH.
 .TP
+\fB\-T\fP \fI[+/\-]MICROSECONDS\fP | \fB–timetravel=\fP‌\fI[+/\-]MICROSECONDS\fP
+Modify system time (as seen by this process) by the given offset (for debugging/testing).
+.TP
 \fB\-t\fP \fITIMESTAMP\fP | \fB–time=\fP‌\fITIMESTAMP\fP
 Operate as if the current time was \fITIMESTAMP\fP\&.
 .TP
diff --git a/man/taler-exchange-transfer.1 b/man/taler-exchange-transfer.1
new file mode 100644
index 00000000..30255adb
--- /dev/null
+++ b/man/taler-exchange-transfer.1
@@ -0,0 +1,69 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "TALER-EXCHANGE-TRANSFER" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
+.SH NAME
+taler-exchange-transfer \- execute wire transfers
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBtaler\-exchange\-transfer\fP
+[\fB\-h\fP\ |\ \fB\-\-help\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
+Use the configuration and other resources for the exchange to operate
+from \fIFILENAME\fP\&.
+.TP
+\fB\-h\fP | \fB\-\-help\fP
+Print short help on options.
+.TP
+\fB\-t\fP | \fB\-\-test\fP
+Run in test mode and exit when idle.
+.TP
+\fB\-v\fP | \fB\-\-version\fP
+Print version information.
+.UNINDENT
+.SH SEE ALSO
+.sp
+taler\-exchange\-aggregator(1), taler\-exchange\-closer(1),
+taler\-exchange\-httpd(1), taler.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://gnunet.org/bugs/\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014, 2015, 2016 Florian Dold, Benedikt Muller, Sree Harsha Totakura, Christian Grothoff, Marcello Stanisci (GPLv3+ or GFDL 1.3+)
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/taler-exchange-wire.1 b/man/taler-exchange-wire.1
index 9690bad2..15e746ba 100644
--- a/man/taler-exchange-wire.1
+++ b/man/taler-exchange-wire.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER-EXCHANGE-WIRE" "1" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-WIRE" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-wire \- create the master-key signed responses to /wire
 .
diff --git a/man/taler-exchange-wirewatch.1 b/man/taler-exchange-wirewatch.1
index 1000caf7..e8724a31 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-EXCHANGE-WIREWATCH" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-exchange-wirewatch \- watch for incoming wire transfers
 .
diff --git a/man/taler-merchant-benchmark.1 b/man/taler-merchant-benchmark.1
index ca4326f5..660a7b79 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-MERCHANT-BENCHMARK" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-merchant-benchmark \- generate Taler-style benchmarking payments
 .
diff --git a/man/taler-merchant-httpd.1 b/man/taler-merchant-httpd.1
index 58cc1d85..ed0f8250 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" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER-MERCHANT-HTTPD" "1" "Mar 22, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler-merchant-httpd \- run Taler merchant backend (with RESTful API)
 .
diff --git a/man/taler.conf.5 b/man/taler.conf.5
index 627821f1..9877608a 100644
--- a/man/taler.conf.5
+++ b/man/taler.conf.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TALER.CONF" "5" "Sep 18, 2019" "0.6pre1" "GNU Taler"
+.TH "TALER.CONF" "5" "Mar 21, 2020" "0.6pre1" "GNU Taler"
 .SH NAME
 taler.conf \- Taler configuration file
 .
@@ -98,6 +98,10 @@ can be run offline (as the master key is for offline signing).
 Specifies the base URL under which the exchange can be reached. Added
 to wire transfers to enable tracking by merchants.
 .TP
+.B AGGREGATOR_IDLE_SLEEP_INTERVAL
+For how long should the aggregator sleep when it is idle before trying
+to look for more work? Default is 60 seconds.
+.TP
 .B SIGNKEY_DURATION
 For how long is a signing key valid?
 .TP
@@ -110,6 +114,42 @@ How long do we generate denomination and signing keys ahead of time?
 .B LOOKAHEAD_PROVIDE
 How long into the future do we provide signing and denomination keys
 to clients?
+.TP
+.B TERMS_DIR
+Directory where the terms of service of the exchange operator can be fund. The directory must contain sub\-directories for every supported language, using the two\-character language code in lower case, i.e. "en/" or "fr/".  Each subdirectory must then contain files with the terms of service in various formats.  The basename of the file of the current policy must be specified under TERMS_ETAG.  The extension defines the mime type. Supported extensions include "html", "htm", "txt", "pdf", "jpg", "jpeg", "png" and "gif".  For example, using a TERMS_ETAG of "0", the structure could be the following:
+\- $TERMS_DIR/en/0.pdf
+\- $TERMS_DIR/en/0.html
+\- $TERMS_DIR/en/0.txt
+\- $TERMS_DIR/fr/0.pdf
+\- $TERMS_DIR/fr/0.html
+\- $TERMS_DIR/de/0.txt
+.TP
+.B TERMS_ETAG
+Basename of the file(s) in the TERMS_DIR with the current terms of service.  The value is also used for the "Etag" in the HTTP request to control caching. Whenever the terms of service change, the TERMS_ETAG MUST also change, and old values MUST NOT be repeated.  For example, the date or version number of the terms of service SHOULD be used for the Etag.  If there are minor (i.e. spelling) fixes to the terms of service, the TERMS_ETAG probably SHOULD NOT be changed. However, whenever users must approve the new terms, the TERMS_ETAG MUST change.
+.TP
+.B PRIVACY_DIR
+Works the same as TERMS_DIR, just for the privacy policy.
+.TP
+.B PRIVACY_ETAG
+Works the same as TERMS_ETAG, just for the privacy policy.
+.UNINDENT
+.SS EXCHANGE DATABASE OPTIONS
+.sp
+The following options must be in the section "[exchangedb]".
+.INDENT 0.0
+.TP
+.B DURATION_OVERLAP
+How much should validity periods for coins overlap?
+Should be long enough to avoid problems with
+wallets picking one key and then due to network latency
+another key being valid.  The DURATION_WITHDRAW period
+must be longer than this value.
+.TP
+.B IDLE_RESERVE_EXPIRATION_TIME
+After which time period should reserves be closed if they are idle?
+.TP
+.B LEGAL_RESERVE_EXPIRATION_TIME
+After what time do we forget about (drained) reserves during garbage collection?
 .UNINDENT
 .SS EXCHANGE POSTGRES BACKEND DATABASE OPTIONS
 .sp
@@ -220,31 +260,58 @@ Crockford Base32 encoded auditor public key.
 .B CURRENCY
 Name of the currency for which this auditor is trusted, i.e.\ “KUDOS”
 .UNINDENT
-.SS ACCOUNT OPTIONS (for exchanges and merchants)
+.SS MERCHANT ACCOUNT OPTIONS
+.INDENT 0.0
+.TP
+.B PAYTO_URI
+Specifies the payto://\-URL of the account. The general format is
+payto://METHOD/DETAILS.
+.TP
+.B WIRE_RESPONSE (exchange and merchant)
+Specifies the name of the file in which the wire details for this merchant
+account should be located. Used by the Taler exchange service and the
+taler\-merchant\-httpd (to generate and then use the file).
+.TP
+.B HONOR_instance
+Must be set to YES for the instances (where "instance" is the section
+name of the instance) of the merchant backend that should allow
+incoming wire transfers for this bank account.
+.TP
+.B ACTIVE_instance
+Must be set to YES for the instances (where “instance” is the section
+name of the instance) of the merchant backend that should use this
+bank account in new offers/contracts. Setting ACTIVE_instance to YES
+requires also setting HONOR_instance to YES.
+.UNINDENT
+.SS EXCHANGE ACCOUNT OPTIONS
 .sp
 An exchange (or merchant) can have multiple bank accounts. The following
 options are for sections named “[account\-SOMETHING]”. The SOMETHING is
 arbitrary and should be chosen to uniquely identify the bank account for
-the operator. Additional authentication options may need to be specified
-in the account section depending on the PLUGIN used.
+the operator.
 .INDENT 0.0
 .TP
-.B URL
+.B PAYTO_URI
 Specifies the payto://\-URL of the account. The general format is
-payto://METHOD/DETAILS. This option is used for exchanges and
-merchants.
+payto://METHOD/DETAILS.
+.TP
+.B WIRE_GATEWAY_URL
+URL of the wire gateway
+.TP
+.B WIRE_GATEWAY_AUTH_METHOD
+This option determines how the exchange (auditor/wirewatch/aggregator)
+authenticates with the wire gateway.  Choices are \fBbasic\fP and \fBnone\fP\&.
+.TP
+.B USERNAME
+User name for \fBbasic\fP authentication with the wire gateway.
+.TP
+.B PASSWORD
+Password for \fBbasic\fP authentication with the wire gateway.
 .TP
 .B WIRE_RESPONSE
 Specifies the name of the file in which the /wire response for this
 account should be located. Used by the Taler exchange service and the
-taler\-exchange\-wire tool and the taler\-merchant\-httpd (to generate
-the files).
-.TP
-.B PLUGIN
-Name of the plugin can be used to access the account
-(i.e.\ “taler\-bank” or “ebics”). Used by the merchant backend for back
-office operations (i.e.\ to identify incoming wire transfers) and by
-the exchange.
+taler\-exchange\-wire tool.
 .TP
 .B ENABLE_DEBIT
 Must be set to YES for the accounts that the
@@ -254,17 +321,6 @@ taler\-exchange\-aggregator should debit. Not used by merchants.
 Must be set to YES for the accounts that the taler\-exchange\-wirewatch
 should check for credits. It is yet uncertain if the merchant
 implementation may check this flag as well.
-.TP
-.B HONOR_instance
-Must be set to YES for the instances (where “instance” is the section
-name of the instance) of the merchant backend that should allow
-incoming wire transfers for this bank account.
-.TP
-.B ACTIVE_instance
-Must be set to YES for the instances (where “instance” is the section
-name of the instance) of the merchant backend that should use this
-bank account in new offers/contracts. Setting ACTIVE_instance to YES
-requires also setting ENABLE_instance to YES.
 .UNINDENT
 .SS TALER\-BANK AUTHENTICATION OPTIONS (for accounts)
 .sp
@@ -285,17 +341,6 @@ authentication method.
 Password to use for authentication. Used with the “basic”
 authentication method.
 .UNINDENT
-.SS EBICS AUTHENTICATION OPTIONS
-.sp
-The following authentication options are supported by the “ebics” wire
-plugin. They must be specified in the “[account\-]” section that uses the
-“ebics” plugin.
-.INDENT 0.0
-.TP
-.B NONE
-Currently the “ebics” implementation is incomplete and does not
-support authentication.
-.UNINDENT
 .SS EXCHANGE WIRE FEE OPTIONS
 .sp
 For each supported wire method (i.e.\ “x\-taler\-bank” or “sepa”), sections
@@ -326,9 +371,6 @@ are used by taler\-exchange\-keyup to create denomination keys.
 Value of the coin, i.e.\ “EUR:1.50” for 1 Euro and 50 Cents (per
 coin).
 .TP
-.B DURATION_OVERLAP
-How much should validity periods for these coins overlap?
-.TP
 .B DURATION_WITHDRAW
 How long should the same key be used for clients to withdraw coins of
 this value?
@@ -371,8 +413,8 @@ The following options must be in section “[auditordb\-postgres]” if the
 .INDENT 0.0
 .TP
 .B CONFIG
-How to access the database, i.e.\ “postgres:///taler” to use the
-“taler” database. Testcases use “talercheck”.
+How to access the database, i.e.\ "postgres:///taler" to use the
+"taler" database. Testcases use “talercheck”.
 .UNINDENT
 .SH SEE ALSO
 .sp