T8410: Fix typos and mistakes for comments and messages

Fix typos and mistakes
No functional changes

15 files changed, 21 insertions, 22 deletions

diff --git a/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper b/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper
index 7c119b0dd..bd111d282 100644
--- a/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper
+++ b/src/etc/dhcp/dhclient-enter-hooks.d/03-vyos-ipwrapper
@@ -141,7 +141,7 @@ function ip () {
         return $?
     fi
 
-    # pass comand to system `ip` if this is not related to routes change
+    # pass command to system `ip` if this is not related to routes change
     if [ "$2" != "route" ] ; then
         logmsg info "Passing command to /usr/sbin/ip: \"$@\""
         /usr/sbin/ip $@
diff --git a/src/migration-scripts/quagga/11-to-12 b/src/migration-scripts/quagga/11-to-12
index 6aee33c5f..ae8cabc63 100644
--- a/src/migration-scripts/quagga/11-to-12
+++ b/src/migration-scripts/quagga/11-to-12
@@ -23,7 +23,7 @@ static_base = ['protocols', 'static']
 
 def migrate(config: ConfigTree) -> None:
     # Check for static route/route6 configuration
-    # Migrate static BFD configuration to match FRR possibillities
+    # Migrate static BFD configuration to match FRR possibilities
     for route_route6 in ['route', 'route6']:
         route_route6_base = static_base + [route_route6]
         if not config.exists(route_route6_base):
diff --git a/src/migration-scripts/quagga/8-to-9 b/src/migration-scripts/quagga/8-to-9
index 4c7089c52..7eed424eb 100644
--- a/src/migration-scripts/quagga/8-to-9
+++ b/src/migration-scripts/quagga/8-to-9
@@ -20,10 +20,10 @@ from vyos.template import is_ip
 
 def migrate_interface_route(config, base, path, route_route6):
     """ Generic migration function which can be called on every instance of
-    interface-route, beeing it ipv4, ipv6 or nested under the "static table" nodes.
+    interface-route, being it ipv4, ipv6 or nested under the "static table" nodes.
 
     What we do?
-      - Drop 'interface-route' or 'interface-route6' and migrate the route unter the
+      - Drop 'interface-route' or 'interface-route6' and migrate the route under the
         'route' or 'route6' tag node.
     """
     if config.exists(base + path):
@@ -49,7 +49,7 @@ def migrate_interface_route(config, base, path, route_route6):
 
 def migrate_route(config, base, path, route_route6):
     """ Generic migration function which can be called on every instance of
-    route, beeing it ipv4, ipv6 or even nested under the static table nodes.
+    route, being it ipv4, ipv6 or even nested under the static table nodes.
 
     What we do?
       - for consistency reasons rename next-hop-interface to interface
@@ -61,7 +61,7 @@ def migrate_route(config, base, path, route_route6):
             if config.exists(next_hop):
                 for gateway in config.list_nodes(next_hop):
                     # IPv4 routes calls it next-hop-interface, rename this to
-                    # interface instead so it's consitent with IPv6
+                    # interface instead so it's consistent with IPv6
                     interface_path = next_hop + [gateway, 'next-hop-interface']
                     if config.exists(interface_path):
                         config.rename(interface_path, 'interface')
@@ -76,7 +76,7 @@ def migrate_route(config, base, path, route_route6):
             if config.exists(next_hop):
                 for interface in config.list_nodes(next_hop):
                     # IPv4 routes calls it next-hop-interface, rename this to
-                    # interface instead so it's consitent with IPv6
+                    # interface instead so it's consistent with IPv6
                     interface_path = next_hop + [interface, 'next-hop-interface']
                     if config.exists(interface_path):
                         config.rename(interface_path, 'interface')
diff --git a/src/op_mode/generate_interfaces_debug_archive.py b/src/op_mode/generate_interfaces_debug_archive.py
index 60b3ed691..cf1f23c42 100755
--- a/src/op_mode/generate_interfaces_debug_archive.py
+++ b/src/op_mode/generate_interfaces_debug_archive.py
@@ -54,7 +54,7 @@ CMD_INTERFACES_LIST: list[str] = [
     "ethtool --phy-statistics "
 ]
 
-# get intefaces info
+# get interfaces info
 interfaces_list = os.popen('ls /sys/class/net/').read().split()
 
 # modify CMD_INTERFACES_LIST for all interfaces
diff --git a/src/opt/vyatta/share/vyatta-op/functions/interpreter/vyatta-op-run b/src/opt/vyatta/share/vyatta-op/functions/interpreter/vyatta-op-run
index 7c183222a..3cccb9154 100644
--- a/src/opt/vyatta/share/vyatta-op/functions/interpreter/vyatta-op-run
+++ b/src/opt/vyatta/share/vyatta-op/functions/interpreter/vyatta-op-run
@@ -20,7 +20,7 @@
 
 _vyatta_op_init ()
 {
-    # empty and default line compeletion
+    # empty and default line completion
     complete -E -F _vyatta_op_expand
     complete -D -F _vyatta_op_default_expand
 
diff --git a/src/services/vyos-network-event-logger b/src/services/vyos-network-event-logger
index 135cc8ec5..699c57b1a 100644
--- a/src/services/vyos-network-event-logger
+++ b/src/services/vyos-network-event-logger
@@ -732,7 +732,7 @@ class RouteFormatter(BaseMSGFormatter):
             message += self._format_rta_pref(msg.get_attr("RTA_PREF"))
 
         if msg.get_attr('RTA_TTL_PROPAGATE') is not None:
-            message += f' ttl-propogate {"enabled" if msg.get_attr("RTA_TTL_PROPAGATE") else "disabled"}'
+            message += f' ttl-propagate {"enabled" if msg.get_attr("RTA_TTL_PROPAGATE") else "disabled"}'
 
         if msg.get_attr('RTA_MULTIPATH') is not None:
             _tmp = self._format_rta_multipath(
diff --git a/src/shim/mkjson/mkjson.c b/src/shim/mkjson/mkjson.c
index 1172664fb..58ab455c5 100644
--- a/src/shim/mkjson/mkjson.c
+++ b/src/shim/mkjson/mkjson.c
@@ -279,7 +279,7 @@ char *mkjson( enum mkjson_container_type otype, int count, ... )
 			for ( i = 0; i < count; i++ )
 			{
 				// Add separators:
-				// - not on the begining
+				// - not on the beginning
 				// - always after valid chunk
 				// - between two valid chunks
 				// - between valid and ignored chunk if the latter isn't the last one
@@ -304,4 +304,3 @@ char *mkjson( enum mkjson_container_type otype, int count, ... )
 
 	return json;
 }
-
diff --git a/src/system/grub_update.py b/src/system/grub_update.py
index a5bf0bdeb..0477cfa99 100644
--- a/src/system/grub_update.py
+++ b/src/system/grub_update.py
@@ -58,7 +58,7 @@ if __name__ == '__main__':
     vyos_menuentries = compat.parse_menuentries(grub_cfg_main)
     vyos_versions = compat.find_versions(vyos_menuentries)
     unparsed_items = compat.filter_unparsed(grub_cfg_main)
-    # compatibilty for raid installs
+    # compatibility for raid installs
     search_root = compat.get_search_root(unparsed_items)
     common_dict = {}
     common_dict['search_root'] = search_root
diff --git a/src/system/keepalived-fifo.py b/src/system/keepalived-fifo.py
index 21c261099..c6c3fa9d0 100755
--- a/src/system/keepalived-fifo.py
+++ b/src/system/keepalived-fifo.py
@@ -55,7 +55,7 @@ class KeepalivedFifo:
         self._config_load()
         self.pipe_path = cmd_args.PIPE
 
-        # create queue for messages and events for syncronization
+        # create queue for messages and events for synchronization
         self.message_queue = Queue(maxsize=100)
         self.stopme = threading.Event()
         self.message_event = threading.Event()
@@ -111,7 +111,7 @@ class KeepalivedFifo:
             # wait for a new message event from pipe_wait
             self.message_event.wait()
             try:
-                # clear mesage event flag
+                # clear message event flag
                 self.message_event.clear()
                 # get all messages from queue and try to process them
                 while self.message_queue.empty() is not True:
diff --git a/src/system/standalone_root_pw_reset b/src/system/standalone_root_pw_reset
index c2eea9411..9a7da8e4c 100755
--- a/src/system/standalone_root_pw_reset
+++ b/src/system/standalone_root_pw_reset
@@ -64,7 +64,7 @@ change_password() {
 dead() {
     echo $*
     echo
-    echo "This tool can only recover missing admininistrator password."
+    echo "This tool can only recover missing administrator password."
     echo "It is not a full system restore"
     echo
     echo -n "Hit return to reboot system: "
diff --git a/src/system/vyos-event-handler.py b/src/system/vyos-event-handler.py
index 7fc21bae4..bb1a42ee9 100755
--- a/src/system/vyos-event-handler.py
+++ b/src/system/vyos-event-handler.py
@@ -134,7 +134,7 @@ if __name__ == '__main__':
         )
         exit(1)
 
-    # Prepare for proper exitting
+    # Prepare for proper exiting
     signal(SIGTERM, handle_signal)
     signal(SIGINT, handle_signal)
 
diff --git a/src/systemd/vyos-system-update.service b/src/systemd/vyos-system-update.service
index 032e5a14c..0e62a1814 100644
--- a/src/systemd/vyos-system-update.service
+++ b/src/systemd/vyos-system-update.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=VyOS system udpate-check service
+Description=VyOS system update-check service
 After=network.target vyos-router.service
 
 [Service]
diff --git a/src/udev/vyos_net_name b/src/udev/vyos_net_name
index 6ad7af2d6..568734cb7 100755
--- a/src/udev/vyos_net_name
+++ b/src/udev/vyos_net_name
@@ -43,7 +43,7 @@ def is_available(intfs: dict, intf_name: str) -> bool:
 
 
 def find_available(intfs: dict, prefix: str) -> str:
-    """Find lowest indexed iterface name that is not assigned"""
+    """Find lowest indexed interface name that is not assigned"""
     index_list = [
         int(x.replace(prefix, '')) for x in list(intfs.values()) if prefix in x
     ]
@@ -72,7 +72,7 @@ def mod_ifname(ifname: str) -> str:
 def get_biosdevname(ifname: str) -> str:
     """Use legacy vyatta-biosdevname to query for name
 
-    This is carried over for compatability only, and will likely be dropped
+    This is carried over for compatibility only, and will likely be dropped
     going forward.
     XXX: This throws an error, and likely has for a long time, unnoticed
     since vyatta_net_name redirected stderr to /dev/null.
diff --git a/src/validators/bgp-large-community b/src/validators/bgp-large-community
index e322c653c..2b9ef7a8a 100755
--- a/src/validators/bgp-large-community
+++ b/src/validators/bgp-large-community
@@ -48,6 +48,6 @@ if __name__ == '__main__':
         print("Invalid community format")
         exit(1)
 
-    # fail if none of validators catched the value
+    # fail if none of validators caught the value
     print("Invalid community format")
     exit(1)
\ No newline at end of file
diff --git a/src/validators/bgp-regular-community b/src/validators/bgp-regular-community
index 0cc7f8fc3..6df3e8d5d 100755
--- a/src/validators/bgp-regular-community
+++ b/src/validators/bgp-regular-community
@@ -45,6 +45,6 @@ if __name__ == '__main__':
         print("Invalid community format")
         exit(1)
 
-    # fail if none of validators catched the value
+    # fail if none of validators caught the value
     print("Invalid community format")
     exit(1)
\ No newline at end of file