T8410: Fix typos and mistakes for comments and messages

Fix typos and mistakes
No functional changes

43 files changed, 65 insertions, 66 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index caabab3d9..fadbebdc9 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -28,7 +28,7 @@ the box, please use [x]
 <!---
 Please describe in detail how you tested your changes. Include details of your testing
 environment, and the tests you ran. When pasting configs, logs, shell output, backtraces,
-and other large chunks of text, surround this text with triple backtics
+and other large chunks of text, surround this text with triple backticks
 ```
 like this
 ```
diff --git a/data/templates/ipsec/charon.j2 b/data/templates/ipsec/charon.j2
index a9108eeda..bafdaf157 100644
--- a/data/templates/ipsec/charon.j2
+++ b/data/templates/ipsec/charon.j2
@@ -6,7 +6,7 @@ charon {
     # Maximum number of half-open IKE_SAs for a single peer IP.
     # block_threshold = 5
 
-    # Whether Certicate Revocation Lists (CRLs) fetched via HTTP or LDAP should
+    # Whether Certificate Revocation Lists (CRLs) fetched via HTTP or LDAP should
     # be saved under a unique file name derived from the public key of the
     # Certification Authority (CA) to /etc/ipsec.d/crls (stroke) or
     # /etc/swanctl/x509crl (vici), respectively.
diff --git a/data/templates/wifi/hostapd.conf.j2 b/data/templates/wifi/hostapd.conf.j2
index 5f3757216..33a0703a3 100644
--- a/data/templates/wifi/hostapd.conf.j2
+++ b/data/templates/wifi/hostapd.conf.j2
@@ -3133,7 +3133,7 @@ own_ip_addr=127.0.0.1
 
 # WAN Metrics
 # format: <WAN Info>:<DL Speed>:<UL Speed>:<DL Load>:<UL Load>:<LMD>
-# WAN Info: B0-B1: Link Status, B2: Symmetric Link, B3: At Capabity
+# WAN Info: B0-B1: Link Status, B2: Symmetric Link, B3: At Capability
 #    (encoded as two hex digits)
 #    Link Status: 1 = Link up, 2 = Link down, 3 = Link in test state
 # Downlink Speed: Estimate of WAN backhaul link current downlink speed in kbps;
@@ -3261,7 +3261,7 @@ own_ip_addr=127.0.0.1
 # FST is the transfer of a session from a channel to another channel, in the
 # same or different frequency bands.
 #
-# For detals, see IEEE Std 802.11ad-2012.
+# For details, see IEEE Std 802.11ad-2012.
 
 # Identifier of an FST Group the interface belongs to.
 #fst_group_id=bond0
diff --git a/interface-definitions/include/accel-ppp/auth-mode.xml.i b/interface-definitions/include/accel-ppp/auth-mode.xml.i
index ccaed6f04..476cf7b62 100644
--- a/interface-definitions/include/accel-ppp/auth-mode.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-mode.xml.i
@@ -8,7 +8,7 @@
     </valueHelp>
     <valueHelp>
       <format>radius</format>
-      <description>Use RADIUS server for user autentication</description>
+      <description>Use RADIUS server for user authentication</description>
     </valueHelp>
     <valueHelp>
       <format>noauth</format>
diff --git a/interface-definitions/include/auth-psk-secret.xml.i b/interface-definitions/include/auth-psk-secret.xml.i
index 24257dcab..4577d2ac1 100644
--- a/interface-definitions/include/auth-psk-secret.xml.i
+++ b/interface-definitions/include/auth-psk-secret.xml.i
@@ -9,7 +9,7 @@
     <constraint>
       <validator name="psk-secret"/>
     </constraint>
-    <constraintErrorMessage>Pre-Shared-Keys must be at leas 16 bytes long, which implies at least 32 characterss</constraintErrorMessage>
+    <constraintErrorMessage>Pre-Shared-Keys must be at least 16 bytes long, which implies at least 32 characters</constraintErrorMessage>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/rip/timers.xml.i b/interface-definitions/include/rip/timers.xml.i
index 771a6700e..e8b9d99c6 100644
--- a/interface-definitions/include/rip/timers.xml.i
+++ b/interface-definitions/include/rip/timers.xml.i
@@ -9,7 +9,7 @@
         <help>Garbage collection timer</help>
         <valueHelp>
           <format>u32:5-2147483647</format>
-          <description>Garbage colletion time</description>
+          <description>Garbage collection time</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 5-2147483647"/>
diff --git a/interface-definitions/service_dns_dynamic.xml.in b/interface-definitions/service_dns_dynamic.xml.in
index 9f8f1a1b5..99103ec73 100644
--- a/interface-definitions/service_dns_dynamic.xml.in
+++ b/interface-definitions/service_dns_dynamic.xml.in
@@ -52,7 +52,7 @@
                           #include <include/url-http-https.xml.i>
                           <leafNode name="skip">
                             <properties>
-                              <help>Pattern to skip from the HTTP(S) respose</help>
+                              <help>Pattern to skip from the HTTP(S) response</help>
                               <valueHelp>
                                 <format>txt</format>
                                 <description>Pattern to skip from the HTTP(S) response to extract the external IP address</description>
diff --git a/interface-definitions/service_snmp.xml.in b/interface-definitions/service_snmp.xml.in
index bdc9f88fe..be4c2f6cc 100644
--- a/interface-definitions/service_snmp.xml.in
+++ b/interface-definitions/service_snmp.xml.in
@@ -15,7 +15,7 @@
               <constraint>
                 <regex>[[:alnum:]\-_!@*#]{1,100}</regex>
               </constraint>
-              <constraintErrorMessage>Community string is limited to alphanumerical characters, -, _, !, @, *, and # with a total lenght of 100</constraintErrorMessage>
+              <constraintErrorMessage>Community string is limited to alphanumerical characters, -, _, !, @, *, and # with a total length of 100</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="authorization">
diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py
index c70190e38..3c4c86f4b 100644
--- a/python/vyos/ifconfig/ethernet.py
+++ b/python/vyos/ifconfig/ethernet.py
@@ -518,7 +518,7 @@ class EthernetIf(Interface):
         cmd = f'ethtool --set-channels {ifname} {rx_tx_comb} {queues}'
         output, code = self._popen(cmd)
         # ethtool error codes:
-        #  80 - value already setted
+        #  80 - value already set
         #  81 - does not possible to set value
         if code and code != 80:
             print(f'could not set "{rx_tx_comb}" channel for {ifname}')
diff --git a/python/vyos/ifconfig/pppoe.py b/python/vyos/ifconfig/pppoe.py
index 2a89cbddd..7c4a6dfbb 100644
--- a/python/vyos/ifconfig/pppoe.py
+++ b/python/vyos/ifconfig/pppoe.py
@@ -102,9 +102,9 @@ class PPPoEIf(Interface):
         self.set_interface('accept_ra_defrtr', enable)
 
     def update(self, config):
-        """ General helper function which works on a dictionary retrived by
+        """ General helper function which works on a dictionary retrieved by
         get_config_dict(). It's main intention is to consolidate the scattered
-        interface setup code and provide a single point of entry when workin
+        interface setup code and provide a single point of entry when working
         on any interface. """
 
         # Cache the configuration - it will be reused inside e.g. DHCP handler
diff --git a/python/vyos/ifconfig/tunnel.py b/python/vyos/ifconfig/tunnel.py
index eb8fcdd1f..befaed8fd 100644
--- a/python/vyos/ifconfig/tunnel.py
+++ b/python/vyos/ifconfig/tunnel.py
@@ -163,7 +163,7 @@ class TunnelIf(Interface):
     def update(self, config):
         """ General helper function which works on a dictionary retrieved by
         get_config_dict(). It's main intention is to consolidate the scattered
-        interface setup code and provide a single point of entry when workin
+        interface setup code and provide a single point of entry when working
         on any interface. """
         # Adjust iproute2 tunnel parameters if necessary
         self._change_options()
diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index 2a1698ab7..b4e52004e 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -70,7 +70,7 @@ class BasicAccelPPPTest:
         def basic_protocol_specific_config(self):
             """
             An astract method.
-            Initialize protocol scpecific configureations.
+            Initialize protocol specific configurations.
             """
             self.assertFalse(True, msg="Function must be defined")
 
@@ -126,7 +126,7 @@ class BasicAccelPPPTest:
             """
             Return part of configuration from line
             where the first injection of start keyword to the line
-            where the first injection of end keyowrd
+            where the first injection of end keyword
             :param start: start keyword
             :type start: str
             :param end: end keyword
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index b2f700fce..50606efe3 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -581,7 +581,7 @@ class BasicInterfaceTest:
                         self.assertTrue(is_intf_addr_assigned(intf, addr['addr']))
 
         def test_ipv6_link_local_address(self):
-            # Common function for IPv6 link-local address assignemnts
+            # Common function for IPv6 link-local address assignments
             if not self._test_ipv6:
                 self.skipTest(MSG_TESTCASE_UNSUPPORTED)
 
diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py
index 08639f31b..ab0a95caf 100644
--- a/smoketest/scripts/cli/base_vyostest_shim.py
+++ b/smoketest/scripts/cli/base_vyostest_shim.py
@@ -43,7 +43,7 @@ save_config = '/tmp/vyos-smoketest-save'
 class VyOSUnitTestSHIM:
     class TestCase(unittest.TestCase):
         # If enabled, print out each and every set/del command on stdout.
-        # This is usefull to grap all the commands required to trigger the
+        # This is useful to grab all the commands required to trigger the
         # certain failure condition.
         debug = False
         mgmt_daemon_pid = 0
diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index ae85273e8..237e6238d 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -297,7 +297,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         n = cmd_to_json(f'sudo podman network inspect {net_name}')
         self.assertEqual(n['subnets'][0]['subnet'], prefix)
 
-        # skipt first container, it was never created
+        # skip first container, it was never created
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
@@ -343,7 +343,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         n = cmd_to_json(f'sudo podman network inspect {net_name}')
         self.assertEqual(n['subnets'][0]['subnet'], prefix)
 
-        # skipt first container, it was never created
+        # skip first container, it was never created
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
@@ -403,7 +403,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         self.assertEqual(n['subnets'][0]['subnet'], prefix4)
         self.assertEqual(n['subnets'][1]['subnet'], prefix6)
 
-        # skipt first container, it was never created
+        # skip first container, it was never created
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
diff --git a/smoketest/scripts/cli/test_interfaces_openvpn.py b/smoketest/scripts/cli/test_interfaces_openvpn.py
index 42e4eed60..2cf3a26c0 100755
--- a/smoketest/scripts/cli/test_interfaces_openvpn.py
+++ b/smoketest/scripts/cli/test_interfaces_openvpn.py
@@ -290,7 +290,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'remote {remote_host}', config)
         self.assertIn(f'persist-tun', config)
 
-        # IPv4 only: client usees udp4 protocol
+        # IPv4 only: client uses udp4 protocol
         self.cli_set(path + ['ip-version', 'ipv4'])
         self.cli_commit()
 
@@ -319,7 +319,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         interface = 'vtun5000'
         path = base_path + [interface]
 
-        # check validate() - must speciy operating mode
+        # check validate() - must specify operating mode
         self.cli_set(path)
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
@@ -559,7 +559,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'lport {port}', config)
         self.assertIn(f'push "redirect-gateway def1"', config)
 
-        # IPv4 only: server usees udp4 protocol
+        # IPv4 only: server uses udp4 protocol
         self.cli_set(path + ['ip-version', 'ipv4'])
         self.cli_commit()
 
@@ -799,7 +799,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'lport {port}', config)
         self.assertIn(f'rport {port}', config)
 
-        # IPv4 only: server usees udp4 protocol
+        # IPv4 only: server uses udp4 protocol
         self.cli_set(path + ['ip-version', 'ipv4'])
         self.cli_commit()
 
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py
index e656a89f2..8d6d4c562 100755
--- a/smoketest/scripts/cli/test_interfaces_tunnel.py
+++ b/smoketest/scripts/cli/test_interfaces_tunnel.py
@@ -346,7 +346,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.TestCase):
             if 'remote' in tunnel_config:
                 self.cli_set(self._base_path + [tunnel, 'remote', tunnel_config['remote']])
 
-        # GRE key must be supplied when two or more tunnels are formed to the same desitnation
+        # GRE key must be supplied when two or more tunnels are formed to the same destination
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         for tunnel, tunnel_config in tunnels.items():
diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py
index 3529fecf9..8526e16b1 100755
--- a/smoketest/scripts/cli/test_qos.py
+++ b/smoketest/scripts/cli/test_qos.py
@@ -244,7 +244,7 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
             self.assertEqual(flows, tmp['options']['flows'])
             self.assertEqual(queue_limit, tmp['options']['limit'])
 
-            # due to internal rounding we need to substract 1 from interval and target after converting to milliseconds
+            # due to internal rounding we need to subtract 1 from interval and target after converting to milliseconds
             # configuration of:
             # tc qdisc add dev eth0 root fq_codel quantum 1500 flows 512 interval 100ms limit 2048 target 5ms noecn
             # results in: tc -j qdisc show dev eth0
diff --git a/smoketest/scripts/cli/test_service_dhcp-server.py b/smoketest/scripts/cli/test_service_dhcp-server.py
index 285b56dfe..3fe613672 100755
--- a/smoketest/scripts/cli/test_service_dhcp-server.py
+++ b/smoketest/scripts/cli/test_service_dhcp-server.py
@@ -909,7 +909,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):
         range_0_start = inc_ip(subnet, 10)
         range_0_stop = inc_ip(subnet, 100)
 
-        # the DHCP exclude addresse is blanked out of the range which is done
+        # the DHCP exclude address is blanked out of the range which is done
         # by slicing one range into two ranges
         exclude_addr = inc_ip(range_0_start, 20)
         range_0_stop_excl = dec_ip(exclude_addr, 1)
diff --git a/smoketest/scripts/cli/test_service_dns_dynamic.py b/smoketest/scripts/cli/test_service_dns_dynamic.py
index a4c06af88..c68b831af 100755
--- a/smoketest/scripts/cli/test_service_dns_dynamic.py
+++ b/smoketest/scripts/cli/test_service_dns_dynamic.py
@@ -75,7 +75,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
             for opt, value in details.items():
                 self.cli_set(name_path + [svc, opt, value])
 
-            # 'zone' option is supported by 'cloudfare' and 'zoneedit1', but not 'freedns'
+            # 'zone' option is supported by 'cloudflare' and 'zoneedit1', but not 'freedns'
             self.cli_set(name_path + [svc, 'zone', zone])
             if details['protocol'] in ['cloudflare', 'zoneedit1']:
                 pass
@@ -85,7 +85,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
                     self.cli_commit()
                 self.cli_delete(name_path + [svc, 'zone'])
 
-            # 'ttl' option is supported by 'cloudfare', but not 'freedns' and 'zoneedit'
+            # 'ttl' option is supported by 'cloudflare', but not 'freedns' and 'zoneedit'
             self.cli_set(name_path + [svc, 'ttl', ttl])
             if details['protocol'] == 'cloudflare':
                 pass
@@ -174,7 +174,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
             for opt, value in details.items():
                 self.cli_set(name_path + [name, opt, value])
 
-            # Dual stack is supported by 'cloudfare' and 'freedns' but not 'googledomains'
+            # Dual stack is supported by 'cloudflare' and 'freedns' but not 'googledomains'
             # exception is raised for unsupported ones
             self.cli_set(name_path + [name, 'ip-version', ip_version])
             if details['protocol'] not in ['cloudflare', 'freedns']:
diff --git a/smoketest/scripts/cli/test_service_lldp.py b/smoketest/scripts/cli/test_service_lldp.py
index 9a022a0ac..f01bc23d2 100755
--- a/smoketest/scripts/cli/test_service_lldp.py
+++ b/smoketest/scripts/cli/test_service_lldp.py
@@ -126,7 +126,7 @@ class TestServiceLLDP(VyOSUnitTestSHIM.TestCase):
     def test_06_lldp_snmp(self):
         self.cli_set(base_path + ['snmp'])
 
-        # verify - can not start lldp snmp without snmp beeing configured
+        # verify - can not start lldp snmp without snmp being configured
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         self.cli_set(['service', 'snmp'])
diff --git a/smoketest/scripts/cli/test_service_mdns_repeater.py b/smoketest/scripts/cli/test_service_mdns_repeater.py
index c093f051d..ee46ed694 100755
--- a/smoketest/scripts/cli/test_service_mdns_repeater.py
+++ b/smoketest/scripts/cli/test_service_mdns_repeater.py
@@ -102,7 +102,7 @@ class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
         self.cli_set(base_path + ['interface', 'dum10'])
         self.cli_set(base_path + ['interface', 'dum40'])
 
-        # exception is raised if partcipating interfaces do not have IPv4 address
+        # exception is raised if participating interfaces do not have IPv4 address
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         self.cli_delete(base_path + ['interface', 'dum40'])
@@ -119,12 +119,12 @@ class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
         self.assertEqual(conf['reflector']['enable-reflector'], 'yes')
 
     def test_service_ipv6(self):
-        # partcipating interfaces should have IPv6 addresses
+        # participating interfaces should have IPv6 addresses
         self.cli_set(base_path + ['ip-version', 'ipv6'])
         self.cli_set(base_path + ['interface', 'dum10'])
         self.cli_set(base_path + ['interface', 'dum30'])
 
-        # exception is raised if partcipating interfaces do not have IPv4 address
+        # exception is raised if participating interfaces do not have IPv4 address
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         self.cli_delete(base_path + ['interface', 'dum10'])
diff --git a/smoketest/scripts/cli/test_service_snmp.py b/smoketest/scripts/cli/test_service_snmp.py
index a23692982..729dc2328 100755
--- a/smoketest/scripts/cli/test_service_snmp.py
+++ b/smoketest/scripts/cli/test_service_snmp.py
@@ -101,7 +101,7 @@ class TestSNMPService(VyOSUnitTestSHIM.TestCase):
 
         # verify listen address, it will be returned as
         # ['unix:/run/snmpd.socket,udp:127.0.0.1:161,udp6:[::1]:161']
-        # thus we need to transfor this into a proper list
+        # thus we need to transform this into a proper list
         config = get_config_value('agentaddress')
         expected = 'unix:/run/snmpd.socket'
         self.assertIn(expected, config)
@@ -202,7 +202,7 @@ class TestSNMPService(VyOSUnitTestSHIM.TestCase):
         self.cli_set(base_path + ['v3', 'user', 'vyos', 'group', snmpv3_group])
 
         self.cli_set(base_path + ['v3', 'group', snmpv3_group, 'mode', 'ro'])
-        # check validate() - a view must be created before this can be comitted
+        # check validate() - a view must be created before this can be committed
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
 
diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py
index 72f828093..98dd90d8a 100755
--- a/smoketest/scripts/cli/test_service_ssh.py
+++ b/smoketest/scripts/cli/test_service_ssh.py
@@ -173,7 +173,7 @@ class TestServiceSSH(VyOSUnitTestSHIM.TestCase):
         # commit changes
         self.cli_commit()
 
-        # Check configured port agains CLI default value
+        # Check configured port against CLI default value
         port = get_config_value('Port')
         cli_default = default_value(base_path + ['port'])
         self.assertEqual(port, cli_default)
diff --git a/smoketest/scripts/cli/test_service_tftp-server.py b/smoketest/scripts/cli/test_service_tftp-server.py
index 71c147087..d001b3671 100755
--- a/smoketest/scripts/cli/test_service_tftp-server.py
+++ b/smoketest/scripts/cli/test_service_tftp-server.py
@@ -106,7 +106,7 @@ class TestServiceTFTPD(VyOSUnitTestSHIM.TestCase):
             self.assertIn(directory, config)
 
         # Check for running processes - one process is spawned per listen
-        # IP address, wheter it's IPv4 or IPv6
+        # IP address, whether it's IPv4 or IPv6
         count = 0
         for p in process_iter():
             if PROCESS_NAME in p.name():
diff --git a/smoketest/scripts/cli/test_system_login.py b/smoketest/scripts/cli/test_system_login.py
index 592e21ece..7088097c4 100755
--- a/smoketest/scripts/cli/test_system_login.py
+++ b/smoketest/scripts/cli/test_system_login.py
@@ -585,7 +585,7 @@ class TestSystemLogin(VyOSUnitTestSHIM.TestCase):
         self.assertFalse(err)
         self.assertEqual(out, self.ssh_test_command_result)
 
-        # Cancel pending reboot - we do wan't to preceed with the remaining tests
+        # Cancel pending reboot - we do want to proceed with the remaining tests
         self.op_mode(['reboot', 'cancel'])
 
 if __name__ == '__main__':
diff --git a/smoketest/scripts/cli/test_vpn_ipsec.py b/smoketest/scripts/cli/test_vpn_ipsec.py
index a15532a96..3e60e51b2 100755
--- a/smoketest/scripts/cli/test_vpn_ipsec.py
+++ b/smoketest/scripts/cli/test_vpn_ipsec.py
@@ -1473,7 +1473,7 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase):
         self.tearDownPKI()
 
     def test_remote_access_no_rekey(self):
-        # In some RA secnarios, disabling server-initiated rekey of IKE and CHILD SA is desired
+        # In some RA scenarios, disabling server-initiated rekey of IKE and CHILD SA is desired
         self.setupPKI()
 
         ike_group = 'IKE-RW'
@@ -1882,7 +1882,7 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         for config_option, cli_option in retransmission_options.items():
-            # Check configured value agains CLI default value
+            # Check configured value against CLI default value
             config_values_list = get_config_value(charon_file,config_option + ' =')
 
             if config_values_list:
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index 2b364dea3..63fe46d21 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -64,7 +64,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         # always forward to base class
         super().setUp()
 
-        # VRF strict_most ist always enabled
+        # VRF strict_most is always enabled
         tmp = read_file('/proc/sys/net/vrf/strict_mode')
         self.assertEqual(tmp, '1')
 
@@ -740,7 +740,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         dns_2 = inc_ip(subnet, 3)
         domain_name = 'vyos.net'
 
-        # declare fiels
+        # declare files
         process_name = 'kea-dhcp4'
         kea4_conf = f'/var/run/kea/kea-{vrf}-dhcp4.conf'
 
@@ -938,7 +938,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         interface = 'dum8888'
         interface_addr = inc_ip(subnet, 1) + '/64'
 
-        # declare fiels
+        # declare files
         process_name = 'kea-dhcp6'
         kea6_conf = f'/var/run/kea/kea-{vrf}-dhcp6.conf'
 
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