summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-10-16 18:45:45 +0200
committerChristian Grothoff <christian@grothoff.org>2021-10-16 18:45:52 +0200
commitb156b9f069babf4860943dd54541120b8cf3e455 (patch)
tree8c40e0f84cc96e0dd263d46eb6a7b79686834324
parente17e525244f81adbc8d1baa18b5249693758fcb9 (diff)
downloaddocs-b156b9f069babf4860943dd54541120b8cf3e455.tar.gz
docs-b156b9f069babf4860943dd54541120b8cf3e455.tar.bz2
docs-b156b9f069babf4860943dd54541120b8cf3e455.zip
add trisquel
-rw-r--r--core/api-exchange.rst10
-rw-r--r--frags/installing-trisquel.rst4
-rw-r--r--manpages/taler.conf.5.rst10
-rw-r--r--taler-exchange-manual.rst4
-rw-r--r--taler-merchant-manual.rst6
5 files changed, 31 insertions, 3 deletions
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 1aae8e7..59edb2a 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -15,9 +15,9 @@
@author Christian Grothoff
-=============================
-The Exchange RESTful JSON API
-=============================
+========================
+The Exchange RESTful API
+========================
The API specified here follows the :ref:`general conventions <http-common>`
for all details not specified in the individual requests.
@@ -1702,6 +1702,10 @@ denomination.
// the ``/kyc-check/$PAYMENT_TARGET_UUID`` endpoint.
payment_target_uuid: Integer;
+ // True if the KYC check for the merchant has been
+ // satisfied.
+ kyc_ok: boolean;
+
// Timestamp when the deposit was received by the exchange.
exchange_timestamp: Timestamp;
diff --git a/frags/installing-trisquel.rst b/frags/installing-trisquel.rst
new file mode 100644
index 0000000..4ca8bcc
--- /dev/null
+++ b/frags/installing-trisquel.rst
@@ -0,0 +1,4 @@
+To install the GNU Taler Trisquel packages, first ensure that you have
+the right Trisquel distribution. Packages are currently available for
+Trisquel GNU/Linux 10.0. Simply follow the same instructions provided
+for Ubuntu 20.04 LTS (Focal Fossa).
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index 7d7f5b8..79ca6d7 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -178,6 +178,16 @@ KYC_MODE
Set to "NONE" to disable KYC for this exchange (but check with your lawyer first).
Set to "OAUTH2" to use OAuth2 for KYC.
+KYC_WITHDRAW_LIMIT
+ Maximum amount that can be withdrawn in
+ KYC_WITHDRAW_PERIOD without needing KYC.
+ Only used if KYC_MODE is not "NONE".
+
+KYC_WITHDRAW_PERIOD
+ The time period over which transactions
+ are considered for the KYC_WITHDRAW_LIMIT.
+ Only used if KYC_MODE is not "NONE".
+
EXCHANGE KYC OAUTH2 OPTIONS
---------------------------
diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst
index ef0d501..7054b3d 100644
--- a/taler-exchange-manual.rst
+++ b/taler-exchange-manual.rst
@@ -332,6 +332,10 @@ offline signing and the terms of service.
Sample configuration files for the HTTP reverse proxy can be found in
``/etc/taler-exchange/``.
+Installing the GNU Taler binary packages on Trisquel
+----------------------------------------------------
+
+.. include:: frags/installing-trisquel.rst
Installing the GNU Taler binary packages on Ubuntu
--------------------------------------------------
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index d5b9fcc..b076684 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -357,6 +357,12 @@ Installing the GNU Taler binary packages on Debian
.. include:: frags/apt-install-taler-merchant.rst
+Installing the GNU Taler binary packages on Trisquel
+----------------------------------------------------
+
+.. include:: frags/installing-trisquel.rst
+
+
Installing the GNU Taler binary packages on Ubuntu
--------------------------------------------------