Merge branch 'master' of git+ssh://git.taler.net/docs

4 files changed, 68 insertions, 55 deletions

diff --git a/manpages/taler-auditor.1.rst b/manpages/taler-auditor.1.rst
index c4b82376..622643fc 100644
--- a/manpages/taler-auditor.1.rst
+++ b/manpages/taler-auditor.1.rst
@@ -12,9 +12,14 @@ Synopsis
 ========
 
 **taler-auditor**
+[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
 [**-h** | **––help**]
 [**-i**_|_**––internal**]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
+[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*]
 [**-m** *MASTER_KEY* | **––exchange-key=**\ ‌\ *MASTER_KEY*]
+[**-T** *USEC* | **––timetravel**\ \ *USEC*]
+[**-v** | **––version**]
 
 
 Description
@@ -30,6 +35,10 @@ found in the database. It does NOT check with the bank to see that the
 incoming and outgoing wire transfers that the bank claims to have
 matches the exchange’s database. Its options are as follows.
 
+**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
+   Use the configuration and other resources for the merchant to operate
+   from *FILENAME*.
+
 **-h** \| **––help**
    Print short help on options.
 
@@ -37,12 +46,26 @@ matches the exchange’s database. Its options are as follows.
    Run additional checks that can only performed on the exchange-internal
    database and not the "safe" replicated database at the auditor.
 
+**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
+   Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
+   ``WARNING``, ``ERROR``.
+
+**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME*
+   Send logging output to *FILENAME*.
+
 **-m** *KEY* \| **––exchange-key=**\ ‌\ *KEY*
    Public master key of the exchange in Crockford base32 encoding, for
    example as generated by gnunet-ecc -p. If this option is missing,
    taler-auditor will use the MASTER_PUBLIC_KEY value from the
    “exchange” section of the configuration.
 
+**-T** *USEC* \| **––timetravel=**\ \ *USEC*
+   Modify the system time by *USEC* microseconds.
+   *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``).
+   This option is intended for debugging/testing only.
+
+**-v** \| **––version**
+   Print version information.
 
 
 See Also
diff --git a/manpages/taler-config-generate.1.rst b/manpages/taler-config-generate.1.rst
index 22f5c61f..5c9b813a 100644
--- a/manpages/taler-config-generate.1.rst
+++ b/manpages/taler-config-generate.1.rst
@@ -13,21 +13,21 @@ Synopsis
 ========
 
 **taler-config-generate**
-[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
 [**-C** *CURRENCY* | **––currency=**\ ‌\ *CURRENCY*]
+[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
 [**-e** | **––exchange**]
 [**-f** *AMOUNT* | *––wirefee=*\ ‌\ *AMOUNT*]
+[**-h** | **––help**]
+[**-J** *JSON* | **––wire-json-exchange=**\ ‌\ *JSON*]
+[**-j** *JSON* | **––wire-json-merchant=**\ ‌\ *JSON*]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
 [**-m** | **––merchant**]
 [**-t** | **––trusted**]
+[**-v** | **––version**]
 [**-w** *WIREFORMAT* | **––wire** *WIREFORMAT*]
-[**-j** *JSON* | **––wire-json-merchant=**\ ‌\ *JSON*]
-[**-J** *JSON* | **––wire-json-exchange=**\ ‌\ *JSON*]
 [**––bank-uri**]
 [**––exchange-bank-account**]
 [**––merchant-bank-account**]
-[**-h** | **––help**]
-[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
-[**-v** | **––version**]
 
 Description
 ===========
@@ -35,13 +35,13 @@ Description
 **taler-config-generate** can be used to generate configuration files
 for the Taler exchange or Taler merchants.
 
+**-C** *CURRENCY* \| **––currency=**\ ‌\ *CURRENCY*
+   Which currency should we use in the configuration.
+
 **-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
    Location where to write the generated configuration. Existing file
    will be updated, not overwritten.
 
-**-C** *CURRENCY* \| **––currency=**\ ‌\ *CURRENCY*
-   Which currency should we use in the configuration.
-
 **-e** \| **––exchange**
    Generate configuration for a Taler exchange.
 
@@ -49,6 +49,19 @@ for the Taler exchange or Taler merchants.
    Setup wire transfer fees for the next 5 years for the exchange (for
    all wire methods).
 
+**-h** \| **––help**
+   Shows this man page.
+
+**-J** *JSON* \| **––wire-json-exchange=**\ ‌\ *JSON*
+   Wire configuration to use for the exchange.
+
+**-j** *JSON* \| **––wire-json-merchant=**\ ‌\ *JSON*
+   Wire configuration to use for the merchant.
+
+**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
+   Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and
+   ERROR.
+
 **-m** \| **––merchant**
    Generate configuration for a Taler merchant.
 
@@ -56,15 +69,12 @@ for the Taler exchange or Taler merchants.
    Setup current exchange as trusted with current merchant. Generally
    only useful when configuring for testcases.
 
+**-v** \| **––version**
+   Print version information.
+
 **-w** *WIREFORMAT* \| **––wire** *WIREFORMAT*
    Specifies which wire format to use (i.e. “test” or “sepa”)
 
-**-j** *JSON* \| **––wire-json-merchant=**\ ‌\ *JSON*
-   Wire configuration to use for the merchant.
-
-**-J** *JSON* \| **––wire-json-exchange=**\ ‌\ *JSON*
-   Wire configuration to use for the exchange.
-
 **––bank-uri**
    Alternative to specify wire configuration to use for the exchange and
    merchant for the “test” wire method. Only useful if WIREFORMAT was
@@ -80,16 +90,6 @@ for the Taler exchange or Taler merchants.
    the “test” wire method. Only useful if WIREFORMAT was set to “test”.
    Specifies the bank account number of the merchant.
 
-**-h** \| **––help**
-   Shows this man page.
-
-**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
-   Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and
-   ERROR.
-
-**-v** \| **––version**
-   Print GNUnet version number.
-
 Bugs
 ====
 
diff --git a/manpages/taler-merchant-benchmark.1.rst b/manpages/taler-merchant-benchmark.1.rst
index 45f966dd..a8af27a0 100644
--- a/manpages/taler-merchant-benchmark.1.rst
+++ b/manpages/taler-merchant-benchmark.1.rst
@@ -50,11 +50,6 @@ corner
               payments use only one coin).  TC defaults to 1.
 
 
-       **-i** *AI* \| **––alt-instance=**\ \ *AI*
-              Use AI as the instance, instead of 'default' (which is the
-              default instance used.)
-
-
        **-u** *UN* \| **––unaggregated-number=**\ \ *UN*
               Generate UN payments that will be left unaggregated.  Note that
               subsequent invocations of the generator may pick those
@@ -65,34 +60,29 @@ corner
 Common Options
 ==============
 
-**-k** *K* \| **––currency=**\ \ *K*
-       Use currency K, mandatory.
-
-
-**-m** *URL* \| **––merchant-url=**\ \ *URL*
-       Use URL as the merchant base URL during the benchmark.  The URL
-       is mainly used to download and pay for contracts.  Mandatory.
-
-
-**-b** *URL* \| **––bank-url=**\ \ *URL*
-       Use URL as the bank's base URL during the benchmark.  The URL is
-       used to test whether the bank is up and running.  Mandatory.
+**-a** *APIKEY* \| **--apikey=**\ \ *APIKEY*
+   HTTP 'Authorization' header to send to the merchant.
 
 **-c** *FILENAME* \| **––config=**\ \ *FILENAME*
-       Use the configuration and other resources for the merchant to
-       operate from FILENAME.
+   Use the configuration and other resources for the merchant to
+   operate from FILENAME.
+
+**-e** *SECTION* \| **--exchange-account=**\ \ *SECTION*
+   Mandatory.
+   Configuration *SECTION* specifying the exchange account to use.
 
 **-h** \| **––help**
-       Print short help on options.
+   Print short help on options.
 
-**-v** \| **––version**
-       Print version information.
+**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
+   Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
+   ``WARNING``, ``ERROR``.
 
-**-l** *LF* \| **––logfile=**\ \ *LF*
-       Sends logs to file whose path is LF.
+**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME*
+   Send logging output to *FILENAME*.
 
-**-L** *LOGLEVEL* \| **––log=**\ \ *LOGLEVEL*
-       Use loglevel LOGLEVEL.
+**-v** \| **––version**
+   Print version information.
 
 
 See Also
diff --git a/manpages/taler-wallet-cli.1.rst b/manpages/taler-wallet-cli.1.rst
index d109470b..8303fea1 100644
--- a/manpages/taler-wallet-cli.1.rst
+++ b/manpages/taler-wallet-cli.1.rst
@@ -13,8 +13,8 @@ Synopsis
 
 **taler-auditor**
 [**-h** | **––help**]
-[**––verbose**]
 [**-V** | **––version**]
+[**––verbose**]
 <command> [<args>]
 
 
@@ -27,12 +27,12 @@ for testing.
 **-h** | **––help**
    Print short help on options.
 
-**––verbose**
-   Enable verbose output.
-
 **-V** | **––version**
    Output the version number.
 
+**––verbose**
+   Enable verbose output.
+
 **test-withdraw** [**-e** URL | **––exchange** URL] [**-a** AMOUNT | **––amount** AMOUNT][**-b** URL | **––bank** URL]
    withdraw test currency from the test bank