diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index 71f8d9715d..8a331bd71a 100644
--- a/samples/access/accesstest.cpp
+++ b/samples/access/accesstest.cpp
@@ -57,7 +57,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 957b0c0006..49e8442502 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -704,7 +704,7 @@ MyPanel::MyPanel(wxWindow *parent)
     m_calendar = DoCreateCalendar(wxDefaultDateTime,
                                   wxCAL_MONDAY_FIRST | wxCAL_SHOW_HOLIDAYS);
 
-    // adjust to vertical/horizontal display, check mostly dedicated to WinCE
+    // adjust to vertical/horizontal display
     bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) );
     m_sizer = new wxBoxSizer( horizontal ? wxHORIZONTAL : wxVERTICAL );
 
diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index b14a0ba0f2..0ec88af1f1 100644
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -42,7 +42,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index c6c2f809e8..69882263d6 100644
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -35,7 +35,7 @@
 #include "wx/display.h"
 
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/dnd/d_and_d.txt b/samples/dnd/d_and_d.txt
index a6ed029255..e1a7c7fdfb 100644
--- a/samples/dnd/d_and_d.txt
+++ b/samples/dnd/d_and_d.txt
@@ -1,4 +1,4 @@
-                        Drag-and-Drop Support in wxWindows
+                        Drag-and-Drop Support in wxWidgets
                         ==================================
 
 1. Overview
@@ -7,9 +7,7 @@
  a) What is it?
 
     We're calling drag-and-drop (or d&d for short) the OLE mechanism of data
-transfer. Please note that it's not the same thing as the file oriented d&d
-of Windows 3.1 "File Manager" which is designed for and limited to the file
-names only.
+transfer.
 
     OLE d&d allows application to transfer data of any type to the same or
 another process.
diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 018c407861..d3722a125f 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -822,7 +822,7 @@ void MyCanvas::DrawText(wxDC& dc)
     dc.DrawRotatedText( wxT("That is text"), 20, 10, -45 );
 
     // use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated
-    // under Win9x (it is not TrueType)
+    // under MSW (it is not TrueType)
     dc.SetFont( *wxSWISS_FONT );
 
     wxString text;
diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 28af5c2ca6..0c5f5c1aff 100644
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -53,7 +53,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 5e4631ca15..92c930e33e 100644
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -28,7 +28,7 @@
 
 #include "joytest.h"
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 076d88b9a7..27aabd76d7 100644
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -33,7 +33,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index fc6ca0ef27..9e104ecfe5 100644
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -36,7 +36,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index a18ac4b274..d626b301de 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -45,7 +45,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index b9ca7a0549..a78e9632cd 100644
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -870,7 +870,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     SetMenuBar(menuBar);
 
     // create a status bar just for fun (by default with 1 pane only)
-    // but don't create it on limited screen space (WinCE)
+    // but don't create it on limited screen space (mobile device)
     bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA;
 
 #if wxUSE_STATUSBAR
diff --git a/samples/sample.rc b/samples/sample.rc
index 6aa0a3b6ad..b214b99b23 100644
--- a/samples/sample.rc
+++ b/samples/sample.rc
@@ -1,20 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        samples/samples.rc
-// Purpose:     a standard Win32 .rc file for the wxWindows samples
+// Purpose:     a standard MSW .rc file for the wxWidgets samples
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.08.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// this minimal resource file is all what is needed for most of the wxWindows
+// this minimal resource file is all what is needed for most of the wxWidgets
 // samples
 
 // note that the icon used by the Explorer (i.e. the programs icon) is the
 // first icon in the executable and the icons are sorted both by their order
-// (Win9x) and by alphabetically (!) (NT), so put this icon first and give it
-// a name starting with "a"
+// and alphabetically (!), so put this icon first and give it a name
+// starting with "a"
 aaaaaaaa ICON "sample.ico"
 
 // this icon is used with wxFrame::SetIcon()
diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 23f5dd89a1..07353e32cb 100644
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -34,7 +34,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index d1024a8cf5..fbaa160028 100644
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -37,7 +37,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 1a13ebe53d..c4c89d8030 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -42,7 +42,7 @@
 // resources
 //----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 2b3dea7158..a9db883899 100644
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -27,7 +27,7 @@
     #include "wx/wx.h"
 #endif
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
@@ -125,8 +125,7 @@ MyDialog::MyDialog(const wxString& title)
 
     m_taskBarIcon = new MyTaskBarIcon();
 
-    // we should be able to show up to 128 characters on recent Windows versions
-    // (and 64 on Win9x)
+    // we should be able to show up to 128 characters on Windows
     if ( !m_taskBarIcon->SetIcon(wxICON(sample),
                                  "wxTaskBarIcon Sample\n"
                                  "With a very, very, very, very\n"
diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index f3fa5c9ffc..0e00a8d6e4 100644
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -1164,7 +1164,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_enter->SetClientData((void *)wxT("enter"));
 
     m_textrich = new MyTextCtrl(this, wxID_ANY, wxT("Allows more than 30Kb of text\n")
-                                wxT("(even under broken Win9x)\n")
+                                wxT("(on all Windows versions)\n")
                                 wxT("and a very very very very very ")
                                 wxT("very very very long line to test ")
                                 wxT("wxHSCROLL style\n")
@@ -1545,7 +1545,7 @@ void MyFrame::OnFileSave(wxCommandEvent& WXUNUSED(event))
     if ( m_panel->m_textrich->SaveFile(wxT("dummy.txt")) )
     {
 #if wxUSE_FILE
-        // verify that the fil length is correct (it wasn't under Win95)
+        // verify that the file length is correct
         wxFile file(wxT("dummy.txt"));
         wxLogStatus(this,
                     wxT("Successfully saved file (text len = %lu, file size = %ld)"),
diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp
index c72da1851f..87fcf2f575 100644
--- a/samples/uiaction/uiaction.cpp
+++ b/samples/uiaction/uiaction.cpp
@@ -37,7 +37,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index 57491f2a3d..52116ad276 100644
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -38,7 +38,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources)
+// the application icon (under Windows it is in resources)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index e231e91123..890e9fd73c 100644
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -277,7 +277,7 @@ void SliderWidgetsPage::CreateContent()
     m_chkBothSides = CreateCheckBoxAndAddToSizer
                      (sizerLeft, wxT("&Both sides"), SliderPage_BothSides);
 #if wxUSE_TOOLTIPS
-    m_chkBothSides->SetToolTip( wxT("\"Both sides\" is only supported \nin Win95 and Universal") );
+    m_chkBothSides->SetToolTip( wxT("\"Both sides\" is only supported \nin Universal") );
 #endif // wxUSE_TOOLTIPS
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 1492fd5731..bdb95e2ee0 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -59,7 +59,7 @@
 // Regular resources (the non-XRC kind).
 //-----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
+// the application icon (under Windows it is in resources and even
 // though we could still include the XPM here it would be unused)
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"