diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 2a2d89c031..3a12a83581 100644
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -683,7 +683,9 @@ int MyApp::OnExit()
   delete NormalFont;
   delete BoldFont;
   delete ItalicFont;
-  delete poem_buffer;
+  delete[] poem_buffer;
+  if (search_string)
+    delete[] search_string;
 
   return 0;
 }
@@ -993,7 +995,7 @@ long MainWindow::DoSearch(void)
 // Load index (or compile it if none found)
 void TryLoadIndex()
 {
-  index_ok = LoadIndex(index_filename);
+  index_ok = (LoadIndex(index_filename) != 0);
   if (!index_ok || (nitems == 0))
   {
       PoetryError("Index file not found; will compile new one", "wxPoem");
diff --git a/docs/latex/wx/db.tex b/docs/latex/wx/db.tex
index 13bbc5a51d..73177a466b 100644
--- a/docs/latex/wx/db.tex
+++ b/docs/latex/wx/db.tex
@@ -6,12 +6,10 @@ database connection allows function to be performed directly on the
 datasource, as well as allowing access to any tables/views defined in
 the datasource to which the user has sufficient privileges.
 
-
 \wxheading{Include files}
 
 <wx/db.h>
 
-
 \wxheading{Helper classes and data structures}
 
 The following classes and structs are defined in db.cpp/.h for use with the wxDb class.
@@ -23,13 +21,11 @@ The following classes and structs are defined in db.cpp/.h for use with the wxDb
 \item \helpref{wxDbInf}{wxdbinf}
 \end{itemize}
 
-
 \wxheading{Constants}
 
-NOTE: In a future release, all ODBC class constants will be prefaced with 'wx'
+NOTE: In a future release, all ODBC class constants will be prefaced with 'wx'.
 
 \begin{verbatim}
-
     wxDB_PATH_MAX           Maximum path length allowed to be passed to
                             the ODBC driver to indicate where the data 
                             file(s) are located.
@@ -57,8 +53,8 @@ NOTE: In a future release, all ODBC class constants will be prefaced with 'wx'
                             data type
 \end{verbatim}
 
-
 \subsection{Enumerated types}\label{wxdbenumeratedtypes}
+
 \wxheading{Enumerated types}
 
 \docparam{enum {\bf wxDbSqlLogState}}{sqlLogOFF, sqlLogON}
@@ -3970,8 +3966,8 @@ structure.
 
 Eventually, accessor functions will be added for this class
 
-
 \membersection{wxDbTableInf::Initialize}\label{wxdbtableinfinitialize}
 
 Simply initializes all member variables to a cleared state.  Called by 
 the constructor automatically.
+
diff --git a/docs/latex/wx/postscpt.tex b/docs/latex/wx/postscpt.tex
index 541f3158c0..68ef4d111f 100644
--- a/docs/latex/wx/postscpt.tex
+++ b/docs/latex/wx/postscpt.tex
@@ -49,3 +49,4 @@ output. Default is 720ppi.
 
 Return resolution used in PostScript output. See 
 \helpref{SetResolution}{wxpostscriptdcsetresolution}.
+
diff --git a/docs/latex/wx/scrolwin.tex b/docs/latex/wx/scrolwin.tex
index 2cf1f691cd..e89c1ae6fc 100644
--- a/docs/latex/wx/scrolwin.tex
+++ b/docs/latex/wx/scrolwin.tex
@@ -395,3 +395,4 @@ parameters and returns a tuple of values for x and y.}
 
 \perlnote{In wxPerl this method takes no parameters and returns a
 2-element list {\tt ( x, y )}.}
+
diff --git a/docs/latex/wx/statusbr.tex b/docs/latex/wx/statusbr.tex
index e9e0e7b9a9..7c1c99b309 100644
--- a/docs/latex/wx/statusbr.tex
+++ b/docs/latex/wx/statusbr.tex
@@ -270,3 +270,4 @@ variable fields.
 integers.}
 
 \perlnote{In wxPerl this method takes as parameters the field widths.}
+
diff --git a/docs/latex/wx/tdb.tex b/docs/latex/wx/tdb.tex
index db1bb2e0f1..c2a51164fc 100644
--- a/docs/latex/wx/tdb.tex
+++ b/docs/latex/wx/tdb.tex
@@ -1075,8 +1075,7 @@ delete DbConnectInf;
 
 \end{verbatim}
 
-
-\subsection{wxDatabase ODBC class overview [DEPRECATED]}\label{wxodbcoverview}
+\subsection{wxDatabase ODBC class overview [DEPRECATED]}\label{oldwxodbcoverview}
 
 Classes: \helpref{wxDatabase}{wxdatabase}, \helpref{wxRecordSet}{wxrecordset}, \helpref{wxQueryCol}{wxquerycol},
 \rtfsp\helpref{wxQueryField}{wxqueryfield}
diff --git a/docs/latex/wx/timespan.tex b/docs/latex/wx/timespan.tex
index 1a884f1bd4..e63cb8dc9b 100644
--- a/docs/latex/wx/timespan.tex
+++ b/docs/latex/wx/timespan.tex
@@ -32,7 +32,7 @@ No base class
 
 \membersection{Constructors}
 
-\helpref{wxTimeSpan()}{wxtimespandef}
+wxTimeSpan()\\
 \helpref{wxTimeSpan(hours, min, sec, msec)}{wxtimespan}
 
 \membersection{Accessors}
diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 691c2fcf77..07caa08bae 100644
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=n:\wx2dev\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=c:\wx2dev\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
diff --git a/docs/latex/wx/wxPython.tex b/docs/latex/wx/wxPython.tex
index b735e6cb12..efba33ab20 100644
--- a/docs/latex/wx/wxPython.tex
+++ b/docs/latex/wx/wxPython.tex
@@ -362,7 +362,7 @@ as possible to the C++ spec over time.
 \item \helpref{wxIndividualLayoutConstraint}{wxindividuallayoutconstraint}
 \item \helpref{wxInitDialogEvent}{wxinitdialogevent}
 \item \helpref{wxInputStream}{wxinputstream}
-\item \helpref{wxInternetFSHandler}{wxinternetfshandler}
+\item \helpref{wxInternetFSHandler}{fs}
 \item \helpref{wxJoystickEvent}{wxjoystickevent}
 \item wxJPEGHandler
 \item \helpref{wxKeyEvent}{wxkeyevent}
@@ -461,7 +461,7 @@ as possible to the C++ spec over time.
 \item \helpref{wxValidator}{wxvalidator}
 \item \helpref{wxWindowDC}{wxwindowdc}
 \item \helpref{wxWindow}{wxwindow}
-\item \helpref{wxZipFSHandler}{wxzipfshandler}
+\item \helpref{wxZipFSHandler}{fs}
 \end{itemize}
 
 %----------------------------------------------------------------------
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 8a4aa27ca4..01c84d36e7 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -665,7 +665,7 @@ clean: $(PERIPH_CLEAN_TARGET)
 
 
 # Making documents
-docs:   allhlp allhtml allpdfrtf htb htmlhelp
+docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
@@ -684,11 +684,15 @@ referencps:	$(WXDIR)\docs\ps\referenc.ps
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc hlp
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc hlp
         cd $(THISDIR)
 
 allhtml: wxhtml
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc html
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc html
         cd $(THISDIR)
 
 allps: wxps referencps
@@ -699,12 +703,29 @@ allps: wxps referencps
 allpdfrtf: pdfrtf
         cd $(WXDIR)\utils\dialoged\src
         nmake -f makefile.vc pdfrtf
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc pdfrtf
+        cd $(THISDIR)
+
+allhtmlhelp: htmlhelp
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htmlhelp
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc htmlhelp
+        cd $(THISDIR)
+
+allhtb: htb
+        cd $(WXDIR)\utils\dialoged\src
+        nmake -f makefile.vc htb
+        cd $(WXDIR)\utils\tex2rtf\src
+        nmake -f makefile.vc htb
         cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
         -erase wx.ph
         hc wx
+        -mkdir $(DOCDIR)\winhelp
         -erase $(DOCDIR)\winhelp\wx.hlp
         -erase $(DOCDIR)\winhelp\wx.cnt
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
@@ -731,6 +752,7 @@ $(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
 
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
+        -mkdir $(DOCDIR)\pdf
         -copy *.wmf $(DOCDIR)\pdf
         -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
@@ -745,6 +767,7 @@ $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
 
 $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
         cd $(DOCDIR)\latex\wx
+        -mkdir $(DOCDIR)\html
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
diff --git a/utils/tex2rtf/docs/tex2rtf.hpj b/utils/tex2rtf/docs/tex2rtf.hpj
index c7d299f843..ccb40cccad 100644
--- a/utils/tex2rtf/docs/tex2rtf.hpj
+++ b/utils/tex2rtf/docs/tex2rtf.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2dev\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is
+BMROOT=c:\wx2dev\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is
 TITLE=Tex2RTF Manual
 CONTENTS=Contents
 COMPRESS=HIGH