Merge branch '57-finalize' into stage

content/cumulus-linux-57/Layer-1-and-Switch-Ports/802.1X-Interfaces.md

@@ -82,17 +82,17 @@ The following example:
 
 - Sets the 802.1X RADIUS server IP address to 10.10.10.1 and the VRF to BLUE.
 - Sets the 802.1X RADIUS shared secret to mysecret.
-- Sets the 802.1X RADIUS authentication port to 2812.
-- Sets the 802.1X RADIUS accounting port to 2813.
+- Sets the 802.1X RADIUS authentication port to 2813.
+- Sets the 802.1X RADIUS accounting port to 2812.
 - Sets the fixed IP address for the RADIUS client to receive requests to 10.10.10.6.
 - Sets the EAP reauthentication interval to 40.
 - Enables 802.1X on swp1, swp2, and swp3.
 
 ```
 cumulus@switch:~$ nv set system dot1x radius server 10.10.10.1 vrf BLUE
 cumulus@switch:~$ nv set system dot1x radius server 10.10.10.1 shared-secret mysecret
-cumulus@switch:~$ nv set system dot1x radius server 10.10.10.1 authentication-port 2812 
-cumulus@switch:~$ nv set system dot1x radius server 10.10.10.1 accounting-port 2813 
+cumulus@switch:~$ nv set system dot1x radius server 10.10.10.1 authentication-port 2813 
+cumulus@switch:~$ nv set system dot1x radius server 10.10.10.1 accounting-port 2812 
 cumulus@switch:~$ nv set system dot1x radius client-src-ip 10.10.10.6
 cumulus@switch:~$ nv set system dot1x reauthentication-interval 40
 cumulus@switch:~$ nv set interface swp1,swp2,swp3 dot1x eap enabled 
@@ -135,8 +135,8 @@ The following example:
 
 - Sets the 802.1X RADIUS server IP address to 10.10.10.1 and the VRF to BLUE.
 - Sets the 802.1X RADIUS shared secret to mysecret.
-- Sets the 802.1X RADIUS authentication port to 2812.
-- Sets the 802.1X RADIUS accounting port to 2813.
+- Sets the 802.1X RADIUS authentication port to 2813.
+- Sets the 802.1X RADIUS accounting port to 2812.
 - Sets the fixed IP address for the RADIUS client to receive requests to 10.10.10.6.
 - Sets the EAP reauthentication interval to 40.
 - Enables 802.1X on swp1 through swp3.
@@ -149,10 +149,10 @@ interfaces=swp1,swp2,swp3
 eap_reauth_period=40
 ...
 auth_server_addr=10.10.10.1%BLUE
-auth_server_port=1812
+auth_server_port=1813
 auth_server_shared_secret=mysecret
 acct_server_addr=10.10.10.1%BLUE
-acct_server_port=2813
+acct_server_port=2812
 acct_server_shared_secret=mysecret
 radius_client_addr=10.10.10.6
 ...
@@ -180,7 +180,7 @@ iface swp2
         bridge-access <vlan>
         bridge-learning off
         mstpctl-bpduguard yes
-        mstpctl-portadminedge ye
+        mstpctl-portadminedge yes
 auto swp3
 iface swp3
         bridge-access <vlan>