From 0df15ea014c5234cfaf6e261e6c6dca3a3045ae4 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 22 Mar 2009 10:42:48 +0000
Subject: [PATCH] Merge misc. changes from trunk, mostly minor documentation
 fixes.

Merged revisions 48412,50921,51042,51369,51386-51387,51506-51507,51668,51802,51804,51881 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r48412 | danieljames | 2008-08-28 11:23:33 +0100 (Thu, 28 Aug 2008) | 1 line

  Fix a typo. Thanks to Jon Biggar.
........
  r50921 | danieljames | 2009-01-31 09:36:38 +0000 (Sat, 31 Jan 2009) | 1 line

  Remove executable flag from preprocess.cmd. It was a mistake to add it.
........
  r51042 | danieljames | 2009-02-06 00:04:44 +0000 (Fri, 06 Feb 2009) | 1 line

  Ignore some version control files in inspect.
........
  r51369 | danieljames | 2009-02-21 18:49:48 +0000 (Sat, 21 Feb 2009) | 1 line

  Minor markup fix in concept check documentation.
........
  r51386 | danieljames | 2009-02-22 11:53:28 +0000 (Sun, 22 Feb 2009) | 1 line

  Add index.html file for compose, as our server setup doesn't support index.htm files.
........
  r51387 | danieljames | 2009-02-22 11:53:48 +0000 (Sun, 22 Feb 2009) | 5 lines

  Add missing index.html file for MPI and GIL.

  All the top level libraries now have index.html files but
  several sub-libraries don't. I'm not sure it's worth adding them as many
  of them don't have appropriate subdirectories anyway.
........
  r51506 | danieljames | 2009-03-01 14:16:00 +0000 (Sun, 01 Mar 2009) | 1 line

  Update links to command line invocation.
........
  r51507 | danieljames | 2009-03-01 14:16:24 +0000 (Sun, 01 Mar 2009) | 1 line

  Use xpointer attributes in the boost build documentation.
........
  r51668 | danieljames | 2009-03-09 20:56:51 +0000 (Mon, 09 Mar 2009) | 1 line

  Redirect to the Trac wiki instead of the old one.
........
  r51802 | danieljames | 2009-03-16 20:21:05 +0000 (Mon, 16 Mar 2009) | 1 line

  Use paragraphs inside purpose tags.
........
  r51804 | danieljames | 2009-03-16 20:21:46 +0000 (Mon, 16 Mar 2009) | 1 line

  Give the variablelist a margin.
........
  r51881 | danieljames | 2009-03-21 15:35:35 +0000 (Sat, 21 Mar 2009) | 1 line

  Fix html.
........


[SVN r51897]
---
 doc/src/advanced.xml  |  2 +-
 doc/src/howto.xml     |  2 +-
 doc/src/reference.xml | 26 +++++++++++++-------------
 doc/src/v1_vs_v2.xml  |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

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>