diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm
index 2b6b864cf3..25fc5d82b4 100644
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -140,10 +140,10 @@ platform-independent code, such as the wxTreeCtrl and wxListCtrl classes.<P>
 No. This is a much-discussed topic that has (many times) ended with the conclusion that it is in
 wxWidgets&#39; best interests to avoid use of templates. Not all compilers can handle
 templates adequately so it would dramatically reduce the number of compilers
-and platforms that could be supported. It would also be undersirable to make
+and platforms that could be supported. It would also be undesirable to make
 wxWidgets dependent on another large library that may have to be downloaded and installed.
 In addition, use of templates can lead to executable bloat, which is something
-wxWidgets 2 is strenously trying to avoid.<P>
+wxWidgets 2 is strenuously trying to avoid.<P>
 
 The standard C++ string class is not used, again because it is not available to all compilers,
 and it is not necessarily a very efficient implementation. Also, we retain more flexibility
diff --git a/docs/html/faqgtk.htm b/docs/html/faqgtk.htm
index cc4b3748e6..6da8b25c07 100644
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -49,7 +49,7 @@ often abbreviated to wxGTK. wxGTK has a separate home page <a href="http://www.f
 <h3><a name="locale">Why doesn&#39;t reading floating point numbers work when using wxWidgets?</a></h3>
 
 If your program reads the floating point numbers in the format <tt>123.45</tt>
-from a file, it may suddently start returning just <tt>123</tt> instead of the
+from a file, it may suddenly start returning just <tt>123</tt> instead of the
 correct value on some systems -- which is all the more mysterious as the same
 code in a standalone program works just fine.
 
diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm
index 3e7f255569..6c053adb95 100644
--- a/docs/html/faqmac.htm
+++ b/docs/html/faqmac.htm
@@ -200,7 +200,7 @@ This error can sometimes be corrected or avoided by modifying the source code. H
 Because wxWidgets does not have a specific API for the <i>About</i> menu item or the <i>Help</i> menu, the Mac OS port uses some static variables to help the engine make the right decisions:
 <ul>
 <li>It assumes that the <i>About</i> menu item is part of a <i>Help</i> menu.
-<li>The title of the <i>Help</i> menu is stored in <code>wxApp::s_macHelpMenuTitleName</code>, it defaults to "&Help", but you can change it in your constructor to your specific menu title.
+<li>The title of the <i>Help</i> menu is stored in <code>wxApp::s_macHelpMenuTitleName</code>, it defaults to "&amp;Help", but you can change it in your constructor to your specific menu title.
 <li>The item Id of the <i>About</i> menu is stored in <code>wxApp::s_macAboutMenuItemID</code>, it defaults to <code>wxID_ABOUT</code>, but can be changed as well to suit your needs.
 <li>The other items of the wxWidgets help menu are appended to the Mac OS <i>Help</i> menu and the translation of Ids is handled transparently for your application.
 </ul>
diff --git a/docs/html/faqmot.htm b/docs/html/faqmot.htm
index 6a7fdd83eb..e877346726 100644
--- a/docs/html/faqmot.htm
+++ b/docs/html/faqmot.htm
@@ -28,7 +28,6 @@ and <a href="faqunx.htm">Unix FAQ page</a>.
 <ul>
 <li><a href="#versiob">What version of Motif do I need?</a></li>
 <li><a href="#missing">What features are missing or partially implemented?</a></li>
-<li><a href="#dialoged">Does Dialog Editor work with wxWidgets for Motif?</a></li>
 <li><a href="#refresh">Why are windows are not refreshed properly until I resize them?</a></li>
 </ul>
 <hr>
@@ -63,12 +62,6 @@ system is in preparation.
 
 <p>
 
-<h3><a name="dialoged">Does Dialog Editor work with wxWidgets for Motif?</a></h3>
-
-Suport for Dialog Editor is almost there, but there are some wrinkles to iron
-out. You may find it&#39;s useful though: compile it and see.
-<P>
-
 <h3><a name="refresh">Why are windows are not refreshed properly until I resize them?</a></h3>
 
 Very occasionally you can experience this glitch, probably because sometimes the
diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm
index f266bf1ba6..fdaf7b458c 100644
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -1,3 +1,4 @@
+
 <HTML>
 
 <HEAD>
@@ -44,7 +45,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></li>
 <li><a href="#regconfig">Why can I not write to the HKLM part of the registry with wxRegConfig?</a></li>
 <li><a href="#access">Is MS Active Accessibility supported?</a></li>
-<li><a href="#dspfmt">Why does Visual C++ complain about corrupted project files??</a></li>
+<li><a href="#dspfmt">Why does Visual C++ complain about corrupted project files{/a></li>
 <li><a href="#crtmismatch">Visual C++ gives errors about multiply defined symbols, what can I do?</a></li>
 <li><a href="#directx">Why do I get compilation erros when using wxWidgets with DirectShow?</a></li>
 <li><a href="#handlewm">How do I handle Windows messages in my wxWidgets program?</a></li>
@@ -322,6 +323,10 @@ Code&#39; (and no others). This will then work.<P>
 
 <H3><a name="makefiles">How are the wxWidgets makefiles edited under Windows?</a></H3>
 
+wxWidgets 2.5.x and above uses Bakefile to generate makefiles, which
+is described in technical note 16 under docs/tech in your distribution.
+For 2.4.x, the following explanation applies.<P>
+
 As of wxWidgets 2.1, there is a new system written by Vadim Zeitlin, that
 generates the makefiles from templates using tmake.<P>
 
@@ -453,7 +458,7 @@ First, you can use wxRegKey directly, for example:
     regKey.SetName(idName);
 
     {
-        wxLogNull dummy;  
+        wxLogNull dummy; 
         if (!regKey.Create())
         {
             idName = wxT("HKEY_CURRENT_USER\\SOFTWARE\\My Company\\My Product\\Stuff\\");
@@ -499,7 +504,7 @@ for the current status.
 <P>
 
 
-<h3><a name="#dspfmt">Why does Visual C++ complain about corrupted project files??</a></h3>
+<h3><a name="#dspfmt">Why does Visual C++ complain about corrupted project files{/a></h3>
 
 If you have downloaded the wxWidgets sources from the cvs using a Unix cvs
 client or downloaded a daily snapshot in <tt>.tar.gz</tt> format, it is likely