[Boost-commit] svn:boost r59545 - in branches/quickbook-1.5-spirit2: . test

Subject: [Boost-commit] svn:boost r59545 - in branches/quickbook-1.5-spirit2: . test
From: daniel_james_at_[hidden]
Date: 2010-02-07 04:00:19

Author: danieljames
Date: 2010-02-07 04:00:18 EST (Sun, 07 Feb 2010)
New Revision: 59545
URL: http://svn.boost.org/trac/boost/changeset/59545

Log:
Merge from trunk.
Added:
   branches/quickbook-1.5-spirit2/test/include_1_5.gold
      - copied unchanged from r59544, /trunk/tools/quickbook/test/include_1_5.gold
Removed:
   branches/quickbook-1.5-spirit2/test/include.gold
Properties modified: 
   branches/quickbook-1.5-spirit2/   (props changed)
Text files modified: 
   branches/quickbook-1.5-spirit2/test/include_1_5.quickbook |     3 ++-                                     
   1 files changed, 2 insertions(+), 1 deletions(-)

Deleted: branches/quickbook-1.5-spirit2/test/include.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include.gold	2010-02-07 04:00:18 EST (Sun, 07 Feb 2010)
+++ (empty file)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Include Test</title>
-  <articleinfo>
-  </articleinfo>
-  <section id="include_test_sub_document.test">
-    <title><link linkend="include_test_sub_document.test"> Test</link></title>
-    <para>
-      Just testing.
-    </para>
-  </section>
-</article>

Modified: branches/quickbook-1.5-spirit2/test/include_1_5.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_5.quickbook	(original)
+++ branches/quickbook-1.5-spirit2/test/include_1_5.quickbook	2010-02-07 04:00:18 EST (Sun, 07 Feb 2010)
@@ -4,4 +4,5 @@
 ]
 
 [include include-sub.quickbook]
-[include include-sub2.quickbook]
\ No newline at end of file
+[include include-sub2.quickbook]
+[include:foo include-sub2.quickbook]
\ No newline at end of file