From 686a94155d2f738062420389da09b0e31cc10252 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 18 Nov 2005 01:17:16 +0000
Subject: [PATCH] Add QuickBook docs to the global Boost docs under the Tools
 section.

[SVN r31688]
---
 doc/Jamfile.v2    | 2 ++
 doc/src/boost.xml | 1 +
 tools/quickbook   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index add1340e2c..3c95c1dea0 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -19,6 +19,7 @@ boostbook doc : src/boost.xml
      <dependency>../libs/xpressive/doc//xpressive
      <dependency>../more/whos_using//using
      <dependency>../tools/jam/doc//bjam
+     <dependency>../tools/quickbook/doc//quickbook
      
      ## Add path references to the QuickBook generated docs...
      
@@ -31,6 +32,7 @@ boostbook doc : src/boost.xml
      <implicit-dependency>../libs/xpressive/doc//xpressive
      <implicit-dependency>../more/whos_using//using
      <implicit-dependency>../tools/jam/doc//bjam
+     <implicit-dependency>../tools/quickbook/doc//quickbook
      
      <xsl:param>boost.libraries=../../libs/libraries.htm
     ;
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 1d3312c723..d56435182a 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -763,6 +763,7 @@
     </para>
 
     <xi:include href="../../tools/boostbook/doc/boostbook.xml"/>
+    <xi:include href="quickbook.xml"/>
     <xi:include href="bjam.xml"/>
     <xi:include href="../../tools/build/v2/doc/src/userman.xml"/>
   </part>
diff --git a/tools/quickbook b/tools/quickbook
index 4df2189827..d3918712e0 160000
--- a/tools/quickbook
+++ b/tools/quickbook
@@ -1 +1 @@
-Subproject commit 4df2189827c19c556d1957ae0d9d6b4f4771359d
+Subproject commit d3918712e08eac40d2936abc2d91281cf49e760e