summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api-exchange.rst2
-rw-r--r--design-documents/011-auditor-db-sync.rst4
-rw-r--r--developers-manual.rst26
-rw-r--r--manpages/taler.conf.5.rst2
-rw-r--r--taler-exchange-manual.rst7
-rw-r--r--taler-merchant-manual.rst22
6 files changed, 36 insertions, 27 deletions
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 1f2cb82..46c36b5 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -108,7 +108,7 @@ possibly by using HTTPS.
:http:statuscode:`200 OK`:
The exchange responds with a `ExchangeKeysResponse` object. This request should
virtually always be successful. It only fails if the exchange is misconfigured or
- has not yet been provisioned with key signatures via `taler-exchange-offline`.
+ has not yet been provisioned with key signatures via ``taler-exchange-offline``.
**Details:**
diff --git a/design-documents/011-auditor-db-sync.rst b/design-documents/011-auditor-db-sync.rst
index 1088976..71d83bd 100644
--- a/design-documents/011-auditor-db-sync.rst
+++ b/design-documents/011-auditor-db-sync.rst
@@ -75,8 +75,8 @@ Proposed Solution
and then restart exchange.
* For GC, simply run GC logic also on auditor's "secure" copy.
(The synchronization mechanism will take care of the primary copy,
- and the helper to copy should not be disturbed by the DELETE operations
- anyway.)
+ and the helper to copy should not be disturbed by the DELETE operations
+ anyway.)
diff --git a/developers-manual.rst b/developers-manual.rst
index df12bd4..95ba384 100644
--- a/developers-manual.rst
+++ b/developers-manual.rst
@@ -622,21 +622,29 @@ https://wiki.debian.org/DebianRepository/SetupWithReprepro
First, update at least the version of the Debian package in
debian/changelog, and then run:
-$ dpkg-buildpackage -rfakeroot -b -uc -us
+.. code-block:: bash
+
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
in the respective source directory (GNUnet, exchange, merchant) to create the
-".deb" files. Note that they will be created in the parent directory. This
+``.deb`` files. Note that they will be created in the parent directory. This
can be done on gv.taler.net, or on another (secure) machine.
-Next, the "*.deb" files should be copied to gv.taler.net, say to
-``/root/incoming``. Then, go to ``/var/www/repos/apt/debian/`` and run
-``reprepro includedeb sid /root/incoming/*.deb`` to import all Debian files
-from ``/root/incoming/`` into the ``sid`` distribution. If Debian packages
-were build against other distributions, reprepro may need to be first
-configured for those and the import command updated accordingly.
+Next, the ``*.deb`` files should be copied to gv.taler.net, say to
+``/root/incoming``. Then, run
+
+.. code-block:: bash
+
+ # cd /var/www/repos/apt/debian/
+ # reprepro includedeb sid /root/incoming/*.deb
+
+to import all Debian files from ``/root/incoming/`` into the ``sid``
+distribution. If Debian packages were build against other distributions,
+reprepro may need to be first configured for those and the import command
+updated accordingly.
Finally, make sure to clean up ``/root/incoming/`` (by deleting the
-now imported "*.deb" files).
+now imported ``*.deb`` files).
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index b153182..4c8b70b 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -183,7 +183,7 @@ SECM_ESIGN_PUBKEY
EXCHANGE RSA CRYPTO HELPER OPTIONS
-------------------------------
+----------------------------------
The following options must be in the section "[taler-helper-crypto-rsa]".
diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst
index 04213de..8cda73e 100644
--- a/taler-exchange-manual.rst
+++ b/taler-exchange-manual.rst
@@ -59,7 +59,7 @@ license and/or follow applicable financial regulation.
GNU Taler payment service providers generally need to ensure high
availability and have *really* good backups (synchronous replication,
asynchronous remote replication, off-site backup, 24/7 monitoring,
-etc.). [1]_ This manual will not cover these aspects of operating a
+etc.). This manual will not cover these aspects of operating a
payment service provider.
We will assume that you can operate a (high-availability,
@@ -167,13 +167,14 @@ components:
is used by the aggregator to execute wire transfers and for the
auditor to query bank transaction histories.
+
- DBMS
-.. index:: Postgres
The exchange requires a DBMS to stores the transaction history for
the Taler exchange and aggregator, and a (typically separate) DBMS
for the Taler auditor. For now, the GNU Taler reference implementation
only supports Postgres, but the code could be easily extended to
support another DBMS.
+ .. index:: Postgres
- Auditor
The auditor verifies that the transactions performed by the exchange
@@ -205,7 +206,7 @@ private offline key on more than one physical medium though.)
Exchange operators are strongly advised to secure your private master key and
any copies on encrypted, always-offline computers. Again, we assume that you
are familiar with good best practices in operational security, including
-securing key material. [2]_
+securing key material.
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 56fe9c3..3871905 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -325,7 +325,7 @@ Installing the GNU Taler exchange
.. index:: exchange
-.. include:: frags/instaling-taler-exchange.rst
+.. include:: frags/installing-taler-exchange.rst
There is no need to actually run a Taler exchange to use the Taler merchant
backend -- all the merchant needs from the Taler exchange is a few headers and
@@ -841,16 +841,16 @@ create a file ``instance.json`` with an `InstanceConfigurationMessage`
.. code-block:: json
{
- payto_uris : [ "$PAYTO_URI" ],
- id : "default",
- name: "example.com",
- address: { country : "zz" },
- jurisdiction: { country : "zz" },
- default_max_wire_fee: "KUDOS:1",
- default_wire_fee_amortization: 100,
- default_max_deposit_fee: "KUDOS:1",
- default_wire_transfer_delay: { d_ms : 1209600000 },
- default_pay_delay: { d_ms : 1209600000 },
+ "payto_uris" : [ "$PAYTO_URI" ],
+ "id" : "default",
+ "name": "example.com",
+ "address": { "country" : "zz" },
+ "jurisdiction": { "country" : "zz" },
+ "default_max_wire_fee": "KUDOS:1",
+ "default_wire_fee_amortization": 100,
+ "default_max_deposit_fee": "KUDOS:1",
+ "default_wire_transfer_delay": { "d_ms" : 1209600000 },
+ "default_pay_delay": { "d_ms" : 1209600000 }
}
In the text above, you must replace "$PAYTO_URI" with your actual