update man pages

57 files changed, 503 insertions, 155 deletions

diff --git a/man/challenger-admin.1 b/man/challenger-admin.1
index b724b6e6..09fbc2aa 100644
--- a/man/challenger-admin.1
+++ b/man/challenger-admin.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "CHALLENGER-ADMIN" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "CHALLENGER-ADMIN" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 challenger-admin \- manipulate list of authorized Challenger clients
 .SH SYNOPSIS
diff --git a/man/challenger-config.1 b/man/challenger-config.1
index 5c3c437e..33d60ef3 100644
--- a/man/challenger-config.1
+++ b/man/challenger-config.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "CHALLENGER-CONFIG" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "CHALLENGER-CONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 challenger-config \- manipulate Challenger configuration files
 .SH SYNOPSIS
diff --git a/man/challenger-dbconfig.1 b/man/challenger-dbconfig.1
index fb3b80fb..d83e116a 100644
--- a/man/challenger-dbconfig.1
+++ b/man/challenger-dbconfig.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "CHALLENGER-DBCONFIG" "1" "Sep 07, 2023" "0.9" "GNU Taler"
+.TH "CHALLENGER-DBCONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 challenger-dbconfig \- configure challenger database
 .SH SYNOPSIS
diff --git a/man/challenger-dbinit.1 b/man/challenger-dbinit.1
index 2c5e95d6..06575f06 100644
--- a/man/challenger-dbinit.1
+++ b/man/challenger-dbinit.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "CHALLENGER-DBINIT" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "CHALLENGER-DBINIT" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 challenger-dbinit \- initialize the Challenger database
 .SH SYNOPSIS
diff --git a/man/challenger-httpd.1 b/man/challenger-httpd.1
index d1b63cf0..f0241d89 100644
--- a/man/challenger-httpd.1
+++ b/man/challenger-httpd.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "CHALLENGER-HTTPD" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "CHALLENGER-HTTPD" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 challenger-httpd \- provide the Challenger HTTP interface
 .SH SYNOPSIS
diff --git a/man/challenger.conf.5 b/man/challenger.conf.5
index 79779192..79260442 100644
--- a/man/challenger.conf.5
+++ b/man/challenger.conf.5
@@ -27,35 +27,26 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "CHALLENGER.CONF" "5" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "CHALLENGER.CONF" "5" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 challenger.conf \- Challenger configuration file
 .SH DESCRIPTION
 .sp
-The configuration file is line\-oriented.
-Blank lines and whitespace at the beginning and end of a line are ignored.
-Comments start with \fB#\fP or \fB%\fP in the first column
-(after any beginning\-of\-line whitespace) and go to the end of the line.
+The configuration file is line\-oriented.  Blank lines and whitespace at the
+beginning and end of a line are ignored.  Comments start with \fB#\fP or \fB%\fP
+in the first column (after any beginning\-of\-line whitespace) and go to the end
+of the line.
 .sp
-The file is split into sections.
-Every section begins with “[SECTIONNAME]” and
-contains a number of options of the form “OPTION=VALUE”.
-There may be whitespace around the \fB=\fP (equal sign).
-Section names and options are \fIcase\-insensitive\fP\&.
+The file is split into sections.  Every section begins with \fB[SECTIONNAME]\fP
+and contains a number of options of the form \fBOPTION=VALUE\fP\&.  There may be
+whitespace around the \fB=\fP (equal sign).  Section names and options are
+\fIcase\-insensitive\fP\&.
 .sp
-The values, however, are \fIcase\-sensitive\fP\&.
-In particular, boolean values are one of \fBYES\fP or \fBNO\fP\&.
-Values can include whitespace by surrounding
-the entire value with \fB\(dq\fP (double quote).
-Note, however, that there are no escape characters in such strings;
-all characters between the double quotes (including other double quotes)
-are taken verbatim.
-.sp
-Values that represent filenames can begin with a \fB/bin/sh\fP\-like
-variable reference.
-This can be simple, such as \fB$TMPDIR/foo\fP, or complex,
-such as \fB${TMPDIR:\-${TMP:\-/tmp}}/foo\fP\&.
-See \fB[PATHS]\fP (below).
+The values, however, are \fIcase\-sensitive\fP\&.  In particular, boolean values are
+one of \fBYES\fP or \fBNO\fP\&.  Values can include whitespace by surrounding the
+entire value with \fB\(dq\fP (double quote).  Note, however, that there are no
+escape characters in such strings; all characters between the double quotes
+(including other double quotes) are taken verbatim.
 .sp
 Values that represent a time duration are represented as a series
 of one or more \fBNUMBER UNIT\fP pairs, e.g. \fB60 s\fP, \fB4 weeks 1 day\fP,
@@ -65,16 +56,25 @@ Values that represent an amount are in the usual amount syntax:
 \fBCURRENCY:VALUE.FRACTION\fP, e.g. \fBEUR:1.50\fP\&.
 The \fBFRACTION\fP portion may extend up to 8 places.
 .sp
-The “[PATHS]” section is special in that it contains paths that can be
-referenced using “$” in other configuration values that specify
+Values that represent filenames can begin with a \fB/bin/sh\fP\-like variable
+reference.  This can be simple, such as \fB$TMPDIR/foo\fP, or complex, such as
+\fB${TMPDIR:\-${TMP:\-/tmp}}/foo\fP\&.  The variables are expanded either using
+key\-values from the \fB[PATHS]\fP section (see below) or from the environment
+(\fBgetenv()\fP). The values from \fB[PATHS]\fP take precedence over those from
+the environment.  If the variable name is found in neither \fB[PATHS]\fP nor the
+environment, a warning is printed and the value is left unchanged.  Variables (including those from the environment) are expanded recursively, so if \fBFOO=$BAR\fP and \fBBAR=buzz\fP then the result is \fBFOO=buzz\fP\&.  Recursion is bounded to at most 128 levels to avoid undefined behavior for mutually recursive expansions like if \fBBAR=$FOO\fP in the example above.
+.sp
+The \fB[PATHS]\fP section is special in that it contains paths that can be
+referenced using \fB$\fP in other configuration values that specify
 \fIfilenames\fP\&. Note that configuration options that are not specifically
 retrieved by the application as \fIfilenames\fP will not see “$”\-expressions
-expanded. To expand “$”\-expressions when using \fBtaler\-config\fP, you must pass
+expanded. To expand \fB$\fP\-expressions when using \fBtaler\-config\fP, you must pass
 the \fB\-f\fP command\-line option.
 .sp
-The system automatically pre\-populates the “[PATHS]” section with a few values
-at run\-time in addition to the values that are in the actual configuration
-file.  These automatically generated values refer to installation properties
+The system automatically pre\-populates the \fB[PATHS]\fP section with a few values
+at run\-time (in addition to the values that are in the actual configuration
+file and automatically overwriting those values if they are present).
+These automatically generated values refer to installation properties
 from \fI\%GNU autoconf\fP\&. The
 values are usually dependent on an \fBINSTALL_PREFIX\fP which is determined by
 the \fB\-\-prefix\fP option given to configure.  The canonical values are:
@@ -103,7 +103,8 @@ DATADIR = $INSTALL_PREFIX/share/taler/
 .sp
 Note that on some platforms, the given paths may differ depending
 on how the system was compiled or installed, the above are just the
-canonical locations of the various resources.
+canonical locations of the various resources.  These
+automatically generated values are never written to disk.
 .sp
 Files containing default values for many of the options described below
 are installed under \fB$PREFIX/share/challenger/config.d/\fP\&.
diff --git a/man/libeufin-nexus.1 b/man/libeufin-nexus.1
index 0856d5e1..cb882455 100644
--- a/man/libeufin-nexus.1
+++ b/man/libeufin-nexus.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "LIBEUFIN-NEXUS" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "LIBEUFIN-NEXUS" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 libeufin-nexus \- service to interface to various bank access APIs
 .SH SYNOPSIS
diff --git a/man/libeufin-sandbox.1 b/man/libeufin-sandbox.1
index 84733d82..63771a20 100644
--- a/man/libeufin-sandbox.1
+++ b/man/libeufin-sandbox.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "LIBEUFIN-SANDBOX" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "LIBEUFIN-SANDBOX" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 libeufin-sandbox \- simulate core banking system with EBICS access to bank accounts
 .SH SYNOPSIS
diff --git a/man/sync-config.1 b/man/sync-config.1
index cc8aa4ce..d5c728a5 100644
--- a/man/sync-config.1
+++ b/man/sync-config.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNC-CONFIG" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "SYNC-CONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 sync-config \- manipulate Sync configuration files
 .SH SYNOPSIS
diff --git a/man/sync-dbconfig.1 b/man/sync-dbconfig.1
new file mode 100644
index 00000000..126efca6
--- /dev/null
+++ b/man/sync-dbconfig.1
@@ -0,0 +1,83 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.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
+..
+.TH "SYNC-DBCONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
+.SH NAME
+sync-dbconfig \- configure sync database
+.SH SYNOPSIS
+.sp
+\fBsync\-dbconfig\fP
+[\fB\-c\fP\ \fIFILENAME\fP]
+[\fB\-h\fP]
+[\fB\-n\fP\ \fINAME\fP]
+[\fB\-r\fP]
+[\fB\-s\fP]
+[\fB\-u\fP\ \fIUSER\fP]
+.SH DESCRIPTION
+.sp
+\fBsync\-dbconfig\fP is a simple shell script that configures
+a Postgresql database for use by \fBsync\-httpd\fP\&.
+.sp
+Its options are as follows:
+.INDENT 0.0
+.TP
+\fB\-c\fP \fIFILENAME\fP
+Write the database configuration to FILENAME. The tool
+will append the required \fBCONFIG\fP option for the
+Postgresql access to the respective file.
+.TP
+\fB\-h\fP
+Print short help on options.
+.TP
+\fB\-n\fP \fIDBNAME\fP
+Use DBNAME for the name of the created database.
+.TP
+\fB\-r\fP
+Reset any existing database. Looses all existing data. DANGEROUS.
+.TP
+\fB\-s\fP
+Skip database initialization. Useful if you want to run
+\fBsync\-dbinit\fP manually.
+.TP
+\fB\-u\fP \fIUSER\fP
+Specifies the (main) sync user that will access the database.
+.UNINDENT
+.SH SEE ALSO
+.sp
+sync\-dbinit(1), sync.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://bugs.taler.net\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014-2022 Taler Systems SA (GPLv3+ or GFDL 1.3+)
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/sync-dbinit.1 b/man/sync-dbinit.1
index 06d8c76d..98bb5d8f 100644
--- a/man/sync-dbinit.1
+++ b/man/sync-dbinit.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNC-DBINIT" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "SYNC-DBINIT" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 sync-dbinit \- initialize the Sync database
 .SH SYNOPSIS
diff --git a/man/sync-httpd.1 b/man/sync-httpd.1
index 0886ff0c..b9c6c3ae 100644
--- a/man/sync-httpd.1
+++ b/man/sync-httpd.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNC-HTTPD" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "SYNC-HTTPD" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 sync-httpd \- provide the Sync HTTP interface
 .SH SYNOPSIS
diff --git a/man/sync.conf.5 b/man/sync.conf.5
index 8d77b58c..00ba0f70 100644
--- a/man/sync.conf.5
+++ b/man/sync.conf.5
@@ -27,35 +27,26 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNC.CONF" "5" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "SYNC.CONF" "5" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 sync.conf \- Sync configuration file
 .SH DESCRIPTION
 .sp
-The configuration file is line\-oriented.
-Blank lines and whitespace at the beginning and end of a line are ignored.
-Comments start with \fB#\fP or \fB%\fP in the first column
-(after any beginning\-of\-line whitespace) and go to the end of the line.
+The configuration file is line\-oriented.  Blank lines and whitespace at the
+beginning and end of a line are ignored.  Comments start with \fB#\fP or \fB%\fP
+in the first column (after any beginning\-of\-line whitespace) and go to the end
+of the line.
 .sp
-The file is split into sections.
-Every section begins with “[SECTIONNAME]” and
-contains a number of options of the form “OPTION=VALUE”.
-There may be whitespace around the \fB=\fP (equal sign).
-Section names and options are \fIcase\-insensitive\fP\&.
+The file is split into sections.  Every section begins with \fB[SECTIONNAME]\fP
+and contains a number of options of the form \fBOPTION=VALUE\fP\&.  There may be
+whitespace around the \fB=\fP (equal sign).  Section names and options are
+\fIcase\-insensitive\fP\&.
 .sp
-The values, however, are \fIcase\-sensitive\fP\&.
-In particular, boolean values are one of \fBYES\fP or \fBNO\fP\&.
-Values can include whitespace by surrounding
-the entire value with \fB\(dq\fP (double quote).
-Note, however, that there are no escape characters in such strings;
-all characters between the double quotes (including other double quotes)
-are taken verbatim.
-.sp
-Values that represent filenames can begin with a \fB/bin/sh\fP\-like
-variable reference.
-This can be simple, such as \fB$TMPDIR/foo\fP, or complex,
-such as \fB${TMPDIR:\-${TMP:\-/tmp}}/foo\fP\&.
-See \fB[PATHS]\fP (below).
+The values, however, are \fIcase\-sensitive\fP\&.  In particular, boolean values are
+one of \fBYES\fP or \fBNO\fP\&.  Values can include whitespace by surrounding the
+entire value with \fB\(dq\fP (double quote).  Note, however, that there are no
+escape characters in such strings; all characters between the double quotes
+(including other double quotes) are taken verbatim.
 .sp
 Values that represent a time duration are represented as a series
 of one or more \fBNUMBER UNIT\fP pairs, e.g. \fB60 s\fP, \fB4 weeks 1 day\fP,
@@ -65,16 +56,25 @@ Values that represent an amount are in the usual amount syntax:
 \fBCURRENCY:VALUE.FRACTION\fP, e.g. \fBEUR:1.50\fP\&.
 The \fBFRACTION\fP portion may extend up to 8 places.
 .sp
-The “[PATHS]” section is special in that it contains paths that can be
-referenced using “$” in other configuration values that specify
+Values that represent filenames can begin with a \fB/bin/sh\fP\-like variable
+reference.  This can be simple, such as \fB$TMPDIR/foo\fP, or complex, such as
+\fB${TMPDIR:\-${TMP:\-/tmp}}/foo\fP\&.  The variables are expanded either using
+key\-values from the \fB[PATHS]\fP section (see below) or from the environment
+(\fBgetenv()\fP). The values from \fB[PATHS]\fP take precedence over those from
+the environment.  If the variable name is found in neither \fB[PATHS]\fP nor the
+environment, a warning is printed and the value is left unchanged.  Variables (including those from the environment) are expanded recursively, so if \fBFOO=$BAR\fP and \fBBAR=buzz\fP then the result is \fBFOO=buzz\fP\&.  Recursion is bounded to at most 128 levels to avoid undefined behavior for mutually recursive expansions like if \fBBAR=$FOO\fP in the example above.
+.sp
+The \fB[PATHS]\fP section is special in that it contains paths that can be
+referenced using \fB$\fP in other configuration values that specify
 \fIfilenames\fP\&. Note that configuration options that are not specifically
 retrieved by the application as \fIfilenames\fP will not see “$”\-expressions
-expanded. To expand “$”\-expressions when using \fBtaler\-config\fP, you must pass
+expanded. To expand \fB$\fP\-expressions when using \fBtaler\-config\fP, you must pass
 the \fB\-f\fP command\-line option.
 .sp
-The system automatically pre\-populates the “[PATHS]” section with a few values
-at run\-time in addition to the values that are in the actual configuration
-file.  These automatically generated values refer to installation properties
+The system automatically pre\-populates the \fB[PATHS]\fP section with a few values
+at run\-time (in addition to the values that are in the actual configuration
+file and automatically overwriting those values if they are present).
+These automatically generated values refer to installation properties
 from \fI\%GNU autoconf\fP\&. The
 values are usually dependent on an \fBINSTALL_PREFIX\fP which is determined by
 the \fB\-\-prefix\fP option given to configure.  The canonical values are:
@@ -103,7 +103,8 @@ DATADIR = $INSTALL_PREFIX/share/taler/
 .sp
 Note that on some platforms, the given paths may differ depending
 on how the system was compiled or installed, the above are just the
-canonical locations of the various resources.
+canonical locations of the various resources.  These
+automatically generated values are never written to disk.
 .sp
 Files containing default values for many of the options described below
 are installed under \fB$PREFIX/share/sync/config.d/\fP\&.
diff --git a/man/taler-aggregator-benchmark.1 b/man/taler-aggregator-benchmark.1
index ee9f088c..1e164bce 100644
--- a/man/taler-aggregator-benchmark.1
+++ b/man/taler-aggregator-benchmark.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AGGREGATOR-BENCHMARK" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AGGREGATOR-BENCHMARK" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-aggregator-benchmark \- generate database to measure aggregator performance
 .SH SYNOPSIS
@@ -52,7 +52,7 @@ prepares the database with synthetic work.
 .INDENT 0.0
 .TP
 \fB\-c\fP \fICONFIG_FILENAME\fP | \fB\-\-config=\fP‌\fICONFIG_FILENAME\fP
-(Mandatory) Use CONFIG_FILENAME.
+(Mandatory) Use CONFIG_FILENAME as the name for the configuration file.
 .TP
 \fB\-d\fP \fIDN\fP | \fB\-\-deposits=\fP‌\fIDN\fP
 How many deposits should be instantiated \fIper merchant\fP\&.
diff --git a/man/taler-auditor-dbconfig.1 b/man/taler-auditor-dbconfig.1
new file mode 100644
index 00000000..b8eac769
--- /dev/null
+++ b/man/taler-auditor-dbconfig.1
@@ -0,0 +1,83 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.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
+..
+.TH "TALER-AUDITOR-DBCONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
+.SH NAME
+taler-auditor-dbconfig \- configure Taler auditor database
+.SH SYNOPSIS
+.sp
+\fBtaler\-auditor\-dbconfig\fP
+[\fB\-c\fP\ \fIFILENAME\fP]
+[\fB\-h\fP]
+[\fB\-n\fP\ \fINAME\fP]
+[\fB\-r\fP]
+[\fB\-s\fP]
+[\fB\-u\fP\ \fIUSER\fP]
+.SH DESCRIPTION
+.sp
+\fBtaler\-auditor\-dbconfig\fP is a simple shell script that configures
+a Postgresql database for use by the GNU Taler auditor.
+.sp
+Its options are as follows:
+.INDENT 0.0
+.TP
+\fB\-c\fP \fIFILENAME\fP
+Write the database configuration to FILENAME. The tool
+will append the required \fBCONFIG\fP option for the
+Postgresql access to the respective file.
+.TP
+\fB\-h\fP
+Print short help on options.
+.TP
+\fB\-n\fP \fIDBNAME\fP
+Use DBNAME for the name of the created database.
+.TP
+\fB\-r\fP
+Reset any existing database. Looses all existing data. DANGEROUS.
+.TP
+\fB\-s\fP
+Skip database initialization. Useful if you want to run
+\fBtaler\-auditor\-dbinit\fP manually.
+.TP
+\fB\-u\fP \fIUSER\fP
+Specifies the (main) auditor user that will access the database.
+.UNINDENT
+.SH SEE ALSO
+.sp
+taler\-auditor\-dbinit(1), taler.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://bugs.taler.net\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014-2022 Taler Systems SA (GPLv3+ or GFDL 1.3+)
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/taler-auditor-dbinit.1 b/man/taler-auditor-dbinit.1
index ae7a7efb..028baf65 100644
--- a/man/taler-auditor-dbinit.1
+++ b/man/taler-auditor-dbinit.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AUDITOR-DBINIT" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AUDITOR-DBINIT" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-auditor-dbinit \- setup auditor database
 .SH SYNOPSIS
diff --git a/man/taler-auditor-exchange.1 b/man/taler-auditor-exchange.1
index 8615b97b..057d0005 100644
--- a/man/taler-auditor-exchange.1
+++ b/man/taler-auditor-exchange.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AUDITOR-EXCHANGE" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AUDITOR-EXCHANGE" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-auditor-exchange \- add or remove exchange from auditor’s list
 .SH SYNOPSIS
diff --git a/man/taler-auditor-httpd.1 b/man/taler-auditor-httpd.1
index 8a696175..3beef382 100644
--- a/man/taler-auditor-httpd.1
+++ b/man/taler-auditor-httpd.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AUDITOR-HTTPD" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AUDITOR-HTTPD" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-auditor-httpd \- HTTP server providing a RESTful API to access a Taler auditor
 .SH SYNOPSIS
diff --git a/man/taler-auditor-offline.1 b/man/taler-auditor-offline.1
index 6116b44b..c7edc072 100644
--- a/man/taler-auditor-offline.1
+++ b/man/taler-auditor-offline.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AUDITOR-OFFLINE" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AUDITOR-OFFLINE" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-auditor-offline \- Taler auditor certifies that it audits a Taler exchange
 .SH SYNOPSIS
diff --git a/man/taler-auditor-sync.1 b/man/taler-auditor-sync.1
index 3390ff2f..0c4ba633 100644
--- a/man/taler-auditor-sync.1
+++ b/man/taler-auditor-sync.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AUDITOR-SYNC" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AUDITOR-SYNC" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-auditor-sync \- tool to safely synchronize auditor database
 .SH SYNOPSIS
diff --git a/man/taler-auditor.1 b/man/taler-auditor.1
index d6c65ae5..0748a605 100644
--- a/man/taler-auditor.1
+++ b/man/taler-auditor.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-AUDITOR" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-AUDITOR" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-auditor \- audit exchange
 .SH SYNOPSIS
diff --git a/man/taler-bank-benchmark.1 b/man/taler-bank-benchmark.1
index 0395e165..9ec8a1ee 100644
--- a/man/taler-bank-benchmark.1
+++ b/man/taler-bank-benchmark.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-BANK-BENCHMARK" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-BANK-BENCHMARK" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-bank-benchmark \- measure bank performance
 .SH SYNOPSIS
@@ -39,7 +39,6 @@ taler-bank-benchmark \- measure bank performance
 [\fB\-L\fP\ \fILOGLEVEL\fP\ |\ \fB\-\-loglevel=\fP‌\fILOGLEVEL\fP]
 [\fB\-l\fP\ \fIFILENAME\fP\ |\ \fB\-\-logfile=\fP‌\fIFILENAME\fP]
 [\fB\-p\fP\ \fINPROCS\fP\ |\ \fB\-\-worker\-parallelism=\fP\fINPROCS\fP]
-[\fB\-P\fP\ \fINTHREADS\fP\ |\ \fB\-\-service\-parallelism=\fP\fINTHREADS\fP]
 [\fB\-r\fP\ \fINRESERVES\fP\ |\ \fB\-\-reserves=\fP\fINRESERVES\fP]
 [\fB\-u\fP\ \fISECTION\fP\ |\ \fB\-\-exchange\-account\-section=\fP\fISECTION\fP]
 [\fB\-V\fP\ |\ \fB\-\-verbose\fP]
@@ -74,9 +73,6 @@ Send logging output to \fIFILENAME\fP\&.
 Run as \fBbank\fP, \fBclient\fP or \fBboth\fP\&.
 If unspecified, \fIMODE\fP defaults to \fBboth\fP\&.
 .TP
-\fB\-P\fP \fINTHREADS*\fP | \fB\-\-service\-parallelism=\fP\fINTHREADS\fP
-Run with \fINTHREADS\fP service threads.
-.TP
 \fB\-p\fP \fINPROCS\fP | \fB\-\-worker\-parallelism=\fP\fINPROCS\fP
 Run with \fINPROCS\fP client processes.
 .TP
diff --git a/man/taler-config.1 b/man/taler-config.1
index 7eeb9de6..4392c3cf 100644
--- a/man/taler-config.1
+++ b/man/taler-config.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-CONFIG" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-CONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-config \- Taler configuration inspection and editing
 .SH SYNOPSIS
diff --git a/man/taler-exchange-aggregator.1 b/man/taler-exchange-aggregator.1
index 79c1fe88..5ac39acc 100644
--- a/man/taler-exchange-aggregator.1
+++ b/man/taler-exchange-aggregator.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-AGGREGATOR" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-AGGREGATOR" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-aggregator \- aggregate deposits into wire transfers
 .SH SYNOPSIS
diff --git a/man/taler-exchange-benchmark.1 b/man/taler-exchange-benchmark.1
index a3ed5407..f8a34e0b 100644
--- a/man/taler-exchange-benchmark.1
+++ b/man/taler-exchange-benchmark.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-BENCHMARK" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-BENCHMARK" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-benchmark \- measure exchange performance
 .SH SYNOPSIS
diff --git a/man/taler-exchange-closer.1 b/man/taler-exchange-closer.1
index e245670a..2d032074 100644
--- a/man/taler-exchange-closer.1
+++ b/man/taler-exchange-closer.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-CLOSER" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-CLOSER" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-closer \- close idle reserves
 .SH SYNOPSIS
diff --git a/man/taler-exchange-dbconfig.1 b/man/taler-exchange-dbconfig.1
new file mode 100644
index 00000000..7704c920
--- /dev/null
+++ b/man/taler-exchange-dbconfig.1
@@ -0,0 +1,83 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.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
+..
+.TH "TALER-EXCHANGE-DBCONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
+.SH NAME
+taler-exchange-dbconfig \- configure Taler exchange database
+.SH SYNOPSIS
+.sp
+\fBtaler\-exchange\-dbconfig\fP
+[\fB\-c\fP\ \fIFILENAME\fP]
+[\fB\-h\fP]
+[\fB\-n\fP\ \fINAME\fP]
+[\fB\-r\fP]
+[\fB\-s\fP]
+[\fB\-u\fP\ \fIUSER\fP]
+.SH DESCRIPTION
+.sp
+\fBtaler\-exchange\-dbconfig\fP is a simple shell script that configures
+a Postgresql database for use by the GNU Taler exchange.
+.sp
+Its options are as follows:
+.INDENT 0.0
+.TP
+\fB\-c\fP \fIFILENAME\fP
+Write the database configuration to FILENAME. The tool
+will append the required \fBCONFIG\fP option for the
+Postgresql access to the respective file.
+.TP
+\fB\-h\fP
+Print short help on options.
+.TP
+\fB\-n\fP \fIDBNAME\fP
+Use DBNAME for the name of the created database.
+.TP
+\fB\-r\fP
+Reset any existing database. Looses all existing data. DANGEROUS.
+.TP
+\fB\-s\fP
+Skip database initialization. Useful if you want to run
+\fBtaler\-exchange\-dbinit\fP manually.
+.TP
+\fB\-u\fP \fIUSER\fP
+Specifies the (main) exchange user that will access the database.
+.UNINDENT
+.SH SEE ALSO
+.sp
+taler\-exchange\-dbinit(1), taler.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://bugs.taler.net\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014-2022 Taler Systems SA (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 4f1621ef..bc0a5014 100644
--- a/man/taler-exchange-dbinit.1
+++ b/man/taler-exchange-dbinit.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-DBINIT" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-DBINIT" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-dbinit \- initialize Taler exchange database
 .SH SYNOPSIS
diff --git a/man/taler-exchange-drain.1 b/man/taler-exchange-drain.1
index b5597ad8..a1366823 100644
--- a/man/taler-exchange-drain.1
+++ b/man/taler-exchange-drain.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-DRAIN" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-DRAIN" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-drain \- drain profits from exchange
 .SH SYNOPSIS
diff --git a/man/taler-exchange-expire.1 b/man/taler-exchange-expire.1
index 4a43b3a7..744635ad 100644
--- a/man/taler-exchange-expire.1
+++ b/man/taler-exchange-expire.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-EXPIRE" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-EXPIRE" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-expire \- refund expired purses
 .SH SYNOPSIS
diff --git a/man/taler-exchange-httpd.1 b/man/taler-exchange-httpd.1
index f6d3cf72..cd53441f 100644
--- a/man/taler-exchange-httpd.1
+++ b/man/taler-exchange-httpd.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-HTTPD" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-HTTPD" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-httpd \- run Taler exchange (with RESTful API)
 .SH SYNOPSIS
diff --git a/man/taler-exchange-kyc-aml-pep-trigger.1 b/man/taler-exchange-kyc-aml-pep-trigger.1
index c9d99ed1..b7bb90ad 100644
--- a/man/taler-exchange-kyc-aml-pep-trigger.1
+++ b/man/taler-exchange-kyc-aml-pep-trigger.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-KYC-AML-PEP-TRIGGER" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-KYC-AML-PEP-TRIGGER" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-kyc-aml-pep-trigger \- Taler KYC_AML_TRIGGER example
 .SH SYNOPSIS
diff --git a/man/taler-exchange-kyc-tester.1 b/man/taler-exchange-kyc-tester.1
index e865b034..e4fc551f 100644
--- a/man/taler-exchange-kyc-tester.1
+++ b/man/taler-exchange-kyc-tester.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-KYC-TESTER" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-KYC-TESTER" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-kyc-tester \- test KYC service integration
 .SH SYNOPSIS
diff --git a/man/taler-exchange-offline.1 b/man/taler-exchange-offline.1
index dc69e221..222a7c80 100644
--- a/man/taler-exchange-offline.1
+++ b/man/taler-exchange-offline.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-OFFLINE" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-OFFLINE" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-offline \- operations using the offline key of a Taler exchange
 .SH SYNOPSIS
diff --git a/man/taler-exchange-router.1 b/man/taler-exchange-router.1
index d979b3af..ac2872a4 100644
--- a/man/taler-exchange-router.1
+++ b/man/taler-exchange-router.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-ROUTER" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-ROUTER" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-router \- route payments to partner exchanges
 .SH SYNOPSIS
diff --git a/man/taler-exchange-secmod-cs.1 b/man/taler-exchange-secmod-cs.1
index 9debdffd..7a31883f 100644
--- a/man/taler-exchange-secmod-cs.1
+++ b/man/taler-exchange-secmod-cs.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-SECMOD-CS" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-SECMOD-CS" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-secmod-cs \- handle private CS key operations for a Taler exchange
 .SH SYNOPSIS
diff --git a/man/taler-exchange-secmod-eddsa.1 b/man/taler-exchange-secmod-eddsa.1
index 80af34f7..87f0ac8c 100644
--- a/man/taler-exchange-secmod-eddsa.1
+++ b/man/taler-exchange-secmod-eddsa.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-SECMOD-EDDSA" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-SECMOD-EDDSA" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-secmod-eddsa \- handle private EDDSA key operations for a Taler exchange
 .SH SYNOPSIS
diff --git a/man/taler-exchange-secmod-rsa.1 b/man/taler-exchange-secmod-rsa.1
index 01205812..5fef67ac 100644
--- a/man/taler-exchange-secmod-rsa.1
+++ b/man/taler-exchange-secmod-rsa.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-SECMOD-RSA" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-SECMOD-RSA" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-secmod-rsa \- handle private RSA key operations for a Taler exchange
 .SH SYNOPSIS
diff --git a/man/taler-exchange-transfer.1 b/man/taler-exchange-transfer.1
index 02071126..0f37ba68 100644
--- a/man/taler-exchange-transfer.1
+++ b/man/taler-exchange-transfer.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-TRANSFER" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-TRANSFER" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-transfer \- execute wire transfers
 .SH SYNOPSIS
diff --git a/man/taler-exchange-wire-gateway-client.1 b/man/taler-exchange-wire-gateway-client.1
index 4c133248..56d1cb3f 100644
--- a/man/taler-exchange-wire-gateway-client.1
+++ b/man/taler-exchange-wire-gateway-client.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-WIRE-GATEWAY-CLIENT" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-WIRE-GATEWAY-CLIENT" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-wire-gateway-client \- trigger a transfer at the bank
 .SH SYNOPSIS
diff --git a/man/taler-exchange-wirewatch.1 b/man/taler-exchange-wirewatch.1
index 4bb0f773..fe0fcc21 100644
--- a/man/taler-exchange-wirewatch.1
+++ b/man/taler-exchange-wirewatch.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-EXCHANGE-WIREWATCH" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-EXCHANGE-WIREWATCH" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-exchange-wirewatch \- watch for incoming wire transfers
 .SH SYNOPSIS
@@ -55,7 +55,7 @@ Use the configuration and other resources for the exchange to operate
 from \fIFILENAME\fP\&.
 .TP
 \fB\-f\fP \fIDELAY\fP| \fB\-\-longpoll\-timeout=\fP\fIDELAY\fP
-How long do we wait for a response for bank transactions from the bank. This is both the timeout for the long polling as well as the maximum frequency at which we would query the bank. Default is 60s.
+How long do we wait for a response for bank transactions from the bank. This is both the timeout for the long polling as well as the maximum frequency at which we would query the bank. Specified with unit (e.g. 30s, 1d, 2w), if no unit is given the number is interpreted in microseconds. Default is 60s.
 .TP
 \fB\-h\fP | \fB\-\-help\fP
 Print short help on options.
diff --git a/man/taler-helper-auditor-aggregation.1 b/man/taler-helper-auditor-aggregation.1
index 8146c75b..c2821763 100644
--- a/man/taler-helper-auditor-aggregation.1
+++ b/man/taler-helper-auditor-aggregation.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-HELPER-AUDITOR-AGGREGATION" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-AGGREGATION" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-helper-auditor-aggregation \- audit Taler exchange aggregation activity
 .SH SYNOPSIS
diff --git a/man/taler-helper-auditor-coins.1 b/man/taler-helper-auditor-coins.1
index 920710dc..f53989f5 100644
--- a/man/taler-helper-auditor-coins.1
+++ b/man/taler-helper-auditor-coins.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-HELPER-AUDITOR-COINS" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-COINS" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-helper-auditor-coins \- audit Taler coin processing
 .SH SYNOPSIS
diff --git a/man/taler-helper-auditor-deposits.1 b/man/taler-helper-auditor-deposits.1
index 1918e738..32abc6c4 100644
--- a/man/taler-helper-auditor-deposits.1
+++ b/man/taler-helper-auditor-deposits.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-HELPER-AUDITOR-DEPOSITS" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-DEPOSITS" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-helper-auditor-deposits \- audit Taler exchange database for deposit confirmation consistency
 .SH SYNOPSIS
diff --git a/man/taler-helper-auditor-purses.1 b/man/taler-helper-auditor-purses.1
index 80a744bb..c93c5391 100644
--- a/man/taler-helper-auditor-purses.1
+++ b/man/taler-helper-auditor-purses.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-HELPER-AUDITOR-PURSES" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-PURSES" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-helper-auditor-purses \- audit Taler exchange purse handling
 .SH SYNOPSIS
diff --git a/man/taler-helper-auditor-reserves.1 b/man/taler-helper-auditor-reserves.1
index d2163e46..a0935ccb 100644
--- a/man/taler-helper-auditor-reserves.1
+++ b/man/taler-helper-auditor-reserves.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-HELPER-AUDITOR-RESERVES" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-RESERVES" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-helper-auditor-reserves \- audit Taler exchange reserve handling
 .SH SYNOPSIS
diff --git a/man/taler-helper-auditor-wire.1 b/man/taler-helper-auditor-wire.1
index 5b0e7950..9b492827 100644
--- a/man/taler-helper-auditor-wire.1
+++ b/man/taler-helper-auditor-wire.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-HELPER-AUDITOR-WIRE" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-HELPER-AUDITOR-WIRE" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-helper-auditor-wire \- audit exchange database for consistency with the bank's wire transfers
 .SH SYNOPSIS
diff --git a/man/taler-merchant-benchmark.1 b/man/taler-merchant-benchmark.1
index 08287be7..5284ecf4 100644
--- a/man/taler-merchant-benchmark.1
+++ b/man/taler-merchant-benchmark.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-MERCHANT-BENCHMARK" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-MERCHANT-BENCHMARK" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-merchant-benchmark \- generate Taler-style benchmarking payments
 .SH SYNOPSIS
diff --git a/man/taler-merchant-dbconfig.1 b/man/taler-merchant-dbconfig.1
new file mode 100644
index 00000000..f414696a
--- /dev/null
+++ b/man/taler-merchant-dbconfig.1
@@ -0,0 +1,83 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.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
+..
+.TH "TALER-MERCHANT-DBCONFIG" "1" "Sep 08, 2023" "0.9" "GNU Taler"
+.SH NAME
+taler-merchant-dbconfig \- configure Taler merchant database
+.SH SYNOPSIS
+.sp
+\fBtaler\-merchant\-dbconfig\fP
+[\fB\-c\fP\ \fIFILENAME\fP]
+[\fB\-h\fP]
+[\fB\-n\fP\ \fINAME\fP]
+[\fB\-r\fP]
+[\fB\-s\fP]
+[\fB\-u\fP\ \fIUSER\fP]
+.SH DESCRIPTION
+.sp
+\fBtaler\-merchant\-dbconfig\fP is a simple shell script that configures
+a Postgresql database for use by the GNU Taler merchant.
+.sp
+Its options are as follows:
+.INDENT 0.0
+.TP
+\fB\-c\fP \fIFILENAME\fP
+Write the database configuration to FILENAME. The tool
+will append the required \fBCONFIG\fP option for the
+Postgresql access to the respective file.
+.TP
+\fB\-h\fP
+Print short help on options.
+.TP
+\fB\-n\fP \fIDBNAME\fP
+Use DBNAME for the name of the created database.
+.TP
+\fB\-r\fP
+Reset any existing database. Looses all existing data. DANGEROUS.
+.TP
+\fB\-s\fP
+Skip database initialization. Useful if you want to run
+\fBtaler\-merchant\-dbinit\fP manually.
+.TP
+\fB\-u\fP \fIUSER\fP
+Specifies the (main) merchant user that will access the database.
+.UNINDENT
+.SH SEE ALSO
+.sp
+taler\-merchant\-dbinit(1), taler.conf(5).
+.SH BUGS
+.sp
+Report bugs by using \fI\%https://bugs.taler.net\fP or by sending electronic
+mail to <\fI\%taler@gnu.org\fP>.
+.SH AUTHOR
+GNU Taler contributors
+.SH COPYRIGHT
+2014-2022 Taler Systems SA (GPLv3+ or GFDL 1.3+)
+.\" Generated by docutils manpage writer.
+.
diff --git a/man/taler-merchant-dbinit.1 b/man/taler-merchant-dbinit.1
index 1c042b29..0961f651 100644
--- a/man/taler-merchant-dbinit.1
+++ b/man/taler-merchant-dbinit.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-MERCHANT-DBINIT" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-MERCHANT-DBINIT" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-merchant-dbinit \- initialize Taler merchant database
 .SH SYNOPSIS
diff --git a/man/taler-merchant-httpd.1 b/man/taler-merchant-httpd.1
index b4ba91ac..a33f4cac 100644
--- a/man/taler-merchant-httpd.1
+++ b/man/taler-merchant-httpd.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-MERCHANT-HTTPD" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-MERCHANT-HTTPD" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-merchant-httpd \- run Taler merchant backend (with RESTful API)
 .SH SYNOPSIS
@@ -105,7 +105,7 @@ instance to the given value.
 .UNINDENT
 .SH SEE ALSO
 .sp
-taler\-merchant\-dbinit(1), taler\-merchant\-tip\-enable(1), taler.conf(5)
+taler\-merchant\-dbinit(1), taler\-merchant\-setup\-reserve(1), taler.conf(5)
 .SH BUGS
 .sp
 Report bugs by using Mantis \fI\%https://bugs.taler.net/\fP or by sending
diff --git a/man/taler-merchant-setup-reserve.1 b/man/taler-merchant-setup-reserve.1
index 2f3a17ca..d1f62e36 100644
--- a/man/taler-merchant-setup-reserve.1
+++ b/man/taler-merchant-setup-reserve.1
@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-MERCHANT-SETUP-RESERVE" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-MERCHANT-SETUP-RESERVE" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
-taler-merchant-setup-reserve \- setup reserve for tipping at a Taler merchant backend
+taler-merchant-setup-reserve \- setup reserve for rewards at a Taler merchant backend
 .SH SYNOPSIS
 .sp
 \fBtaler\-merchant\-setup\-reserve\fP
diff --git a/man/taler-merchant-webhook.1 b/man/taler-merchant-webhook.1
index e9f07215..10e30ee8 100644
--- a/man/taler-merchant-webhook.1
+++ b/man/taler-merchant-webhook.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-MERCHANT-WEBHOOK" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-MERCHANT-WEBHOOK" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-merchant-webhook \- execute webhooks of the Taler merchant backend (optional service)
 .SH SYNOPSIS
diff --git a/man/taler-merchant-wirewatch.1 b/man/taler-merchant-wirewatch.1
index 3314f06c..ec436043 100644
--- a/man/taler-merchant-wirewatch.1
+++ b/man/taler-merchant-wirewatch.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-MERCHANT-WIREWATCH" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-MERCHANT-WIREWATCH" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-merchant-wirewatch \- import credit transactions from a merchant bank account into merchant backend (optional)
 .SH SYNOPSIS
diff --git a/man/taler-terms-generator.1 b/man/taler-terms-generator.1
index b7147a82..4f2c038d 100644
--- a/man/taler-terms-generator.1
+++ b/man/taler-terms-generator.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-TERMS-GENERATOR" "1" "Jul 20, 2023" "0.9" "GNU Taler"
+.TH "TALER-TERMS-GENERATOR" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-terms-generator \- create legal policy documents for services
 .SH SYNOPSIS
diff --git a/man/taler-unified-setup.1 b/man/taler-unified-setup.1
index bfbbd431..5c8ce4ae 100644
--- a/man/taler-unified-setup.1
+++ b/man/taler-unified-setup.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER-UNIFIED-SETUP" "1" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER-UNIFIED-SETUP" "1" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler-unified-setup \- conveniently start and stop various GNU Taler services
 .SH SYNOPSIS
diff --git a/man/taler.conf.5 b/man/taler.conf.5
index ce21f218..32d2dce0 100644
--- a/man/taler.conf.5
+++ b/man/taler.conf.5
@@ -27,35 +27,26 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TALER.CONF" "5" "Jul 16, 2023" "0.9" "GNU Taler"
+.TH "TALER.CONF" "5" "Sep 08, 2023" "0.9" "GNU Taler"
 .SH NAME
 taler.conf \- Taler configuration file
 .SH DESCRIPTION
 .sp
-The configuration file is line\-oriented.
-Blank lines and whitespace at the beginning and end of a line are ignored.
-Comments start with \fB#\fP or \fB%\fP in the first column
-(after any beginning\-of\-line whitespace) and go to the end of the line.
-.sp
-The file is split into sections.
-Every section begins with “[SECTIONNAME]” and
-contains a number of options of the form “OPTION=VALUE”.
-There may be whitespace around the \fB=\fP (equal sign).
-Section names and options are \fIcase\-insensitive\fP\&.
-.sp
-The values, however, are \fIcase\-sensitive\fP\&.
-In particular, boolean values are one of \fBYES\fP or \fBNO\fP\&.
-Values can include whitespace by surrounding
-the entire value with \fB\(dq\fP (double quote).
-Note, however, that there are no escape characters in such strings;
-all characters between the double quotes (including other double quotes)
-are taken verbatim.
-.sp
-Values that represent filenames can begin with a \fB/bin/sh\fP\-like
-variable reference.
-This can be simple, such as \fB$TMPDIR/foo\fP, or complex,
-such as \fB${TMPDIR:\-${TMP:\-/tmp}}/foo\fP\&.
-See \fB[PATHS]\fP (below).
+The configuration file is line\-oriented.  Blank lines and whitespace at the
+beginning and end of a line are ignored.  Comments start with \fB#\fP or \fB%\fP
+in the first column (after any beginning\-of\-line whitespace) and go to the end
+of the line.
+.sp
+The file is split into sections.  Every section begins with \fB[SECTIONNAME]\fP
+and contains a number of options of the form \fBOPTION=VALUE\fP\&.  There may be
+whitespace around the \fB=\fP (equal sign).  Section names and options are
+\fIcase\-insensitive\fP\&.
+.sp
+The values, however, are \fIcase\-sensitive\fP\&.  In particular, boolean values are
+one of \fBYES\fP or \fBNO\fP\&.  Values can include whitespace by surrounding the
+entire value with \fB\(dq\fP (double quote).  Note, however, that there are no
+escape characters in such strings; all characters between the double quotes
+(including other double quotes) are taken verbatim.
 .sp
 Values that represent a time duration are represented as a series
 of one or more \fBNUMBER UNIT\fP pairs, e.g. \fB60 s\fP, \fB4 weeks 1 day\fP,
@@ -65,16 +56,25 @@ Values that represent an amount are in the usual amount syntax:
 \fBCURRENCY:VALUE.FRACTION\fP, e.g. \fBEUR:1.50\fP\&.
 The \fBFRACTION\fP portion may extend up to 8 places.
 .sp
-The “[PATHS]” section is special in that it contains paths that can be
-referenced using “$” in other configuration values that specify
+Values that represent filenames can begin with a \fB/bin/sh\fP\-like variable
+reference.  This can be simple, such as \fB$TMPDIR/foo\fP, or complex, such as
+\fB${TMPDIR:\-${TMP:\-/tmp}}/foo\fP\&.  The variables are expanded either using
+key\-values from the \fB[PATHS]\fP section (see below) or from the environment
+(\fBgetenv()\fP). The values from \fB[PATHS]\fP take precedence over those from
+the environment.  If the variable name is found in neither \fB[PATHS]\fP nor the
+environment, a warning is printed and the value is left unchanged.  Variables (including those from the environment) are expanded recursively, so if \fBFOO=$BAR\fP and \fBBAR=buzz\fP then the result is \fBFOO=buzz\fP\&.  Recursion is bounded to at most 128 levels to avoid undefined behavior for mutually recursive expansions like if \fBBAR=$FOO\fP in the example above.
+.sp
+The \fB[PATHS]\fP section is special in that it contains paths that can be
+referenced using \fB$\fP in other configuration values that specify
 \fIfilenames\fP\&. Note that configuration options that are not specifically
 retrieved by the application as \fIfilenames\fP will not see “$”\-expressions
-expanded. To expand “$”\-expressions when using \fBtaler\-config\fP, you must pass
+expanded. To expand \fB$\fP\-expressions when using \fBtaler\-config\fP, you must pass
 the \fB\-f\fP command\-line option.
 .sp
-The system automatically pre\-populates the “[PATHS]” section with a few values
-at run\-time in addition to the values that are in the actual configuration
-file.  These automatically generated values refer to installation properties
+The system automatically pre\-populates the \fB[PATHS]\fP section with a few values
+at run\-time (in addition to the values that are in the actual configuration
+file and automatically overwriting those values if they are present).
+These automatically generated values refer to installation properties
 from \fI\%GNU autoconf\fP\&. The
 values are usually dependent on an \fBINSTALL_PREFIX\fP which is determined by
 the \fB\-\-prefix\fP option given to configure.  The canonical values are:
@@ -103,7 +103,8 @@ DATADIR = $INSTALL_PREFIX/share/taler/
 .sp
 Note that on some platforms, the given paths may differ depending
 on how the system was compiled or installed, the above are just the
-canonical locations of the various resources.
+canonical locations of the various resources.  These
+automatically generated values are never written to disk.
 .sp
 Files containing default values for many of the options described below
 are installed under \fB$TALER_PREFIX/share/taler/config.d/\fP\&.
@@ -184,10 +185,6 @@ Hostname to which the exchange HTTP server should be bound to, e.g. \(dqlocalhos
 Crockford Base32\-encoded master public key, public version of the
 exchange\(aqs long\-time offline signing key.
 .TP
-.B MASTER_PRIV_FILE
-Location of the master private key on disk. Only used by tools that
-can be run offline (as the master key is for offline signing).
-.TP
 .B AML_THRESHOLD
 Largest amount in this currency that can be transferred per month without
 an AML staff member doing a (manual) AML check. For example: \(dqUSD:1000000\(dq.
@@ -202,6 +199,26 @@ that rewards are allowed.  The option merely announces that
 rewards is enabled or disabled, and protocol\-compliant merchant
 backends will then enable or disable the feature accordingly.
 .TP
+.B CURRENCY_FRACTION_DIGITS
+How many digits should amounts be rendered
+with by default. Small capitals should
+be used to render fractions beyond the number
+given here (like on gas stations).  Defaults to 0.
+For EUR and USD, the value would be 2, while for
+JPY it would be 0.
+.TP
+.B STEFAN_ABS
+Absolte amount to use in the STEFAN fee approximation
+curve (see DD47).  Defaults to 0 if not specified.
+.TP
+.B STEFAN_LOG
+Logarithmic factor to use in the STEFAN fee approximation
+curve (see DD47).  Defaults to 0 if not specified.
+.TP
+.B STEFAN_LIN
+Linear factor to use in the STEFAN fee approximation
+curve (see DD47).  Defaults to 0 if not specified.
+.TP
 .B BASE_URL
 The base URL under which the exchange can be reached.
 Added to wire transfers to enable tracking by merchants.
@@ -423,7 +440,8 @@ The following options must be in the section \(dq[exchange\-offline]\(dq.
 .INDENT 0.0
 .TP
 .B MASTER_PRIV_FILE
-Where to store the offline private key of the exchange.
+Location of the master private key on disk. Only used by tools that
+can be run offline (as the master key is for offline signing).
 Mandatory.
 .TP
 .B SECM_TOFU_FILE