[taler-merchant] branch master updated: typos

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new eb494d2  typos
eb494d2 is described below

commit eb494d2cafb6dff07f86dacf6859928c6d3398b3
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Mar 31 21:08:50 2020 +0200

    typos
---
 README                                               |  2 +-
 src/backend/taler-merchant-httpd.c                   |  4 ++--
 src/backend/taler-merchant-httpd_check-payment.c     |  2 +-
 src/backend/taler-merchant-httpd_pay.c               |  4 ++--
 src/backend/taler-merchant-httpd_poll-payment.c      |  2 +-
 src/backend/taler-merchant-httpd_refund.c            |  2 +-
 src/backend/taler-merchant-httpd_track-transaction.c |  2 +-
 src/backenddb/merchant-0000.sql                      |  2 +-
 src/backenddb/plugin_merchantdb_postgres.c           | 12 ++++++------
 src/backenddb/test_merchantdb.c                      |  4 ++--
 src/include/taler_merchant_service.h                 |  4 ++--
 src/include/taler_merchantdb_plugin.h                |  8 ++++----
 src/lib/merchant_api_check_payment.c                 |  2 +-
 src/lib/merchant_api_poll_payment.c                  |  2 +-
 src/lib/test_merchant_api.conf                       |  6 +++---
 src/lib/testing_api_cmd_check_payment.c              |  4 ++--
 src/lib/testing_api_cmd_poll_payment.c               |  4 ++--
 src/lib/testing_api_cmd_track_transaction.c          |  2 +-
 18 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README b/README
index 326a1d9..9977eef 100644
--- a/README
+++ b/README
@@ -31,6 +31,6 @@ PHP:  PHP License, AGPL- and LGPL-Compatible, owned by The 
PHP Group
 
 5. DIRECTORY STRUCTURE
 
-- 'src/' contains the "backend", a C piece of software which implements cryto 
routines
+- 'src/' contains the "backend", a C piece of software which implements crypto 
routines
   and communication with the 'exchange'
  'doc/' contains documentation files, like TeXinfo
diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index b47413c..d958434 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1216,7 +1216,7 @@ iterate_instances (void)
  *        can be set with the #MHD_OPTION_NOTIFY_COMPLETED).
  *        Initially, `*con_cls` will be NULL.
  * @return #MHD_YES if the connection was handled successfully,
- *         #MHD_NO if the socket must be closed due to a serios
+ *         #MHD_NO if the socket must be closed due to a serious
  *         error while handling the request
  */
 static int
@@ -1489,7 +1489,7 @@ url_handler (void *cls,
   {
     hc->rh = selected_handler;
     /* Store the async context ID, so we can restore it if
-     * we get another callack for this request. */
+     * we get another callback for this request. */
     hc->async_scope_id = aid;
   }
   return ret;
diff --git a/src/backend/taler-merchant-httpd_check-payment.c 
b/src/backend/taler-merchant-httpd_check-payment.c
index c36bf59..740cbe8 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -141,7 +141,7 @@ cprc_cleanup (struct TM_HandlerContext *hc)
  * @param cls closure
  * @param coin_pub public coin from which the refund comes from
  * @param rtransaction_id identificator of the refund
- * @param reason human-readable explaination of the refund
+ * @param reason human-readable explanation of the refund
  * @param refund_amount refund amount which is being taken from coin_pub
  * @param refund_fee cost of this refund operation
  */
diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index 83cc4f4..d2b7abf 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -179,7 +179,7 @@ struct PayContext
 
   /**
    * Proposal data for the proposal that is being
-   * payed for in this context.
+   * paid for in this context.
    */
   json_t *contract_terms;
 
@@ -1742,7 +1742,7 @@ parse_pay (struct MHD_Connection *connection,
  * @param cls closure with a `struct PayContext`
  * @param coin_pub public coin from which the refund comes from
  * @param rtransaction_id identificator of the refund
- * @param reason human-readable explaination of the refund
+ * @param reason human-readable explanation of the refund
  * @param refund_amount refund amount which is being taken from coin_pub
  * @param refund_fee cost of this refund operation
  */
diff --git a/src/backend/taler-merchant-httpd_poll-payment.c 
b/src/backend/taler-merchant-httpd_poll-payment.c
index 8e28ec6..8545e3a 100644
--- a/src/backend/taler-merchant-httpd_poll-payment.c
+++ b/src/backend/taler-merchant-httpd_poll-payment.c
@@ -141,7 +141,7 @@ pprc_cleanup (struct TM_HandlerContext *hc)
  * @param cls closure
  * @param coin_pub public coin from which the refund comes from
  * @param rtransaction_id identificator of the refund
- * @param reason human-readable explaination of the refund
+ * @param reason human-readable explanation of the refund
  * @param refund_amount refund amount which is being taken from coin_pub
  * @param refund_fee cost of this refund operation
  */
diff --git a/src/backend/taler-merchant-httpd_refund.c 
b/src/backend/taler-merchant-httpd_refund.c
index 609450b..4d5db6f 100644
--- a/src/backend/taler-merchant-httpd_refund.c
+++ b/src/backend/taler-merchant-httpd_refund.c
@@ -411,7 +411,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
  * @param cls closure
  * @param coin_pub public coin from which the refund comes from
  * @param rtransaction_id identificator of the refund
- * @param reason human-readable explaination of the refund
+ * @param reason human-readable explanation of the refund
  * @param refund_amount refund amount which is being taken from coin_pub
  * @param refund_fee cost of this refund operation
  */
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c 
b/src/backend/taler-merchant-httpd_track-transaction.c
index abc5d8c..4ce5aa3 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -843,7 +843,7 @@ trace_coins (struct TrackTransactionContext *tctx)
 
   for (tcc = tctx->tcc_head; NULL != tcc; tcc = tcc->next)
 
-    /* How come one does't have wtid? */
+    /* How come one doesn't have wtid? */
     if (GNUNET_YES != tcc->have_wtid)
       break;
 
diff --git a/src/backenddb/merchant-0000.sql b/src/backenddb/merchant-0000.sql
index 1483e20..116f409 100644
--- a/src/backenddb/merchant-0000.sql
+++ b/src/backenddb/merchant-0000.sql
@@ -150,7 +150,7 @@ BEGIN;
 -- It requires that PL/pgSQL is already loaded - will raise exception 
otherwise.
 -- All versioning "stuff" (tables, functions) is in "_v" schema.
 
--- All functions are defined as 'RETURNS SETOF INT4' to be able to make them 
to RETURN literaly nothing (0 rows).
+-- All functions are defined as 'RETURNS SETOF INT4' to be able to make them 
to RETURN literally nothing (0 rows).
 -- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql 
when calling.
 CREATE SCHEMA IF NOT EXISTS _v;
 COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 12be050..0f547e3 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -499,10 +499,10 @@ postgres_insert_order (void *cls,
 
 
 /**
- * Mark contract terms as payed.  Needed by /history as only payed
+ * Mark contract terms as paid.  Needed by /history as only paid
  * contracts must be shown.
  *
- * NOTE: we can't get the list of (payed) contracts from the
+ * NOTE: we can't get the list of (paid) contracts from the
  * transactions table because it lacks contract_terms plain JSON.  In
  * facts, the protocol doesn't allow to store contract_terms in
  * transactions table, as /pay handler doesn't receive this data (only
@@ -883,8 +883,8 @@ find_contracts_cb (void *cls,
  * the same timestamp and just go behind in history by tuning `start`.
  * @param nrows only nrows rows are returned.
  * @param past if set to #GNUNET_YES, retrieves rows older than `date`.
- * @param ascending if GNUNET_YES, results will be sorted in chronological 
order.
- * This is tipically used to show live updates on the merchant's backoffice
+ * @param ascending if #GNUNET_YES, results will be sorted in chronological 
order.
+ * This is typically used to show live updates on the merchant's backoffice
  * Web interface.
  * @param cb function to call with transaction data, can be NULL.
  * @param cb_cls closure for @a cb
@@ -1831,11 +1831,11 @@ postgres_get_refunds_from_contract_terms_hash (void 
*cls,
  * Insert a refund row into merchant_refunds.  Not meant to be exported
  * in the db API.
  *
- * @param cls closure, tipically a connection to the db
+ * @param cls closure, typically a connection to the db
  * @param merchant_pub merchant instance public key
  * @param h_contract_terms hashcode of the contract related to this refund
  * @param coin_pub public key of the coin giving the (part of) refund
- * @param reason human readable explaination behind the refund
+ * @param reason human readable explanation behind the refund
  * @param refund how much this coin is refunding
  * @param refund_fee refund fee for this coin
  */
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index f7baf1e..ff1e2b0 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -129,7 +129,7 @@ static struct TALER_Amount refund_amount;
 
 /**
  * Amount to be refunded.  Used to trigger error about
- * subsequest refund amount being lesser than the previous
+ * subsequent refund amount being lesser than the previous
  * ones.
  */
 static struct TALER_Amount little_refund_amount;
@@ -200,7 +200,7 @@ static json_t *contract_terms_future;
  * @param cls closure
  * @param coin_pub public coin from which the refund comes from
  * @param rtransaction_id identificator of the refund
- * @param reason human-readable explaination of the refund
+ * @param reason human-readable explanation of the refund
  * @param refund_amount refund amount which is being taken from coin_pub
  * @param refund_fee cost of this refund operation
  */
diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index 0e36b98..1bb6016 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -985,7 +985,7 @@ typedef void
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
  * @param order_id order id to identify the payment
- * @parem session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
+ * @param session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
  * @param timeout timeout to use in long polling (how long may the server wait 
to reply
  *        before generating an unpaid response). Note that this is just 
provided to
  *        the server, we as client will block until the response comes back or 
until
@@ -1124,7 +1124,7 @@ typedef void
  * @param backend_url base URL of the merchant backend
  * @param order_id order id to identify the payment
  * @param h_contract hash of the contract for @a order_id
- * @parem session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
+ * @param session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
  * @param timeout timeout to use in long polling (how long may the server wait 
to reply
  *        before generating an unpaid response). Note that this is just 
provided to
  *        the server, we as client will block until the response comes back or 
until
diff --git a/src/include/taler_merchantdb_plugin.h 
b/src/include/taler_merchantdb_plugin.h
index f88f311..38c1886 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -33,7 +33,7 @@ struct TALER_MERCHANTDB_Plugin;
 
 
 /**
- * Tipically called by `find_contract_terms_by_date`.
+ * Typically called by `find_contract_terms_by_date`.
  *
  * @param cls closure
  * @param order_id order id
@@ -145,7 +145,7 @@ typedef void
  * @param cls closure
  * @param coin_pub public coin from which the refund comes from
  * @param rtransaction_id identificator of the refund
- * @param reason human-readable explaination of the refund
+ * @param reason human-readable explanation of the refund
  * @param refund_amount refund amount which is being taken from coin_pub
  * @param refund_fee cost of this refund operation
  */
@@ -228,10 +228,10 @@ struct TALER_MERCHANTDB_Plugin
                            const json_t *contract_terms);
 
   /**
-   * Mark contract terms as payed.  Needed by /history as only payed
+   * Mark contract terms as paid.  Needed by /history as only paid
    * contracts must be shown.
    *
-   * NOTE: we can't get the list of (payed) contracts from the
+   * NOTE: we can't get the list of (paid) contracts from the
    * transactions table because it lacks contract_terms plain JSON.
    * In facts, the protocol doesn't allow to store contract_terms in
    * transactions table, as /pay handler doesn't receive this data
diff --git a/src/lib/merchant_api_check_payment.c 
b/src/lib/merchant_api_check_payment.c
index c4c07ae..9802b49 100644
--- a/src/lib/merchant_api_check_payment.c
+++ b/src/lib/merchant_api_check_payment.c
@@ -177,7 +177,7 @@ handle_check_payment_finished (void *cls,
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
  * @param order_id order id to identify the payment
- * @parem session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
+ * @param session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
  * @param timeout timeout to use in long polling (how long may the server wait 
to reply
  *        before generating an unpaid response). Note that this is just 
provided to
  *        the server, we as client will block until the response comes back or 
until
diff --git a/src/lib/merchant_api_poll_payment.c 
b/src/lib/merchant_api_poll_payment.c
index 4c819a2..c00fc18 100644
--- a/src/lib/merchant_api_poll_payment.c
+++ b/src/lib/merchant_api_poll_payment.c
@@ -194,7 +194,7 @@ handle_poll_payment_finished (void *cls,
  * @param backend_url base URL of the merchant backend
  * @param order_id order id to identify the payment
  * @param h_contract hash of the contract for @a order_id
- * @parem session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
+ * @param session_id sesion id for the payment (or NULL if the payment is not 
bound to a session)
  * @param timeout timeout to use in long polling (how long may the server wait 
to reply
  *        before generating an unpaid response). Note that this is just 
provided to
  *        the server, we as client will block until the response comes back or 
until
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
index 7e38195..cb0d25e 100644
--- a/src/lib/test_merchant_api.conf
+++ b/src/lib/test_merchant_api.conf
@@ -1,10 +1,10 @@
 # This file is in the public domain.
 #
 [PATHS]
-# Persistant data storage for the testcase
+# Persistent data storage for the testcase
 TALER_TEST_HOME = test_merchant_api_home/
 
-# Persistant data storage
+# Persistent data storage
 TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
 
 # Configuration files
@@ -206,7 +206,7 @@ ENABLE_CREDIT = YES
 # wire fees
 [fees-x-taler-bank]
 
-# Fees for the forseeable future...
+# Fees for the foreseeable future...
 # If you see this after 2018, update to match the next 10 years...
 WIRE-FEE-2018 = EUR:0.01
 WIRE-FEE-2019 = EUR:0.01
diff --git a/src/lib/testing_api_cmd_check_payment.c 
b/src/lib/testing_api_cmd_check_payment.c
index bf4d545..b138e6a 100644
--- a/src/lib/testing_api_cmd_check_payment.c
+++ b/src/lib/testing_api_cmd_check_payment.c
@@ -284,7 +284,7 @@ check_payment_cb (void *cls,
 /**
  * Run a /check-payment CMD.
  *
- * @param cmd the command currenly being run.
+ * @param cmd the command currently being run.
  * @param cls closure.
  * @param is interpreter state.
  */
@@ -426,7 +426,7 @@ check_payment_conclude_cleanup (void *cls,
 /**
  * Run a /check-payment conclusion CMD.
  *
- * @param cmd the command currenly being run.
+ * @param cmd the command currently being run.
  * @param cls closure.
  * @param is interpreter state.
  */
diff --git a/src/lib/testing_api_cmd_poll_payment.c 
b/src/lib/testing_api_cmd_poll_payment.c
index 8c9dd58..aa92043 100644
--- a/src/lib/testing_api_cmd_poll_payment.c
+++ b/src/lib/testing_api_cmd_poll_payment.c
@@ -284,7 +284,7 @@ poll_payment_cb (void *cls,
 /**
  * Run a /poll-payment CMD.
  *
- * @param cmd the command currenly being run.
+ * @param cmd the command currently being run.
  * @param cls closure.
  * @param is interpreter state.
  */
@@ -399,7 +399,7 @@ poll_payment_conclude_cleanup (void *cls,
 /**
  * Run a /poll-payment CMD.
  *
- * @param cmd the command currenly being run.
+ * @param cmd the command currently being run.
  * @param cls closure.
  * @param is interpreter state.
  */
diff --git a/src/lib/testing_api_cmd_track_transaction.c 
b/src/lib/testing_api_cmd_track_transaction.c
index 6c0c61f..8ae0a95 100644
--- a/src/lib/testing_api_cmd_track_transaction.c
+++ b/src/lib/testing_api_cmd_track_transaction.c
@@ -62,7 +62,7 @@ struct TrackTransactionState
   const char *pay_reference;
 
   /**
-   * Subject line of the wire transfer that payed
+   * Subject line of the wire transfer that paid
    * the tracked contract back.  WARNING: impredictible
    * behaviour if _multiple_ wire transfers were
    * issued to pay this contract back.

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