[GNUnet-SVN] [taler-api] branch master updated: use URL instead of URI consistently

[gnunet]

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

dold pushed a commit to branch master
in repository api.

The following commit(s) were added to refs/heads/master by this push:
     new eaf875f  use URL instead of URI consistently
eaf875f is described below

commit eaf875f3b72510aa3fe7904cc2ec59e236d79e33
Author: Florian Dold <address@hidden>
AuthorDate: Tue Jan 30 01:37:14 2018 +0100

    use URL instead of URI consistently
---
 api-bank.rst           | 6 +++---
 api-exchange.rst       | 4 ++--
 api-merchant.rst       | 8 ++++----
 cf/captcha-payment.txt | 2 +-
 wireformats.rst        | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/api-bank.rst b/api-bank.rst
index b64fd7a..f038d6b 100644
--- a/api-bank.rst
+++ b/api-bank.rst
@@ -205,7 +205,7 @@ request.
 ..
   The counterpart currently only points to the same bank as
   the client using the bank.  A reasonable improvement is to
-  specify a bank URI too, so that Taler can run across multiple
+  specify a bank URL too, so that Taler can run across multiple
   banks.
 
 ------------------------
@@ -233,7 +233,7 @@ must be added to ``x``, as follows:
 Clearly, a fallback page must be provided, which will be useful if the
 wallet is *not* installed.  This special page will hide any element of
 the class ``taler-install-show``; it can be downloaded at the following
-URI: ``git://taler.net/web-common/taler-fallback.css``.
+URL: ``git://taler.net/web-common/taler-fallback.css``.
 
 Withdrawing coins.
 ^^^^^^^^^^^^^^^^^^
@@ -253,7 +253,7 @@ along with the following HTTP headers:
 
   interface WireDetails {
     type: string; // Only 'test' value admitted so far.
-    bank_uri: URI of the bank.
+    bank_uri: URL of the bank.
     account_number: bank account number of the user attempting to withdraw.
   }
 
diff --git a/api-exchange.rst b/api-exchange.rst
index 39b4dd9..2d95c67 100644
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@ -279,8 +279,8 @@ Obtaining wire-transfer information
       // Account number at the bank
       account_number: number;
 
-      // URI of the bank
-      bank_uri: string;
+      // URL of the bank
+      bank_url: string;
 
       // Name of the account's owner
       name: string;
diff --git a/api-merchant.rst b/api-merchant.rst
index 06c5549..e7bd03b 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -270,7 +270,7 @@ Giving tips to customers
       // Expiration time for obtaining the tip
       expiration: Timestamp;
 
-      // URI of the exchange from where the tip can be withdrawn
+      // URL of the exchange from where the tip can be withdrawn
       exchange_uri: String;
     }
 
@@ -287,7 +287,7 @@ Tracking wire transfers
 
   :query wtid: raw wire transfer identifier identifying the wire transfer (a 
base32-encoded value)
   :query wire_method: name of the wire transfer method used for the wire 
transfer
-  :query exchange: base URI of the exchange that made the wire transfer
+  :query exchange: base URL of the exchange that made the wire transfer
   :query instance: (optional) identificative token of the merchant `instance 
<https://docs.taler.net/operate-merchant.html#instances-lab>`_ which is being 
tracked.
 
   **Response:**
@@ -568,7 +568,7 @@ The `contract terms` must have the following structure:
       // The URL where the wallet has to send coins.
       pay_url: string;
 
-      // The URI for this purchase.  Every time is is visited, the merchant
+      // The URL for this purchase.  Every time is is visited, the merchant
       // will send back to the customer the same proposal.  Clearly, this URL
       // can be bookmarked and shared by users.
       fulfillment_url: string;
@@ -667,7 +667,7 @@ The `contract terms` must have the following structure:
       // time indicating when this product should be delivered
       delivery_date: Timestamp;
 
-      // where to deliver this product. This may be an URI for online delivery
+      // where to deliver this product. This may be an URL for online delivery
       // (i.e. `http://example.com/download` or `mailto:address@hidden),
       // or a location label defined inside the proposition's `locations`.
       // The presence of a colon (`:`) indicates the use of an URL.
diff --git a/cf/captcha-payment.txt b/cf/captcha-payment.txt
index ac4aeda..ecc065b 100644
--- a/cf/captcha-payment.txt
+++ b/cf/captcha-payment.txt
@@ -62,7 +62,7 @@ Required changes to Taler:
      thus no choice to be made). This change is also rather trivial.
   3) Change Wallet to check for HTTP headers requesting payment for the
      DOM, and then inject an HTTP header in all subsequent requests generated
-     by that page with the payment (i.e. signing the request's URI with
+     by that page with the payment (i.e. signing the request's URL with
      the coin/token).  This change is non-trivial, and may require
      browser-specific solutions.
 
diff --git a/wireformats.rst b/wireformats.rst
index 4e15493..9a5aa4b 100644
--- a/wireformats.rst
+++ b/wireformats.rst
@@ -21,10 +21,10 @@ for a local / regional currency or accounting system.  
Using the TEST
 wire format in combination with the Taler's bank, it is thus possible to
 fully test the Taler system without using "real" currencies.  The wire
 format for "TEST" is very simple, in that it only specifies an account
-number in a field "account_number" and the URI of the bank:
+number in a field "account_number" and the URL of the bank:
 
   * `type`: the string constant `"test"`
-  * `bank_uri`: the URI of the bank (starting with `http://` or `https://`)
+  * `bank_uri`: the URL of the bank (starting with `http://` or `https://`)
   * `account_number`: the number of the account at the bank
 
 The account number given must be a positive 53-bit integer.

-- 
To stop receiving notification emails like this one, please contact
address@hidden