summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-04-27 23:29:48 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2021-04-28 10:25:39 +0200
commit1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd (patch)
treeb2c2e39f0815220bc8f23af2c97dbe4d4612ad0e
parent5e347ac9df8b49503a1fdfa38707a99a6b2b3b0c (diff)
- fix misc typos
-rw-r--r--doc/man/gnunet-resolver.12
-rw-r--r--doc/man/gnunet-scalarproduct.12
-rw-r--r--doc/man/gnunet-vpn.12
-rw-r--r--doc/release_policy.rfc.txt2
-rw-r--r--m4/freetype2.m42
-rw-r--r--m4/glib-2.0.m424
-rw-r--r--m4/gtk-2.0.m420
-rw-r--r--m4/libxml2.m414
-rw-r--r--m4/pkg.m44
-rw-r--r--pkgconfig/gnunet_config.h.in2
-rw-r--r--pkgconfig/gnunetdatastore.pc.in2
-rwxr-xr-xsrc/abd/test_abd_own.sh3
-rw-r--r--src/arm/arm.conf.in2
-rw-r--r--src/arm/test_gnunet_arm.py.in20
-rw-r--r--src/ats/ats.conf.in48
-rw-r--r--src/ats/perf_ats_solver.conf51
-rw-r--r--src/cadet/cadet.conf.in2
-rw-r--r--src/consensus/test_consensus.conf2
-rw-r--r--src/dht/test_dht_tools.py.in18
-rw-r--r--src/gns/gnunet-gns-proxy-ca.template12
-rw-r--r--src/gns/openssl.cnf9
-rw-r--r--src/namestore/test_namestore_put_multiple.sh2
-rw-r--r--src/nat/test_nat_data.conf3
-rw-r--r--src/nat/test_nat_test_data.conf10
-rw-r--r--src/nse/nse.conf.in2
-rw-r--r--src/rps/profiler_rps.conf2
-rw-r--r--src/rps/rps.conf.in2
-rw-r--r--src/rps/test_rps.conf2
-rw-r--r--src/secretsharing/test_secretsharing.conf2
-rw-r--r--src/set/test_set.conf2
-rw-r--r--src/seti/test_seti.conf2
-rw-r--r--src/setu/test_setu.conf2
-rw-r--r--src/testbed/barriers.README.org2
-rw-r--r--src/testbed/test_testbed_api_barriers.conf.in2
-rw-r--r--src/util/util.conf2
35 files changed, 90 insertions, 190 deletions
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 71ec25b77..8dc63ff06 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -38,7 +38,7 @@
.Ao Ar hostname Ac
.Sh DESCRIPTION
.Nm
-allows you to use the build-in GNUnet stub resolver.
+allows you to use the built-in GNUnet stub resolver.
.Bl -tag -width indent
.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
Use the configuration file FILENAME.
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index ff0bcb6e1..725eccba3 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -54,7 +54,7 @@ Elements to support a peer in computing a vectorproduct (Bob)
.Pp
Both requests must share the same SID, which can be an arbitrary
string identifying the session. SIDs should be unique, however it is
-sufficient to guarantee the uniqueness of the tupel element count and
+sufficient to guarantee the uniqueness of the tuple element count and
session ID.
.Pp
Alice's client must supply the ASCII encoded peer ID of bob's
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index 210476b79..7e2303f45 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -80,7 +80,7 @@ Use the configuration file FILENAME.
The mapping should be established for TIME.
The value given must be a number followed by a space and a time unit, for example "500 ms".
Note that the quotes are required on the shell.
-The default vaue is 5 minutes.
+The default value is 5 minutes.
.It Fl h | -help
Print short help on options.
.It Fl i Ar IP | Fl -ip Ar IP
diff --git a/doc/release_policy.rfc.txt b/doc/release_policy.rfc.txt
index e13e72f43..e9e9eae99 100644
--- a/doc/release_policy.rfc.txt
+++ b/doc/release_policy.rfc.txt
@@ -65,7 +65,7 @@ III. Concerns (of team members)
(if there are concerns of team members, write them down here to later
review)
-I disagree that "bugs tend to accumulate until they are not managable".
+I disagree that "bugs tend to accumulate until they are not manageable".
The real issue is that neither writing testcases nor fixing bugs are
fun tasks volunteers like to do. As you write yourself: you want a
sense of achievement, recognition, "new features". So as long as that
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
index 7424a32ab..f03906e9d 100644
--- a/m4/freetype2.m4
+++ b/m4/freetype2.m4
@@ -162,7 +162,7 @@ main()
The FreeType test program failed to run. If your system uses
shared libraries and they are installed outside the normal
system library path, make sure the variable LD_LIBRARY_PATH
- (or whatever is appropiate for your system) is correctly set.
+ (or whatever is appropriate for your system) is correctly set.
])
fi
fi
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
index 13a3ce68f..e8ac8522e 100644
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@@ -2,11 +2,11 @@
# Owen Taylor 1997-2001
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
dnl gthread is specified in MODULES, pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl
+[dnl
dnl Get the cflags and libraries from pkg-config
dnl
AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
@@ -16,13 +16,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
for module in . $4
do
case "$module" in
- gmodule)
+ gmodule)
pkg_config_args="$pkg_config_args gmodule-2.0"
;;
- gobject)
+ gobject)
pkg_config_args="$pkg_config_args gobject-2.0"
;;
- gthread)
+ gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
@@ -89,7 +89,7 @@ dnl
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
@@ -108,17 +108,17 @@ main ()
(glib_minor_version != $glib_config_minor_version) ||
(glib_micro_version != $glib_config_micro_version))
{
- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n");
- }
+ }
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) ||
(glib_micro_version != GLIB_MICRO_VERSION))
@@ -149,7 +149,7 @@ main ()
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
@@ -162,7 +162,7 @@ main ()
fi
if test "x$no_glib" = x ; then
AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then
@@ -191,7 +191,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
+ echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
diff --git a/m4/gtk-2.0.m4 b/m4/gtk-2.0.m4
index 3deba01be..a1059264e 100644
--- a/m4/gtk-2.0.m4
+++ b/m4/gtk-2.0.m4
@@ -2,11 +2,11 @@
# Owen Taylor 1997-2001
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl
+[dnl
dnl Get the cflags and libraries from pkg-config
dnl
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
@@ -16,7 +16,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
for module in . $4
do
case "$module" in
- gthread)
+ gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
@@ -79,7 +79,7 @@ dnl
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
@@ -98,17 +98,17 @@ main ()
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n");
- }
+ }
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
@@ -139,7 +139,7 @@ main ()
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
@@ -152,7 +152,7 @@ main ()
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then
@@ -181,7 +181,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+ echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
index 68cd8242f..2865b54f8 100644
--- a/m4/libxml2.m4
+++ b/m4/libxml2.m4
@@ -9,7 +9,7 @@
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
dnl
-AC_DEFUN([AM_PATH_XML2],[
+AC_DEFUN([AM_PATH_XML2],[
AC_ARG_WITH(xml-prefix,
[ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
xml_config_prefix="$withval", xml_config_prefix="")
@@ -64,7 +64,7 @@ dnl
#include <string.h>
#include <libxml/xmlversion.h>
-int
+int
main()
{
int xml_major_version, xml_minor_version, xml_micro_version;
@@ -100,9 +100,9 @@ main()
printf("*** xml2-config (version %d.%d.%d)\n",
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
return 1;
- }
+ }
/* Compare the headers to the library to make sure we match */
- /* Less than ideal -- doesn't provide us with return value feedback,
+ /* Less than ideal -- doesn't provide us with return value feedback,
* only exits if there's a serious mismatch between header and library.
*/
LIBXML_TEST_VERSION;
@@ -128,7 +128,7 @@ main()
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
printf("*** correct copy of xml2-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
return 1;
@@ -141,7 +141,7 @@ main()
if test "x$no_xml" = x ; then
AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$XML2_CONFIG" = "no" ; then
@@ -170,7 +170,7 @@ main()
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
+ echo "*** exact error that occurred. This usually means LIBXML was incorrectly installed"
echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
CPPFLAGS="$ac_save_CPPFLAGS"
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index 4688002e4..bba798444 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -86,7 +86,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
@@ -156,7 +156,7 @@ if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
diff --git a/pkgconfig/gnunet_config.h.in b/pkgconfig/gnunet_config.h.in
index 9ffb6a2e2..7e6150f27 100644
--- a/pkgconfig/gnunet_config.h.in
+++ b/pkgconfig/gnunet_config.h.in
@@ -730,7 +730,7 @@
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
-/* Need with solaris or errno doesnt work */
+/* Need with solaris or errno doesn't work */
#undef _REENTRANT
/* This is a Windows system */
diff --git a/pkgconfig/gnunetdatastore.pc.in b/pkgconfig/gnunetdatastore.pc.in
index 249426a0d..69ff505f5 100644
--- a/pkgconfig/gnunetdatastore.pc.in
+++ b/pkgconfig/gnunetdatastore.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
Name: GNUnet datastore
-Description: Management API for the datastore for persistant storage to disk
+Description: Management API for the datastore for persistent storage to disk
URL: http://gnunet.org
Version: @VERSION@
Requires:
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