summaryrefslogtreecommitdiff
path: root/manpages/taler.conf.5.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-04-29 22:28:29 +0200
committerChristian Grothoff <christian@grothoff.org>2020-04-29 22:28:29 +0200
commit273bbdf924c7d011c6249334e94a34a04a18fe39 (patch)
treeed36a0f50d9842420b1899b3ff95fa5e0bf8c9de /manpages/taler.conf.5.rst
parent220b06cf14f44f3241590e8e1cc08d23d44885e0 (diff)
parentd6df3784a31df42b5d2e77ef92259b62c7a6c47b (diff)
downloaddocs-273bbdf924c7d011c6249334e94a34a04a18fe39.tar.gz
docs-273bbdf924c7d011c6249334e94a34a04a18fe39.tar.bz2
docs-273bbdf924c7d011c6249334e94a34a04a18fe39.zip
Merge branch 'master' of git+ssh://git.taler.net/docs
Diffstat (limited to 'manpages/taler.conf.5.rst')
-rw-r--r--manpages/taler.conf.5.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index 5c2b7558..d7ca470c 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -262,9 +262,9 @@ WIRE_RESPONSE (exchange and merchant)
taler-merchant-httpd (to generate and then use the file).
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.
+ Must be set to YES for the instances (where "instance" is the section name
+ of the instance) of the merchant backend that should accept payments (i.e.
+ Taler deposit operations) with the corresponding payto URI.
ACTIVE_instance
Must be set to YES for the instances (where “instance” is the section