[taler-docs] branch master updated (7fdb6a2 -> b8830a4)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 7fdb6a2  nexus tells general facades info
     new 2d65789  taler-config-generate(1): don't mention GNUnet in ‘-v’ 
description
     new b8830a4  taler-config-generate(1): reorder opts in synopsis, 
description

The 2 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-config-generate.1.rst | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/manpages/taler-config-generate.1.rst 
b/manpages/taler-config-generate.1.rst
index 22f5c61..5c9b813 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
 ====
 

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