diff --git a/documentation/src/common.dox b/documentation/src/common.dox
index dcad4b1fe..c8536e095 100644
--- a/documentation/src/common.dox
+++ b/documentation/src/common.dox
@@ -168,17 +168,12 @@ widget's parent.
 
 \section common_colors Colors
 
-FLTK stores the colors of widgets as an 32-bit unsigned
-number that is either an index into a color palette of 256
-colors or a 24-bit RGB color. The color palette is \e not
-the X or MS Windows colormap, but instead is an internal table with
-fixed contents.
+FLTK stores the colors of widgets as a 32-bit unsigned number that is
+either an index into a color palette of 256 colors (0 \<= color \<= 255)
+or a 24-bit RGB color (color > 255). The color palette is \e not the
+X or Windows colormap, but instead is an internal table with fixed contents.
 
-See the
-\ref drawing_colors
-section of
-\ref drawing
-for implementation details.
+See the \ref drawing_colors section of \ref drawing for implementation details.
 
 There are symbols for naming some of the more common colors:
 
diff --git a/documentation/src/drawing.dox b/documentation/src/drawing.dox
index 3a2ad42dd..89b1a6830 100644
--- a/documentation/src/drawing.dox
+++ b/documentation/src/drawing.dox
@@ -386,9 +386,8 @@ responsibility to set it back to the default with
 
 \par
 \b Note:
-Because of how line styles are implemented on MS Windows systems, you
-\e must set the line style \e after setting the drawing color.
-If you set the
+Because of how line styles are implemented on Windows systems, you \e must
+set the line style \e after setting the drawing color. If you set the
 color after the line style you will lose the line style settings!
 
 \par
@@ -511,7 +510,7 @@ void fl_pie(int x, int y, int w, int h, double a1, double a2)
 \par
 Draw ellipse sections using integer coordinates. These
 functions match the rather limited circle drawing code provided
-by X and MS Windows. The advantage over using
+by X and Windows. The advantage over using
 \ref drawing_fl_arc "fl_arc()"
 with floating point
 coordinates is that they are faster because they often use the
@@ -555,11 +554,10 @@ with 2-D linear transformations. The functionality matches that
 found in the Adobe&reg; PostScript&tm; language. The
 exact pixels that are filled are less defined than for the fast
 drawing functions so that FLTK can take advantage of drawing
-hardware. On both X and MS Windows the transformed vertices are
-rounded to integers before drawing the line segments: this
-severely limits the accuracy of these functions for complex
-graphics, so use OpenGL when greater accuracy and/or performance
-is required.
+hardware. On both X and Windows the transformed vertices are
+rounded to integers before drawing the line segments: this severely
+limits the accuracy of these functions for complex graphics, so use
+OpenGL when greater accuracy and/or performance is required.
 
 void fl_load_matrix(double a,double b,double c,double d,double x,double y)
 void fl_load_identity()
diff --git a/documentation/src/preface.dox b/documentation/src/preface.dox
index f325c4dc8..67304fbd2 100644
--- a/documentation/src/preface.dox
+++ b/documentation/src/preface.dox
@@ -69,11 +69,11 @@ The X Window System version 11.
 \par Xlib
 The X Window System interface library.
 
-\par MS Windows, <tt>WIN32</tt>
+\par Windows, <tt>WIN32</tt>
 The Microsoft Windows Application Programmer's Interface for Windows 2000,
 Windows XP, Windows Vista, Windows 7 and later Windows versions.
 FLTK uses the preprocessor definition <tt>_WIN32</tt> for the 32 bit
-and 64 bit MS Windows API.
+and 64 bit Windows API.
 
 \par OS X, <tt>__APPLE__</tt>
 The Apple desktop operating sytem OS X 10.0 and later. MacOS 8 and 9 support
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 90efd0216..1ad8cfdfe 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -1149,7 +1149,7 @@ static void cb_Condition(Fl_Choice* o, void* v) {
 
 Fl_Menu_Item menu_Condition[] = {
  {"all platforms", 0,  0, (void*)(Fd_Shell_Command::ALWAYS), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"MS Windows only", 0,  0, (void*)(Fd_Shell_Command::WIN_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"Windows only", 0,  0, (void*)(Fd_Shell_Command::WIN_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {"Linux only", 0,  0, (void*)(Fd_Shell_Command::UX_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {"macOS only", 0,  0, (void*)(Fd_Shell_Command::MAC_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {"Linux and macOS", 0,  0, (void*)(Fd_Shell_Command::MAC_AND_UX_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index b8de00efb..8c14d9811 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -1213,7 +1213,7 @@ if (v == LOAD) {
                 xywh {0 0 100 20} labelsize 11
               }
               MenuItem {} {
-                label {MS Windows only}
+                label {Windows only}
                 user_data {Fd_Shell_Command::WIN_ONLY} user_data_type long
                 xywh {0 0 100 20} labelsize 11
               }
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
index 41cab4604..6f6d20828 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx
@@ -39,7 +39,7 @@ extern const char *fl_bg2;
 #endif // !HMONITOR_DECLARED && _WIN32_WINNT < 0x0500
 
 static Fl_Text_Editor::Key_Binding extra_bindings[] =  {
-  // Define MS Windows specific accelerators...
+  // Define Windows specific accelerators...
   { 'y',          FL_CTRL,                  Fl_Text_Editor::kf_redo       ,0},
   { 0,            0,                        0                             ,0}
 };