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

2 files changed, 24 insertions, 15 deletions

diff --git a/conf.py b/conf.py
index 534b2f00..c3ea73a0 100644
--- a/conf.py
+++ b/conf.py
@@ -279,8 +279,6 @@ man_pages = [
      "setup auditor database", "GNU Taler contributors", 1),
     ("manpages/taler-auditor.1", "taler-auditor", "audit exchange",
      "GNU Taler contributors", 1),
-    ("manpages/taler-bank-transfer.1", "taler-bank-transfer",
-     "trigger a transfer at the bank", "GNU Taler contributors", 1),
     ("manpages/taler-config-generate.1", "taler-config-generate",
      "tool to simplify Taler configuration generation",
      "GNU Taler contributors", 1),
@@ -316,6 +314,8 @@ man_pages = [
     ("manpages/taler-merchant-setup-reserve.1", "taler-merchant-setup-reserve",
      "setup reserve for tipping at a Taler merchant backend", "GNU Taler contributors",
      1),
+    ("manpages/taler-wire-gateway-client.1", "taler-wire-gateway-client",
+     "trigger a transfer at the bank", "GNU Taler contributors", 1),
     ("manpages/taler.conf.5", "taler.conf", "Taler configuration file",
      "GNU Taler contributors", 5),
 ]
diff --git a/manpages/taler-bank-transfer.1.rst b/manpages/taler-wire-gateway-client.1.rst
index e37d596a..538b412e 100644
--- a/manpages/taler-bank-transfer.1.rst
+++ b/manpages/taler-wire-gateway-client.1.rst
@@ -1,28 +1,30 @@
-taler-bank-transfer(1)
-######################
+taler-wire-gateway-client(1)
+############################
 
 .. only:: html
 
    Name
    ====
 
-   **taler-bank-transfer** - trigger a transfer at the bank (or obtain transaction history)
+   **taler-wire-gateway-client** - trigger a transfer at the bank (or obtain transaction history)
 
 Synopsis
 ========
 
-**taler-bank-transfer**
+**taler-wire-gateway-client**
 [**-a** *VALUE* | **––amount=**\ ‌\ *VALUE*]
 [**-b** *URL* | **––bank=**\ ‌\ *URL*]
-[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
 [**-C** *ACCOUNT* | **––credit=**\ ‌\ *ACCOUNT*]
+[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*]
 [**-D** *ACCOUNT* | **––debit=**\ ‌\ *ACCOUNT*]
 [**-h** | **––help**]
 [**-i** | **––credit-history**]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
+[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*]
 [**-o** | **––debit-history**]
 [**-p** *PASSPHRASE* | **––pass=**\ ‌\ *PASSPHRASE*]
-[**-s** *ACCOUNT-SECTION* | **––section=**\ ‌\ *ACCOUNT-SECTION*]
 [**-S** *STRING* | **––subject=**\ ‌\ *STRING*]
+[**-s** *ACCOUNT-SECTION* | **––section=**\ ‌\ *ACCOUNT-SECTION*]
 [**-u** *USERNAME* | **––user=**\ ‌\ *USERNAME*]
 [**-v** | **––version**]
 [**-w** *ROW* | **––since-when=**\ ‌\ *ROW*]
@@ -30,7 +32,7 @@ Synopsis
 Description
 ===========
 
-**taler-bank-transfer** is a command-line tool to trigger bank transfers or
+**taler-wire-gateway-client** is a command-line tool to trigger bank transfers or
 inspect wire transfers for exchange accounts using the wire API.  The tool is
 expected to be used during testing or for diagnostics.
 
@@ -56,14 +58,14 @@ Options
 **-b** *URL* \| **––bank=**\ ‌\ *URL*
    URL at which the bank is operation.  Conflicts with **-s**.
 
-**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
-   Use the given configuration file.
-
 **-C** *ACCOUNT* \| **––credit=**\ ‌\ *ACCOUNT*
    When doing a wire transfer from the exchange, the money should be credited to *ACCOUNT*.
    Specifies the payto:// URI of the account.  Can also be used as a filter by credit
    account when looking at transaction histories.
 
+**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME*
+   Use the given configuration file.
+
 **-D** *ACCOUNT* \| **––debit=**\ ‌\ *ACCOUNT*
    When doing a wire transfer to the exchange, the *ACCOUNT* is to be debited.
    Specifies the payto:// URI of the account.  Can also be used as a filter by debit
@@ -75,9 +77,19 @@ Options
 **-i** \| **––credit-history**
    Obtain credit history of the exchange. Conflicts with **-o**.
 
+**-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*.
+
 **-o** \| **––debit-history**
    Obtain debit history of the exchange. Conflicts with **-i**.
 
+**-p** *PASSPHRASE* \| **––pass=**\ ‌\ *PASSPHRASE*
+   Specifies the pass phrase for authentication.  Conflicts with **-s**.
+
 **-S** *SUBJECT* \| **––subject=**\ ‌\ *SUBJECT*
    Use *SUBJECT* for the wire transfer subject.  Must be a reserve public key for credit operations and a wire transfer identifier for debit operations. If not specified, a random value will be generated instead.
 
@@ -87,9 +99,6 @@ Options
 **-u** *USERNAME* \| **––user=**\ ‌\ *USERNAME*
    Specifies the username for authentication.  Optional and conflicts with **-s**. If neither **-u** nor **-s** are used, we will attempt to talk to the bank without authentication.
 
-**-p** *PASSPHRASE* \| **––pass=**\ ‌\ *PASSPHRASE*
-   Specifies the pass phrase for authentication.  Conflicts with **-s**.
-
 **-v** \| **––version**
    Print version information.