T8410: Fix typos and mistakes for operational and configuration commands

Fix typos and mistakes in the commands and comments
No functional changes

53 files changed, 95 insertions, 95 deletions

diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py
index 80a91b1ff..20ec300aa 100755
--- a/src/conf_mode/container.py
+++ b/src/conf_mode/container.py
@@ -130,7 +130,7 @@ def verify(container):
 
             # Check if requested container image exists locally. If it does not
             # exist locally - inform the user. This is required as there is a
-            # shared container image storage accross all VyOS images. A user can
+            # shared container image storage across all VyOS images. A user can
             # delete a container image from the system, boot into another version
             # of VyOS and then it would fail to boot. This is to prevent any
             # configuration error when container images are deleted from the
@@ -663,7 +663,7 @@ def apply(container):
 
             if run(f'podman image exists {image}') != 0:
                 # container image does not exist locally - user already got
-                # informed by a WARNING in verfiy() - bail out early
+                # informed by a WARNING in verify() - bail out early
                 continue
 
             if 'disable' in container_config:
diff --git a/src/conf_mode/interfaces_bonding.py b/src/conf_mode/interfaces_bonding.py
index 0b27c8cad..4d6cafc9d 100755
--- a/src/conf_mode/interfaces_bonding.py
+++ b/src/conf_mode/interfaces_bonding.py
@@ -68,7 +68,7 @@ def get_bond_mode(mode):
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
@@ -78,7 +78,7 @@ def get_config(config=None):
     base = ['interfaces', 'bonding']
     ifname, bond = get_interface_dict(conf, base, with_pki=True)
 
-    # To make our own life easier transfor the list of member interfaces
+    # To make our own life easier transform the list of member interfaces
     # into a dictionary - we will use this to add additional information
     # later on for each member
     if 'member' in bond and 'interface' in bond['member']:
diff --git a/src/conf_mode/interfaces_bridge.py b/src/conf_mode/interfaces_bridge.py
index c6792404b..2060ecd8b 100755
--- a/src/conf_mode/interfaces_bridge.py
+++ b/src/conf_mode/interfaces_bridge.py
@@ -40,7 +40,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_dummy.py b/src/conf_mode/interfaces_dummy.py
index 0a83eb23b..c35511199 100755
--- a/src/conf_mode/interfaces_dummy.py
+++ b/src/conf_mode/interfaces_dummy.py
@@ -29,7 +29,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_ethernet.py b/src/conf_mode/interfaces_ethernet.py
index 774a042fe..2eb36a231 100755
--- a/src/conf_mode/interfaces_ethernet.py
+++ b/src/conf_mode/interfaces_ethernet.py
@@ -138,7 +138,7 @@ def update_bond_options(conf: Config, eth_conf: dict) -> list:
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
@@ -200,11 +200,11 @@ def verify_speed_duplex(ethernet: dict, ethtool: Ethtool):
     if ((ethernet['speed'] == 'auto' and ethernet['duplex'] != 'auto') or
             (ethernet['speed'] != 'auto' and ethernet['duplex'] == 'auto')):
         raise ConfigError(
-            'Speed/Duplex missmatch. Must be both auto or manually configured')
+            'Speed/Duplex mismatch. Must be both auto or manually configured')
 
     if ethernet['speed'] != 'auto' and ethernet['duplex'] != 'auto':
         # We need to verify if the requested speed and duplex setting is
-        # supported by the underlaying NIC.
+        # supported by the underlying NIC.
         speed = ethernet['speed']
         duplex = ethernet['duplex']
         if not ethtool.check_speed_duplex(speed, duplex):
@@ -287,7 +287,7 @@ def verify_offload(ethernet: dict, ethtool: Ethtool):
     """
     if dict_search('offload.rps', ethernet) != None:
         if not os.path.exists(f'/sys/class/net/{ethernet["ifname"]}/queues/rx-0/rps_cpus'):
-            raise ConfigError('Interface does not suport RPS!')
+            raise ConfigError('Interface does not support RPS!')
     driver = ethtool.get_driver_name()
     # T3342 - Xen driver requires special treatment
     if driver == 'vif':
@@ -308,7 +308,7 @@ def verify_mac_change(ethernet: dict, ethtool: Ethtool):
     if 'mac' not in ethernet:
         return None
     if not ethtool.check_mac_change():
-        raise ConfigError(f'Driver does not suport changing MAC address!')
+        raise ConfigError(f'Driver does not support changing MAC address!')
 
 def verify_allowedbond_changes(ethernet: dict):
     """
diff --git a/src/conf_mode/interfaces_geneve.py b/src/conf_mode/interfaces_geneve.py
index 2f3e3cb8c..faaa7b848 100755
--- a/src/conf_mode/interfaces_geneve.py
+++ b/src/conf_mode/interfaces_geneve.py
@@ -36,7 +36,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_input.py b/src/conf_mode/interfaces_input.py
index 6ed0bd2cf..d41610b6d 100755
--- a/src/conf_mode/interfaces_input.py
+++ b/src/conf_mode/interfaces_input.py
@@ -26,7 +26,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at
     least the interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_l2tpv3.py b/src/conf_mode/interfaces_l2tpv3.py
index 8478f3c40..85438b6c5 100755
--- a/src/conf_mode/interfaces_l2tpv3.py
+++ b/src/conf_mode/interfaces_l2tpv3.py
@@ -39,7 +39,7 @@ k_mod = ['l2tp_eth', 'l2tp_netlink', 'l2tp_ip', 'l2tp_ip6']
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_loopback.py b/src/conf_mode/interfaces_loopback.py
index bac36b7f0..c19ea162e 100755
--- a/src/conf_mode/interfaces_loopback.py
+++ b/src/conf_mode/interfaces_loopback.py
@@ -26,7 +26,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_macsec.py b/src/conf_mode/interfaces_macsec.py
index 2904e69cb..3c043e11e 100755
--- a/src/conf_mode/interfaces_macsec.py
+++ b/src/conf_mode/interfaces_macsec.py
@@ -55,7 +55,7 @@ GCM_256_KEY_ERROR = 'gcm-aes-256 requires a 256bit long key!'
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
@@ -154,11 +154,11 @@ def verify(macsec):
 
     if 'source_interface' in macsec:
         # MACsec adds a 40 byte overhead (32 byte MACsec + 8 bytes VLAN 802.1ad
-        # and 802.1q) - we need to check the underlaying MTU if our configured
+        # and 802.1q) - we need to check the underlying MTU if our configured
         # MTU is at least 40 bytes less then the MTU of our physical interface.
         lower_mtu = Interface(macsec['source_interface']).get_mtu()
         if lower_mtu < (int(macsec['mtu']) + 40):
-            raise ConfigError('MACsec overhead does not fit into underlaying device MTU,\n' \
+            raise ConfigError('MACsec overhead does not fit into underlying device MTU,\n' \
                               f'{lower_mtu} bytes is too small!')
 
     return None
diff --git a/src/conf_mode/interfaces_openvpn.py b/src/conf_mode/interfaces_openvpn.py
index 861f2e679..16a4ed0b5 100755
--- a/src/conf_mode/interfaces_openvpn.py
+++ b/src/conf_mode/interfaces_openvpn.py
@@ -80,7 +80,7 @@ service_file = '/run/systemd/system/openvpn@{ifname}.service.d/20-override.conf'
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
@@ -747,7 +747,7 @@ def generate(openvpn):
     # create client config directory on demand
     makedir(ccd_dir, user, group)
 
-    # Fix file permissons for keys
+    # Fix file permissions for keys
     generate_pki_files(openvpn)
 
     # Generate User/Password authentication file
diff --git a/src/conf_mode/interfaces_pppoe.py b/src/conf_mode/interfaces_pppoe.py
index 976702aba..b622f5632 100755
--- a/src/conf_mode/interfaces_pppoe.py
+++ b/src/conf_mode/interfaces_pppoe.py
@@ -36,7 +36,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_pseudo-ethernet.py b/src/conf_mode/interfaces_pseudo-ethernet.py
index 7f9345abb..6a4219343 100755
--- a/src/conf_mode/interfaces_pseudo-ethernet.py
+++ b/src/conf_mode/interfaces_pseudo-ethernet.py
@@ -39,7 +39,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at
     least the interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_sstpc.py b/src/conf_mode/interfaces_sstpc.py
index 276fab4f9..50d3d1cb3 100755
--- a/src/conf_mode/interfaces_sstpc.py
+++ b/src/conf_mode/interfaces_sstpc.py
@@ -37,7 +37,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_tunnel.py b/src/conf_mode/interfaces_tunnel.py
index 4cf5ef115..053c831d1 100755
--- a/src/conf_mode/interfaces_tunnel.py
+++ b/src/conf_mode/interfaces_tunnel.py
@@ -37,7 +37,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least
     the interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_virtual-ethernet.py b/src/conf_mode/interfaces_virtual-ethernet.py
index 4bcabe304..00fc9cce9 100755
--- a/src/conf_mode/interfaces_virtual-ethernet.py
+++ b/src/conf_mode/interfaces_virtual-ethernet.py
@@ -33,7 +33,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at
     least the interface name will be added or a deleted flag
     """
     if config:
@@ -46,7 +46,7 @@ def get_config(config=None):
     # We need to know all other veth related interfaces as veth requires a 1:1
     # mapping for the peer-names. The Linux kernel automatically creates both
     # interfaces, the local one and the peer-name, but VyOS also needs a peer
-    # interfaces configrued on the CLI so we can assign proper IP addresses etc.
+    # interfaces configured on the CLI so we can assign proper IP addresses etc.
     veth['other_interfaces'] = conf.get_config_dict(base, key_mangling=('-', '_'),
                                      get_first_key=True, no_tag_node_value_mangle=True)
 
diff --git a/src/conf_mode/interfaces_vti.py b/src/conf_mode/interfaces_vti.py
index 0461c4f68..b4652d727 100755
--- a/src/conf_mode/interfaces_vti.py
+++ b/src/conf_mode/interfaces_vti.py
@@ -28,7 +28,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_vxlan.py b/src/conf_mode/interfaces_vxlan.py
index 968214354..819920009 100755
--- a/src/conf_mode/interfaces_vxlan.py
+++ b/src/conf_mode/interfaces_vxlan.py
@@ -42,7 +42,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least
     the interface name will be added or a deleted flag
     """
     if config:
@@ -101,7 +101,7 @@ def verify(vxlan):
 
     if 'group' in vxlan:
         if 'source_interface' not in vxlan:
-            raise ConfigError('Multicast VXLAN requires an underlaying interface')
+            raise ConfigError('Multicast VXLAN requires an underlying interface')
         if 'remote' in vxlan:
             raise ConfigError('Both group and remote cannot be specified')
         verify_source_interface(vxlan)
@@ -125,7 +125,7 @@ def verify(vxlan):
                 if dict_search('parameters.vni_filter', tunnel_config) != None:
                     other_vni_filter = True
                     break
-            # eqivalent of the C foo ? 'a' : 'b' statement
+            # equivalent of the C foo ? 'a' : 'b' statement
             vni_filter = True and (dict_search('parameters.vni_filter', vxlan) != None) or False
             # If either one is enabled, so must be the other. Both can be off and both can be on
             if (vni_filter and not other_vni_filter) or (not vni_filter and other_vni_filter):
@@ -144,7 +144,7 @@ def verify(vxlan):
 
     if 'source_interface' in vxlan:
         # VXLAN adds at least an overhead of 50 byte - we need to check the
-        # underlaying device if our VXLAN package is not going to be fragmented!
+        # underlying device if our VXLAN package is not going to be fragmented!
         vxlan_overhead = 50
         if 'source_address' in vxlan and is_ipv6(vxlan['source_address']):
             # IPv6 adds an extra 20 bytes overhead because the IPv6 header is 20
diff --git a/src/conf_mode/interfaces_wireguard.py b/src/conf_mode/interfaces_wireguard.py
index 33d782ec6..b430fa94a 100755
--- a/src/conf_mode/interfaces_wireguard.py
+++ b/src/conf_mode/interfaces_wireguard.py
@@ -43,7 +43,7 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/interfaces_wireless.py b/src/conf_mode/interfaces_wireless.py
index a2e31484b..e1a2b22bf 100755
--- a/src/conf_mode/interfaces_wireless.py
+++ b/src/conf_mode/interfaces_wireless.py
@@ -77,7 +77,7 @@ def find_other_stations(conf, base, ifname):
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
@@ -197,7 +197,7 @@ def verify(wifi):
         elif 'wpa' in wifi['security']:
             wpa = wifi['security']['wpa']
             if not any(i in ['passphrase', 'radius'] for i in wpa):
-                raise ConfigError('Misssing WPA key or RADIUS server')
+                raise ConfigError('Missing WPA key or RADIUS server')
 
             if 'username' in wpa:
                 if 'passphrase' not in wpa:
diff --git a/src/conf_mode/interfaces_wwan.py b/src/conf_mode/interfaces_wwan.py
index bde31ebe1..166b857a8 100755
--- a/src/conf_mode/interfaces_wwan.py
+++ b/src/conf_mode/interfaces_wwan.py
@@ -46,7 +46,7 @@ cron_script = '/etc/cron.d/vyos-wwan'
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    Retrieve CLI config as dictionary. Dictionary can never be empty, as at least the
     interface name will be added or a deleted flag
     """
     if config:
diff --git a/src/conf_mode/pki.py b/src/conf_mode/pki.py
index 6d2817384..356a8dd89 100755
--- a/src/conf_mode/pki.py
+++ b/src/conf_mode/pki.py
@@ -153,7 +153,7 @@ def certbot_request(name: str, config: dict, dry_run: bool=True) -> None:
     elif listen_address:
         tmp += f' --http-01-address {listen_address}'
 
-    # verify() does not need to actually request a cert but only test for plausability
+    # verify() does not need to actually request a cert but only test for plausibility
     if dry_run:
         tmp += ' --dry-run'
 
@@ -217,7 +217,7 @@ def get_config(config=None):
     # We only merge on the defaults if there is a configuration at all
     if conf.exists(base):
         # We have gathered the dict representation of the CLI, but there are default
-        # options which we need to update into the dictionary retrived.
+        # options which we need to update into the dictionary retrieved.
         default_values = conf.get_config_defaults(**pki.kwargs, recursive=True)
         # remove ACME default configuration if unused by CLI
         if 'certificate' in pki:
@@ -296,7 +296,7 @@ def get_config(config=None):
     # Check PKI certificates if they are auto-generated by ACME. If they are,
     # traverse the current configuration and determine the service where the
     # certificate is used by.
-    # Required to check if we might need to run certbot behing a reverse proxy.
+    # Required to check if we might need to run certbot behind a reverse proxy.
     if 'certificate' in pki:
         for name, cert_config in pki['certificate'].items():
             if 'acme' not in cert_config:
@@ -420,7 +420,7 @@ def verify(pki):
                     # A call to check_port_availability() will always fail during system
                     # boot when listen_address is set and the address is not yet assigned
                     # to an interface. This happens b/c PKI subsystem is called prior
-                    # to any inteface - e.g. ethernet - and thus the OS will always
+                    # to any interface - e.g. ethernet - and thus the OS will always
                     # be unable to bind() a socket() to a non existing IP address.
                     if boot_configuration_complete() and not check_port_availability(listen_address, 80):
                         raise ConfigError('Port 80 is already in use and not available '\
@@ -498,7 +498,7 @@ def verify(pki):
                         continue
 
                     for found_name, found_path in dict_search_recursive(search_dict, key):
-                        # Check if the name matches either by string compare, or beeing
+                        # Check if the name matches either by string compare, or being
                         # part of a list
                         if ((isinstance(found_name, str) and found_name == item_name) or
                             (isinstance(found_name, list) and item_name in found_name)):
@@ -563,7 +563,7 @@ def generate(pki):
                     # the PEM files on disk. We need to add the certificate to
                     # certbot_list_on_disk to automatically import the CA chain
                     certbot_list_on_disk.append(name)
-                # We alredy had an ACME managed certificate on the system, but
+                # We already had an ACME managed certificate on the system, but
                 # something changed in the configuration
                 elif changed_certificates != None and name in changed_certificates:
                     # Delete old ACME certificate first
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py
index 84962c807..689365724 100755
--- a/src/conf_mode/policy.py
+++ b/src/conf_mode/policy.py
@@ -131,7 +131,7 @@ def verify(config_dict):
             if 'rule' not in instance_config:
                 continue
 
-            # human readable instance name (hypen instead of underscore)
+            # human readable instance name (hyphen instead of underscore)
             policy_hr = policy_type.replace('_', '-')
             entries = []
             for rule, rule_config in instance_config['rule'].items():
diff --git a/src/conf_mode/policy_local-route.py b/src/conf_mode/policy_local-route.py
index 77b39e59f..23aadfade 100755
--- a/src/conf_mode/policy_local-route.py
+++ b/src/conf_mode/policy_local-route.py
@@ -299,8 +299,8 @@ def apply(pbr):
 
         if 'rule' in pbr_route:
             for rule, rule_config in pbr_route['rule'].items():
-                # VRFs get configred as route table alias names for iproute2 and only 
-                # one 'set' can get past validation. Either can be fed to lookup. 
+                # VRFs get configured as route table alias names for iproute2 and only
+                # one 'set' can get past validation. Either can be fed to lookup.
                 vrf = rule_config['set'].get('vrf', '')
                 if vrf == 'default':
                     table_or_vrf = 'main'
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index a7b9ea39b..24e244bb9 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -52,7 +52,7 @@ def verify_vrf_as_import(search_vrf_name: str, afi_name: str, vrfs_config: dict)
     :type afi_name: str
     :param vrfs_config: configuration dependents vrfs
     :type vrfs_config: dict
-    :return: if vrf in import list retrun true else false
+    :return: if vrf in import list return true else false
     :rtype: bool
     """
     for vrf_name, vrf_config in vrfs_config.items():
@@ -155,7 +155,7 @@ def verify_remote_as(peer_config, bgp_config):
     return None
 
 def verify_afi(peer_config, bgp_config):
-    # If address_family configured under neighboor
+    # If address_family configured under neighbor
     if 'address_family' in peer_config:
         return True
 
@@ -183,7 +183,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     bgp = vrf and dict_search(f'vrf.name.{vrf}.protocols.bgp',
                               config_dict) or config_dict['bgp']
     bgp['policy'] = config_dict['policy']
@@ -277,7 +277,7 @@ def verify(config_dict):
                     raise ConfigError(f'Only one local-as number can be specified for peer "{peer}"!')
 
                 # Neighbor local-as override can not be the same as the local-as
-                # we use for this BGP instane!
+                # we use for this BGP instance!
                 asn = list(peer_config['local_as'].keys())[0]
                 if asn == bgp['system_as']:
                     raise ConfigError('Cannot have local-as same as system-as number')
@@ -287,11 +287,11 @@ def verify(config_dict):
                      raise ConfigError(f'Neighbor "{peer}" has local-as specified which is '\
                                         'the same as remote-as, this is not allowed!')
 
-            # ttl-security and ebgp-multihop can't be used in the same configration
+            # ttl-security and ebgp-multihop can't be used in the same configuration
             if 'ebgp_multihop' in peer_config and 'ttl_security' in peer_config:
                 raise ConfigError('You can not set both ebgp-multihop and ttl-security hops')
 
-            # interface and ebgp-multihop can't be used in the same configration
+            # interface and ebgp-multihop can't be used in the same configuration
             if 'ebgp_multihop' in peer_config and 'interface' in peer_config:
                 raise ConfigError(f'Ebgp-multihop can not be used with directly connected '\
                                   f'neighbor "{peer}"')
@@ -395,13 +395,13 @@ def verify(config_dict):
 
                 if 'conditionally_advertise' in afi_config:
                     if 'advertise_map' not in afi_config['conditionally_advertise']:
-                        raise ConfigError('Must speficy advertise-map when conditionally-advertise is in use!')
+                        raise ConfigError('Must specify advertise-map when conditionally-advertise is in use!')
                     # Verify advertise-map (which is a route-map) exists
                     verify_route_map(afi_config['conditionally_advertise']['advertise_map'], bgp)
 
                     if ('exist_map' not in afi_config['conditionally_advertise'] and
                         'non_exist_map' not in afi_config['conditionally_advertise']):
-                        raise ConfigError('Must either speficy exist-map or non-exist-map when ' \
+                        raise ConfigError('Must either specify exist-map or non-exist-map when ' \
                                           'conditionally-advertise is in use!')
 
                     if {'exist_map', 'non_exist_map'} <= set(afi_config['conditionally_advertise']):
@@ -417,7 +417,7 @@ def verify(config_dict):
                 # T4332: bgp deterministic-med cannot be disabled while addpath-tx-bestpath-per-AS is in use
                 if 'addpath_tx_per_as' in afi_config:
                     if dict_search('parameters.deterministic_med', bgp) == None:
-                        raise ConfigError('addpath-tx-per-as requires BGP deterministic-med paramtere to be set!')
+                        raise ConfigError('addpath-tx-per-as requires BGP deterministic-med parameter to be set!')
 
                 # Validate if configured Prefix list exists
                 if 'prefix_list' in afi_config:
diff --git a/src/conf_mode/protocols_eigrp.py b/src/conf_mode/protocols_eigrp.py
index 281909ceb..92e34237c 100755
--- a/src/conf_mode/protocols_eigrp.py
+++ b/src/conf_mode/protocols_eigrp.py
@@ -44,7 +44,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     eigrp = vrf and dict_search(f'vrf.name.{vrf}.protocols.eigrp',
                                  config_dict) or config_dict['eigrp']
     eigrp['policy'] = config_dict['policy']
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 3d172087e..3812515a1 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -47,7 +47,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     isis = vrf and dict_search(f'vrf.name.{vrf}.protocols.isis',
                                  config_dict) or config_dict['isis']
     isis['policy'] = config_dict['policy']
diff --git a/src/conf_mode/protocols_nhrp.py b/src/conf_mode/protocols_nhrp.py
index be08080b1..3901b20ba 100755
--- a/src/conf_mode/protocols_nhrp.py
+++ b/src/conf_mode/protocols_nhrp.py
@@ -92,7 +92,7 @@ def verify(config_dict):
                             nbma_list.append(nbma_ip)
                         else:
                             raise ConfigError(
-                                f'Nbma address {nbma_ip} cannot be maped to several tunnel-ip')
+                                f'Nbma address {nbma_ip} cannot be mapped to several tunnel-ip')
     return None
 
 
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py
index 46023e486..b20cea25a 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -49,7 +49,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     ospf = vrf and dict_search(f'vrf.name.{vrf}.protocols.ospf',
                                  config_dict) or config_dict['ospf']
     ospf['policy'] = config_dict['policy']
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index 2db7b1d42..acf6cadfb 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -48,7 +48,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     ospfv3 = vrf and dict_search(f'vrf.name.{vrf}.protocols.ospfv3',
                                  config_dict) or config_dict['ospfv3']
     ospfv3['policy'] = config_dict['policy']
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py
index 9b1abd752..81039d3da 100755
--- a/src/conf_mode/protocols_rpki.py
+++ b/src/conf_mode/protocols_rpki.py
@@ -51,7 +51,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     rpki = vrf and dict_search(f'vrf.name.{vrf}.protocols.rpki',
                                  config_dict) or config_dict['rpki']
 
@@ -91,7 +91,7 @@ def generate(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     rpki = vrf and dict_search(f'vrf.name.{vrf}.protocols.rpki',
                                 config_dict) or config_dict['rpki']
 
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 144c64efa..d84cfd77f 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -53,7 +53,7 @@ def verify(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     static = vrf and dict_search(f'vrf.name.{vrf}.protocols.static',
                                  config_dict) or config_dict['static']
     static['policy'] = config_dict['policy']
@@ -95,7 +95,7 @@ def generate(config_dict):
     if 'vrf_context' in config_dict:
         vrf = config_dict['vrf_context']
 
-    # eqivalent of the C foo ? 'a' : 'b' statement
+    # equivalent of the C foo ? 'a' : 'b' statement
     static = vrf and dict_search(f'vrf.name.{vrf}.protocols.static',
                                  config_dict) or config_dict['static']
 
diff --git a/src/conf_mode/qos.py b/src/conf_mode/qos.py
index 4ea900bb8..35b9c0aa2 100755
--- a/src/conf_mode/qos.py
+++ b/src/conf_mode/qos.py
@@ -364,7 +364,7 @@ def apply(qos):
     for interface, interface_config in qos['interface'].items():
         if not verify_interface_exists(qos, interface, state_required=True, warning_only=True):
             # When shaper is bound to a dialup (e.g. PPPoE) interface it is
-            # possible that it is yet not availbale when to QoS code runs.
+            # possible that it is yet not available when to QoS code runs.
             # Skip the configuration and inform the user via warning_only=True
             continue
 
diff --git a/src/conf_mode/service_console-server.py b/src/conf_mode/service_console-server.py
index 82386babf..595d7888a 100755
--- a/src/conf_mode/service_console-server.py
+++ b/src/conf_mode/service_console-server.py
@@ -46,7 +46,7 @@ def get_config(config=None):
     #                              'stop_bits': '2'}}}
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     proxy = conf.merge_defaults(proxy, recursive=True)
 
     return proxy
diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py
index c022d0a96..24df20bb7 100755
--- a/src/conf_mode/service_dhcp-server.py
+++ b/src/conf_mode/service_dhcp-server.py
@@ -168,7 +168,7 @@ def get_config(config=None):
     else:
         conf = Config()
 
-    # if running in vrf, set base diffrently
+    # if running in vrf, set base differently
     if argv and len(argv) > 1:
         vrf_name = argv[1]
         base = ['vrf', 'name', vrf_name, 'service', 'dhcp-server']
@@ -617,7 +617,7 @@ def generate(dhcp):
 
 
 def apply(dhcp):
-    # if running in vrf, set base diffrently
+    # if running in vrf, set base differently
     if argv and len(argv) > 1:
         vrf_name = argv[1]
         services = [f'isc-kea-dhcp4-server@{vrf_name}', f'isc-kea-dhcp-ddns-server@{vrf_name}']
diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py
index b567c8ed9..308ed82a8 100755
--- a/src/conf_mode/service_dhcpv6-server.py
+++ b/src/conf_mode/service_dhcpv6-server.py
@@ -77,7 +77,7 @@ def get_config(config=None):
     else:
         conf = Config()
 
-    # if running in vrf, set base diffrently
+    # if running in vrf, set base differently
     if argv and len(argv) > 1:
         vrf_name = argv[1]
         base = ['vrf', 'name', vrf_name, 'service', 'dhcpv6-server']
@@ -292,7 +292,7 @@ def generate(dhcpv6):
     return None
 
 def apply(dhcpv6):
-    # if running in vrf, set base diffrently
+    # if running in vrf, set base differently
     if argv and len(argv) > 1:
         vrf_name = argv[1]
         service_name = f'isc-kea-dhcp6-server@{vrf_name}.service'
diff --git a/src/conf_mode/service_https.py b/src/conf_mode/service_https.py
index 38bb485e7..59fb90bd1 100755
--- a/src/conf_mode/service_https.py
+++ b/src/conf_mode/service_https.py
@@ -69,11 +69,11 @@ def get_config(config=None):
 
     # store path to API config file for later use in templates
     https['api_config_state'] = api_config_state
-    # get fully qualified system hsotname
+    # get fully qualified system hostname
     https['hostname'] = socket.getfqdn()
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     default_values = conf.get_config_defaults(**https.kwargs, recursive=True)
     if 'api' not in https or 'graphql' not in https['api']:
         del default_values['api']
@@ -107,7 +107,7 @@ def verify(https):
         Warning('No certificate specified, using build-in self-signed certificates. '\
                 'Do not use them in a production environment!')
 
-    # Check if server port is already in use by a different appliaction
+    # Check if server port is already in use by a different application
     listen_address = ['0.0.0.0']
     port = int(https['port'])
     if 'listen_address' in https:
diff --git a/src/conf_mode/service_mdns_repeater.py b/src/conf_mode/service_mdns_repeater.py
index aa10a687e..a6d9d0224 100755
--- a/src/conf_mode/service_mdns_repeater.py
+++ b/src/conf_mode/service_mdns_repeater.py
@@ -60,7 +60,7 @@ def verify(mdns):
     if not mdns or 'disable' in mdns:
         return None
 
-    # We need at least two interfaces to repeat mDNS advertisments
+    # We need at least two interfaces to repeat mDNS advertisements
     if 'interface' not in mdns or len(mdns['interface']) < 2:
         raise ConfigError('mDNS repeater requires at least 2 configured interfaces!')
 
diff --git a/src/conf_mode/service_monitoring_network_event.py b/src/conf_mode/service_monitoring_network_event.py
index f43ea23ca..8ae831b66 100644
--- a/src/conf_mode/service_monitoring_network_event.py
+++ b/src/conf_mode/service_monitoring_network_event.py
@@ -43,7 +43,7 @@ def get_config(config=None):
                                       no_tag_node_value_mangle=True)
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     monitoring = conf.merge_defaults(monitoring, recursive=True)
 
     return monitoring
diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py
index de8097e11..2271f240f 100755
--- a/src/conf_mode/service_monitoring_telegraf.py
+++ b/src/conf_mode/service_monitoring_telegraf.py
@@ -80,7 +80,7 @@ def get_config(config=None):
     if tmp: monitoring.update({'restart_required': {}})
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     monitoring = conf.merge_defaults(monitoring, recursive=True)
 
     monitoring['custom_scripts_dir'] = custom_scripts_dir
@@ -198,7 +198,7 @@ def generate(monitoring):
 
     chown(cache_dir, 'telegraf', 'telegraf')
 
-    # Create custome scripts dir
+    # Create custom scripts dir
     if not os.path.exists(custom_scripts_dir):
         os.mkdir(custom_scripts_dir)
 
diff --git a/src/conf_mode/service_ntp.py b/src/conf_mode/service_ntp.py
index fbdcd6b58..e58da2737 100755
--- a/src/conf_mode/service_ntp.py
+++ b/src/conf_mode/service_ntp.py
@@ -51,7 +51,7 @@ def get_config(config=None):
     if tmp: ntp.update({'restart_required': {}})
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     default_values = conf.get_config_defaults(**ntp.kwargs, recursive=True)
     # Only defined PTP default port, if PTP feature is in use
     if 'ptp' not in ntp:
diff --git a/src/conf_mode/service_salt-minion.py b/src/conf_mode/service_salt-minion.py
index f4a339d0d..f035485d3 100755
--- a/src/conf_mode/service_salt-minion.py
+++ b/src/conf_mode/service_salt-minion.py
@@ -52,7 +52,7 @@ def get_config(config=None):
     if 'id' not in salt:
         salt['id'] = gethostname()
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     salt = conf.merge_defaults(salt, recursive=True)
 
     if not conf.exists(base):
diff --git a/src/conf_mode/service_snmp.py b/src/conf_mode/service_snmp.py
index c6059c260..b0b57a723 100755
--- a/src/conf_mode/service_snmp.py
+++ b/src/conf_mode/service_snmp.py
@@ -72,7 +72,7 @@ def get_config(config=None):
     snmp['vyos_user_pass'] = random(16)
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     snmp = conf.merge_defaults(snmp, recursive=True)
 
     if 'listen_address' in snmp:
diff --git a/src/conf_mode/service_ssh.py b/src/conf_mode/service_ssh.py
index d67c1fa3f..15d9d37ba 100755
--- a/src/conf_mode/service_ssh.py
+++ b/src/conf_mode/service_ssh.py
@@ -74,7 +74,7 @@ def get_config(config=None):
         ssh.update({'restart_required': {}})
 
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     ssh = conf.merge_defaults(ssh, recursive=True)
 
     # Ignore default XML values if config doesn't exists
@@ -127,7 +127,7 @@ def generate(ssh):
         return None
 
     # This usually happens only once on a fresh system, SSH keys need to be
-    # freshly generted, one per every system!
+    # freshly generated, one per every system!
     if not os.path.isfile(key_rsa):
         syslog(LOG_INFO, 'SSH RSA host key not found, generating new key!')
         call(f'ssh-keygen -q -N "" -t rsa -f {key_rsa}')
diff --git a/src/conf_mode/service_webproxy.py b/src/conf_mode/service_webproxy.py
index 7a4954de2..eb45f8fcb 100755
--- a/src/conf_mode/service_webproxy.py
+++ b/src/conf_mode/service_webproxy.py
@@ -123,7 +123,7 @@ def get_config(config=None):
     proxy = conf.get_config_dict(base, key_mangling=('-', '_'),
                                  get_first_key=True)
     # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
+    # options which we need to update into the dictionary retrieved.
     default_values = conf.get_config_defaults(**proxy.kwargs,
                                               recursive=True)
 
diff --git a/src/conf_mode/system_conntrack.py b/src/conf_mode/system_conntrack.py
index eed1a4458..e6710223a 100755
--- a/src/conf_mode/system_conntrack.py
+++ b/src/conf_mode/system_conntrack.py
@@ -168,7 +168,7 @@ def verify(conntrack):
                                     if not group_obj:
                                         Warning(f'{error_group} "{group_name}" has no members!')
 
-            Warning(f'It is prefered to define {inet} conntrack ignore rules in <firewall {inet} prerouting raw> section')
+            Warning(f'It is preferred to define {inet} conntrack ignore rules in <firewall {inet} prerouting raw> section')
 
         if dict_search_args(conntrack, 'timeout', 'custom', inet, 'rule') != None:
             for rule, rule_config in conntrack['timeout']['custom'][inet]['rule'].items():
diff --git a/src/conf_mode/system_console.py b/src/conf_mode/system_console.py
index fe910c1b0..4411257e3 100755
--- a/src/conf_mode/system_console.py
+++ b/src/conf_mode/system_console.py
@@ -67,7 +67,7 @@ def verify(console):
             # If the device name still starts with usbXXX no matching tty was found
             # and it can not be used as a serial interface
             if not os.path.isdir(by_bus_dir) or not os.path.exists(by_bus_device):
-                raise ConfigError(f'Device {device} does not support beeing used as tty')
+                raise ConfigError(f'Device {device} does not support being used as tty')
         if not is_tty(device):
             Warning(f'Device "{device}" used for console is not a TTY!')
 
@@ -99,7 +99,7 @@ def generate(console):
                 console['device'][device_updated] = console['device'][device]
                 del console['device'][device]
             else:
-                raise ConfigError(f'Device {device} does not support beeing used as tty')
+                raise ConfigError(f'Device {device} does not support being used as tty')
 
     for device, device_config in console['device'].items():
         # Do not render getty configuration if specified device is not a TTY.
@@ -114,7 +114,7 @@ def generate(console):
 
     # GRUB
     # For existing serial line change speed (if necessary)
-    # Only applys to ttyS0
+    # Only applies to ttyS0
     if 'ttyS0' not in console['device']:
         return None
 
diff --git a/src/conf_mode/system_host-name.py b/src/conf_mode/system_host-name.py
index 2a5592484..5a9265eba 100755
--- a/src/conf_mode/system_host-name.py
+++ b/src/conf_mode/system_host-name.py
@@ -119,7 +119,7 @@ def verify(hosts):
                 raise ConfigError(f'Invalid alias "{a}" in static-host-mapping "{host}"')
 
     for interface, interface_config in hosts['nameservers_dhcp_interfaces'].items():
-        # Warnin user if interface does not have DHCP or DHCPv6 configured
+        # Warning user if interface does not have DHCP or DHCPv6 configured
         if not set(interface_config).intersection(['dhcp', 'dhcpv6']):
             Warning(f'"{interface}" is not a DHCP interface but uses DHCP name-server option!')
 
diff --git a/src/conf_mode/system_login.py b/src/conf_mode/system_login.py
index 270d7c2bf..537a87ae9 100755
--- a/src/conf_mode/system_login.py
+++ b/src/conf_mode/system_login.py
@@ -65,7 +65,7 @@ login_motd_dsa_warning = r'/run/motd.d/92-vyos-user-dsa-deprecation-warning'
 
 # LOGIN_TIMEOUT from /etc/loign.defs minus 10 sec
 MAX_RADIUS_TIMEOUT: int = 50
-# MAX_RADIUS_TIMEOUT divided by 2 sec (minimum recomended timeout)
+# MAX_RADIUS_TIMEOUT divided by 2 sec (minimum recommended timeout)
 MAX_RADIUS_COUNT: int = 8
 # Maximum number of supported TACACS servers
 MAX_TACACS_COUNT: int = 8
diff --git a/src/conf_mode/system_option.py b/src/conf_mode/system_option.py
index 5f23a5633..41b9a23bb 100755
--- a/src/conf_mode/system_option.py
+++ b/src/conf_mode/system_option.py
@@ -283,7 +283,7 @@ def generate(options):
 
     # XXX: This code path and if statements must be kept in sync with the Kernel
     # option handling in image_installer.py:get_cli_kernel_options(). This
-    # occurance is used for having the appropriate options passed to GRUB
+    # occurrence is used for having the appropriate options passed to GRUB
     # when re-configuring options on the CLI.
     cmdline_options = []
     kernel_opts = options.get('kernel', {})
diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py
index 3b5918218..53cf4ed36 100755
--- a/src/conf_mode/vpn_ipsec.py
+++ b/src/conf_mode/vpn_ipsec.py
@@ -190,7 +190,7 @@ def get_config(config=None):
         ipsec['l2tp_ike_default'] = 'aes256-sha1-modp1024,3des-sha1-modp1024'
         ipsec['l2tp_esp_default'] = 'aes256-sha1,3des-sha1'
 
-    # Collect the interface dicts for any refernced VTI interfaces in
+    # Collect the interface dicts for any referenced VTI interfaces in
     # case we need to bring the interface up
     ipsec['vti_interface_dicts'] = {}
 
diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py
index bd8aad3f7..2ccc03078 100755
--- a/src/conf_mode/vpp.py
+++ b/src/conf_mode/vpp.py
@@ -88,7 +88,7 @@ dependency_interface_type_map = {
     'vpp_interfaces_xconnect': 'xconnect',
 }
 
-# dict of drivers that needs to be overrided
+# dict of drivers that needs to be overridden
 override_drivers: dict[str, str] = {
     'hv_netvsc': 'uio_hv_generic',
 }
@@ -139,7 +139,7 @@ def _load_module(module_name: str):
         module_name (str): Name of the module to load.
     """
     if module_name in list_loaded_modules():
-        vpp_log.info(f"Module '{module_name}' is alrady loaded")
+        vpp_log.info(f"Module '{module_name}' is already loaded")
         return
     try:
         check_kmod(module_name)
@@ -888,7 +888,7 @@ def apply(config):
                     )
                     vpp_control.iface_rxmode(lcp_name, rx_mode)
 
-            # Syncronize routes via LCP
+            # Synchronize routes via LCP
             vpp_control.lcp_resync()
 
         except (VPPIOError, VPPValueError, VppNotRunningError) as e:
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 1f2e43381..c9b34fe8e 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -177,7 +177,7 @@ def verify(vrf):
         for name, vrf_config in vrf['name'].items():
             # Reserved VRF names
             if name in reserved_names:
-                raise ConfigError(f'VRF name "{name}" is reserved and connot be used!')
+                raise ConfigError(f'VRF name "{name}" is reserved and cannot be used!')
 
             # table id is mandatory
             if 'table' not in vrf_config:
@@ -249,7 +249,7 @@ def apply(vrf):
     for tmp in (dict_search('vrf_remove', vrf) or []):
         if interface_exists(tmp):
             # T5492: deleting a VRF instance may leafe processes running
-            # (e.g. dhclient) as there is a depedency ordering issue in the CLI.
+            # (e.g. dhclient) as there is a dependency ordering issue in the CLI.
             # We need to ensure that we stop the dhclient processes first so
             # a proper DHCLP RELEASE message is sent
             for interface in get_vrf_members(tmp):
@@ -342,7 +342,7 @@ def apply(vrf):
             cmd(f'nft {nft_add_element}')
 
         # Only call into nftables as long as there is nothing setup to avoid wasting
-        # CPU time and thus lenghten the commit process
+        # CPU time and thus lengthen the commit process
         if not nft_vrf_zone_rule_setup:
             nft_vrf_zone_rule_setup = is_nft_vrf_zone_rule_setup()
         # Install nftables conntrack rules only once