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

Subject: [Boost-commit] svn:boost r59533 - in branches/quickbook-1.5-spirit2: . test
From: daniel_james_at_[hidden]
Date: 2010-02-06 16:21:50

Author: danieljames
Date: 2010-02-06 16:21:50 EST (Sat, 06 Feb 2010)
New Revision: 59533
URL: http://svn.boost.org/trac/boost/changeset/59533

Log:
Merge from trunk.
Added:
   branches/quickbook-1.5-spirit2/test/include-sub2.quickbook
      - copied unchanged from r59532, /trunk/tools/quickbook/test/include-sub2.quickbook
   branches/quickbook-1.5-spirit2/test/include_1_5.quickbook
      - copied unchanged from r59532, /trunk/tools/quickbook/test/include_1_5.quickbook
Removed:
   branches/quickbook-1.5-spirit2/test/include.quickbook
Properties modified: 
   branches/quickbook-1.5-spirit2/   (props changed)
Text files modified: 
   branches/quickbook-1.5-spirit2/test/Jamfile.v2            |     2 +-                                      
   branches/quickbook-1.5-spirit2/test/include-sub.quickbook |     9 +++++----                               
   branches/quickbook-1.5-spirit2/test/include.gold          |     4 ++--                                    
   3 files changed, 8 insertions(+), 7 deletions(-)

Modified: branches/quickbook-1.5-spirit2/test/Jamfile.v2
==============================================================================
--- branches/quickbook-1.5-spirit2/test/Jamfile.v2	(original)
+++ branches/quickbook-1.5-spirit2/test/Jamfile.v2	2010-02-06 16:21:50 EST (Sat, 06 Feb 2010)
@@ -25,7 +25,7 @@
     [ quickbook-test templates_1_5 ]
     #[ quickbook-test xinclude ]
     [ quickbook-test import ]
-    [ quickbook-test include ]
+    [ quickbook-test include_1_5 ]
     [ quickbook-test section_1_4 ]
     [ quickbook-test section_1_5 ]
     [ quickbook-test heading ]

Modified: branches/quickbook-1.5-spirit2/test/include-sub.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include-sub.quickbook	(original)
+++ branches/quickbook-1.5-spirit2/test/include-sub.quickbook	2010-02-06 16:21:50 EST (Sat, 06 Feb 2010)
@@ -1,5 +1,6 @@
-[section:test Test]
+[article Include Test Sub Document
+    [quickbook 1.5]
+    [id include-sub]
+]
 
-Just testing.
-
-[endsect]
\ No newline at end of file
+[/ Empty. Shouldn't really need this comment.]

Modified: branches/quickbook-1.5-spirit2/test/include.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/include.gold	2010-02-06 16:21:50 EST (Sat, 06 Feb 2010)
@@ -5,8 +5,8 @@
   <title>Include Test</title>
   <articleinfo>
   </articleinfo>
-  <section id="include_test.test">
-    <title><link linkend="include_test.test"> Test</link></title>
+  <section id="include_test_sub_document.test">
+    <title><link linkend="include_test_sub_document.test"> Test</link></title>
     <para>
       Just testing.
     </para>

Deleted: branches/quickbook-1.5-spirit2/test/include.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include.quickbook	2010-02-06 16:21:50 EST (Sat, 06 Feb 2010)
+++ (empty file)
@@ -1,6 +0,0 @@
-[article Include Test
-    [quickbook 1.5]
-    [id include-test]
-]
-
-[include include-sub.quickbook]
\ No newline at end of file