diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index e7b2441d85..7feb4dd96e 100644
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -623,8 +623,8 @@ htb:
 	cd $(WXDIR)\docs\html\wx
     -erase /Y wx.zip wx.htb
     zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\html\htb
-    move wx.zip $(DOCDIR)\html\htb\wx.htb
+    -mkdir $(DOCDIR)\htb
+    move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
 
 # In order to force document reprocessing
diff --git a/docs/latex/wx/array.tex b/docs/latex/wx/array.tex
index c5aca501c3..187909f76f 100644
--- a/docs/latex/wx/array.tex
+++ b/docs/latex/wx/array.tex
@@ -249,7 +249,6 @@ This macro defines a new sorted array class named {\it name} and containing
 the elements of type {\it T}. The second form is used when compiling DLL
 under Windows and array needs to be visible outside the DLL.
 
-
 Example:
 
 \begin{verbatim}
@@ -259,7 +258,7 @@ class MyClass;
 WX_DEFINE_SORTED_ARRAY(MyClass *, wxArrayOfMyClass);
 \end{verbatim}
 
-You will have to initialize the objects of this class by passing a comparaison
+You will have to initialize the objects of this class by passing a comparison
 function to the array object constructor like this:
 
 \begin{verbatim}
@@ -356,7 +355,7 @@ Default constructor initializes an empty array object.
 \func{}{wxSortedArray}{\param{int (*)(T first, T second)}{compareFunction}}
 
 There is no default constructor for wxSortedArray classes - you must initialize it
-with a function to use for item comparaison. It is a function which is passed
+with a function to use for item comparison. It is a function which is passed
 two arguments of type {\it T} where {\it T} is the array element type and which
 should return a negative, zero or positive value according to whether the first
 element passed to it is less than, equal to or greater than the second one.
diff --git a/docs/latex/wx/arrstrng.tex b/docs/latex/wx/arrstrng.tex
index dc15f1dd0f..5eca48f74e 100644
--- a/docs/latex/wx/arrstrng.tex
+++ b/docs/latex/wx/arrstrng.tex
@@ -205,23 +205,19 @@ Returns the last element of the array. Attempt to access the last element of
 an empty array will result in assert failure in debug build, however no checks
 are done in release mode.
 
-\membersection{wxArrayString::Remove (by value)}\label{wxarraystringremoveval}
+\membersection{wxArrayString::Remove}\label{wxarraystringremove}
 
 \func{void}{Remove}{\param{const char *}{ sz}}
 
 Removes the first item matching this value. An assert failure is provoked by
 an attempt to remove an element which does not exist in debug build.
 
-See also: \helpref{Index}{wxarraystringindex}, \helpref{Remove}{wxarraystringremove}
-
-\membersection{wxArrayString::Remove (by index)}\label{wxarraystringremove}
+See also: \helpref{Index}{wxarraystringindex}
 
 \func{void}{Remove}{\param{size\_t }{nIndex}}
 
 Removes the item at given position.
 
-See also: \helpref{Remove}{wxarraystringremoveval}
-
 \membersection{wxArrayString::Shrink}\label{wxarraystringshrink}
 
 \func{void}{Shrink}{\void}
@@ -231,7 +227,7 @@ minimize the array memory consumption.
 
 See also: \helpref{Alloc}{wxarraystringalloc}, \helpref{Dynamic array memory management}{wxarraymemorymanagement}
 
-\membersection{wxArrayString::Sort (alphabetically)}\label{wxarraystringsort}
+\membersection{wxArrayString::Sort}\label{wxarraystringsort}
 
 \func{void}{Sort}{\param{bool}{ reverseOrder = FALSE}}
 
@@ -242,10 +238,6 @@ Sorts the array in alphabetical order or in reverse alphabetical order if
 could break the order of items and, for example, subsequent calls to 
 \helpref{Index()}{wxarraystringindex} would then not work!
 
-See also: \helpref{Sort}{wxarraystringsortcallback}
-
-\membersection{wxArrayString::Sort (user defined)}\label{wxarraystringsortcallback}
-
 \func{void}{Sort}{\param{CompareFunction }{compareFunction}}
 
 Sorts the array using the specified {\it compareFunction} for item comparison.
@@ -280,5 +272,3 @@ array.Sort(CompareStringLen);
 could break the order of items and, for example, subsequent calls to 
 \helpref{Index()}{wxarraystringindex} would then not work!
 
-See also: \helpref{Sort}{wxarraystringsort}
-
diff --git a/docs/latex/wx/mdi.tex b/docs/latex/wx/mdi.tex
index 5fa226e109..1e59dcaf45 100644
--- a/docs/latex/wx/mdi.tex
+++ b/docs/latex/wx/mdi.tex
@@ -476,7 +476,14 @@ is available under Windows only.
 
 \func{virtual wxMDIClientWindow*}{OnCreateClient}{\void}
 
-Override this to return a different kind of client window.
+Override this to return a different kind of client window. If you override this function,
+you must create your parent frame in two stages, or your function will never be called,
+due to the way C++ treats virtual functions called from constructors. For example:
+
+\begin{verbatim}
+  frame = new MyParentFrame;
+  frame->Create(parent, myParentFrameId, wxT("My Parent Frame"));
+\end{verbatim}
 
 \wxheading{Remarks}
 
diff --git a/docs/latex/wx/node.tex b/docs/latex/wx/node.tex
index c718a7220e..c2b6600772 100644
--- a/docs/latex/wx/node.tex
+++ b/docs/latex/wx/node.tex
@@ -3,7 +3,7 @@
 A node structure used in linked lists (see \helpref{wxList}{wxlist}) and
 derived classes. You should never use wxNodeBase class directly because it
 works with untyped (void *) data and this is unsafe. Use wxNode-derived classes
-which are defined by WX\_DECLARE\_LIST and WX\_DEFIBE\_LIST macros instead as
+which are defined by WX\_DECLARE\_LIST and WX\_DEFINE\_LIST macros instead as
 described in \helpref{wxList}{wxlist} documentation (see example there). wxNode
 is defined for compatibility as wxNodeBase containing "wxObject *" pointer, but
 usage of this class is deprecated.
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 9e969bdf53..10968d32b0 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -884,7 +884,9 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
     // in any case, our size changed - update
     sizer->SetSizeHints(this);
     sizer->Fit(this);
-    Show(TRUE);
+    // JACS: can't call Show again, because it's a modal dialog
+    // and will generate an assert under MSW.
+    //Show(TRUE);
 }
 
 wxLogDialog::~wxLogDialog()
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 8d1d28d03f..fbd9b7c585 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -828,8 +828,8 @@ htb:
 	cd $(WXDIR)\docs\html\wx
     -erase /Y wx.zip wx.htb
     zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\html\htb
-    move wx.zip $(DOCDIR)\html\htb\wx.htb
+    -mkdir $(DOCDIR)\htb
+    move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
 
 # In order to force document reprocessing
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 3f707adf2c..3d0458b7a6 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1239,6 +1239,11 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
         mask |= TVIF_TEXT;
         tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok
     }
+    else
+    {
+        tvIns.item.pszText = NULL;
+        tvIns.item.cchTextMax = 0;
+    }
 
     if ( image != -1 )
     {