From aa73d21651675ec44c311bb2d7cb4135b7b13de3 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 10 Apr 2006 11:00:44 +0000
Subject: [PATCH] Merge from trunk.

[SVN r33631]
---
 v2/doc/Jamfile.v2      | 4 ++++
 v2/doc/src/userman.xml | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/v2/doc/Jamfile.v2 b/v2/doc/Jamfile.v2
index 29767bb18..708140252 100644
--- a/v2/doc/Jamfile.v2
+++ b/v2/doc/Jamfile.v2
@@ -6,8 +6,12 @@ boostbook userman : src/userman.xml
    : <xsl:param>toc.section.depth=1
      <xsl:param>doc.standalone=true 
      <xsl:param>nav.layout=none
+     <implicit-dependency>jam_docs
+     <dependency>jam_docs     
    ;
    
+xml jam_docs : ../../../jam/doc/bjam.qbk ;   
+   
 if ! $(BOOST_ROOT)
 {   
     BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;   
diff --git a/v2/doc/src/userman.xml b/v2/doc/src/userman.xml
index ef80b7803..e53812b79 100644
--- a/v2/doc/src/userman.xml
+++ b/v2/doc/src/userman.xml
@@ -18,5 +18,10 @@
 
   <!-- Appendicies -->
   <xi:include href="architecture.xml"/>
+  <appendix id="bbv2.jam">
+    <title>Boost.Jam documentation</title>
+    <xi:include href="jam_docs.xml" parse="xml" 
+	xpointer="xpointer(id('jam.intro')|id('jam.intro')/following-sibling::*)"/>
+  </appendix>    
 
 </part>