Merge branch 'master' into feature/tokensfeature/tokens

4 files changed, 20 insertions, 0 deletions

diff --git a/manpages/challenger.conf.5.rst b/manpages/challenger.conf.5.rst
index a46b8461..626d11f7 100644
--- a/manpages/challenger.conf.5.rst
+++ b/manpages/challenger.conf.5.rst
@@ -71,6 +71,8 @@ AUTH_COMMAND
 ADDRESS_TYPE
   Type of the address that is being collected, returned as part of the ``address_type`` in the ``/info`` endpoint. Examples include ``email`` or ``phone``.
 
+ADDRESS_RESTRICTIONS
+  JSON object with a map of keys (names of the fields of the address to be entered by the user) to objects with a "regex" (string) containing an extended Posix regular expression for allowed address field values, and a "hint"/"hint_i18n" giving a human-readable explanation to display if the value entered by the user does not match the regex. Keys that are not mapped to such an object have no restriction on the value provided by the user. Examples would be '{"email":{"hint":"valid e-mail address required","regex":"^[a-zA-Z0-9\_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$"}' or '{"zip":{"hint":"numeric zip code required","regex":"^[0-9]+$"}'.
 
 
 SEE ALSO
diff --git a/manpages/taler-exchange-dbinit.1.rst b/manpages/taler-exchange-dbinit.1.rst
index 0ee83543..cbbc494c 100644
--- a/manpages/taler-exchange-dbinit.1.rst
+++ b/manpages/taler-exchange-dbinit.1.rst
@@ -13,6 +13,7 @@ Synopsis
 ========
 
 **taler-exchange-dbinit**
+[**-a** | **--inject-auditor**]
 [**-c** *FILENAME* | **--config=**\ ‌\ *FILENAME*]
 [**-g** | **--gc**]
 [**-h** | **--help**]
@@ -31,6 +32,9 @@ Taler exchange to operate.
 
 Its options are as follows:
 
+**-a** \| **--inject-auditor**
+   Installs triggers to notify real-time auditors of relevant changes to the database state.
+
 **-c** *FILENAME* \| **--config=**\ ‌\ *FILENAME*
    Use the configuration and other resources for the exchange to operate
    from *FILENAME*.
diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst
index 378c6312..bd8cd793 100644
--- a/manpages/taler-exchange-offline.1.rst
+++ b/manpages/taler-exchange-offline.1.rst
@@ -277,6 +277,14 @@ Afterwards, optional arguments can be given:
     REST API that allows merchants and wallets to determine the current
     conversion rate.
 
+  * ``display-hint`` $PRIORITY $LABEL: specifies that this bank account should
+    be shown to the user with the given numeric $PRIORITY (higher is earlier)
+    and with the given $LABEL.  This is useful to ensure that if an exchange
+    has multiple bank accounts, we can show the user those that are most likely
+    useful first, and give them appropriately labeled hints for selecting other
+    accounts as well.  A display hint is optional, if missing the priority is 0
+    and the wallet must pick some appropriate label itself somehow.
+
   * ``credit-restriction`` $TYPE [$ARGS]: Specifies that there are
     restrictions in place when crediting this bank account. Details depend on
     the restriction $TYPE. This argument may be given multiple times, in which
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index 3748b673..3074f68b 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -182,6 +182,12 @@ BASE_URL
   Added to wire transfers to enable tracking by merchants.
   Used by the KYC logic when interacting with OAuth 2.0.
 
+TOPLEVEL_REDIRECT_URL
+  Where to redirect visitors that access the top-level
+  "/" endpoint of the exchange. Should point users to
+  information about the exchange operator.
+  Optional setting, defaults to "/terms".
+
 AGGREGATOR_IDLE_SLEEP_INTERVAL
   For how long should the taler-exchange-aggregator sleep when it is idle
   before trying to look for more work? Default is 60 seconds.