diff --git a/binutils/po/aa_enabled.pot b/binutils/po/aa_enabled.pot index 09e18546c..8f3a23f7d 100644 --- a/binutils/po/aa_enabled.pot +++ b/binutils/po/aa_enabled.pot @@ -22,7 +22,7 @@ msgstr "" msgid "" "%s: [options]\n" " options:\n" -" -x | --exclusive Shared interfaces must be availabe\n" +" -x | --exclusive Shared interfaces must be available\n" " -q | --quiet Don't print out any messages\n" " -h | --help Print help\n" msgstr "" diff --git a/parser/mount.cc b/parser/mount.cc index 237b844f4..768754aa5 100644 --- a/parser/mount.cc +++ b/parser/mount.cc @@ -457,7 +457,7 @@ ostream &mnt_rule::dump(ostream &os) else if (allow & AA_MAY_PIVOTROOT) os << "pivotroot"; else - os << "error: unknonwn mount perm"; + os << "error: unknown mount perm"; os << " (0x" << hex << flags << " - 0x" << inv_flags << ") "; if (dev_type) { diff --git a/parser/parser_symtab.c b/parser/parser_symtab.c index 7b8f211b7..89ae432e9 100644 --- a/parser/parser_symtab.c +++ b/parser/parser_symtab.c @@ -847,13 +847,13 @@ int main(void) MY_TEST(retval == 0, "get boolean variable 2"); retval = get_boolean_var("non_existant"); - MY_TEST(retval < 0, "get nonexistant boolean variable"); + MY_TEST(retval < 0, "get nonexistent boolean variable"); retval = get_boolean_var("stereopuff"); MY_TEST(retval < 0, "get boolean variable that's declared a set var"); retptr = get_set_var("daves_not_here_man"); - MY_TEST(retptr == NULL, "get non-existent set variable"); + MY_TEST(retptr == NULL, "get nonexistent set variable"); retptr = get_set_var("abuse"); MY_TEST(retptr == NULL, "get set variable that's declared a boolean"); diff --git a/tests/regression/apparmor/dbus_service.c b/tests/regression/apparmor/dbus_service.c index b4c52b1b9..cc1737b12 100644 --- a/tests/regression/apparmor/dbus_service.c +++ b/tests/regression/apparmor/dbus_service.c @@ -68,7 +68,7 @@ static int handle_messages(void) DBusMessage *message; if (!dbus_connection_read_write(connection, 250)) { - fprintf(stderr, "FAIL: Connecion is closed\n"); + fprintf(stderr, "FAIL: Connection is closed\n"); return -1; } diff --git a/utils/aa-notify b/utils/aa-notify index 585766763..7eb036887 100755 --- a/utils/aa-notify +++ b/utils/aa-notify @@ -493,7 +493,7 @@ def main(): found_config_keys = config[''].keys() unknown_keys = [item for item in found_config_keys if item not in allowed_config_keys] for item in unknown_keys: - print(_('Warning! Configration item "{}" is unknown!').format(item)) + print(_('Warning! Configuration item "{}" is unknown!').format(item)) # Warn if use_group is defined and current group does not match defined if 'use_group' in config['']: diff --git a/utils/apparmor/fail.py b/utils/apparmor/fail.py index 6a0c57e8c..af7ee9c31 100644 --- a/utils/apparmor/fail.py +++ b/utils/apparmor/fail.py @@ -46,7 +46,7 @@ def handle_exception(*exc_info): print(''.join(traceback.format_exception(*exc_info)), file=sys.stderr) print('', file=sys.stderr) - print('An unexpected error occoured!', file=sys.stderr) + print('An unexpected error occurred!', file=sys.stderr) print('', file=sys.stderr) print('For details, see %s' % path, file=sys.stderr) print('Please consider reporting a bug at https://gitlab.com/apparmor/apparmor/-/issues', file=sys.stderr)