update style/404 update branch to stage, fix tooltip merge conflicts :-|

.github/workflows/build_rns.yml

@@ -3,7 +3,7 @@ name: 'Release Note Publisher'
 on:
   push:
     branches:
-      - rn-stage
+      - stage
 
 jobs:
   release-notes:

build_trigger.txt

@@ -1 +1 @@
-build..
+build...

content/cumulus-linux-37/Layer-2/Multi-Chassis-Link-Aggregation-MLAG.md

@@ -1008,7 +1008,7 @@ Peer priority and id: 32768 44:38:39:00:00:12; Peer role: secondary
 ```
 
 {{%notice note%}}
-The MLAG healthCheck module listens on UDP port 5342. If you have not configured a backup VRF, the module listens on all VRFs, which is normal UDP socket behaviour. Make sure to configure a backup link and backup VRF so that the MLAG healtcheck module only listens on the backup VRF.
+The MLAG healthCheck module listens on UDP port 5342. If you have not configured a backup VRF, the module listens on all VRFs, which is normal UDP socket behavior. Make sure to configure a backup link and backup VRF so that the MLAG healthcheck module only listens on the backup VRF.
 {{%/notice%}}
 
 **Comparing VRF and Management VRF Configurations**

content/cumulus-linux-37/Layer-2/Spanning-Tree-and-Rapid-Spanning-Tree.md

@@ -48,7 +48,7 @@ RSTP works with MST seamlessly, creating a single instance of spanning tree that
 
 RSTP treats the MST domain as one giant switch, whereas MST treats the RSTP domain as a different region. To enable proper communication between the regions, MST creates a Common Spanning Tree (CST) that connects all the boundary switches and forms the overall view of the MST domain. Because changes in the CST need to be reflected in all regions, the RSTP tree is included in the CST to ensure that changes on the RSTP domain are reflected in the CST domain. This does cause topology changes on the RSTP domain to impact the rest of the network but keeps the MST domain informed of every change occurring in the RSTP domain, ensuring a loop-free network.
 
-Configure the root bridge within the MST domain by changing the priority on the relevant MST switch. When MST detects an RSTP link, it falls back into RSTP mode. The MST domain choses the switch with the lowest cost to the CST root bridge as the CIST root bridge.
+Configure the root bridge within the MST domain by changing the priority on the relevant MST switch. When MST detects an RSTP link, it falls back into RSTP mode. The MST domain chooses the switch with the lowest cost to the CST root bridge as the CIST root bridge.
 
 ### RSTP with MLAG
 

content/cumulus-linux-37/Layer-3/Policy-based-Routing.md

@@ -33,7 +33,7 @@ A PBR policy contains one or more policy maps. Each policy map:
 
   - A set rule determines the PBR nexthop for the policy. The set rule can contain a single nexthop IP address or it can contain a nexthop group. A nexthop group has more than one nexthop IP address so that you can use multiple interfaces to forward traffic. To use ECMP, you configure a nexthop group.
 
-To use PBR in Cumulus linux, you define a PBR policy and apply it to the ingress interface (the interface must already have an IP address assigned). Traffic is matched against the match rules in sequential order and forwarded according to the set rule in the first match. Traffic that does not match any rule is passed onto the normal destination based routing mechanism.
+To use PBR in Cumulus Linux, you define a PBR policy and apply it to the ingress interface (the interface must already have an IP address assigned). Traffic is matched against the match rules in sequential order and forwarded according to the set rule in the first match. Traffic that does not match any rule is passed onto the normal destination based routing mechanism.
 
 {{%notice note%}}
 

content/cumulus-linux-37/Monitoring-and-Troubleshooting/Simple-Network-Management-Protocol-SNMP/_index.md

@@ -1080,7 +1080,7 @@ way:
      
            OPTIONS
      
-                  There are various options to control the behaviour of the monitored expression.  These include:
+                  There are various options to control the behavior of the monitored expression.  These include:
                   -D     indicates that the expression should be evaluated using delta differences between sample
                          values (rather than the values themselves).
                   -d OID  or  -di OID
@@ -1109,7 +1109,7 @@ way:
                   -S     indicates that the monitor expression should not be evaluated when the agent first starts up.
                          The first evaluation will be done once the first repeat interval has expired.
                   -s     indicates that the monitor expression should be evaluated when the agent first starts up.
-                         This is the default behaviour.
+                         This is the default behavior.
                          Note:  Notifications triggered by this initial evaluation will be sent before the coldStart trap.
                   -u SECNAME
                          specifies a security name to use for scanning the local host, instead of the default