diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/api-bank-access.rst | 2 | ||||
| -rw-r--r-- | core/api-common.rst | 2 | ||||
| -rw-r--r-- | core/api-error.rst | 6 | ||||
| -rw-r--r-- | core/api-exchange.rst | 12 | ||||
| -rw-r--r-- | core/api-merchant.rst | 16 | ||||
| -rw-r--r-- | core/api-sync.rst | 8 | ||||
| -rw-r--r-- | core/api-wire.rst | 2 |
7 files changed, 24 insertions, 24 deletions
diff --git a/core/api-bank-access.rst b/core/api-bank-access.rst index 5863ef78..abd7d5c1 100644 --- a/core/api-bank-access.rst +++ b/core/api-bank-access.rst @@ -22,7 +22,7 @@ Taler Bank Access API This chapter describes the API that the GNU Taler demonstrator bank offers to access accounts. -This API differes from the "Bank Integration API" in that it provides advanced API access to accounts, as opposed +This API differs from the "Bank Integration API" in that it provides advanced API access to accounts, as opposed to enabling wallets to withdraw with a better user experience ("tight integration"). diff --git a/core/api-common.rst b/core/api-common.rst index 7796bdec..1364ae5b 100644 --- a/core/api-common.rst +++ b/core/api-common.rst @@ -114,7 +114,7 @@ handle the error as if an internal error (500) had been returned. // Name of the object that was bogus (if applicable) object?: string; - // Name of the currency thant was problematic (if applicable) + // Name of the currency than was problematic (if applicable) currency?: string; // Expected type (if applicable). diff --git a/core/api-error.rst b/core/api-error.rst index 88c43879..eb66d37d 100644 --- a/core/api-error.rst +++ b/core/api-error.rst @@ -258,7 +258,7 @@ The following list shows error codes defined in /** * The respective coin did not have sufficient residual value * for the /deposit operation (i.e. due to double spending). - * The "history" in the respose provides the transaction history + * The "history" in the response provides the transaction history * of the coin proving this fact. This response is provided * with HTTP status code MHD_HTTP_FORBIDDEN. */ @@ -690,7 +690,7 @@ The following list shows error codes defined in * The exchange failed to recover information about the * denomination key of the refunded coin (even though it * recognizes the key). Hence it could not check the fee - * strucutre. + * structure. * This response is provided with HTTP status code * MHD_HTTP_INTERNAL_SERVER_ERROR. */ @@ -982,7 +982,7 @@ The following list shows error codes defined in /** - * Integer overflow with sepcified timestamp argument detected. + * Integer overflow with specified timestamp argument detected. * This response is provided * with HTTP status code MHD_HTTP_BAD_REQUEST. */ diff --git a/core/api-exchange.rst b/core/api-exchange.rst index 15547ed5..af1c5096 100644 --- a/core/api-exchange.rst +++ b/core/api-exchange.rst @@ -355,7 +355,7 @@ Withdrawal This API is used by the wallet to obtain digital coins. -When transfering money to the exchange such as via SEPA transfers, the exchange creates +When transferring money to the exchange such as via SEPA transfers, the exchange creates a *reserve*, which keeps the money from the customer. The customer must specify an EdDSA reserve public key as part of the transfer, and can then withdraw digital coins using the corresponding private key. All incoming and @@ -524,7 +524,7 @@ exchange. **Response:** :status 200 OK: - The request was succesful, and the response is a `WithdrawResponse`. Note that repeating exactly the same request + The request was successful, and the response is a `WithdrawResponse`. Note that repeating exactly the same request will again yield the same response, so if the network goes down during the transaction or before the client can commit the coin signature to disk, the coin is not lost. @@ -860,7 +860,7 @@ the API during normal operation. :status 401 Unauthorized: One of the signatures is invalid. :status 200 OK: - The request was succesful. The response body is `MeltResponse` in this case. + The request was successful. The response body is `MeltResponse` in this case. :status 404: the exchange does not recognize the denomination key as belonging to the exchange, or it has expired @@ -967,7 +967,7 @@ the API during normal operation. .. http:post:: /refreshes/$RCH/reveal - Reveal previously commited values to the exchange, except for the values + Reveal previously committed values to the exchange, except for the values corresponding to the ``noreveal_index`` returned by the /coins/-melt step. The $RCH is the hash over the refresh commitment from the /coins/-melt step @@ -993,7 +993,7 @@ the API during normal operation. The response body is a `RevealResponse` :status 409 Conflict: There is a problem between the original commitment and the revealed private - keys. The returned information is proof of the missmatch, and therefore + keys. The returned information is proof of the mismatch, and therefore rather verbose, as it includes most of the original /refresh/melt request, but of course expected to be primarily used for diagnostics. The response body is a `RevealConflictResponse`. @@ -1132,7 +1132,7 @@ in using this API. **Response:** :status 200 OK: - The request was succesful, and the response is a `RecoupConfirmation`. + The request was successful, and the response is a `RecoupConfirmation`. Note that repeating exactly the same request will again yield the same response, so if the network goes down during the transaction or before the client can commit the coin signature to disk, the diff --git a/core/api-merchant.rst b/core/api-merchant.rst index fd8bb583..a1c99038 100644 --- a/core/api-merchant.rst +++ b/core/api-merchant.rst @@ -156,7 +156,7 @@ Dynamic Merchant Instances default_max_wire_fee: Amount; // Default factor for wire fee amortization calculations. - // Can be overriden by the frontend on a per-order basis. + // Can be overridden by the frontend on a per-order basis. default_wire_fee_amortization: Integer; // Maximum deposit fee (sum over all coins) this instance is willing to pay. @@ -216,7 +216,7 @@ Dynamic Merchant Instances default_max_wire_fee: Amount; // Default factor for wire fee amortization calculations. - // Can be overriden by the frontend on a per-order basis. + // Can be overridden by the frontend on a per-order basis. default_wire_fee_amortization: Integer; // Maximum deposit fee (sum over all coins) this instance is willing to pay. @@ -271,7 +271,7 @@ Dynamic Merchant Instances default_max_wire_fee: Amount; // Default factor for wire fee amortization calculations. - // Can be overriden by the frontend on a per-order basis. + // Can be overridden by the frontend on a per-order basis. default_wire_fee_amortization: Integer; // Maximum deposit fee (sum over all coins) this instance is willing to pay. @@ -316,7 +316,7 @@ Dynamic Merchant Instances or purge merchant instance in the backend. Purging will delete all offers and payments associated with the instance, while disabling (the default) only deletes the private key - and makes the instance unusuable for new orders or payments. + and makes the instance unusable for new orders or payments. **Request:** @@ -664,7 +664,7 @@ Payment processing A different proposal already exists under the specified order ID. :status 410 Gone: The order given used products from the inventory that are out of stock. - The reponse is a :ts:type:`OutOfStockResponse`. + The response is a :ts:type:`OutOfStockResponse`. .. ts:def:: PostOrderRequest @@ -1238,7 +1238,7 @@ Payment processing .. http:get:: /private/orders/$ORDER_ID - Merchant checks the payment status of an order. If the order exists but is not payed + Merchant checks the payment status of an order. If the order exists but is not paid and not claimed yet, the response provides a redirect URL. When the user goes to this URL, they will be prompted for payment. Differs from the ``/public/`` API both in terms of what information is returned and in that the wallet must provide @@ -1377,7 +1377,7 @@ Payment processing // execution time of the wire transfer execution_time: Timestamp; - // Total amount that has been wire transfered + // Total amount that has been wire transferred // to the merchant amount: Amount; @@ -2639,7 +2639,7 @@ The `Product` object describes the product being purchased from the merchant. It .. ts:def:: Location - // Delivery location, losely modeled as a subset of + // Delivery location, loosely modeled as a subset of // ISO20022's PostalAddress25. interface Location { // Nation with its own government. diff --git a/core/api-sync.rst b/core/api-sync.rst index 67d1e214..650cd8a7 100644 --- a/core/api-sync.rst +++ b/core/api-sync.rst @@ -94,7 +94,7 @@ itself cannot not enforce these rules. increment it by the smallest possible amount when uploading an update. * In general, the merge operation should be implemented in such a way - that it deals gracefully with adversarial devices from rouge + that it deals gracefully with adversarial devices from rogue devices connected to the same account. It is assumed that the synchronization service is only ever accessed @@ -186,7 +186,7 @@ Receiving Terms of Service "200 OK" responses include an HTTP header "Sync-Signature" with the signature of the - client from the orginal upload, and an + client from the original upload, and an "Sync-Previous" with the version that was being updated (unless this is the first revision). "Sync-Previous" is only given to enable @@ -303,7 +303,7 @@ Receiving Terms of Service Responses with a body include an HTTP header "Sync-Signature" with the signature of the - client from the orginal upload, and an + client from the original upload, and an "If-Match" with the version that is being updated (unless this is the first revision). @@ -337,7 +337,7 @@ auditors or exchanges. The client should urge the user to make use of a synchronization service upon first withdrawal, suggesting one that is free or accepts payment in the respective currency. If none is available, -the client should warn the user about the lack of availalable +the client should warn the user about the lack of available backups and synchronization and suggest to the user to find a reasonable service. Once a synchronization service was selected, the client should urge the user to print the respective key diff --git a/core/api-wire.rst b/core/api-wire.rst index fee78890..676c8029 100644 --- a/core/api-wire.rst +++ b/core/api-wire.rst @@ -91,7 +91,7 @@ Making Transactions amount: Amount; // Base URL of the exchange. Shall be included by the bank gateway - // in the approriate section of the wire transfer details. + // in the appropriate section of the wire transfer details. exchange_base_url: string; // Wire transfer identifier chosen by the exchange, |