aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/taler-config-generate.15
-rw-r--r--doc/taler.conf.58
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/taler-config-generate.1 b/doc/taler-config-generate.1
index 7f69e5556..8a72cddd7 100644
--- a/doc/taler-config-generate.1
+++ b/doc/taler-config-generate.1
@@ -1,7 +1,7 @@
.TH TALER\-CONFIG\-GENERATE 1 "May 5, 2016" "GNU Taler"
.SH NAME
-taler\-config\-generate \- tool to simplfy Taler configuration generation
+taler\-config\-generate \- tool to simplify Taler configuration generation
.SH SYNOPSIS
.B taler\-config\-generate
@@ -22,6 +22,9 @@ Which currency should we use in the configuration.
.IP "\-e, \-\-exchange"
Generate configuration for a Taler exchange.
.B
+.IP "\-f AMOUNT, \-\-wirefee=AMOUNT"
+Setup wire transfer fees for the next 5 years for the exchange (for all wire methods).
+.B
.IP "\-m, \-\-merchant"
Generate configuration for a Taler merchant.
.B
diff --git a/doc/taler.conf.5 b/doc/taler.conf.5
index 6e50c69be..40a9506e4 100644
--- a/doc/taler.conf.5
+++ b/doc/taler.conf.5
@@ -16,8 +16,6 @@ The following options are from the "[exchange]" section and used by most exchang
.IP CURRENCY
Name of the currency, i.e. "EUR" for Euro.
-.IP WIREFORMAT
- Format used for wire transfers to the merchant, i.e. "SEPA".
.IP DB
Plugin to use for the database, i.e. "postgres"
.IP PORT
@@ -28,7 +26,8 @@ The following options are from the "[exchange]" section and used by most exchang
.SH WIRE transfer details
-The following options must be in section "[wire\-incoming\-test]" and "[wire\-outgoing\-test]":
+To enable the "test" wire transfer method, you must set "ENABLE = YES" in "[exchange\-wire\-test]".
+Then, the following options must be in section "[exchange\-wire\-incoming\-test]" and "[exchange\-wire\-outgoing\-test]":
.IP BANK_URI
URL of the Taler bank.
@@ -36,7 +35,8 @@ The following options must be in section "[wire\-incoming\-test]" and "[wire\-ou
.IP BANK_ACCOUNT_NUMBER
Number of the bank account of the exchange.
-The following options must be in section "[wire\-incoming\-sepa]" and "[wire\-outgoing\-sepa]":
+To enable the "sepa" wire transfer method, you must set "ENABLE = YES" in "[exchange\-wire\-sepa]".
+Then, the following options must be in section "[exchange\-wire\-incoming\-sepa]" and "[exchange\-wire\-outgoing\-sepa]":
.IP SEPA_RESPONSE_FILE
Filename with the JSON body for the /wire response, signed using the exchange\'s long-term offline master key. Use taler\-exchange\-sepa to create the SEPA_RESPONSE_FILE.