diff --git a/v2/doc/src/advanced.xml b/v2/doc/src/advanced.xml
index 76ff86d87..b946f791d 100644
--- a/v2/doc/src/advanced.xml
+++ b/v2/doc/src/advanced.xml
@@ -297,10 +297,9 @@ boost-build /path/to/boost.build ;
         <emphasis>Main target</emphasis> is a user-defined named
         entity which can be build, for example a named executable file.
         Declaring a main target is usually done using one of <link linkend=
-          "bbv2.advanced.builtins.targets">main target functions</link>.
-        The user can also declare <ulink url=
-          "doc/extending.html#main_target_rules">custom main target
-          function</ulink>.</para>
+          "bbv2.advanced.builtins.targets">main target functions</link>.  The
+        user can also declare <link linkend="bbv2.extending.rules"> custom
+        main target function</link>.</para>
       
       <para>Most main targets rules in Boost.Build use similiar
         syntax:</para>
@@ -426,7 +425,7 @@ obj main : main.cpp : &lt;optimization&gt;off ;
 
       <para>Sometimes, requirements are necessary only for a specific
         compiler, or build variant. The 
-        <link linkend="v2.reference.variants.propcond">conditional
+        <link linkend="bbv2.reference.variants.propcond">conditional
         properties</link> can be used in that case:
 <programlisting>
 lib util : util.cpp : &lt;toolset&gt;msvc:&lt;link&gt;static ;
diff --git a/v2/doc/src/extending.xml b/v2/doc/src/extending.xml
index 97ef8345d..7d3bf416c 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=
-          "../../example/customization">example/customization</ulink>
+          "../../../tools/build/v2/example/customization">example/customization</ulink>
         directory.
       </para>
 
diff --git a/v2/doc/src/howto.xml b/v2/doc/src/howto.xml
index 109d77d63..af0e272b4 100644
--- a/v2/doc/src/howto.xml
+++ b/v2/doc/src/howto.xml
@@ -27,7 +27,7 @@
 
     <para>
       If you have questions, please post them to our <ulink
-      url="../../../../more/mailing_lists.htm#jamboost">mailing
+      url="http://boost.org/more/mailing_lists.htm#jamboost">mailing
       list</ulink>, and be sure to indicate in the subject line that
       you're asking about Boost.Build <emphasis
       role="bold">V2</emphasis>.
diff --git a/v2/doc/src/install.xml b/v2/doc/src/install.xml
index bf23cf5f9..053b6b156 100644
--- a/v2/doc/src/install.xml
+++ b/v2/doc/src/install.xml
@@ -26,7 +26,7 @@
       <listitem>
         <simpara>
           Boost.Build uses <ulink
-          url= "../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= "../../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/doc/src/reference.xml b/v2/doc/src/reference.xml
index 5f1d02bc8..c7a32abb3 100644
--- a/v2/doc/src/reference.xml
+++ b/v2/doc/src/reference.xml
@@ -801,12 +801,15 @@ rule explicit ( target-name )
               components of composite features in a build property set.</para>
           </listitem>
 
+<!-- I no longer think link-incompatbile properties are a good idea, so
+     hide them from the docs.
           <listitem>
             <para><emphasis>link-incompatible</emphasis></para>
 
             <para>See <link linkend=
                 "bbv2.reference.variants.compat">below</link>.</para>
           </listitem>
+-->
 
           <listitem>
             <para><emphasis>dependency</emphasis></para>
diff --git a/v2/doc/src/tutorial.xml b/v2/doc/src/tutorial.xml
index 3cf155265..cf8ba8b5c 100644
--- a/v2/doc/src/tutorial.xml
+++ b/v2/doc/src/tutorial.xml
@@ -161,11 +161,14 @@ exe hello
         &quot;free&quot; feautures like <code>&lt;include&gt;</code>
         <footnote>See <xref
         linkend="bbv2.reference.features.attributes"/></footnote>,
-        augments) the target requirements.  However, when a
+        augments) the target requirements.  
+<!--
+However, when a
         contradiction of a target's requrements involves certain
         <firstterm>link-incompatible</firstterm> features, the target
         will be skipped.  See <xref linkend=
         "bbv2.reference.variants.compat"/> for more information.
+-->
       </para>
 
     </section>
@@ -495,7 +498,7 @@ lib l : l.cpp : &lt;link&gt;static ;
           <para>
             What if library can be both static and shared, but when
             using it in specific executable, you want it static?
-            <link linkend="bbv2.advanced.targets.references">Target
+            <link linkend="bbv2.reference.targets.references">Target
               references</link> are here to help:
 
 <programlisting>
@@ -643,8 +646,8 @@ lib zlib : : &lt;name&gt;z_d &lt;variant&gt;debug ;
       version of zlib, but for other libraries this is quite reasonable.
     </para>
 
-    <para>More advanced use of prebuilt target is described in <ulink
-        url="doc/recipes.html#site_config_targets">recipes</ulink>.</para>
+    <para>More advanced use of prebuilt target is described in <link
+        linkend="bbv2.recipies.site-config">a FAQ entry</link>.</para>
 
   </section>