summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libeufin/concepts.rst8
-rw-r--r--manpages/taler-auditor-offline.1.rst139
-rw-r--r--manpages/taler-exchange-offline.1.rst165
-rw-r--r--manpages/taler.conf.5.rst2
4 files changed, 183 insertions, 131 deletions
diff --git a/libeufin/concepts.rst b/libeufin/concepts.rst
index c3764344..9cfc13e4 100644
--- a/libeufin/concepts.rst
+++ b/libeufin/concepts.rst
@@ -66,7 +66,7 @@ Examples:
.. code-block:: console
# Download latest transactions via the default bank connection and store them locally
- curl -XPOST $AUTHEADER https://example1.libeufin.tech/bank-accounts/my-acct/fetch-transactions
+ $ curl -XPOST $AUTHEADER https://example1.libeufin.tech/bank-accounts/my-acct/fetch-transactions
Bank Connections
----------------
@@ -100,12 +100,12 @@ Examples:
.. code-block:: console
# Manually request the inter-day account report via the EBICS C52 order
- curl -XPOST $AUTHEADER https://example1.libeufin.tech/bank-connections/my-ebics-testacct/ebics/download/C52
+ $ curl -XPOST $AUTHEADER https://example1.libeufin.tech/bank-connections/my-ebics-testacct/ebics/download/C52
# Download available bank accounts that can be accessed through this connection,
# according to the bank server (with EBICS, does a HTD request).
# For each of them, create a bank account resource in LibEuFin.
- curl -XPOST $AUTHEADER https://example1.libeufin.tech/bank-connection/my-ebics-testacct/fetch-accounts
+ $ curl -XPOST $AUTHEADER https://example1.libeufin.tech/bank-connection/my-ebics-testacct/fetch-accounts
Facades
-------
@@ -128,7 +128,7 @@ Examples:
.. code-block:: console
# Request the Taler-specific history through the facade
- curl $AUTHEADER https://example1.libeufin.tech/facades/my-taler-wire-gw/taler/history/incoming
+ $ curl $AUTHEADER https://example1.libeufin.tech/facades/my-taler-wire-gw/taler/history/incoming
Access Control
==============
diff --git a/manpages/taler-auditor-offline.1.rst b/manpages/taler-auditor-offline.1.rst
index 3ee3b7db..75f4f731 100644
--- a/manpages/taler-auditor-offline.1.rst
+++ b/manpages/taler-auditor-offline.1.rst
@@ -12,51 +12,54 @@ Synopsis
========
**taler-auditor-offline**
+[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
[**-h** | **––help**]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
+[**-o** *FILE* | **––output=**\ ‌\ *FILE*]
[**-v** | **––version**]
-[SUBCOMMANDS]*
+[subcommand ...]
Description
===========
-**taler-auditor-offline** is a command line tool to be used by an auditor to
+**taler-auditor-offline** is a command-line tool to be used by an auditor to
sign that he is aware of certain keys being used by a exchange. Using this
signature, the auditor affirms that he will verify that the exchange is
properly accounting for coins of those denominations. The tool takes a list
of subcommands as arguments which are then processed sequentially.
The tool includes two subcommands to interact *online* with the exchange's
-REST APIs. The "download" subcommand downloads current public keys from the
+REST APIs. The ``download`` subcommand downloads current public keys from the
running exchange. Note that this only includes keys that the exchange
operator has previously validated using the **taler-exchange-offline** tool.
-The resulting data serves as input to the "sign" and "show" subcommands.
+The resulting data serves as input to the ``sign`` and ``show`` subcommands.
-The "upload" subcommand uploads the signatures created with the private key to
-the exchange. It handles the output of all subcommands (except "download").
-The "download" and "upload" commands must naturally be run "online" and do not
+The ``upload`` subcommand uploads the signatures created with the private key to
+the exchange. It handles the output of all subcommands (except ``download``).
+The ``download`` and ``upload`` subcommands must naturally be run "online" and do not
require access to the auditor's private key, which should be kept offline.
All other subcommands are intended to be run "offline". However, especially
-when testing, it is of course possible to run the commands online as well.
+when testing, it is of course possible to run the subcommands online as well.
Generally, subcommands read inputs (beyond command-line arguments)
-from {\tt stdin}. However, they may also consume outputs of previous
-subcommands. The outputs of multiple commands is automatically combined,
-and if not consumed the final output is printed to {\tt stdout}.
+from ``stdin``. However, they may also consume outputs of previous
+subcommands. The outputs of multiple subcommands are automatically combined,
+and if not consumed the final output is printed to ``stdout``.
-The general options to for **taler-auditor-offline** are:
+The general options for **taler-auditor-offline** are:
**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
Use the configuration and other resources for the merchant to operate
- from FILENAME.
+ from *FILENAME*.
**-h** \| **––help**
Print short help on options.
**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
- Specifies the log level to use. Accepted values are: DEBUG, INFO,
- WARNING, ERROR.
+ Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
+ ``WARNING``, ``ERROR``.
**-o** *FILE* \| **––output=**\ ‌\ *FILE*
Where to write a denomination key signing request file to be given to
@@ -75,21 +78,25 @@ The exchange and the **taler-auditor-httpd** must both be provided with
the auditor's public key, such that they can validate messages signed
by the auditor. To obtain the auditor's public key, use:
-$ AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
-$ gnunet-ecc -p $AUDITOR_PRIV_FILE
+.. code-block:: console
+
+ $ AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
+ $ gnunet-ecc -p $AUDITOR_PRIV_FILE
Note that if the private key file does not yet exist, the above will fail.
In this case, create the private key using:
-$ AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
-$ AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE`
-$ mkdir -p $AUDITOR_PRIV_DIR
-$ gnunet-ecc -g1 $AUDITOR_PRIV_FILE
+.. code-block:: console
+
+ $ AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
+ $ AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE`
+ $ mkdir -p $AUDITOR_PRIV_DIR
+ $ gnunet-ecc -g1 $AUDITOR_PRIV_FILE
Relevant configuration options for **taler-auditor-offline** are:
-* [auditor/AUDITOR_PRIV_FILE] --- where to store the private key
+* ``[auditor/AUDITOR_PRIV_FILE]`` --- where to store the private key
@@ -99,67 +106,68 @@ Subcommands
download
--------
-This command must be run online. It downloads future signing and denomination
+This subcommand must be run online. It downloads future signing and denomination
keys with the associated meta data from the exchange and outputs the resulting
-JSON (for consumption by subsequent commands, or to stdout).
+JSON (for consumption by subsequent subcommands, or to ``stdout``).
show
----
-This command outputs information about future signing and denomination keys for
+This subcommand outputs information about future signing and denomination keys for
manual checking against the business-approved fee structure, lifetimes and
other parameters.
-It consumes the output of the "download" subcommand, either from "stdin" or
+It consumes the output of the ``download`` subcommand, either from ``stdin`` or
directly.
-Its output always goes to "stdout" for human consumption (not in JSON). It
-is usually a bad idea (but possible) to combine "show" with other commands,
+Its output always goes to ``stdout`` for human consumption (not in JSON). It
+is usually a bad idea (but possible) to combine ``show`` with other subcommands,
except maybe for testing.
sign
----
-This command signs information about future signing and denomination keys.
+This subcommand signs information about future signing and denomination keys.
-It consumes the output of the "download" subcommand, either from "stdin" or
+It consumes the output of the ``download`` subcommand, either from ``stdin`` or
directly.
It outputs the signatures over *all* denomination and signing keys
-present in the input, in a format suitable for the "upload" subcommand.
+present in the input, in a format suitable for the ``upload`` subcommand.
revoke-denomination
-------------------
-This command signs a revocation message for a denomination key.
+This subcommand signs a revocation message for a denomination key.
The hash of the denomination public key must be given in the usual
base32-encoding as the first and only argument to the subcommand.
It outputs the signature affirming the revocation of the denomination key,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
revoke-signkey
--------------
-This command signs a revocation message for an exchange online signing key.
+This subcommand signs a revocation message for an exchange online signing key.
The online signing public key must be given in the usual
base32-encoding as the first and only argument to the subcommand.
It outputs the signature affirming the revocation of the online signing key,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
enable-auditor
--------------
-Informs an exchange that an auditor is to be activated. Afterwards, the
+This subcommand
+informs an exchange that an auditor is to be activated. Afterwards, the
exchange will accept inputs from that auditor's **taler-auditor-offline**
tool. Note that the auditor also must add the exchange to the list of
exchanges that it audits via **taler-auditor-exchange**. Furthermore, the
@@ -179,32 +187,34 @@ The third argument must be a human-readable name for the auditor. This may
be shown to users and should identify the auditor's business entity. If
the name includes spaces, the argument should be quoted.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the addition of the auditor,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
disable-auditor
---------------
-Informs an exchange that an auditor is to be deactivated. Afterwards, the
+This subcommand
+informs an exchange that an auditor is to be deactivated. Afterwards, the
exchange will refuse inputs from that auditor's **taler-auditor-offline**
tool.
The auditor's public key must be given in the usual base32-encoding as the
first argument.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the removal of the auditor,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
enable-account
--------------
-Informs an exchange that it should advertise a bank account as belonging to
+This subcommand
+informs an exchange that it should advertise a bank account as belonging to
the exchange on its ``/wire`` endpoint. Note that this does *not* ensure that
the exchange will use this bank account for incoming or outgoing wire
transfers! For this, the **taler-exchange-transfer** and
@@ -213,28 +223,29 @@ account information advertised could theoretically differ from that which
these tool actually use, for example if the public bank account is only a
front for the actual internal business acounts.
-The payto:// URI (RFC 8905) of the exchange's bank account must be given
+The ``payto://`` URI (RFC 8905) of the exchange's bank account must be given
as the first argument to the subcommand.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the addition of the wire account,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
disable-account
---------------
-Informs an exchange that it should stop advertising a bank account as
+This subcommand
+informs an exchange that it should stop advertising a bank account as
belonging to the exchange on its ``/wire`` endpoint.
-The payto:// URI (RFC 8905) of the exchange's (former) bank account must be
+The ``payto://`` URI (RFC 8905) of the exchange's (former) bank account must be
given as the first argument to the subcommand.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the deletion of the wire account, in a
-format suitable for the "upload" subcommand.
+format suitable for the ``upload`` subcommand.
wire-fee
@@ -252,16 +263,16 @@ Instead of a year, the string ``now`` can be given for the current year
GANA registry as given in RFC 8905. The fees must be given in the usual
Taler format of ``CURRENCY:NUMBER.FRACTION``.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the wire fees, in a format suitable for the
-"upload" subcommand.
+``upload`` subcommand.
upload
------
-This subcommand uploads outputs from other commands (except "download" and "show")
+This subcommand uploads outputs from other subcommands (except ``download`` and ``show``)
to the exchange. Note that it is possible that some uploads succeed, while others
fail, as the operation is not atomic.
@@ -282,29 +293,39 @@ Examples
Download public keys from an exchange (online)
----------------------------------------------
-$ taler-auditor-offline download > keys.json
+.. code-block:: console
+
+ $ taler-auditor-offline download > keys.json
Show information about public keys (offline or online)
------------------------------------------------------
-$ taler-auditor-offline show < keys.json
+.. code-block:: console
+
+ $ taler-auditor-offline show < keys.json
Sign public keys (offline)
--------------------------
-$ taler-auditor-offline sign < keys.json > sigs.json
+.. code-block:: console
+
+ $ taler-auditor-offline sign < keys.json > sigs.json
Upload auditor signatures (online)
----------------------------------
-$ taler-auditor-offline upload < sigs.json
+.. code-block:: console
+
+ $ taler-auditor-offline upload < sigs.json
Download, sign and upload, all in one (online)
----------------------------------------------
Note that doing this is only recommended in non-production deployments.
-$ taler-auditor-offline download sign upload
+.. code-block:: console
+
+ $ taler-auditor-offline download sign upload
@@ -313,9 +334,9 @@ Security considerations
=======================
The **taler-auditor-offline** tool assumes that it is run on a high-security
-system, especially for the "sign" command.
+system, especially for the ``sign`` subcommand.
-The auditor should first use the "show" command on the offline system to
+The auditor should first use the ``show`` subcommand on the offline system to
check that the keys being signed are acceptable. This process requires
manual work: the auditor should check with the exchange operator that
the keys (and meta data) matches that previously seen by the
diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst
index cdedd20f..8d62ac5f 100644
--- a/manpages/taler-exchange-offline.1.rst
+++ b/manpages/taler-exchange-offline.1.rst
@@ -12,48 +12,51 @@ Synopsis
========
**taler-exchange-offline**
+[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
[**-h** | **––help**]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
+[**-o** *FILE* | **––output=**\ ‌\ *FILE*]
[**-v** | **––version**]
-[SUBCOMMANDS]*
+[subcommand ...]
Description
===========
-**taler-exchange-offline** is a command line tool to interact with the Taler
+**taler-exchange-offline** is a command-line tool to interact with the Taler
exchange's master private key. Most operations of this tool require access to
the exchange’s long-term offline signing key and should be run in a secure
(offline) environment under strict controls. The tool takes a list of
subcommands as arguments which are then processed sequentially.
The tool includes two subcommands to interact *online* with the exchange's
-REST APIs. The "download" subcommand downloads the future public keys from the
-running exchange. The resulting data serves as input to the "sign" and "show"
-subcommands. The "upload" subcommand uploads the signatures created with the
+REST APIs. The ``download`` subcommand downloads the future public keys from the
+running exchange. The resulting data serves as input to the ``sign`` and ``show``
+subcommands. The ``upload`` subcommand uploads the signatures created with the
private master key to the exchange. It handles the output of all subcommands
-(except "download"). The "download" and "upload" commands must naturally be
+(except ``download``). The ``download`` and ``upload`` subcommands must naturally be
run "online" and do not require access to the offline key.
All other subcommands are intended to be run "offline". However, especially
-when testing, it is of course possible to run the commands online as well.
+when testing, it is of course possible to run the subcommands online as well.
Generally, subcommands read inputs (beyond command-line arguments)
-from {\tt stdin}. However, they may also consume outputs of previous
-subcommands. The outputs of multiple commands is automatically combined,
-and if not consumed the final output is printed to {\tt stdout}.
+from ``stdin``. However, they may also consume outputs of previous
+subcommands. The outputs of multiple subcommands are automatically combined,
+and if not consumed the final output is printed to ``stdout``.
-The general options to for **taler-exchange-offline** are:
+The general options for **taler-exchange-offline** are:
**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
Use the configuration and other resources for the merchant to operate
- from FILENAME.
+ from *FILENAME*.
**-h** \| **––help**
Print short help on options.
**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
- Specifies the log level to use. Accepted values are: DEBUG, INFO,
- WARNING, ERROR.
+ Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
+ ``WARNING``, ``ERROR``.
**-o** *FILE* \| **––output=**\ ‌\ *FILE*
Where to write a denomination key signing request file to be given to
@@ -70,23 +73,27 @@ The exchange validates all operations by checking the signatures against the
master public key that must be provided in the exchange configuration. To
obtain the master public key, use:
-$ MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
-$ gnunet-ecc -p $MASTER_PRIV_FILE
+.. code-block:: console
+
+ $ MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+ $ gnunet-ecc -p $MASTER_PRIV_FILE
Note that if the private key file does not yet exist, the above will fail.
In this case, create the private key using:
-$ MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
-$ MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
-$ mkdir -p $MASTER_PRIV_DIR
-$ gnunet-ecc -g1 $MASTER_PRIV_FILE
+.. code-block:: console
+
+ $ MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+ $ MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
+ $ mkdir -p $MASTER_PRIV_DIR
+ $ gnunet-ecc -g1 $MASTER_PRIV_FILE
Relevant configuration options for **taler-exchange-offline** are:
-* [exchange/BASE_URL] --- how to reach the exchange (for download/upload)
-* [exchange-offline/MASTER_PRIV_FILE] --- where to store the private keys
-* [exchange-offline/SECM_TOFU_FILE] --- where to store TOFU data
+* ``[exchange/BASE_URL]`` --- how to reach the exchange (for download/upload)
+* ``[exchange-offline/MASTER_PRIV_FILE]`` --- where to store the private keys
+* ``[exchange-offline/SECM_TOFU_FILE]`` --- where to store TOFU data
@@ -96,67 +103,68 @@ Subcommands
download
--------
-This command must be run online. It downloads future signing and denomination
+This subcommand must be run online. It downloads future signing and denomination
keys with the associated meta data from the exchange and outputs the resulting
-JSON (for consumption by subsequent commands, or to stdout).
+JSON (for consumption by subsequent subcommands, or to ``stdout``).
show
----
-This command outputs information about future signing and denomination keys for
+This subcommand outputs information about future signing and denomination keys for
manual checking against the business-approved fee structure, lifetimes and
other parameters.
-It consumes the output of the "download" subcommand, either from "stdin" or
+It consumes the output of the ``download`` subcommand, either from ``stdin`` or
directly.
-Its output always goes to "stdout" for human consumption (not in JSON). It
-is usually a bad idea (but possible) to combine "show" with other commands,
+Its output always goes to ``stdout`` for human consumption (not in JSON). It
+is usually a bad idea (but possible) to combine ``show`` with other subcommands,
except maybe for testing.
sign
----
-This command signs information about future signing and denomination keys.
+This subcommand signs information about future signing and denomination keys.
-It consumes the output of the "download" subcommand, either from "stdin" or
+It consumes the output of the ``download`` subcommand, either from ``stdin`` or
directly.
It outputs the signatures over *all* denomination and signing keys
-present in the input, in a format suitable for the "upload" subcommand.
+present in the input, in a format suitable for the ``upload`` subcommand.
revoke-denomination
-------------------
-This command signs a revocation message for a denomination key.
+This subcommand signs a revocation message for a denomination key.
The hash of the denomination public key must be given in the usual
base32-encoding as the first and only argument to the subcommand.
It outputs the signature affirming the revocation of the denomination key,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
revoke-signkey
--------------
-This command signs a revocation message for an exchange online signing key.
+This subcommand signs a revocation message for an exchange online signing key.
The online signing public key must be given in the usual
base32-encoding as the first and only argument to the subcommand.
It outputs the signature affirming the revocation of the online signing key,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
enable-auditor
--------------
-Informs an exchange that an auditor is to be activated. Afterwards, the
+This subcommand
+informs an exchange that an auditor is to be activated. Afterwards, the
exchange will accept inputs from that auditor's **taler-auditor-offline**
tool. Note that the auditor also must add the exchange to the list of
exchanges that it audits via **taler-auditor-exchange**. Furthermore, the
@@ -176,32 +184,34 @@ The third argument must be a human-readable name for the auditor. This may
be shown to users and should identify the auditor's business entity. If
the name includes spaces, the argument should be quoted.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the addition of the auditor,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
disable-auditor
---------------
-Informs an exchange that an auditor is to be deactivated. Afterwards, the
+This subcommand
+informs an exchange that an auditor is to be deactivated. Afterwards, the
exchange will refuse inputs from that auditor's **taler-auditor-offline**
tool.
The auditor's public key must be given in the usual base32-encoding as the
first argument.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the removal of the auditor,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
enable-account
--------------
-Informs an exchange that it should advertise a bank account as belonging to
+This subcommand
+informs an exchange that it should advertise a bank account as belonging to
the exchange on its ``/wire`` endpoint. Note that this does *not* ensure that
the exchange will use this bank account for incoming or outgoing wire
transfers! For this, the **taler-exchange-transfer** and
@@ -210,28 +220,29 @@ account information advertised could theoretically differ from that which
these tool actually use, for example if the public bank account is only a
front for the actual internal business acounts.
-The payto:// URI (RFC 8905) of the exchange's bank account must be given
+The ``payto://`` URI (RFC 8905) of the exchange's bank account must be given
as the first argument to the subcommand.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the addition of the wire account,
-in a format suitable for the "upload" subcommand.
+in a format suitable for the ``upload`` subcommand.
disable-account
---------------
-Informs an exchange that it should stop advertising a bank account as
+This subcommand
+informs an exchange that it should stop advertising a bank account as
belonging to the exchange on its ``/wire`` endpoint.
-The payto:// URI (RFC 8905) of the exchange's (former) bank account must be
+The ``payto://`` URI (RFC 8905) of the exchange's (former) bank account must be
given as the first argument to the subcommand.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the deletion of the wire account, in a
-format suitable for the "upload" subcommand.
+format suitable for the ``upload`` subcommand.
wire-fee
@@ -249,16 +260,16 @@ Instead of a year, the string ``now`` can be given for the current year
GANA registry as given in RFC 8905. The fees must be given in the usual
Taler format of ``CURRENCY:NUMBER.FRACTION``.
-The subcommand takes no inputs from stdin or other subcommands.
+The subcommand takes no inputs from ``stdin`` or other subcommands.
It outputs the signature affirming the wire fees, in a format suitable for the
-"upload" subcommand.
+``upload`` subcommand.
upload
------
-This subcommand uploads outputs from other commands (except "download" and "show")
+This subcommand uploads outputs from other subcommands (except ``download`` and ``show``)
to the exchange. Note that it is possible that some uploads succeed, while others
fail, as the operation is not atomic.
@@ -279,61 +290,81 @@ Examples
Download future public keys from an exchange (online)
-----------------------------------------------------
-$ taler-exchange-offline download > keys.json
+.. code-block:: console
+
+ $ taler-exchange-offline download > keys.json
Show information about future public keys (offline or online)
-------------------------------------------------------------
-$ taler-exchange-offline show < keys.json
+.. code-block:: console
+
+ $ taler-exchange-offline show < keys.json
Sign future public keys (offline)
---------------------------------
-$ taler-exchange-offline sign < keys.json > sigs.json
+.. code-block:: console
+
+ $ taler-exchange-offline sign < keys.json > sigs.json
Upload signatures about future public keys (online)
---------------------------------------------------
-$ taler-exchange-offline upload < sigs.json
+.. code-block:: console
+
+ $ taler-exchange-offline upload < sigs.json
Download, sign and upload, all in one (online)
----------------------------------------------
Note that doing this is only recommended in non-production deployments.
-$ taler-exchange-offline download sign upload
+.. code-block:: console
+
+ $ taler-exchange-offline download sign upload
Create signature to enable bank account (offline)
-------------------------------------------------
-$ taler-exchange-offline enable-account payto://iban/DE24242 > account.json
+.. code-block:: console
+
+ $ taler-exchange-offline enable-account payto://iban/DE24242 > account.json
Upload bank account signature (online)
--------------------------------------
-$ taler-exchange-offline upload < account.json
+.. code-block:: console
+
+ $ taler-exchange-offline upload < account.json
Combine signing keys and enabling bank account (offline)
--------------------------------------------------------
-$ taler-exchange-offline sign enable-account payto://iban/DE24242 < keys.json > combo.json
+.. code-block:: console
+
+ $ taler-exchange-offline sign enable-account payto://iban/DE24242 < keys.json > combo.json
Upload various signatures (online)
----------------------------------
-$ taler-exchange-offline upload < combo.json
+.. code-block:: console
+
+ $ taler-exchange-offline upload < combo.json
Create multiple revocation messages in one pass (offline)
---------------------------------------------------------
-$ taler-exchange-offline revoke-denomination $DKH1 revoke-denomination $DKH2 > revoke.json
-$ taler-exchange-offline revoke-signkey $SK1 revoke-signkey $SK2 > revoke.json
-$ taler-exchange-offline revoke-signkey $SK revoke-denomkey $DKH > mix.json
+.. code-block:: console
+
+ $ taler-exchange-offline revoke-denomination $DKH1 revoke-denomination $DKH2 > revoke.json
+ $ taler-exchange-offline revoke-signkey $SK1 revoke-signkey $SK2 > revoke.json
+ $ taler-exchange-offline revoke-signkey $SK revoke-denomkey $DKH > mix.json
-The outputs ("revoke.json", "mix.json") must be uploaded using the "upload"
-command to the exchange to actually revoke the keys.
+The outputs ("revoke.json", "mix.json") must be uploaded using the ``upload``
+subcommand to the exchange to actually revoke the keys.
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index 98c941d1..66e9699d 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -181,7 +181,7 @@ KEY_DIR
UNIXPATH
On which path should the security module listen for signing requests?
-Note that the **taler-exchange-helper-rsa** also evaluates the ``[coin-*]``
+Note that the **taler-exchange-helper-rsa** also evaluates the ``[coin_*]``
configuration sections described below.