Merge pull request #5082 from sever-sever/T8410

T8410: Fix typos and mistakes for operational and configuration commands

23 files changed, 27 insertions, 27 deletions

diff --git a/src/migration-scripts/bgp/5-to-6 b/src/migration-scripts/bgp/5-to-6
index 5e5090587..3443e8000 100644
--- a/src/migration-scripts/bgp/5-to-6
+++ b/src/migration-scripts/bgp/5-to-6
@@ -25,7 +25,7 @@ def migrate(config: ConfigTree) -> None:
         return
 
     for address_family in ['ipv4-unicast', 'ipv6-unicast']:
-        # there is no non-main routing table beeing redistributed under this addres family
+        # there is no non-main routing table being redistributed under this address family
         # bail out early and continue with next AFI
         table_path = bgp_base + ['address-family', address_family, 'redistribute', 'table']
         if not config.exists(table_path):
diff --git a/src/migration-scripts/container/0-to-1 b/src/migration-scripts/container/0-to-1
index db0b6de2b..6f11bdbac 100644
--- a/src/migration-scripts/container/0-to-1
+++ b/src/migration-scripts/container/0-to-1
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T4870: change underlaying container filesystem from vfs to overlay
+# T4870: change underlying container filesystem from vfs to overlay
 
 import os
 import shutil
@@ -35,7 +35,7 @@ def migrate(config: ConfigTree) -> None:
             image_name = config.return_value(base + [container, 'image'])
             call(f'sudo podman image save --quiet --output /root/{container}.tar --format oci-archive {image_name}')
 
-    # No need to adjust the strage driver online (this is only used for testing and
+    # No need to adjust the storage driver online (this is only used for testing and
     # debugging on a live system) - it is already overlay2 when the migration script
     # is run during system update. But the specified driver in the image is actually
     # overwritten by the still present VFS filesystem on disk. Thus podman still
diff --git a/src/migration-scripts/dns-dynamic/2-to-3 b/src/migration-scripts/dns-dynamic/2-to-3
index bd6ed7c00..9e79078fa 100644
--- a/src/migration-scripts/dns-dynamic/2-to-3
+++ b/src/migration-scripts/dns-dynamic/2-to-3
@@ -33,7 +33,7 @@ def normalize_name(name):
     the old name format.
     """
     # Normalize unicode characters to ASCII (NFKD)
-    # Replace all separators with hypens, strip leading and trailing hyphens
+    # Replace all separators with hyphens, strip leading and trailing hyphens
     name = normalize('NFKD', name).encode('ascii', 'ignore').decode()
     name = re.sub(r'(\s|_|\W)+', '-', name).strip('-')
 
diff --git a/src/migration-scripts/firewall/11-to-12 b/src/migration-scripts/firewall/11-to-12
index ff4f71614..5e9e9de32 100644
--- a/src/migration-scripts/firewall/11-to-12
+++ b/src/migration-scripts/firewall/11-to-12
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T5681: Firewall re-writing. Simplify cli when mathcing interface
+# T5681: Firewall re-writing. Simplify cli when matching interface
 # From
     # set firewall ... rule <rule> [inbound-interface | outboubd-interface] interface-name <iface>
     # set firewall ... rule <rule> [inbound-interface | outboubd-interface] interface-group <iface_group>
diff --git a/src/migration-scripts/firewall/14-to-15 b/src/migration-scripts/firewall/14-to-15
index e3f5bd554..692b4d949 100644
--- a/src/migration-scripts/firewall/14-to-15
+++ b/src/migration-scripts/firewall/14-to-15
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T5535: Migrate <set system ip disable-directed-broadcast> to <set firewall global-options directed-broadcas [enable|disable]
+# T5535: Migrate <set system ip disable-directed-broadcast> to <set firewall global-options directed-broadcast [enable|disable]
 
 from vyos.configtree import ConfigTree
 
diff --git a/src/migration-scripts/interfaces/1-to-2 b/src/migration-scripts/interfaces/1-to-2
index 65da60f24..d0abb4466 100644
--- a/src/migration-scripts/interfaces/1-to-2
+++ b/src/migration-scripts/interfaces/1-to-2
@@ -34,7 +34,7 @@ def migrate(config: ConfigTree) -> None:
         if config.exists(['interfaces', 'ethernet', intf, 'bond-group']):
             # get configured bond interface
             bond = config.return_value(['interfaces', 'ethernet', intf, 'bond-group'])
-            # delete old interface asigned (nested) bond group
+            # delete old interface assigned (nested) bond group
             config.delete(['interfaces', 'ethernet', intf, 'bond-group'])
             # create new bond member interface
             config.set(base + [bond, 'member', 'interface'], value=intf, replace=False)
@@ -42,7 +42,7 @@ def migrate(config: ConfigTree) -> None:
     #
     # some combinations were allowed in the past from a CLI perspective
     # but the kernel overwrote them - remove from CLI to not confuse the users.
-    # In addition new consitency checks are in place so users can't repeat the
+    # In addition new consistency checks are in place so users can't repeat the
     # mistake. One of those nice issues is https://vyos.dev/T532
     for bond in config.list_nodes(base):
         if config.exists(base + [bond, 'arp-monitor', 'interval']) and config.exists(base + [bond, 'mode']):
diff --git a/src/migration-scripts/interfaces/5-to-6 b/src/migration-scripts/interfaces/5-to-6
index 8f406b5c8..e172d9c80 100644
--- a/src/migration-scripts/interfaces/5-to-6
+++ b/src/migration-scripts/interfaces/5-to-6
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# Migrate IPv6 router advertisments from a nested interface configuration to
+# Migrate IPv6 router advertisements from a nested interface configuration to
 # a denested "service router-advert"
 
 from vyos.configtree import ConfigTree
diff --git a/src/migration-scripts/interfaces/7-to-8 b/src/migration-scripts/interfaces/7-to-8
index a2e875b82..e670deb37 100644
--- a/src/migration-scripts/interfaces/7-to-8
+++ b/src/migration-scripts/interfaces/7-to-8
@@ -43,7 +43,7 @@ def migrate(config: ConfigTree) -> None:
         # Nothing to do
         return
 
-    # list all individual wireguard interface isntance
+    # list all individual wireguard interface instance
     for i in config.list_nodes(base):
         iface = base + [i]
         for peer in config.list_nodes(iface + ['peer']):
diff --git a/src/migration-scripts/interfaces/8-to-9 b/src/migration-scripts/interfaces/8-to-9
index 8e1881911..baabce8bc 100644
--- a/src/migration-scripts/interfaces/8-to-9
+++ b/src/migration-scripts/interfaces/8-to-9
@@ -26,7 +26,7 @@ def migrate(config: ConfigTree) -> None:
             # Nothing to do
             continue
 
-        # list all individual interface isntance
+        # list all individual interface instance
         for i in config.list_nodes(base):
             iface = base + [i]
             if config.exists(iface + ['link']):
diff --git a/src/migration-scripts/interfaces/9-to-10 b/src/migration-scripts/interfaces/9-to-10
index 06429ba98..354416975 100644
--- a/src/migration-scripts/interfaces/9-to-10
+++ b/src/migration-scripts/interfaces/9-to-10
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# - rename CLI node 'dhcpv6-options delgate' to 'dhcpv6-options prefix-delegation
+# - rename CLI node 'dhcpv6-options delegate' to 'dhcpv6-options prefix-delegation
 #   interface'
 # - rename CLI node 'interface-id' for prefix-delegation to 'address' as it
 #   represents the local interface IPv6 address assigned by DHCPv6-PD
@@ -41,5 +41,5 @@ def migrate(config: ConfigTree) -> None:
                 for interface in config.list_nodes(new_path + ['interface']):
                     config.rename(new_path + ['interface', interface, 'interface-id'], 'address')
 
-                # delete old noe
+                # delete old node
                 config.delete(base_path)
diff --git a/src/migration-scripts/ipoe-server/1-to-2 b/src/migration-scripts/ipoe-server/1-to-2
index cf1cb5ca6..6db4a7167 100644
--- a/src/migration-scripts/ipoe-server/1-to-2
+++ b/src/migration-scripts/ipoe-server/1-to-2
@@ -21,7 +21,7 @@
 # - changed cli of all named pools
 # - moved gateway-address from pool to global configuration with / netmask
 #   gateway can exist without pool if radius is used
-#   and Framed-ip-address is transmited
+#   and Framed-ip-address is transmitted
 # - There are several gateway-addresses in ipoe
 # - default-pool by migration.
 #       1. The first pool that contains next-poll.
diff --git a/src/migration-scripts/l2tp/5-to-6 b/src/migration-scripts/l2tp/5-to-6
index c1f13a8c7..d57819d2a 100644
--- a/src/migration-scripts/l2tp/5-to-6
+++ b/src/migration-scripts/l2tp/5-to-6
@@ -28,7 +28,7 @@ def migrate(config: ConfigTree) -> None:
                    value=config.return_value(idle_path))
         config.delete(idle_path)
 
-    #migrate mppe from authentication to ppp-otion
+    #migrate mppe from authentication to ppp-options
     mppe_path = base + ['authentication', 'mppe']
     if config.exists(mppe_path):
         config.set(base + ['ppp-options', 'mppe'],
diff --git a/src/migration-scripts/nat/6-to-7 b/src/migration-scripts/nat/6-to-7
index 651179f4e..2e8929b1c 100644
--- a/src/migration-scripts/nat/6-to-7
+++ b/src/migration-scripts/nat/6-to-7
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T5681: Firewall re-writing. Simplify cli when mathcing interface
+# T5681: Firewall re-writing. Simplify cli when matching interface
 # From
 #   'set nat [source|destination] rule X [inbound-interface|outbound interface] interface-name <iface>'
 #   'set nat [source|destination] rule X [inbound-interface|outbound interface] interface-group <iface_group>'
diff --git a/src/migration-scripts/nat66/1-to-2 b/src/migration-scripts/nat66/1-to-2
index b506f891b..eef55e878 100644
--- a/src/migration-scripts/nat66/1-to-2
+++ b/src/migration-scripts/nat66/1-to-2
@@ -29,7 +29,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T5681: Firewall re-writing. Simplify cli when mathcing interface
+# T5681: Firewall re-writing. Simplify cli when matching interface
 # From
 #   'set nat66 [source|destination] rule X [inbound-interface|outbound interface] <iface>'
 # to
diff --git a/src/migration-scripts/nhrp/0-to-1 b/src/migration-scripts/nhrp/0-to-1
index daed73993..1923f9283 100644
--- a/src/migration-scripts/nhrp/0-to-1
+++ b/src/migration-scripts/nhrp/0-to-1
@@ -112,7 +112,7 @@ def migrate(config: ConfigTree) -> None:
                     config.set(base + [tunnel_name, 'multicast'], value=nbma,
                                replace=False)
 
-        ## Delete non-cahching
+        ## Delete non-caching
         if config.exists(base + [tunnel_name, 'non-caching']):
             config.delete(base + [tunnel_name, 'non-caching'])
         ## Delete shortcut-destination
@@ -126,4 +126,4 @@ def migrate(config: ConfigTree) -> None:
                 config.set(base + [tunnel_name, 'shortcut'])
             config.delete(base + [tunnel_name, 'shortcut-target'])
         ## Set registration-no-unique
-        config.set(base + [tunnel_name, 'registration-no-unique'])
\ No newline at end of file
+        config.set(base + [tunnel_name, 'registration-no-unique'])
diff --git a/src/migration-scripts/openconnect/1-to-2 b/src/migration-scripts/openconnect/1-to-2
index 07b1903b8..b145ccb0f 100644
--- a/src/migration-scripts/openconnect/1-to-2
+++ b/src/migration-scripts/openconnect/1-to-2
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# Delete depricated outside-nexthop address
+# Delete deprecated outside-nexthop address
 
 from vyos.configtree import ConfigTree
 
diff --git a/src/migration-scripts/policy/3-to-4 b/src/migration-scripts/policy/3-to-4
index 4e213eec1..b34411c39 100644
--- a/src/migration-scripts/policy/3-to-4
+++ b/src/migration-scripts/policy/3-to-4
@@ -105,7 +105,7 @@ def migrate(config: ConfigTree) -> None:
         for rule in config.list_nodes(base + [route_map, 'rule']):
             base_rule: list[str] = base + [route_map, 'rule', rule, 'set']
 
-            # IF additive presents in coummunity then comm-list is redundant
+            # IF additive presents in community then comm-list is redundant
             isAdditive: bool = True
             #### Change Set community ########
             if config.exists(base_rule + ['community']):
diff --git a/src/migration-scripts/quagga/11-to-12 b/src/migration-scripts/quagga/11-to-12
index 83fd1d0d3..6aee33c5f 100644
--- a/src/migration-scripts/quagga/11-to-12
+++ b/src/migration-scripts/quagga/11-to-12
@@ -14,7 +14,7 @@
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 # T6747:
-#   - Migrate static BFD configuration to match FRR possibillities
+#   - Migrate static BFD configuration to match FRR possibilities
 #   - Consolidate static multicast routing configuration under a new node
 
 from vyos.configtree import ConfigTree
diff --git a/src/migration-scripts/snmp/1-to-2 b/src/migration-scripts/snmp/1-to-2
index d2b8457ce..0d1b0aa21 100644
--- a/src/migration-scripts/snmp/1-to-2
+++ b/src/migration-scripts/snmp/1-to-2
@@ -16,7 +16,7 @@
 from vyos.configtree import ConfigTree
 
 # We no longer support hashed values prefixed with '0x' to unclutter
-# CLI and also calculate the hases in advance instead of retrieving
+# CLI and also calculate the hashes in advance instead of retrieving
 # them after service startup - which was always a bad idea
 prefix = '0x'
 
diff --git a/src/migration-scripts/snmp/2-to-3 b/src/migration-scripts/snmp/2-to-3
index b0020a7a5..2cacea007 100644
--- a/src/migration-scripts/snmp/2-to-3
+++ b/src/migration-scripts/snmp/2-to-3
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T4857: Implement FRR SNMP recomendations
+# T4857: Implement FRR SNMP recommendations
 #  cli changes from:
 #  set service snmp oid-enable route-table
 #  To
diff --git a/src/migration-scripts/sstp/0-to-1 b/src/migration-scripts/sstp/0-to-1
index 5cc091965..f5d5c4715 100644
--- a/src/migration-scripts/sstp/0-to-1
+++ b/src/migration-scripts/sstp/0-to-1
@@ -15,7 +15,7 @@
 
 # - migrate from "service sstp-server" to "vpn sstp"
 # - remove primary/secondary identifier from nameserver
-# - migrate RADIUS configuration to a more uniform syntax accross the system
+# - migrate RADIUS configuration to a more uniform syntax across the system
 #   - authentication radius-server x.x.x.x to authentication radius server x.x.x.x
 #   - authentication radius-settings to authentication radius
 #   - do not migrate radius server req-limit, use default of unlimited
diff --git a/src/migration-scripts/system/22-to-23 b/src/migration-scripts/system/22-to-23
index 92695668f..177a206e4 100644
--- a/src/migration-scripts/system/22-to-23
+++ b/src/migration-scripts/system/22-to-23
@@ -22,7 +22,7 @@ def migrate(config: ConfigTree) -> None:
         # Nothing to do
         return
 
-    # T4346: drop support to disbale IPv6 address family within the OS Kernel
+    # T4346: drop support to disable IPv6 address family within the OS Kernel
     if config.exists(base + ['disable']):
         config.delete(base + ['disable'])
         # IPv6 address family disable was the only CLI option set - we can cleanup
diff --git a/src/migration-scripts/system/23-to-24 b/src/migration-scripts/system/23-to-24
index ad88a4a2b..0efd54de7 100644
--- a/src/migration-scripts/system/23-to-24
+++ b/src/migration-scripts/system/23-to-24
@@ -43,7 +43,7 @@ def migrate(config: ConfigTree) -> None:
         return
 
     # We need a temporary copy of the config tree as the original one needs to be
-    # deleted first due to a change iun thge tagNode structure.
+    # deleted first due to a change in the tagNode structure.
     config.copy(base, tmp_base)
     config.delete(base)