diff --git a/wx/lib/colourchooser/__init__.py b/wx/lib/colourchooser/__init__.py
index 8789a71f..b149067f 100644
--- a/wx/lib/colourchooser/__init__.py
+++ b/wx/lib/colourchooser/__init__.py
@@ -16,7 +16,7 @@ from __future__ import absolute_import
 
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/colourchooser/canvas.py b/wx/lib/colourchooser/canvas.py
index 2b749c26..f7367b85 100644
--- a/wx/lib/colourchooser/canvas.py
+++ b/wx/lib/colourchooser/canvas.py
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/colourchooser/pycolourbox.py b/wx/lib/colourchooser/pycolourbox.py
index 5c7cb5d2..6fb86379 100644
--- a/wx/lib/colourchooser/pycolourbox.py
+++ b/wx/lib/colourchooser/pycolourbox.py
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 """
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/colourchooser/pycolourchooser.py b/wx/lib/colourchooser/pycolourchooser.py
index b1305a8a..1d488e43 100644
--- a/wx/lib/colourchooser/pycolourchooser.py
+++ b/wx/lib/colourchooser/pycolourchooser.py
@@ -16,7 +16,7 @@ from __future__ import absolute_import
 
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/colourchooser/pycolourslider.py b/wx/lib/colourchooser/pycolourslider.py
index 859f11e2..f7f043a0 100644
--- a/wx/lib/colourchooser/pycolourslider.py
+++ b/wx/lib/colourchooser/pycolourslider.py
@@ -20,7 +20,7 @@ from __future__ import absolute_import
 
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/colourchooser/pypalette.py b/wx/lib/colourchooser/pypalette.py
index 916cbd0b..06e6c703 100644
--- a/wx/lib/colourchooser/pypalette.py
+++ b/wx/lib/colourchooser/pypalette.py
@@ -20,7 +20,7 @@ from __future__ import absolute_import
 
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/colourselect.py b/wx/lib/colourselect.py
index 6b2f516c..5b5bf0dd 100644
--- a/wx/lib/colourselect.py
+++ b/wx/lib/colourselect.py
@@ -30,7 +30,7 @@
 
 # 12/01/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o Updated for 2.5 compatability.
+# o Updated for 2.5 compatibility.
 #
 
 """
diff --git a/wx/lib/dialogs.py b/wx/lib/dialogs.py
index 8dc0336c..a5011c59 100644
--- a/wx/lib/dialogs.py
+++ b/wx/lib/dialogs.py
@@ -12,7 +12,7 @@
 #----------------------------------------------------------------------
 # 12/01/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o Updated for 2.5 compatability.
+# o Updated for 2.5 compatibility.
 #
 # 12/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/editor/__init__.py b/wx/lib/editor/__init__.py
index b6cf981e..cd13dd94 100644
--- a/wx/lib/editor/__init__.py
+++ b/wx/lib/editor/__init__.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/editor/editor.py b/wx/lib/editor/editor.py
index b73901ae..bfe62c25 100644
--- a/wx/lib/editor/editor.py
+++ b/wx/lib/editor/editor.py
@@ -21,7 +21,7 @@
 #----------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/editor/images.py b/wx/lib/editor/images.py
index 86259533..1adf7c8f 100644
--- a/wx/lib/editor/images.py
+++ b/wx/lib/editor/images.py
@@ -3,7 +3,7 @@
 
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 
 from wx.lib.embeddedimage import PyEmbeddedImage
diff --git a/wx/lib/editor/selection.py b/wx/lib/editor/selection.py
index df61cdc5..aa433444 100644
--- a/wx/lib/editor/selection.py
+++ b/wx/lib/editor/selection.py
@@ -1,6 +1,6 @@
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 
 def RestOfLine(sx, width, data, bool):
diff --git a/wx/lib/evtmgr.py b/wx/lib/evtmgr.py
index db2ee6c2..35847f96 100644
--- a/wx/lib/evtmgr.py
+++ b/wx/lib/evtmgr.py
@@ -13,7 +13,7 @@
 #---------------------------------------------------------------------------
 # 12/02/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o Updated for 2.5 compatability.
+# o Updated for 2.5 compatibility.
 #
 
 """
diff --git a/wx/lib/fancytext.py b/wx/lib/fancytext.py
index 695b3be7..9ea477ac 100644
--- a/wx/lib/fancytext.py
+++ b/wx/lib/fancytext.py
@@ -12,7 +12,7 @@
 #----------------------------------------------------------------------------
 # 12/02/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o Updated for 2.5 compatability.
+# o Updated for 2.5 compatibility.
 #
 
 """
diff --git a/wx/lib/filebrowsebutton.py b/wx/lib/filebrowsebutton.py
index a8f23f77..a2c09ec5 100644
--- a/wx/lib/filebrowsebutton.py
+++ b/wx/lib/filebrowsebutton.py
@@ -13,7 +13,7 @@
 #----------------------------------------------------------------------
 # 12/02/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 Compatability changes
+# o 2.5 Compatibility changes
 #
 
 import os
diff --git a/wx/lib/floatbar.py b/wx/lib/floatbar.py
index 546af429..8ab075b1 100644
--- a/wx/lib/floatbar.py
+++ b/wx/lib/floatbar.py
@@ -9,7 +9,7 @@
 #----------------------------------------------------------------------------
 # 12/02/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 Compatability changes
+# o 2.5 Compatibility changes
 #
 # 12/07/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/foldmenu.py b/wx/lib/foldmenu.py
index a3e82d36..0b3fe6be 100644
--- a/wx/lib/foldmenu.py
+++ b/wx/lib/foldmenu.py
@@ -1,6 +1,6 @@
 # 12/07/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 Compatability changes
+# o 2.5 Compatibility changes
 #
 
 import wx
diff --git a/wx/lib/gridmovers.py b/wx/lib/gridmovers.py
index c51db420..5f6d1ba8 100644
--- a/wx/lib/gridmovers.py
+++ b/wx/lib/gridmovers.py
@@ -11,7 +11,7 @@
 #----------------------------------------------------------------------------
 # 12/07/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 Compatability changes
+# o 2.5 Compatibility changes
 #
 # 12/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/intctrl.py b/wx/lib/intctrl.py
index 40a1627a..51d44e0d 100644
--- a/wx/lib/intctrl.py
+++ b/wx/lib/intctrl.py
@@ -27,7 +27,7 @@
 #----------------------------------------------------------------------------
 # 12/08/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 Compatability changes
+# o 2.5 Compatibility changes
 #
 # 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/masked/timectrl.py b/wx/lib/masked/timectrl.py
index 8b1d29c6..6012304c 100644
--- a/wx/lib/masked/timectrl.py
+++ b/wx/lib/masked/timectrl.py
@@ -34,7 +34,7 @@
 #----------------------------------------------------------------------------
 # 12/13/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o Updated for V2.5 compatability
+# o Updated for V2.5 compatibility
 # o wx.SpinCtl has some issues that cause the control to
 #   lock up. Noted in other places using it too, it's not this module
 #   that's at fault.
diff --git a/wx/lib/mixins/__init__.py b/wx/lib/mixins/__init__.py
index caa42dd8..a710b5c8 100644
--- a/wx/lib/mixins/__init__.py
+++ b/wx/lib/mixins/__init__.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 
 
diff --git a/wx/lib/mixins/grid.py b/wx/lib/mixins/grid.py
index b0d9a1b8..acae451b 100644
--- a/wx/lib/mixins/grid.py
+++ b/wx/lib/mixins/grid.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o Untested
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
diff --git a/wx/lib/mixins/imagelist.py b/wx/lib/mixins/imagelist.py
index d245f593..d51ea1a2 100644
--- a/wx/lib/mixins/imagelist.py
+++ b/wx/lib/mixins/imagelist.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o Untested.
 #
 
diff --git a/wx/lib/mixins/listctrl.py b/wx/lib/mixins/listctrl.py
index b1cc45a7..57b99413 100644
--- a/wx/lib/mixins/listctrl.py
+++ b/wx/lib/mixins/listctrl.py
@@ -11,7 +11,7 @@
 #----------------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o ListCtrlSelectionManagerMix untested.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
diff --git a/wx/lib/mixins/rubberband.py b/wx/lib/mixins/rubberband.py
index cc6139e5..210abd33 100644
--- a/wx/lib/mixins/rubberband.py
+++ b/wx/lib/mixins/rubberband.py
@@ -11,7 +11,7 @@
 #---------------------------------------------------------------------------
 # 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o Tested, but there is an anomaly between first use and subsequent uses.
 #   First use is odd, subsequent uses seem to be OK. Init error?
 #   -- No, the first time it uses an aspect ratio, but after the reset it doesn't.
diff --git a/wx/lib/multisash.py b/wx/lib/multisash.py
index 30da4f49..9e767b8d 100644
--- a/wx/lib/multisash.py
+++ b/wx/lib/multisash.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------
 # 12/09/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/plot/CHANGELOG.md b/wx/lib/plot/CHANGELOG.md
index acf0e0a9..eaa601bf 100644
--- a/wx/lib/plot/CHANGELOG.md
+++ b/wx/lib/plot/CHANGELOG.md
@@ -57,7 +57,7 @@ on 2016-07-05 and finished on [insert date here].
   'x is None')
 + Documentation updates
 + Added Box Plot
-+ Added contect manager and decorator that gets and resets the pen before
++ Added context manager and decorator that gets and resets the pen before
   and after a function call
 + updated demo for new features
 + Most items are now allow custom pens (color, width, linestyle)
diff --git a/wx/lib/popupctl.py b/wx/lib/popupctl.py
index 4d7f2971..883be5ae 100644
--- a/wx/lib/popupctl.py
+++ b/wx/lib/popupctl.py
@@ -15,7 +15,7 @@
 #
 # 12/09/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/printout.py b/wx/lib/printout.py
index 52afc6f6..43c73324 100644
--- a/wx/lib/printout.py
+++ b/wx/lib/printout.py
@@ -16,7 +16,7 @@
 # add index to data list after parsing total pages for paging
 #----------------------------------------------------------------------------
 # 12/10/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #----------------------------------------------------------------------------
 # 11/23/2004 - Vernon Cole (wnvcole@peppermillcas.com)
 # o Generalize for non-2-dimensional sequences and non-text data
diff --git a/wx/lib/rcsizer.py b/wx/lib/rcsizer.py
index 5c9fcd80..966f2f30 100644
--- a/wx/lib/rcsizer.py
+++ b/wx/lib/rcsizer.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------
 # 12/10/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o There appears to be a prob with the wx.Sizer.GetSize() method.
 #
 # 12/23/2003 - Jeff Grimmett (grimmtooth@softhome.net)
diff --git a/wx/lib/scrolledpanel.py b/wx/lib/scrolledpanel.py
index ceb7b18d..e4c482af 100644
--- a/wx/lib/scrolledpanel.py
+++ b/wx/lib/scrolledpanel.py
@@ -8,7 +8,7 @@
 #----------------------------------------------------------------------------
 # 12/11/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
diff --git a/wx/lib/sheet.py b/wx/lib/sheet.py
index f90accd7..76e471a4 100644
--- a/wx/lib/sheet.py
+++ b/wx/lib/sheet.py
@@ -6,7 +6,7 @@
 #---------------------------------------------------------------------------
 # 12/11/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o Untested.
 #
 
diff --git a/wx/lib/stattext.py b/wx/lib/stattext.py
index 265ac144..4562dc44 100644
--- a/wx/lib/stattext.py
+++ b/wx/lib/stattext.py
@@ -13,7 +13,7 @@
 #----------------------------------------------------------------------
 # 12/12/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 # o Untested.
 #
 
diff --git a/wx/lib/throbber.py b/wx/lib/throbber.py
index b187ba9e..41384ffc 100644
--- a/wx/lib/throbber.py
+++ b/wx/lib/throbber.py
@@ -17,7 +17,7 @@ can continue unencumbered.
 #
 # 12/12/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o 2.5 compatability update.
+# o 2.5 compatibility update.
 #
 # Tags:        phoenix-port, unittest, py3-port, documented
 
diff --git a/wx/lib/wxpTag.py b/wx/lib/wxpTag.py
index 28af78bf..8170a69b 100644
--- a/wx/lib/wxpTag.py
+++ b/wx/lib/wxpTag.py
@@ -11,7 +11,7 @@
 #----------------------------------------------------------------------
 # 12/13/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o Updated for V2.5 compatability
+# o Updated for V2.5 compatibility
 #
 
 '''
diff --git a/wx/tools/dbg.py b/wx/tools/dbg.py
index 80d5f6f2..743e7ba9 100644
--- a/wx/tools/dbg.py
+++ b/wx/tools/dbg.py
@@ -9,7 +9,7 @@
 #----------------------------------------------------------------------------
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o V2.5 compatability update
+# o V2.5 compatibility update
 #
 
 """
diff --git a/wx/tools/img2img.py b/wx/tools/img2img.py
index ce631a25..2c93ca59 100644
--- a/wx/tools/img2img.py
+++ b/wx/tools/img2img.py
@@ -10,7 +10,7 @@
 #----------------------------------------------------------------------
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o V2.5 compatability update
+# o V2.5 compatibility update
 #
 
 import  getopt
diff --git a/wx/tools/img2png.py b/wx/tools/img2png.py
index c2a8b986..1eff7b36 100644
--- a/wx/tools/img2png.py
+++ b/wx/tools/img2png.py
@@ -9,7 +9,7 @@
 #----------------------------------------------------------------------
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o V2.5 compatability update
+# o V2.5 compatibility update
 #
 
 """
diff --git a/wx/tools/img2xpm.py b/wx/tools/img2xpm.py
index e49a9989..586cdff6 100644
--- a/wx/tools/img2xpm.py
+++ b/wx/tools/img2xpm.py
@@ -9,7 +9,7 @@
 #----------------------------------------------------------------------
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o V2.5 compatability update
+# o V2.5 compatibility update
 #
 
 """