[taler-docs] branch master updated (7ed74e6 -> 1c79852)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ttn pushed a change to branch master
in repository docs.

    from 7ed74e6  taler-wallet-cli(1): reorder opts in synopsis, description
     new 695869d  taler-merchant-benchmark(1): reorder opts in description
     new 1f4b812  taler-merchant-benchmark(1): rewrite descriptions for ‘-L’, 
‘-l’
     new bca2a39  dedent (nine instances)
     new 0771c67  taler-merchant-benchmark(1): add opt ‘-a’ to Common Options
     new cd09fb9  taler-merchant-benchmark(1): add opt ‘-e’ to Common Options
     new f946586  taler-merchant-benchmark(1): delete opt ‘-i’ from ‘corner’ 
options
     new 1c79852  taler-merchant-benchmark(1): delete opts ‘-b’, ‘-k’, ‘-m’ 
from "Common Options"

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 manpages/taler-merchant-benchmark.1.rst | 42 +++++++++++++--------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/manpages/taler-merchant-benchmark.1.rst 
b/manpages/taler-merchant-benchmark.1.rst
index 45f966d..a8af27a 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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.