Merge the changes from 3.0 branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/gtk/wxGNOME/wxGNOME.html

@@ -22,7 +22,7 @@ and another one, which only uses X11 calls and which draws its
 widgets entirely itself, without using any outside library. This port
 is called wxX11 or sometimes more generally wxUniv (short for
 wxUniversal), since this widget set (implemented entirely within
-wxWidgets) is available whereever wxWidgets is available. Since this
+wxWidgets) is available wherever wxWidgets is available. Since this
 short overview is mainly about how to write wxWidgets applications
 for the GNOME<A HREF="http://www.gnome.org/"><SUP>[3]</SUP></A>
 desktop, I will focus on the GTK+ port, which is generally referred
@@ -43,11 +43,11 @@ most aspects of GUI and non-GUI application programming. Sometimes,
 various aspects of these design goals contradict each other and this
 holds true especially for the Linux platform which &ndash; from the
 point of view of the desktop environment integration &ndash; is
-lagging behind the other two major desktops (Windows and MacOS X)
+lagging behind the other two major desktops (Windows and OS X)
 mostly because of the schism between the GTK+ based GNOME desktop and
 the Qt<A HREF="http://www.trolltech.com/"><SUP>[5]</SUP></A> based
 KDE<A HREF="http://www.kde.org/"><SUP>[6]</SUP></A> desktop. So far,
-the typical wxWidgets user targeted Windows, maybe MacOS X and Linux
+the typical wxWidgets user targeted Windows, maybe OS X and Linux
 <I>in general</I>, so the aim was to make wxGTK applications run as
 well as possible on as many versions of Linux as possible, including
 those using the KDE environment. Luckily, most of these distributions