Merge branch 'dd13'

2 files changed, 93 insertions, 0 deletions

diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst
index 6d800f5b..027316b6 100644
--- a/manpages/taler-exchange-offline.1.rst
+++ b/manpages/taler-exchange-offline.1.rst
@@ -270,6 +270,37 @@ It outputs the signature affirming the wire fees, in a format suitable for the
 ``upload`` subcommand.
 
 
+enable-partner
+--------------
+
+This subcommand informs an exchange about the wad fee and frequency to apply
+to a partner exchange.  The arguments provided must include:
+
+  (1) Partner exchange base URL.
+  (2) Partner exchange master public key.
+  (3) Calendar year for which the fee applies, 'now' for the current year.
+  (4) Wad frequency, in minutes (for example, '30').
+  (5) Wad fee (for example, 'KUDOS:0.1').
+
+
+p2p-fees
+--------
+
+This subcommand configures fees related to wallet-to-wallet payments. If this configuration is not provided, wallet-to-wallet payments will be disabled by the exchange.
+
+The arguments provided must include:
+
+  (1) Calendar year for which the fee applies, 'now' for the current year.
+  (2) KYC timeout. How long does the exchange keep a reserve open that is waiting for the KYC.
+  (3) KYC fee. How much will the exchange charge for performing KYC.
+  (4) Purse timeout. How long does the exchange keep information about a purse around after it expired or was successfully merged?
+  (5) Purse fee. How much will the exchange charge for an abandoned purse. Also the minimum amount that can be in a purse that is not associated with an account.
+  (6) Number of free purses per account.
+  (7) Annual fee charged to an open account.
+  (8) How long will the exchange preserve an account history.
+  (9) History fee charged when inquiring about non-recent account history.
+
+
 upload
 ------
 
diff --git a/manpages/taler-fakebank-run.1.rst b/manpages/taler-fakebank-run.1.rst
new file mode 100644
index 00000000..240c7142
--- /dev/null
+++ b/manpages/taler-fakebank-run.1.rst
@@ -0,0 +1,62 @@
+taler-fakebank-run(1)
+#####################
+
+.. only:: html
+
+   Name
+   ====
+
+   **taler-fakebank-run** - run Taler "in memory" bank (with RESTful API)
+
+Synopsis
+========
+
+**taler-fakebank-run**
+[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
+[**-h** | **––help**]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
+[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*]
+[**-n** *N* | **––num-threads=**\ \ *N*]
+[**-v** | **––version**]
+
+Description
+===========
+
+**taler-fakebank-run** is a command-line tool to run a Taler "bank" API (HTTP REST service). The program is useful to provide the bank functionality for benchmarking or testing when LibEuFin is unavailable or otherwise unsuitable.
+
+Its options are as follows:
+
+**-C** \| **––connection-close**
+   Force each HTTP connection to be closed after each request (useful in
+   combination with **-f** to avoid having to wait for nc to time out).
+
+**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
+   Use the configuration and other resources for the merchant to operate
+   from FILENAME.
+
+**-h** \| **––help**
+   Print short help on options.
+
+**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
+   Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
+   ``WARNING``, ``ERROR``.
+
+**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME*
+   Send logging output to *FILENAME*.
+
+**-n** *N* \| **––num-threads=**\ \ *N*
+   Use *N* threads in the thread pool.
+
+**-v** \| **––version**
+   Print version information.
+
+See Also
+========
+
+taler-exchange-httpd(1), taler.conf(5).
+
+Bugs
+====
+
+Report bugs by using https://bugs.taler.net or by sending electronic
+mail to <taler@gnu.org>.