- fix misc typos

24 files changed, 52 insertions, 152 deletions

diff --git a/src/abd/test_abd_own.sh b/src/abd/test_abd_own.sh
index f4780ea90..3fc210284 100755
--- a/src/abd/test_abd_own.sh
+++ b/src/abd/test_abd_own.sh
@@ -58,7 +58,7 @@ END_ATTR="end"
 
 gnunet-identity -d
 
-# FORWARD, subject side stored (different constallations)
+# FORWARD, subject side stored (different constellations)
 SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"`
 gnunet-abd --createSubjectSide --ego=a --import="$SIGNED"
 gnunet-namestore -D -z a
@@ -137,4 +137,3 @@ else
   echo "FAIL: Failed to verify credential."
   exit 1
 fi
-
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 383d578d5..8015e0e15 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -33,7 +33,7 @@ OPTIONS = -l $GNUNET_CACHE_HOME/gnunet-%Y-%m-%d.log
 # If set to YES, ARM will only start services that are marked as
 # per-user services (and we'll expect a system user to run ARM to
 # provide system-level services).  Per-user services enable
-# better personalization and  priviledge separation and in particular
+# better personalization and  privilege separation and in particular
 # ensures that personal data is stored under $HOME, which might
 # be important in a multi-user system (or if $HOME is encrypted
 # and /var/ is not).
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in
index e657d4a3f..2b30b6b97 100644
--- a/src/arm/test_gnunet_arm.py.in
+++ b/src/arm/test_gnunet_arm.py.in
@@ -53,7 +53,7 @@ def fail(result):
     sys.exit(1)
 
 
-def end_arm_failer(command, rc, stdo, stde, normal):
+def end_arm_failure(command, rc, stdo, stde, normal):
     if normal:
         if rc != 0:
             fail(
@@ -69,7 +69,7 @@ def end_arm_failer(command, rc, stdo, stde, normal):
             )
 
 
-def print_only_failer(command, rc, stdo, stde, normal):
+def print_only_failure(command, rc, stdo, stde, normal):
     if normal:
         if rc != 0:
             print(
@@ -87,12 +87,12 @@ def print_only_failer(command, rc, stdo, stde, normal):
             sys.exit(1)
 
 
-def r_something(to_run, extra_args, failer=None, normal=True, **kw):
+def r_something(to_run, extra_args, failure=None, normal=True, **kw):
     rc, stdo, stde = sub_run(
         to_run + extra_args, nofail=True, want_stde=True, **kw
     )
-    if failer is not None:
-        failer(to_run + extra_args, rc, stdo, stde, normal)
+    if failure is not None:
+        failure(to_run + extra_args, rc, stdo, stde, normal)
     return (rc, stdo, stde)
 
 
@@ -103,26 +103,26 @@ def r_arm(extra_args, **kw):
 cleanup()
 
 print("TEST: Bad argument checking...", end='')
-r_arm(['-x'], normal=False, failer=print_only_failer)
+r_arm(['-x'], normal=False, failure=print_only_failure)
 print("PASS")
 
 print("TEST: Start ARM...", end='')
-r_arm(['-s'], failer=print_only_failer)
+r_arm(['-s'], failure=print_only_failure)
 time.sleep(1)
 print("PASS")
 
 print("TEST: Start another service...", end='')
-r_arm(['-i', 'resolver'], failer=end_arm_failer)
+r_arm(['-i', 'resolver'], failure=end_arm_failure)
 time.sleep(1)
 print("PASS")
 
 print("TEST: Stop a service...", end='')
-r_arm(['-k', 'resolver'], failer=end_arm_failer)
+r_arm(['-k', 'resolver'], failure=end_arm_failure)
 time.sleep(1)
 print("PASS")
 
 print("TEST: Stop ARM...", end='')
-r_arm(['-e'], failer=print_only_failer)
+r_arm(['-e'], failure=print_only_failure)
 time.sleep(1)
 print("PASS")
 
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index 7691f98c0..4abddd99c 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -37,54 +37,8 @@ BLUETOOTH_QUOTA_OUT = 10 MiB
 # Proportional specific settings
 # How proportional to preferences is bandwidth distribution in a network
 # 1.0: Fair with respect to addresses without preferences
-# > 1.0: The bigger, the more respect is payed to preferences
+# > 1.0: The bigger, the more respect is paid to preferences
 PROP_PROPORTIONALITY_FACTOR = 2.00
 # Should we stick to existing connections are prefer to switch?
 # [1.0...2.0], lower value prefers to switch, bigger value is more tolerant
 PROP_STABILITY_FACTOR = 1.25
-
-# MLP specific settings
-# MLP defaults
-
-# Maximum duration for a solution process (both LP and MILP)
-# MLP_MAX_DURATION = 3 s
-# Maximum numbero of iterations for a solution process (only LP)
-# MLP_MAX_ITERATIONS =
-# Tolerated MIP Gap [0.0 .. 1.0], default 0.025
-MLP_MAX_MIP_GAP = 0.025
-# Tolerated LP/MIP Gap [0.0 .. 1.0], default 0.025
-MLP_MAX_LP_MIP_GAP = 0.025
-
-
-# Maximum number of iterations for a solution process
-# MLP_MAX_ITERATIONS = 1024
-# MLP_COEFFICIENT_D = 1.0
-# MLP_COEFFICIENT_U = 1.0
-# MLP_COEFFICIENT_R = 1.0
-# MLP_MIN_BANDWIDTH = 1024
-# MLP_MIN_CONNECTIONS = 4
-
-# MLP Log settings
-# Dump all problems to disk
-# MLP_DUMP_PROBLEM_ALL = YES
-# Dump all solution to disk
-# MLP_DUMP_SOLUTION_ALL = YES
-# Print GLPK output
-# MLP_GLPK_VERBOSE = YES
-
-# Dump all problems to disk
-MLP_DUMP_PROBLEM_ON_FAIL = YES
-# Dump all solution to disk
-MLP_DUMP_SOLUTION_ON_FAIL = YES
-
-# RIL specifc settings
-RIL_STEP_TIME_MIN = 500 ms
-RIL_STEP_TIME_MAX = 1000 ms
-
-# SARSA or Q-LEARNING
-RIL_ALGORITHM = Q-LEARNING
-RIL_DISCOUNT_BETA = 0.7
-RIL_GRADIENT_STEP_SIZE = 0.3
-RIL_TRACE_DECAY = 0.2
-RIL_EXPLORE_RATIO = 0.1
-RIL_GLOBAL_REWARD_SHARE = 1
diff --git a/src/ats/perf_ats_solver.conf b/src/ats/perf_ats_solver.conf
index 00657d895..a535891df 100644
--- a/src/ats/perf_ats_solver.conf
+++ b/src/ats/perf_ats_solver.conf
@@ -21,57 +21,8 @@ BLUETOOTH_QUOTA_OUT = 10000000
 # Proportional specific settings
 # How proportional to preferences is bandwidth distribution in a network
 # 1: Fair with respect to addresses without preferences
-# > 10: The bigger, the more respect is payed to preferences 
+# > 10: The bigger, the more respect is paid to preferences
 PROP_PROPORTIONALITY_FACTOR = 2.00
 # Should we stick to existing connections are prefer to switch?
 # [10...200], lower value prefers to switch, bigger value is more tolerant
 PROP_STABILITY_FACTOR = 1.25
-
-# MLP specific settings
-# MLP defaults
-
-# Maximum duration for a solution process
-# MLP_MAX_DURATION = 30 s
-
-# Maximum number of iterations for a solution process
-# MLP_MAX_ITERATIONS = 1024
-# Tolerated MIP Gap [0.0 .. 1.0], default 0.025
-MLP_MAX_MIP_GAP = 0.025
-# Tolerated LP/MIP Gap [0.0 .. 1.0], default 0.025
-MLP_MAX_LP_MIP_GAP = 0.025
-
-# MLP_COEFFICIENT_D = 1.0
-# MLP_COEFFICIENT_U = 1.0
-# MLP_COEFFICIENT_R = 1.0
-MLP_MIN_BANDWIDTH = 10
-# MLP_MIN_CONNECTIONS = 4
-# MLP_DBG_FEASIBILITY_ONLY = YES
-MLP_DBG_AUTOSCALE_PROBLEM = YES
-# MLP_DBG_INTOPT_PRESOLVE = YES
-# Print GLPK output
-# MLP_DBG_GLPK_VERBOSE = YES
-
-#MLP_DBG_OPTIMIZE_UTILITY = NO
-#MLP_DBG_OPTIMIZE_QUALITY = NO
-#MLP_DBG_OPTIMIZE_RELATIVITY = NO
-#DLP_DBG_OPTIMIZE_DIVERSITY = NO
-
-MLP_LOG_FORMAT = CPLEX
-
-# MLP Log settings
-# Dump all problems to disk
-# MLP_DUMP_PROBLEM_ALL = YES
-# Dump all solution to disk
-# MLP_DUMP_SOLUTION_ALL = YES
-
-# RIL specifc settings
-RIL_STEP_TIME_MIN = 1 ms
-RIL_STEP_TIME_MAX = 10 ms
-
-RIL_ALGORITHM = Q
-RIL_DISCOUNT_BETA = 0.7
-RIL_GRADIENT_STEP_SIZE = 0.3
-RIL_TRACE_DECAY = 0.2
-RIL_EXPLORE_RATIO = 0.1
-RIL_GLOBAL_REWARD_SHARE = 1
-
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index d1ddcb96f..8f700951c 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -19,7 +19,7 @@ REFRESH_CONNECTION_TIME = 5 min
 # Percentage of packets CADET is artificially dropping. Used for testing only!
 # DROP_PERCENT =
 
-# How frequently do we usually anounce our presence in the DHT?
+# How frequently do we usually announce our presence in the DHT?
 ID_ANNOUNCE_TIME = 1 h
 
 # FIXME: document
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 4f17fa359..67b366405 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -63,7 +63,7 @@ START_ON_DEMAND = NO
 START_ON_DEMAND = NO
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 
 # Disable IPv6 support
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 20739c45f..84e297081 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -72,10 +72,10 @@ def fail(result):
     cleanup(1)
 
 
-def r_something(to_run, extra_args, failer=None, normal=True, **kw):
+def r_something(to_run, extra_args, failure=None, normal=True, **kw):
     rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, **kw)
-    if failer is not None:
-        failer(to_run + extra_args, rc, stdo, stde, normal)
+    if failure is not None:
+        failure(to_run + extra_args, rc, stdo, stde, normal)
     return (rc, stdo, stde)
 
 
@@ -91,7 +91,7 @@ def r_put(extra_args, **kw):
     return r_something(run_put, extra_args, **kw)
 
 
-def end_arm_failer(command, rc, stdo, stde, normal):
+def end_arm_failure(command, rc, stdo, stde, normal):
     if normal:
         if rc != 0:
             fail(
@@ -107,7 +107,7 @@ def end_arm_failer(command, rc, stdo, stde, normal):
             )
 
 
-def print_only_failer(command, rc, stdo, stde, normal):
+def print_only_failure(command, rc, stdo, stde, normal):
     if normal:
         if rc != 0:
             print(
@@ -126,19 +126,19 @@ def print_only_failer(command, rc, stdo, stde, normal):
 
 
 print("TEST: Starting ARM...", end='')
-r_arm(['-s'], failer=end_arm_failer, want_stdo=False, want_stde=False)
+r_arm(['-s'], failure=end_arm_failure, want_stdo=False, want_stde=False)
 print("PASS")
 time.sleep(1)
 
 print("TEST: Testing put...", end='')
-r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failer=end_arm_failer)
+r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failure=end_arm_failure)
 print("PASS")
 time.sleep(1)
 
 print("TEST: Testing get...", end='')
 rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'],
                        want_stdo=True,
-                       failer=end_arm_failer)
+                       failure=end_arm_failure)
 stdo = stdo.decode('utf-8').replace('\r', '').splitlines()
 expect = "Result 0, type 8:\ntestdata".splitlines()
 if len(stdo) != 2 or len(expect
@@ -146,4 +146,4 @@ if len(stdo) != 2 or len(expect
     fail("output `{}' differs from expected `{}'".format(stdo, expect))
 print("PASS")
 
-r_arm(['-e', '-d'], failer=print_only_failer)
+r_arm(['-e', '-d'], failure=print_only_failure)
diff --git a/src/gns/gnunet-gns-proxy-ca.template b/src/gns/gnunet-gns-proxy-ca.template
index 541e3a355..b1a0d16fd 100644
--- a/src/gns/gnunet-gns-proxy-ca.template
+++ b/src/gns/gnunet-gns-proxy-ca.template
@@ -41,10 +41,10 @@ cn = "GNS Proxy CA"
 # An alternative way to set the certificate's distinguished name directly
 # is with the "dn" option. The attribute names allowed are:
 # C (country), street, O (organization), OU (unit), title, CN (common name),
-# L (locality), ST (state), placeOfBirth, gender, countryOfCitizenship, 
-# countryOfResidence, serialNumber, telephoneNumber, surName, initials, 
-# generationQualifier, givenName, pseudonym, dnQualifier, postalCode, name, 
-# businessCategory, DC, UID, jurisdictionOfIncorporationLocalityName, 
+# L (locality), ST (state), placeOfBirth, gender, countryOfCitizenship,
+# countryOfResidence, serialNumber, telephoneNumber, surName, initials,
+# generationQualifier, givenName, pseudonym, dnQualifier, postalCode, name,
+# businessCategory, DC, UID, jurisdictionOfIncorporationLocalityName,
 # jurisdictionOfIncorporationStateOrProvinceName,
 # jurisdictionOfIncorporationCountryName, XmppAddr, and numeric OIDs.
 
@@ -59,7 +59,7 @@ cn = "GNS Proxy CA"
 # Use -1 if there is no expiration date.
 expiration_days = 3650
 
-# Alternatively you may set concrete dates and time. The GNU date string 
+# Alternatively you may set concrete dates and time. The GNU date string
 # formats are accepted. See:
 # https://www.gnu.org/software/tar/manual/html_node/Date-input-formats.html
 
@@ -226,7 +226,7 @@ tls_www_server
 #honor_crq_ext = 2.5.29.17
 #honor_crq_ext = 2.5.29.15
 
-# Path length contraint. Sets the maximum number of
+# Path length constraint. Sets the maximum number of
 # certificates that can be used to certify this certificate.
 # (i.e. the certificate chain length)
 #path_len = -1
diff --git a/src/gns/openssl.cnf b/src/gns/openssl.cnf
index 503460f9f..a2561b9b2 100644
--- a/src/gns/openssl.cnf
+++ b/src/gns/openssl.cnf
@@ -15,7 +15,7 @@ oid_section		= new_oids
 # To use this configuration file with the "-extfile" option of the
 # "openssl x509" utility, name here the section containing the
 # X.509v3 extensions to use:
-# extensions		= 
+# extensions		=
 # (Alternatively, use a configuration file that has only
 # X.509v3 extensions in its main [= default] section.)
 
@@ -46,7 +46,7 @@ crl		= $dir/crl.pem 		# The current CRL
 private_key	= $dir/private/cakey.pem# The private key
 RANDFILE	= $dir/private/.rand	# private random number file
 
-x509_extensions	= usr_cert		# The extentions to add to the cert
+x509_extensions	= usr_cert		# The extensions to add to the cert
 
 # Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
 # so this is commented out by default to leave a V1 CRL.
@@ -89,13 +89,13 @@ default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 
 # Passwords for private keys if not present they will be prompted for
 # input_password = secret
 # output_password = secret
 
-# This sets a mask for permitted string types. There are several options. 
+# This sets a mask for permitted string types. There are several options.
 # default: PrintableString, T61String, BMPString.
 # pkix	 : PrintableString, BMPString.
 # utf8only: only UTF8Strings.
@@ -242,4 +242,3 @@ basicConstraints = CA:true
 
 # issuerAltName=issuer:copy
 authorityKeyIdentifier=keyid:always,issuer:always
-
diff --git a/src/namestore/test_namestore_put_multiple.sh b/src/namestore/test_namestore_put_multiple.sh
index 81e1ad2b5..f33fb1c3a 100644
--- a/src/namestore/test_namestore_put_multiple.sh
+++ b/src/namestore/test_namestore_put_multiple.sh
@@ -15,7 +15,7 @@ if [ 0 -ne $ret ]; then
 fi
 
 ## GNUNET part
-# Check if identity exists and delets and readds it to get rid of entries in zone
+# Check if identity exists and deletes and readds it to get rid of entries in zone
 gnunet-identity -d | grep randomtestingid 2>&1 /dev/null
 ret=$?
 
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index cb018cecd..e139d0c05 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -14,7 +14,7 @@ PUNCHED_NAT = NO
 # Disable UPNP by default until it gets cleaner!
 ENABLE_UPNP = YES
 
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 
 # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
@@ -34,4 +34,3 @@ ENABLE_ICMP_SERVER = NO
 
 # Disable IPv6 support
 DISABLEV6 = NO
-
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index 03850ec06..ca78ca9f3 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -18,14 +18,14 @@ PUNCHED_NAT = YES
 # Disable UPNP by default until it gets cleaner!
 ENABLE_UPNP = NO
 
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 RETURN_LOCAL_ADDRESSES = YES
 
 # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
-# normal interface IP address for non-NATed peers; 
+# normal interface IP address for non-NATed peers;
 # possibly auto-detected (using UPnP) if possible if not specified
-# EXTERNAL_ADDRESS = 
+# EXTERNAL_ADDRESS =
 
 # Should we use ICMP-based NAT traversal to try connect to NATed peers
 # or, if we are behind NAT, to allow connections to us?
@@ -33,7 +33,7 @@ ENABLE_ICMP_CLIENT = NO
 ENABLE_ICMP_SERVER = NO
 
 # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
-# normal interface IP address for non-NATed peers; 
+# normal interface IP address for non-NATed peers;
 # likely auto-detected (via interface list) if not specified (!)
 INTERNAL_ADDRESS = 127.0.0.1
 
@@ -43,5 +43,3 @@ DISABLEV6 = YES
 
 [nse]
 START_ON_DEMAND = NO
-
-
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index 6330254e9..0ac5621aa 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -11,7 +11,7 @@ UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat
 
-# The directory where the NSE services logs timestamps everytime
+# The directory where the NSE services logs timestamps every time
 # a size estime flooding message is received
 # This option is only used for benchmarking, not in production.
 HISTOGRAM_DIR = $GNUNET_CACHE_HOME/nse/histogram
diff --git a/src/rps/profiler_rps.conf b/src/rps/profiler_rps.conf
index 5edd6d3ff..89e5e35f2 100644
--- a/src/rps/profiler_rps.conf
+++ b/src/rps/profiler_rps.conf
@@ -52,7 +52,7 @@ SETUP_TIMEOUT = 1 h
 WORKBITS = 0
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 ENABLE_UPNP = NO
 
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in
index 9619c9889..8c7098747 100644
--- a/src/rps/rps.conf.in
+++ b/src/rps/rps.conf.in
@@ -27,7 +27,7 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt
 # So, 50 is enough for a network of size 50^3 = 125000
 MINSIZE = 10
 
-# The probability whith which we want a sampler element to have observed all
+# The probability with which we want a sampler element to have observed all
 # peer ids in the network at least
 DESIRED_PROBABILITY = 0.9
 
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index 68f3982ec..2b1101786 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -51,7 +51,7 @@ SETUP_TIMEOUT = 2 m
 WORKBITS = 0
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 ENABLE_UPNP = NO
 
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index 7c8e45480..9cbe3ebb1 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -22,7 +22,7 @@ OVERLAY_TOPOLOGY = CLIQUE
 SERVERS =
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 
 # Disable IPv6 support
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 21fe984f8..f9b4547e9 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES
 NO_IO = YES
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 
 # Disable IPv6 support
diff --git a/src/seti/test_seti.conf b/src/seti/test_seti.conf
index c87433419..aa4678b49 100644
--- a/src/seti/test_seti.conf
+++ b/src/seti/test_seti.conf
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES
 NO_IO = YES
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 
 # Disable IPv6 support
diff --git a/src/setu/test_setu.conf b/src/setu/test_setu.conf
index 4eaf3f0c0..6d132fc1f 100644
--- a/src/setu/test_setu.conf
+++ b/src/setu/test_setu.conf
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES
 NO_IO = YES
 
 [nat]
-# Use addresses from the local network interfaces (inluding loopback, but also others)
+# Use addresses from the local network interfaces (including loopback, but also others)
 USE_LOCALADDR = YES
 
 # Disable IPv6 support
diff --git a/src/testbed/barriers.README.org b/src/testbed/barriers.README.org
index 40488a0cc..159e1c355 100644
--- a/src/testbed/barriers.README.org
+++ b/src/testbed/barriers.README.org
@@ -11,7 +11,7 @@ the barrier.  A barrier which is reached is deemed as crossed after all the
 peers waiting on it are notified.
 
 The barriers API provides the following functions:
-1) GNUNET_TESTBED_barrier_init(): function to initialse a barrier in the
+1) GNUNET_TESTBED_barrier_init(): function to initialise a barrier in the
    experiment
 2) GNUNET_TESTBED_barrier_cancel(): function to cancel a barrier which has been
    initialised before
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index ac0c9c400..2e9c0038d 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -12,7 +12,7 @@ PORT = 12366
 [test-barriers]
 START_ON_DEMAND = NO
 PORT = 12114
-BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
+BINARY = /will/be/overwritten/in/test_testbed_api_barriers/
 IMMEDIATE_START = YES
 
 [fs]
diff --git a/src/util/util.conf b/src/util/util.conf
index d8613f653..4f0860a49 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -14,7 +14,7 @@ GNUNET_HOME = ${GNUNET_TEST_HOME:-${HOME:-${USERPROFILE}}}
 # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 # for how these should be used.
 
-# Persistant data storage
+# Persistent data storage
 GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/
 
 # Configuration files