aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/taler-merchant.README.Debian2
-rw-r--r--debian/taler-merchant.lintian-overrides2
-rw-r--r--src/backend/taler-merchant-httpd.c2
-rw-r--r--src/include/taler_merchant_service.h2
-rwxr-xr-xsrc/testing/test_merchant_order_creation.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/debian/taler-merchant.README.Debian b/debian/taler-merchant.README.Debian
index 4020d42b..86837e79 100644
--- a/debian/taler-merchant.README.Debian
+++ b/debian/taler-merchant.README.Debian
@@ -8,7 +8,7 @@ This package is integrated with Apache or Nginx, automatically
deploying a configuration for the backend to the respective
Web server at the "/taler-merchant/" endpoint.
-To access the priviledged parts of the Taler backend, you need to provide the
+To access the privileged parts of the Taler backend, you need to provide the
API KEY in an HTTP "Authorization" header. This Debian package creates a
random API KEY and stores it in plaintext in
"/var/lib/taler-merchant/master-api-key.txt." You can change the key by
diff --git a/debian/taler-merchant.lintian-overrides b/debian/taler-merchant.lintian-overrides
index 8c479c02..e2a5c559 100644
--- a/debian/taler-merchant.lintian-overrides
+++ b/debian/taler-merchant.lintian-overrides
@@ -1,3 +1,3 @@
-# internal libraries are not splitted out into a dedicated package to avoid
+# internal libraries are not split out into a dedicated package to avoid
# micropackaging.
taler-merchant: package-name-doesnt-match-sonames
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
index 5cfec854..884820c3 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -2139,7 +2139,7 @@ run (void *cls,
TMH_db->connect (TMH_db->cls))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to initialze database connection\n");
+ "Failed to initialize database connection\n");
GNUNET_SCHEDULER_shutdown ();
return;
}
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index e1155ec9..99675240 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -638,7 +638,7 @@ typedef void
* @param instance_id identity of the instance to patch the authentication for; NULL
* if the instance is identified as part of the @a backend_url
* @param auth_token authorization token needed to access the instance, can be NULL
- * to swith to no (or external) authentication
+ * to switch to no (or external) authentication
* @param cb function to call with the backend's response
* @param cb_cls closure for @a config_cb
* @return the instances handle; NULL upon error
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
index 9e3e0d09..6de4a1d0 100755
--- a/src/testing/test_merchant_order_creation.sh
+++ b/src/testing/test_merchant_order_creation.sh
@@ -295,7 +295,7 @@ BALANCE=`jq -r .balance.amount < $LAST_RESPONSE`
if [ "$BALANCE" == "TESTKUDOS:0" ]
then
- echo 'wire transfer did not happend. got:' $BALANCE `cat $LAST_RESPONSE`
+ echo 'Wire transfer did not happen. Got:' $BALANCE `cat $LAST_RESPONSE`
exit 1
fi