diff --git a/doc/src/advanced.xml b/doc/src/advanced.xml
index 9a4662f77..2a30bc8ff 100644
--- a/doc/src/advanced.xml
+++ b/doc/src/advanced.xml
@@ -1402,7 +1402,7 @@ bjam app1 lib1//lib1 toolset=gcc variant=debug optimization=full
 bjam app1 lib1//lib1 gcc debug optimization=full
 </programlisting>
         The complete syntax, which has some additional shortcuts, is
-        described in <xref linkend="bbv2.reference.commandline"/>.
+        described in <xref linkend="bbv2.advanced.invocation"/>.
       </para>
     </section>
 
diff --git a/doc/src/howto.xml b/doc/src/howto.xml
index bd0cf5b5e..4a8b892b3 100644
--- a/doc/src/howto.xml
+++ b/doc/src/howto.xml
@@ -22,7 +22,7 @@
     <para>
       If you're trying to build a project which uses Boost.Build,
       see <xref linkend="bbv2.installation"/> and then read about
-      <xref linkend="bbv2.reference.commandline"/>.
+      <xref linkend="bbv2.advanced.invocation"/>.
     </para>
 
     <para>
diff --git a/doc/src/reference.xml b/doc/src/reference.xml
index 80c3484fc..9f8302a22 100644
--- a/doc/src/reference.xml
+++ b/doc/src/reference.xml
@@ -770,10 +770,10 @@ using gcc : &toolset_ops; ;</programlisting>
           &option_list_intro;
           <variablelist>
 
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
 
-            <xi:include href="fragments.xml#xpointer(id('root_option')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('root_option')/*)"
                         parse="xml"/>
 
             <varlistentry>
@@ -848,7 +848,7 @@ using msvc : &toolset_ops; ;
           &option_list_intro;
           <variablelist>
 
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
 
             <varlistentry>
@@ -1034,7 +1034,7 @@ using intel-win : &toolset_ops; ;</programlisting>
           &option_list_intro;
           <variablelist>
 
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
 
           </variablelist>
@@ -1042,7 +1042,7 @@ using intel-win : &toolset_ops; ;</programlisting>
           <para>The Linux version supports the following additional options:</para>
           <variablelist>
 
-            <xi:include href="fragments.xml#xpointer(id('root_option')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('root_option')/*)"
                         parse="xml"/>
 
           </variablelist>
@@ -1073,7 +1073,7 @@ using acc : &toolset_ops; ;</programlisting>
 
           &option_list_intro;
           <variablelist>
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
           </variablelist>
 
@@ -1108,7 +1108,7 @@ using borland : &toolset_ops; ;</programlisting>
 
           &option_list_intro;
           <variablelist>
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
           </variablelist>
 
@@ -1135,7 +1135,7 @@ using como-linux : &toolset_ops; ;</programlisting>
 
           &option_list_intro;
           <variablelist>
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
           </variablelist>
 
@@ -1170,10 +1170,10 @@ using cw : &toolset_ops; ;</programlisting>
           &option_list_intro;
           <variablelist>
 
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
 
-            <xi:include href="fragments.xml#xpointer(id('root_option')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('root_option')/*)"
                         parse="xml"/>
 
             <varlistentry>
@@ -1232,7 +1232,7 @@ using dmc : &toolset_ops; ;</programlisting>
 
           &option_list_intro;
           <variablelist>
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
           </variablelist>
 
@@ -1257,7 +1257,7 @@ using hp_cxx : &toolset_ops; ;</programlisting>
 
           &option_list_intro;
           <variablelist>
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
           </variablelist>
 
@@ -1293,7 +1293,7 @@ using sun : &toolset_ops; ;</programlisting>
 
           &option_list_intro;
           <variablelist>
-            <xi:include href="fragments.xml#xpointer(id('common_options')/*)"
+            <xi:include href="fragments.xml" xpointer="xpointer(id('common_options')/*)"
                         parse="xml"/>
           </variablelist>
 
diff --git a/doc/src/v1_vs_v2.xml b/doc/src/v1_vs_v2.xml
index 8b77b8f01..482b61cf8 100644
--- a/doc/src/v1_vs_v2.xml
+++ b/doc/src/v1_vs_v2.xml
@@ -92,7 +92,7 @@ bjam toolset=msvc variant=release some_target
 <programlisting>
 bjam msvc release some_target
 </programlisting>
-      See <link linkend="bbv2.reference.commandline">the reference</link> for a
+      See <link linkend="bbv2.advanced.invocation">the reference</link> for a
       complete description of the syntax.
       </para>