Merge branch 'main' into dev-bufalloc

Author: HTRamsey

.github/.cSpellWords.txt

@@ -454,6 +454,7 @@ FPSP
 FRAMERX
 FRMFILTER
 frms
+fsanitize
 FSDMA
 FTSR
 FUDUP
@@ -488,6 +489,7 @@ HASHL
 HCKER
 hclk
 HDFC
+HDLCD
 hein
 HFNMIENA
 HFRDY
@@ -811,6 +813,7 @@ NOPIDEVAD
 NOPRFCNT
 NOTRCPKT
 npacket
+npuspporpl
 NRZVALID
 NSACR
 NSID
@@ -820,6 +823,8 @@ nstat
 NSUID
 NSUIDE
 NSUNID
+NSWDRSTREQ
+NSWDRSTREQEN
 Nullpuc
 Nullpx
 numaker
@@ -1031,6 +1036,7 @@ RPSF
 RRDPSR
 RSERVED
 RSTN
+RSTREQEN
 RTIC
 RTIM
 RTMIS
@@ -1174,6 +1180,7 @@ SLEEPONEXIT
 SLEWCTL
 Slirp
 SLOWCLK
+SLOWCLKWDRSTREQ
 SMII
 smlad
 SMLAD
@@ -1284,13 +1291,15 @@ SUPPR
 SUPR
 SVLAN
 SWDEF
+SWDRSTREQ
 SWFDUP
 SWIER
 SWINC
 SWIT
 SWOENA
 SWOSCALER
 SWRESET
+SWRESETREQ
 sxtab
 SXTAB
 sxtb
@@ -1511,11 +1520,13 @@ VLANE
 VLANP
 VLTV
 VMASK
+VMMPCBLKSIZE
 VMRS
 VMSR
 vnetmask
 vnetwork
 VREDUCE
+VSOCKET
 VTIR
 VTOR
 wakeon
@@ -1565,7 +1576,7 @@ xpsr
 xtopology
 xtopologyp
 xzvf
-YA)   
+YA)
 Zimperium
 zipperowiec
 Zosi

.github/CONTRIBUTING.md

@@ -33,7 +33,7 @@ When creating a new topic on the forums or filing an issue, please include as ma
 ## Contributing via pull request
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
-1. You are working against the latest source on the *master* branch.
+1. You are working against the latest source on the *main* branch.
 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
 3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 
@@ -63,7 +63,7 @@ Looking at the existing issues is a great way to find something to contribute on
 
 
 ## Licensing
-The FreeRTOS-Plus-TCP library is released under the MIT open source license, the text of which can be found [here](https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/master/LICENSE.md)
+The FreeRTOS-Plus-TCP library is released under the MIT open source license, the text of which can be found [here](https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/LICENSE.md)
 
 Additional license files can be found in the folders containing any supplementary libraries licensed by their respective copyright owners where applicable.