diff --git a/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam b/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam
index aced581a6..b57974cd3 100644
--- a/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam
+++ b/v1/iw-7_1-vc6-stlp-4_5_3-tools.jam
@@ -11,4 +11,7 @@
     extends-toolset intel-win32-stlport ;
     feature stlport-iostream : on off ;
     DEFINES = [ difference $(DEFINES) : _STLP_NO_SGI_IOSTREAMS=1 ] ;
+    # disable auto-linking for this toolset: 
+    # intel toolset lib naming is currently too inconsistent for auto-linking to work.
+    CFLAGS += "/DBOOST_ALL_NO_LIB=1" ;
 }
diff --git a/v1/iw-7_1-vc6-tools.jam b/v1/iw-7_1-vc6-tools.jam
index 2c5f885a6..c689ba8fc 100644
--- a/v1/iw-7_1-vc6-tools.jam
+++ b/v1/iw-7_1-vc6-tools.jam
@@ -9,4 +9,7 @@
 #//<a href="http://developer.intel.com/software/products/compilers/">Intel<br>C++</a>
 {
     extends-toolset intel-win32 ;
+    # disable auto-linking for this toolset: 
+    # intel toolset lib naming is currently too inconsistent for auto-linking to work.
+    CFLAGS += "/DBOOST_ALL_NO_LIB=1" ;
 }
diff --git a/v1/kylix-tools.html b/v1/kylix-tools.html
index a0d2cd0a3..1133c2c02 100644
--- a/v1/kylix-tools.html
+++ b/v1/kylix-tools.html
@@ -78,7 +78,7 @@
       i-checksum="38515" endspan --></p>
 
   <p><i>&copy; Copyright</i> <a href="mailto:john@johnmaddock.co.uk"><i>John
-  Maddock</i></a><i>2002. All Rights Reserved.</i></p>
+  Maddock</i></a><i> 2002.</i></p>
 
   <p><small>Distributed under the Boost Software License, Version 1.0. (See
   accompanying file <a href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
diff --git a/v1/mingw-tools.html b/v1/mingw-tools.html
index 6642d37e8..ae09093a6 100644
--- a/v1/mingw-tools.html
+++ b/v1/mingw-tools.html
@@ -91,11 +91,16 @@
       <td>&nbsp;</td>
     </tr>
   </table>
+  <p><b>Caution</b>: It appears that none of these paths must contain any 
+	spaces, otherwise <b>spurious</b> file not found errors can result (last 
+	reproduced with GCC3.3.1). To work around this limitation, either install 
+	the MinGW under a path that does not contain spaces or use 8.3 names. For 
+	example, if MinGW is installed in C:\Program Files\Dev-Cpp, <code>&quot;-sMINGW_ROOT_DIRECTORY=C:\Progra~1\Dev-Cpp&quot;</code> 
+	should be specified on the bjam command line.</p>
   <hr>
 
   <p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-   14 May, 2002 <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
+  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->04 November, 2004<!--webbot bot="Timestamp" endspan i-checksum="39360" --></p>
 
   <p>Copyright &copy; Dave Abrahams 2002.</p>
 
diff --git a/v2/doc/src/extending.xml b/v2/doc/src/extending.xml
index 05da0aad1..7edf62072 100644
--- a/v2/doc/src/extending.xml
+++ b/v2/doc/src/extending.xml
@@ -103,7 +103,7 @@ and linked it.
 
       <para>In the subsequent sections, we will extend this example, and review
         all the mechanisms in detail. The complete code is available in <ulink url=
-          "../../../tools/build/v2/example/customization">example/customization</ulink>
+          "../../tools/build/v2/example/customization">example/customization</ulink>
         directory.
       </para>
 
diff --git a/v2/doc/src/install.xml b/v2/doc/src/install.xml
index 053b6b156..c81d88b56 100644
--- a/v2/doc/src/install.xml
+++ b/v2/doc/src/install.xml
@@ -26,7 +26,7 @@
       <listitem>
         <simpara>
           Boost.Build uses <ulink
-          url= "../../../tools/build/jam_src/index.html">Boost.Jam</ulink>, an
+          url= "../../tools/build/jam_src/index.html">Boost.Jam</ulink>, an
           extension of the <ulink
           url="http://www.perforce.com/jam/jam.html">Perforce
           Jam</ulink> portable <command>make</command> replacement. The
@@ -37,7 +37,7 @@
           If a prebuilt executable is not provided for your platform
           or you are using Boost's sources in an unreleased state, it
           may be neccessary to <ulink
-          url= "../../../tools/build/jam_src/index.html#building_bjam">build <command>bjam</command>
+          url= "../../tools/build/jam_src/index.html#building_bjam">build <command>bjam</command>
           from sources</ulink> included in the Boost source tree.
         </simpara>
       </listitem>
diff --git a/v2/index.html b/v2/index.html
index 7dbbad5e5..3f0d79517 100644
--- a/v2/index.html
+++ b/v2/index.html
@@ -43,7 +43,7 @@ div.sidebar p.rubric {
         <li>Nightly build: <a href="http://boost.org/boost-build2/boost-build.zip">[zip]</a>, 
           <a href="http://boost.org/boost-build2/boost-build.tar.bz2">[tar.bz2]</a>
         <li><a href="../../../doc/html/bbv2.html">Documentation</a> 
-          (<a href="userman.pdf">PDF</a>)
+          (<a href="doc/userman.pdf">PDF</a>)
         <li><a
           href="http://www.crystalclearsoftware.com/cgi-bin/boost_wiki/wiki.pl?Boost.Build_V2">Wiki
           (User-contibuted documentation)</a>