diff --git a/doc/v2/Jamfile.v2 b/doc/v2/Jamfile.v2
index 27981ab5..8ba643d0 100644
--- a/doc/v2/Jamfile.v2
+++ b/doc/v2/Jamfile.v2
@@ -41,11 +41,6 @@ doxygen autodoc_execution_monitor
       
       # execution monitor source files
       $(BOOST_ROOT)/libs/test/include/boost/test/execution_monitor.hpp
-      #$(BOOST_ROOT)/libs/test/include/boost/test/impl/execution_monitor.ipp
-      $(BOOST_ROOT)/libs/test/example/exec_mon_example.cpp
-
-
-
       
       # datasets
       $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/dataset.hpp
@@ -62,7 +57,7 @@ doxygen autodoc_execution_monitor
       $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/zip.hpp
       
       # datasets generators
-       $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators.hpp
+      $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators.hpp
       $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators/keywords.hpp
       $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators/random.hpp
       $(BOOST_ROOT)/libs/test/include/boost/test/data/monomorphic/generators/xrange.hpp      
@@ -89,12 +84,9 @@ doxygen autodoc_execution_monitor
         <doxygen:param>INTERNAL_DOCS=NO
     ;
 
-
-
-
 doxygen examples
     :
-         [ glob $(BOOST_ROOT)/libs/test/example/*.cpp ]
+        [ glob $(BOOST_ROOT)/libs/test/example/*.cpp ]
     :
         <doxygen:param>EXTRACT_ALL=YES
         <doxygen:param>"PREDEFINED=\"BOOST_TEST_DECL=\" \\
@@ -116,39 +108,6 @@ doxygen examples
     ;
 
 
-
-xml standalone_doc
-  :
-    test.qbk
-  ;
-
-install images
-  :
-    img/boost.test.logo.png
-    img/class-hier.jpg
-    img/post_build_event.jpg
-    img/post_build_out.jpg
-    img/run_args.jpg
-  :
-    <location>html/boost_test
-  ;
-
-
-boostbook standalone
-  :
-    standalone_doc
-  :
-    <xsl:param>boost.root=../../../../..
-    <xsl:param>chapter.autolabel=0
-    <xsl:param>chunk.section.depth=8
-    <xsl:param>chunk.first.sections=1
-    <xsl:param>toc.section.depth=5
-    <xsl:param>toc.max.depth=3
-    <xsl:param>generate.section.toc.level=10
-    <dependency>autodoc_execution_monitor
-    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/test/doc/html
-  ;
-
 ########################################################################
 # HTML documentation for $(BOOST_ROOT)/doc/html
 
@@ -159,37 +118,23 @@ xml test_doc
 
 explicit test_doc ;
 
-install test_doc_images
-  :
-    img/boost.test.logo.png
-    img/class-hier.jpg
-    img/post_build_event.jpg
-    img/post_build_out.jpg
-    img/run_args.jpg
-  :
-    <location>$(BOOST_ROOT)/doc/html/boost_test
-  ;
+path-constant images_location : html ;
 
-explicit test_doc_images ;
-
-path-constant images_location : ../../../../../doc/html ;
-
-boostbook test
+boostbook standalone
   :
     test_doc
   :
+    <xsl:param>boost.root=../../../../..
+    <xsl:param>html.stylesheet=boostbook.css
     <xsl:param>chapter.autolabel=0
-    <xsl:param>chunk.section.depth=8
+    <xsl:param>toc.max.depth=10
+    <xsl:param>toc.section.depth=10
+    <xsl:param>chunk.section.depth=2
     <xsl:param>chunk.first.sections=1
-    <xsl:param>toc.section.depth=2
-    <xsl:param>toc.max.depth=1
-    <xsl:param>generate.section.toc.level=10
-    <xsl:param>root.filename=boost_test
-    <dependency>autodoc_execution_monitor
+    <xsl:param>generate.section.toc.level=0
     <format>pdf:<xsl:param>img.src.path=$(images_location)/
     <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/test/doc/html
-  :
-    <dependency>test_doc_images
+    <dependency>autodoc_execution_monitor
   ;
 
 explicit test ;
diff --git a/doc/v2/autodoc_execution_monitor.xml b/doc/v2/autodoc_execution_monitor.xml
old mode 100644
new mode 100755
index ef7faa52..79fef0bd
--- a/doc/v2/autodoc_execution_monitor.xml
+++ b/doc/v2/autodoc_execution_monitor.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<library-reference><header name="/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp">
-<struct name="my_exception1"><data-member name="m_res_code"><type>int</type></data-member>
-<method-group name="public member functions">
-</method-group>
-<constructor specifiers="explicit"><parameter name="res_code"><paramtype>int</paramtype></parameter></constructor>
-</struct><struct name="my_exception2"><data-member name="m_res_code"><type>int</type></data-member>
-<method-group name="public member functions">
-</method-group>
-<constructor specifiers="explicit"><parameter name="res_code"><paramtype>int</paramtype></parameter></constructor>
-</struct><function name="cpp_main"><type>int</type><parameter name="argc"><paramtype>int</paramtype></parameter><parameter name=""><paramtype>char *</paramtype></parameter></function>
-</header>
-<header name="boost/test/data/monomorphic/array.hpp">
+<library-reference><header name="boost/test/data/monomorphic/array.hpp">
 <para>Defines monomorphic dataset based on C type arrays. </para><namespace name="boost">
 <namespace name="unit_test">
 <namespace name="data">
@@ -182,7 +171,21 @@
 <namespace name="unit_test">
 <namespace name="data">
 <namespace name="monomorphic">
-<struct name="traits"><template>
+<class name="dataset"><template>
+      <template-type-parameter name="T"/>
+    </template><class name="iterator"><typedef name="ref_type"><type><classname>monomorphic::traits</classname>&lt; T &gt;::ref_type</type></typedef>
+<method-group name="public member functions">
+<method name="operator*" cv="= 0" specifiers="virtual"><type>ref_type</type></method>
+<method name="operator++" cv="= 0" specifiers="virtual"><type>void</type></method>
+</method-group>
+<destructor/>
+</class><typedef name="data_type"><type>T</type></typedef>
+<typedef name="iter_ptr"><type>boost::shared_ptr&lt; <classname>iterator</classname> &gt;</type></typedef>
+<method-group name="public member functions">
+<method name="size" cv="const = 0" specifiers="virtual"><type><classname>data::size_t</classname></type></method>
+<method name="begin" cv="const = 0" specifiers="virtual"><type>iter_ptr</type></method>
+</method-group>
+</class><struct name="traits"><template>
       <template-type-parameter name="T"/>
     </template><typedef name="ref_type"><type>T const &amp;</type></typedef>
 <method-group name="public static functions">
@@ -209,21 +212,7 @@
           <template-type-parameter name="Action"/>
         </template><parameter name="arg"><paramtype>ref_type</paramtype></parameter><parameter name="action"><paramtype>Action const &amp;</paramtype></parameter></method>
 </method-group>
-</struct-specialization><class name="dataset"><template>
-      <template-type-parameter name="T"/>
-    </template><class name="iterator"><typedef name="ref_type"><type><classname>monomorphic::traits</classname>&lt; T &gt;::ref_type</type></typedef>
-<method-group name="public member functions">
-<method name="operator*" cv="= 0" specifiers="virtual"><type>ref_type</type></method>
-<method name="operator++" cv="= 0" specifiers="virtual"><type>void</type></method>
-</method-group>
-<destructor/>
-</class><typedef name="data_type"><type>T</type></typedef>
-<typedef name="iter_ptr"><type>boost::shared_ptr&lt; <classname>iterator</classname> &gt;</type></typedef>
-<method-group name="public member functions">
-<method name="size" cv="const = 0" specifiers="virtual"><type><classname>data::size_t</classname></type></method>
-<method name="begin" cv="const = 0" specifiers="virtual"><type>iter_ptr</type></method>
-</method-group>
-</class>
+</struct-specialization>
 
 
 
@@ -706,7 +695,10 @@
 <namespace name="unit_test">
 <namespace name="data">
 <namespace name="monomorphic">
-<class name="join"><template>
+<struct-specialization name="is_dataset"><template>
+      <template-type-parameter name="DS1"/>
+      <template-type-parameter name="DS2"/>
+    </template><specialization><template-arg>join&lt; DS1</template-arg><template-arg>DS2 &gt;</template-arg></specialization><inherit access="public">true_</inherit></struct-specialization><class name="join"><template>
       <template-type-parameter name="DS1"/>
       <template-type-parameter name="DS2"/>
     </template><inherit access="public">boost::unit_test::data::monomorphic::dataset&lt; boost::decay&lt; DS1 &gt;::type::data_type &gt;</inherit><purpose>Defines a new dataset from the concatenation of two datasets. </purpose><description><para>The size of the resulting dataset is the sum of the two underlying datasets. </para></description><struct name="iterator"><inherit access="public">boost::unit_test::data::monomorphic::dataset&lt; T &gt;::iterator</inherit><method-group name="public member functions">
@@ -721,10 +713,7 @@
 </method-group>
 <constructor><parameter name="ds1"><paramtype>DS1 &amp;&amp;</paramtype></parameter><parameter name="ds2"><paramtype>DS2 &amp;&amp;</paramtype></parameter></constructor>
 <constructor><parameter name="j"><paramtype><classname>join</classname> &amp;&amp;</paramtype></parameter></constructor>
-</class><struct-specialization name="is_dataset"><template>
-      <template-type-parameter name="DS1"/>
-      <template-type-parameter name="DS2"/>
-    </template><specialization><template-arg>join&lt; DS1</template-arg><template-arg>DS2 &gt;</template-arg></specialization><inherit access="public">true_</inherit></struct-specialization><namespace name="result_of">
+</class><namespace name="result_of">
 <struct name="join"><template>
       <template-type-parameter name="DS1Gen"/>
       <template-type-parameter name="DS2Gen"/>
@@ -804,7 +793,9 @@
 <namespace name="unit_test">
 <namespace name="data">
 <namespace name="monomorphic">
-<class name="singleton"><template>
+<struct-specialization name="is_dataset"><template>
+      <template-type-parameter name="T"/>
+    </template><specialization><template-arg>singleton&lt; T &gt;</template-arg></specialization><inherit access="public">true_</inherit></struct-specialization><class name="singleton"><template>
       <template-type-parameter name="T"/>
     </template><inherit access="public">boost::unit_test::data::monomorphic::dataset&lt; boost::decay&lt; T &gt;::type &gt;</inherit><purpose>Models a single element data set. </purpose><struct name="iterator"><inherit access="public">boost::unit_test::data::monomorphic::dataset&lt; T &gt;::iterator</inherit><method-group name="public member functions">
 <method name="operator*" specifiers="virtual"><type>base::data_type const &amp;</type></method>
@@ -819,9 +810,7 @@
 </method-group>
 <constructor specifiers="explicit"><parameter name="value"><paramtype>T &amp;&amp;</paramtype></parameter></constructor>
 <constructor><parameter name="s"><paramtype><classname>singleton</classname> &amp;&amp;</paramtype></parameter></constructor>
-</class><struct-specialization name="is_dataset"><template>
-      <template-type-parameter name="T"/>
-    </template><specialization><template-arg>singleton&lt; T &gt;</template-arg></specialization><inherit access="public">true_</inherit></struct-specialization>
+</class>
 
 
 
@@ -888,7 +877,10 @@
 <namespace name="unit_test">
 <namespace name="data">
 <namespace name="monomorphic">
-<class name="zip"><template>
+<struct-specialization name="is_dataset"><template>
+      <template-type-parameter name="DS1"/>
+      <template-type-parameter name="DS2"/>
+    </template><specialization><template-arg>zip&lt; DS1</template-arg><template-arg>DS2 &gt;</template-arg></specialization><inherit access="public">true_</inherit></struct-specialization><class name="zip"><template>
       <template-type-parameter name="DS1"/>
       <template-type-parameter name="DS2"/>
     </template><purpose>Zip datasets. </purpose><struct name="iterator"><inherit access="public">boost::unit_test::data::monomorphic::dataset&lt; T &gt;::iterator</inherit><typedef name="ref_type"><type><classname>monomorphic::traits</classname>&lt; T &gt;::ref_type</type></typedef>
@@ -904,10 +896,7 @@
 </method-group>
 <constructor><parameter name="ds1"><paramtype>DS1 &amp;&amp;</paramtype></parameter><parameter name="ds2"><paramtype>DS2 &amp;&amp;</paramtype></parameter><parameter name="size"><paramtype><classname>data::size_t</classname></paramtype></parameter></constructor>
 <constructor><parameter name="j"><paramtype><classname>zip</classname> &amp;&amp;</paramtype></parameter></constructor>
-</class><struct-specialization name="is_dataset"><template>
-      <template-type-parameter name="DS1"/>
-      <template-type-parameter name="DS2"/>
-    </template><specialization><template-arg>zip&lt; DS1</template-arg><template-arg>DS2 &gt;</template-arg></specialization><inherit access="public">true_</inherit></struct-specialization><namespace name="result_of">
+</class><namespace name="result_of">
 <struct name="zip"><template>
       <template-type-parameter name="DS1Gen"/>
       <template-type-parameter name="DS2Gen"/>
@@ -1153,7 +1142,7 @@
 <para>user's config for Boost.Test debugging support </para><para>This file is intended to be edited by end user to specify varios macros, which configure debugger interface Alterntively you can set these parameters in your own sources/makefiles </para></header>
 <header name="boost/test/execution_monitor.hpp">
 <para>Defines public interface of the Execution Monitor and related classes. </para><namespace name="boost">
-<class name="execution_exception"><purpose>This class is used to report any kind of an failure during execution of a monitored function inside of <classname alt="boost::execution_monitor">execution_monitor</classname>. </purpose><description><para>The instance of this class is thrown out of execution_monitor::execute invocation when failure is detected. Regardless of a kind of failure occured the instance will provide a uniform way to catch and report it.</para><para>One important design rationale for this class is that we should be ready to work after fatal memory corruptions or out of memory conditions. To facilitate this class never allocates any memory and assumes that strings it refers to are either some constants or live in a some kind of persistent (preallocated) memory. </para></description><struct name="location"><purpose>Simple model for the location of failure in a source code. </purpose><data-member name="m_file_name"><type>const_string</type><purpose>File name. </purpose></data-member>
+<class name="execution_aborted"><purpose>This is a trivial default constructible class. Use it to report graceful abortion of a monitored function execution. </purpose></class><class name="execution_exception"><purpose>This class is used to report any kind of an failure during execution of a monitored function inside of <classname alt="boost::execution_monitor">execution_monitor</classname>. </purpose><description><para>The instance of this class is thrown out of execution_monitor::execute invocation when failure is detected. Regardless of a kind of failure occured the instance will provide a uniform way to catch and report it.</para><para>One important design rationale for this class is that we should be ready to work after fatal memory corruptions or out of memory conditions. To facilitate this class never allocates any memory and assumes that strings it refers to are either some constants or live in a some kind of persistent (preallocated) memory. </para></description><struct name="location"><purpose>Simple model for the location of failure in a source code. </purpose><data-member name="m_file_name"><type>const_string</type><purpose>File name. </purpose></data-member>
 <data-member name="m_line_num"><type>size_t</type><purpose>Line number. </purpose></data-member>
 <data-member name="m_function"><type>const_string</type><purpose>Function name. </purpose></data-member>
 <method-group name="public member functions">
@@ -1196,7 +1185,7 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <method-group name="private member functions">
 <method name="catch_signals"><type>int</type><parameter name="F"><paramtype>boost::function&lt; int()&gt; const &amp;</paramtype></parameter></method>
 </method-group>
-</class><class name="execution_aborted"><purpose>This is a trivial default constructible class. Use it to report graceful abortion of a monitored function execution. </purpose></class><class name="system_error"><data-member name="p_errno"><type>unit_test::readonly_property&lt; long &gt;</type></data-member>
+</class><class name="system_error"><data-member name="p_errno"><type>unit_test::readonly_property&lt; long &gt;</type></data-member>
 <data-member name="p_failed_exp"><type>unit_test::readonly_property&lt; char const * &gt;</type></data-member>
 <method-group name="public member functions">
 </method-group>
@@ -1221,10 +1210,10 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 </struct><struct name="internal_error"><inherit access="public">runtime_error</inherit><purpose>This exception type is used to report internal Boost.Test framework errors. </purpose><method-group name="public member functions">
 </method-group>
 <constructor><parameter name="m"><paramtype>const_string</paramtype></parameter></constructor>
-</struct><struct name="setup_error"><inherit access="public">runtime_error</inherit><purpose>This exception type is used to report test module setup errors. </purpose><method-group name="public member functions">
+</struct><struct name="nothing_to_test"/><struct name="setup_error"><inherit access="public">runtime_error</inherit><purpose>This exception type is used to report test module setup errors. </purpose><method-group name="public member functions">
 </method-group>
 <constructor><parameter name="m"><paramtype>const_string</paramtype></parameter></constructor>
-</struct><struct name="test_being_aborted"/><struct name="nothing_to_test"/><namespace name="impl">
+</struct><struct name="test_being_aborted"/><namespace name="impl">
 <function name="apply_filters"><type>void</type><parameter name=""><paramtype>test_unit_id</paramtype></parameter></function>
 </namespace>
 <function name="init"><type>void</type><parameter name="init_func"><paramtype>init_unit_test_func</paramtype><description><para>test module initialization routine </para></description></parameter><parameter name="argc"><paramtype>int</paramtype><description><para>command line arguments collection </para></description></parameter><parameter name="argv"><paramtype>char *</paramtype><description><para>command line arguments collection </para></description></parameter><purpose>This funcion performs initialization of the framework monostate. </purpose><description><para>It needs to be called every time before the test is started. 
@@ -1486,7 +1475,11 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <header name="boost/test/results_collector.hpp">
 <para>defines testing result collector components </para><para>Defines class results_collector_t that is responsible for gathering test results and class test_results for presenting this information to end-user </para><namespace name="boost">
 <namespace name="unit_test">
-<class name="test_results"><purpose>Collection of attributes constituting test unit results. </purpose><description><para>This class is a collection of attributes describing testing results. The atributes presented as public properties on an instance of the class. In addition summary conclusion methods are presented to generate simple answer to pass/fail question </para></description><data-member name="p_assertions_passed"><type>counter_prop</type></data-member>
+<class name="results_collector_t"><inherit access="public">test_observer</inherit><inherit access="public">singleton&lt; results_collector_t &gt;</inherit><purpose>This class implements test observer interface to collect the result of test unit execution. </purpose><method-group name="public member functions">
+<method name="results" cv="const"><type><classname>test_results</classname> const &amp;</type><parameter name="tu_id"><paramtype>test_unit_id</paramtype><description><para>id of a test unit </para></description></parameter><purpose>Results access per test unit. </purpose><description><para>
+</para></description></method>
+</method-group>
+</class><class name="test_results"><purpose>Collection of attributes constituting test unit results. </purpose><description><para>This class is a collection of attributes describing testing results. The atributes presented as public properties on an instance of the class. In addition summary conclusion methods are presented to generate simple answer to pass/fail question </para></description><data-member name="p_assertions_passed"><type>counter_prop</type></data-member>
 <data-member name="p_assertions_failed"><type>counter_prop</type></data-member>
 <data-member name="p_warnings_failed"><type>counter_prop</type></data-member>
 <data-member name="p_expected_failures"><type>counter_prop</type></data-member>
@@ -1504,10 +1497,6 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <method name="clear"><type>void</type></method>
 </method-group>
 <constructor/>
-</class><class name="results_collector_t"><inherit access="public">test_observer</inherit><inherit access="public">singleton&lt; results_collector_t &gt;</inherit><purpose>This class implements test observer interface to collect the result of test unit execution. </purpose><method-group name="public member functions">
-<method name="results" cv="const"><type><classname>test_results</classname> const &amp;</type><parameter name="tu_id"><paramtype>test_unit_id</paramtype><description><para>id of a test unit </para></description></parameter><purpose>Results access per test unit. </purpose><description><para>
-</para></description></method>
-</method-group>
 </class>
 
 
@@ -1581,10 +1570,8 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <header name="boost/test/tree/test_unit.hpp">
 <namespace name="boost">
 <namespace name="unit_test">
-<class name="test_unit"><enum name="@0"><enumvalue name="type"><default>= TUT_ANY</default></enumvalue></enum>
-<typedef name="id_list"><type>std::list&lt; test_unit_id &gt;</type></typedef>
-<typedef name="fixture_list"><type>std::list&lt; test_unit_fixture_ptr &gt;</type></typedef>
-<typedef name="decorator_base"><type>decorator::for_test_unit_ptr</type></typedef>
+<class name="master_test_suite_t"><inherit access="public">boost::unit_test::test_suite</inherit><data-member name="argc"><type>int</type></data-member>
+<data-member name="argv"><type>char **</type></data-member>
 <data-member name="p_type"><type>readonly_property&lt; test_unit_type &gt;</type></data-member>
 <data-member name="p_type_name"><type>readonly_property&lt; const_string &gt;</type></data-member>
 <data-member name="p_file_name"><type>readonly_property&lt; const_string &gt;</type></data-member>
@@ -1600,6 +1587,11 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <data-member name="p_decorators"><type>readwrite_property&lt; decorator_base &gt;</type></data-member>
 <data-member name="p_fixtures"><type>readwrite_property&lt; fixture_list &gt;</type></data-member>
 <method-group name="public member functions">
+<method name="add"><type>void</type><parameter name="tu"><paramtype><classname>test_unit</classname> *</paramtype></parameter><parameter name="expected_failures"><paramtype>counter_t</paramtype><default>0</default></parameter><parameter name="timeout"><paramtype>unsigned</paramtype><default>0</default></parameter><purpose>Adds a test unit to a test suite, with possibility to specify the timeout and the expected failures. </purpose></method>
+<method name="add"><type>void</type><parameter name="gen"><paramtype><classname>test_unit_generator</classname> const &amp;</paramtype></parameter><parameter name="timeout"><paramtype>unsigned</paramtype><default>0</default></parameter></method>
+<method name="remove"><type>void</type><parameter name="id"><paramtype>test_unit_id</paramtype></parameter><purpose>Removes a test from the test suite. </purpose></method>
+<method name="get" cv="const"><type>test_unit_id</type><parameter name="tu_name"><paramtype>const_string</paramtype></parameter></method>
+<method name="size" cv="const"><type>std::size_t</type></method>
 <method name="depends_on"><type>void</type><parameter name="tu"><paramtype><classname>test_unit</classname> *</paramtype></parameter></method>
 <method name="check_dependencies" cv="const"><type>bool</type></method>
 <method name="add_label"><type>void</type><parameter name="l"><paramtype>const_string</paramtype></parameter></method>
@@ -1609,17 +1601,12 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <method name="BOOST_READONLY_PROPERTY"><type>typedef</type><parameter name=""><paramtype>test_unit_id</paramtype></parameter><parameter name=""><paramtype>(<classname>test_suite</classname>)</paramtype></parameter></method>
 <method name="BOOST_READONLY_PROPERTY"><type>typedef</type><parameter name=""><paramtype>id_list</paramtype></parameter><parameter name=""><paramtype>(<classname>test_unit</classname>)</paramtype></parameter></method>
 </method-group>
-<method-group name="protected member functions">
-</method-group>
-<destructor/>
-<constructor><parameter name="tu_name"><paramtype>const_string</paramtype></parameter><parameter name="tc_file"><paramtype>const_string</paramtype></parameter><parameter name="tc_line"><paramtype>std::size_t</paramtype></parameter><parameter name="t"><paramtype>test_unit_type</paramtype></parameter></constructor>
-<constructor specifiers="explicit"><parameter name="module_name"><paramtype>const_string</paramtype></parameter></constructor>
-</class><class name="test_unit_generator"><method-group name="public member functions">
-<method name="next" cv="const = 0" specifiers="virtual"><type><classname>test_unit</classname> *</type></method>
-</method-group>
-<method-group name="protected member functions">
-</method-group>
-<destructor/>
+<constructor/>
+<enum name="@2"><enumvalue name="type"><default>= TUT_SUITE</default></enumvalue></enum>
+<enum name="@0"><enumvalue name="type"><default>= TUT_ANY</default></enumvalue></enum>
+<typedef name="id_list"><type>std::list&lt; test_unit_id &gt;</type></typedef>
+<typedef name="fixture_list"><type>std::list&lt; test_unit_fixture_ptr &gt;</type></typedef>
+<typedef name="decorator_base"><type>decorator::for_test_unit_ptr</type></typedef>
 </class><class name="test_case"><inherit access="public">boost::unit_test::test_unit</inherit><enum name="@1"><enumvalue name="type"><default>= TUT_CASE</default></enumvalue></enum>
 <enum name="@0"><enumvalue name="type"><default>= TUT_ANY</default></enumvalue></enum>
 <typedef name="id_list"><type>std::list&lt; test_unit_id &gt;</type></typedef>
@@ -1695,8 +1682,10 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <data-member name="p_enabled" specifiers="mutable"><type>readwrite_property&lt; bool &gt;</type></data-member>
 <data-member name="p_decorators"><type>readwrite_property&lt; decorator_base &gt;</type></data-member>
 <data-member name="p_fixtures"><type>readwrite_property&lt; fixture_list &gt;</type></data-member>
-</class><class name="master_test_suite_t"><inherit access="public">boost::unit_test::test_suite</inherit><data-member name="argc"><type>int</type></data-member>
-<data-member name="argv"><type>char **</type></data-member>
+</class><class name="test_unit"><enum name="@0"><enumvalue name="type"><default>= TUT_ANY</default></enumvalue></enum>
+<typedef name="id_list"><type>std::list&lt; test_unit_id &gt;</type></typedef>
+<typedef name="fixture_list"><type>std::list&lt; test_unit_fixture_ptr &gt;</type></typedef>
+<typedef name="decorator_base"><type>decorator::for_test_unit_ptr</type></typedef>
 <data-member name="p_type"><type>readonly_property&lt; test_unit_type &gt;</type></data-member>
 <data-member name="p_type_name"><type>readonly_property&lt; const_string &gt;</type></data-member>
 <data-member name="p_file_name"><type>readonly_property&lt; const_string &gt;</type></data-member>
@@ -1712,11 +1701,6 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <data-member name="p_decorators"><type>readwrite_property&lt; decorator_base &gt;</type></data-member>
 <data-member name="p_fixtures"><type>readwrite_property&lt; fixture_list &gt;</type></data-member>
 <method-group name="public member functions">
-<method name="add"><type>void</type><parameter name="tu"><paramtype><classname>test_unit</classname> *</paramtype></parameter><parameter name="expected_failures"><paramtype>counter_t</paramtype><default>0</default></parameter><parameter name="timeout"><paramtype>unsigned</paramtype><default>0</default></parameter><purpose>Adds a test unit to a test suite, with possibility to specify the timeout and the expected failures. </purpose></method>
-<method name="add"><type>void</type><parameter name="gen"><paramtype><classname>test_unit_generator</classname> const &amp;</paramtype></parameter><parameter name="timeout"><paramtype>unsigned</paramtype><default>0</default></parameter></method>
-<method name="remove"><type>void</type><parameter name="id"><paramtype>test_unit_id</paramtype></parameter><purpose>Removes a test from the test suite. </purpose></method>
-<method name="get" cv="const"><type>test_unit_id</type><parameter name="tu_name"><paramtype>const_string</paramtype></parameter></method>
-<method name="size" cv="const"><type>std::size_t</type></method>
 <method name="depends_on"><type>void</type><parameter name="tu"><paramtype><classname>test_unit</classname> *</paramtype></parameter></method>
 <method name="check_dependencies" cv="const"><type>bool</type></method>
 <method name="add_label"><type>void</type><parameter name="l"><paramtype>const_string</paramtype></parameter></method>
@@ -1726,12 +1710,17 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <method name="BOOST_READONLY_PROPERTY"><type>typedef</type><parameter name=""><paramtype>test_unit_id</paramtype></parameter><parameter name=""><paramtype>(<classname>test_suite</classname>)</paramtype></parameter></method>
 <method name="BOOST_READONLY_PROPERTY"><type>typedef</type><parameter name=""><paramtype>id_list</paramtype></parameter><parameter name=""><paramtype>(<classname>test_unit</classname>)</paramtype></parameter></method>
 </method-group>
-<constructor/>
-<enum name="@2"><enumvalue name="type"><default>= TUT_SUITE</default></enumvalue></enum>
-<enum name="@0"><enumvalue name="type"><default>= TUT_ANY</default></enumvalue></enum>
-<typedef name="id_list"><type>std::list&lt; test_unit_id &gt;</type></typedef>
-<typedef name="fixture_list"><type>std::list&lt; test_unit_fixture_ptr &gt;</type></typedef>
-<typedef name="decorator_base"><type>decorator::for_test_unit_ptr</type></typedef>
+<method-group name="protected member functions">
+</method-group>
+<destructor/>
+<constructor><parameter name="tu_name"><paramtype>const_string</paramtype></parameter><parameter name="tc_file"><paramtype>const_string</paramtype></parameter><parameter name="tc_line"><paramtype>std::size_t</paramtype></parameter><parameter name="t"><paramtype>test_unit_type</paramtype></parameter></constructor>
+<constructor specifiers="explicit"><parameter name="module_name"><paramtype>const_string</paramtype></parameter></constructor>
+</class><class name="test_unit_generator"><method-group name="public member functions">
+<method name="next" cv="const = 0" specifiers="virtual"><type><classname>test_unit</classname> *</type></method>
+</method-group>
+<method-group name="protected member functions">
+</method-group>
+<destructor/>
 </class>
 <function name="make_test_case"><type><classname>test_case</classname> *</type><parameter name="test_func"><paramtype>boost::function&lt; void()&gt; const &amp;</paramtype></parameter><parameter name="tc_name"><paramtype>const_string</paramtype></parameter><parameter name="tc_file"><paramtype>const_string</paramtype></parameter><parameter name="tc_line"><paramtype>std::size_t</paramtype></parameter></function>
 <function name="make_test_case"><type><classname>test_case</classname> *</type><template>
@@ -1760,19 +1749,19 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 <header name="boost/test/unit_test_log_formatter.hpp">
 <para>Defines unit test log formatter interface. </para><para>You can define a class with implements this interface and use an instance of it as a Unit Test Framework log formatter </para><namespace name="boost">
 <namespace name="unit_test">
-<struct name="log_entry_data"><purpose>Collection of log entry attributes. </purpose><data-member name="m_file_name"><type>std::string</type><purpose>log entry file name </purpose></data-member>
+<struct name="log_checkpoint_data"><purpose>Collection of log checkpoint attributes. </purpose><data-member name="m_file_name"><type>const_string</type><purpose>log checkpoint file name </purpose></data-member>
+<data-member name="m_line_num"><type>std::size_t</type><purpose>log checkpoint file name </purpose></data-member>
+<data-member name="m_message"><type>std::string</type><purpose>log checkpoint message </purpose></data-member>
+<method-group name="public member functions">
+<method name="clear"><type>void</type></method>
+</method-group>
+</struct><struct name="log_entry_data"><purpose>Collection of log entry attributes. </purpose><data-member name="m_file_name"><type>std::string</type><purpose>log entry file name </purpose></data-member>
 <data-member name="m_line_num"><type>std::size_t</type><purpose>log entry line number </purpose></data-member>
 <data-member name="m_level"><type>log_level</type><purpose>log entry level </purpose></data-member>
 <method-group name="public member functions">
 <method name="clear"><type>void</type></method>
 </method-group>
 <constructor/>
-</struct><struct name="log_checkpoint_data"><purpose>Collection of log checkpoint attributes. </purpose><data-member name="m_file_name"><type>const_string</type><purpose>log checkpoint file name </purpose></data-member>
-<data-member name="m_line_num"><type>std::size_t</type><purpose>log checkpoint file name </purpose></data-member>
-<data-member name="m_message"><type>std::string</type><purpose>log checkpoint message </purpose></data-member>
-<method-group name="public member functions">
-<method name="clear"><type>void</type></method>
-</method-group>
 </struct><class name="unit_test_log_formatter"><purpose>Abstract Unit Test Framework log formatter interface. </purpose><description><para>During the test module execution Unit Test Framework can report messages about success or failure of assertions, which test suites are being run and more (specifically which messages are reported depends on log level threashold selected by the user). All these messages constitute Unit Test Framework log. There are many ways (formats) to present these messages to the user. Boost.Test comes with two formats: "Compiler-like log format" and "XML based log format". Former is intended for human consumption and later is intended for processing by automated regression test systems. If you want to produce some other format you need to implement class with specific interface and use method unit_test_log_t::set_formatter during a test module initialization to set an active formatter. The class <classname alt="boost::unit_test::unit_test_log_formatter">unit_test_log_formatter</classname> defines this interface.</para><para>This interface requires you to format all possible messages being produced in the log. These includes error messages about failed assertions, messages about caught exceptions and information messages about test units being started/ended. All the methods in this interface takes a reference to standard stream as a first argument. This is where final messages needs to be directed to. Also you are givn all the informaion necessary to produce a message. </para></description><enum name="log_entry_types"><enumvalue name="BOOST_UTL_ET_INFO"><purpose>Information message from the framework. </purpose></enumvalue><enumvalue name="BOOST_UTL_ET_MESSAGE"><purpose>Information message from the user. </purpose></enumvalue><enumvalue name="BOOST_UTL_ET_WARNING"><purpose>Warning (non error) condition notification message. </purpose></enumvalue><enumvalue name="BOOST_UTL_ET_ERROR"><purpose>Non fatal error notification message. </purpose></enumvalue><enumvalue name="BOOST_UTL_ET_FATAL_ERROR"><purpose>Fatal error notification message. </purpose></enumvalue><purpose>Types of log entries (messages written into a log) </purpose></enum>
 <method-group name="public member functions">
 <method name="log_start" cv="= 0" specifiers="virtual"><type>void</type><parameter name="os"><paramtype>std::ostream &amp;</paramtype><description><para>output stream to write a messages to </para></description></parameter><parameter name="test_cases_amount"><paramtype>counter_t</paramtype><description><para>total test case amount to be run </para></description></parameter><purpose>Invoked at the begining of test module execution. </purpose><description><para>
@@ -1829,4 +1818,4 @@ em.register_exception_translator&lt;MyException&gt;( myExceptTr );
 </namespace>
 </namespace>
 </header>
-</library-reference>
\ No newline at end of file
+</library-reference>
diff --git a/doc/v2/building_and_linking/building_and_linking.qbk b/doc/v2/building_and_linking/building_and_linking.qbk
index 740cbca2..12df49e5 100644
--- a/doc/v2/building_and_linking/building_and_linking.qbk
+++ b/doc/v2/building_and_linking/building_and_linking.qbk
@@ -22,14 +22,10 @@ of these variants are provided.
 [/ ######################################################## ]
 [include module_initialization.qbk]
 
-
-
-
-
 [/ ######################################################## ]
 [section:usage_variants Linking with the __UTF__]
 
-The __UTF__ presents you with 4 different variants:
+The __UTF__ supports four different usage variants:
 
 # The static library variant
 # The dynamic library variant
@@ -55,13 +51,8 @@ like the floating point comparison or the logged expectations testing, are defin
 
 [endsect] [/section:usage_variants]
 
-
-
-
 [/ ######################################################## ]
 [/ reference of the macros]
 [include link_reference.qbk]
 
-
-
 [endsect] [/section:users_guide]
diff --git a/doc/v2/component_execution_monitor.qbk b/doc/v2/component_execution_monitor.qbk
deleted file mode 100644
index ecef8a98..00000000
--- a/doc/v2/component_execution_monitor.qbk
+++ /dev/null
@@ -1,164 +0,0 @@
-[#ref_execution_monitor][section:execution_monitor The Execution Monitor]
-
-Sometimes we need to call a function and make sure that no user or system originated exceptions are being thrown
-by it. Uniform exception reporting is also may be convenient. That's the purpose of the Boost.Test's
-['Execution Monitor].
-
-The Execution Monitor is a lower-level component of the Boost Test Library. It is the base for implementing all
-other Boost.Test components, but also can be used standalone to get controlled execution of error-prone functions
-with a uniform error notification. The Execution Monitor calls a user-supplied function in a controlled
-environment, relieving users from messy error detection.
-
-The Execution Monitor usage is demonstrated in the example [@../../../example/exec_mon_example.cpp =exec_mon_example.cpp=]. Additional examples are 
-in [link boost_test.components.section_pem Program Execution Monitor] or __UTF__.
-
-[heading Design Rationale]
-The Execution Monitor design assumes that it can be used when no (or almost no) memory available. Also the
-Execution Monitor is intended to be portable to as many platforms as possible.
-
-[section Compilation variants and procedures]
-
-[heading Implementation]
-
-The Execution Monitor is implemented in two modules: one header file and one source file.
-
-* [headerref boost/test/execution_monitor.hpp]: defines abstract execution monitor 
-  interfaces and implements execution exception.
-* `boost/test/impl/execution_monitor.ipp`: provides the Execution Monitor implementation for all supported configurations, 
-  including Microsoft structured exception based, UNIX signals.
-
-You may use this component in both debug and release modes, but in release mode the Execution Monitor won't
-catch Microsoft C runtime debug events.
-
-
-[heading Standalone library compilation]
-
-To compile the Execution Monitor as standalone library compose it using only 
-`execution_monitor.cpp` as a source file. Alternatively you can add this file directly to the 
-list of source files for your project. Boost Test Library's components include this file as a part of their 
-compilation procedure.
-
-[heading Direct include]
-
-In some cases you may want to include the source file along with header file into your sources. But be aware that
-to be able to catch all kinds of standard exceptions and to implement signal handling logic this file will bring
-a lot of dependencies.
-[endsect] [/compilation variants and procedures]
-
-[/ ###########################################]
-[section:section_em_users_guide The Execution Monitor user's guide]
-
-The Execution Monitor is designed to solve the problem of executing potentially dangerous function that may result
-in any number of error conditions, in monitored environment that should prevent any undesirable exceptions to 
-propagate out of function call and produce consistent result report for all 
-[link boost_test.components.execution_monitor.section_em_users_guide.section_em_monitored_functions outcomes]. The Execution Monitor is able to 
-produce informative report for all standard C++ exceptions and intrinsic types. All other exceptions are reported as
-unknown. If you prefer different message for your exception class or need to perform any action, the Execution 
-Monitor supports [link boost_test.components.execution_monitor.section_em_users_guide.section_em_error_reporting custom exception translators].
-There are several other [link boost_test.components.execution_monitor.section_em_users_guide.section_em_parameters parameters] of the 
-monitored environment can be configured by setting appropriate properties of the Execution Monitor.
-
-All symbols in the Execution Monitor implementation are located in the namespace boost. To use the Execution
-Monitor you need to:
-
-* `#include <boost/test/execution_monitor.hpp>`
-* Make an instance of [classref boost::execution_monitor execution_monitor]
-* Optionally register custom exception translators for exception classes which require special processing.
-
-[section:section_em_monitored_functions Monitored function execution]
-
-To start the monitored function, invoke the method [memberref boost::execution_monitor::execute] and pass 
-the monitored function as an argument. If the call succeeds, the method returns the result code produced by the
-monitored function. If any of the following conditions occur:
-
-* Uncaught C++ exception
-* Hardware or software signal, trap, or other exception
-* Timeout reached
-* Debug assert event occurred (under Microsoft Visual C++ or compatible compiler)
-
-then the method throws the [classref boost::execution_exception execution_exception]. The exception contains unique 
-[enumref boost::execution_exception::error_code error_code] value identifying the error condition and the detailed message that can be used to report 
-the error.
-
-[endsect]
-  
-[/ ###########################################]
-[section:section_em_parameters The execution monitor parameters]
-
-All parameters are implemented as public read-write properties of class [classref boost::execution_monitor].
-   
-The `p_catch_system_errors` property is a boolean flag (default value is true) specifying whether
-or not `execution_monitor` should trap system level exceptions (second category in above list).
-Set this property to false, for example, if you wish to force coredump file creation. The Unit Test Framework 
-provides a runtime parameter `--catch_system_errors=yes` to alter the behavior in monitored test cases. 
-
-
-The `p_auto_start_dbg` property is a boolean flag (default value is false) specifying whether or
-not `execution_monitor` should try to attach debugger in case system error is caught.
-
-The `p_timeout` property is an integer timeout (in seconds) for monitored function execution. Use
-this parameter to monitor code with possible deadlocks or indefinite loops. This feature is only available for some 
-operating systems (not yet Microsoft Windows).
-
-The `p_use_alt_stack` property is a boolean flag (default value is false) specifying whether or
-not `execution_monitor` should use an alternative stack for the 
-`sigaction` based signal catching. When enabled the signals are delivered to the 
-`execution_monitor` on a stack different from current execution stack, which is safer in case 
-if it is corrupted by monitored function. For more details on alternative stack handling see appropriate 
-[@http://www.opengroup.org/onlinepubs/000095399/functions/sigaltstack.html manuals].
-
-The `p_detect_fp_exceptions` property is a boolean flag (default value is false) specifying 
-whether or not `execution_monitor` should install hardware traps for the floating point 
-exception on platforms where it's supported.
-
-[endsect]
-
-[/ ###########################################]
-[section:section_em_error_reporting Errors reporting and translation]
-If you need to report an error inside monitored function execution you have to throw an exception. Do not use the
-[classref boost::execution_exception] - it's not intended to be used for this purpose. The simplest choice is 
-to use one of the following C++ types as an exception:
-
-* C string
-* `std:string`
-* any exception class in std::exception hierarchy
-
-In case if you prefer to use your own exception classes or can't govern what exceptions are generated by monitored 
-function and would like to see proper error message in a report, the Execution Monitor allows you to register the
-translator for any exception class. You can register as many independent translators as you like. See 
-`execution_monitor` specification for requirements on translator function. Also see below 
-for usage example.
-   
-Finally, if you need to abort the monitored function execution without reporting any errors, you can throw an 
-exception [classref boost::execution_aborted execution_aborted]. As a result the execution is aborted and zero result code
-is produced by the method [memberref boost::execution_monitor::execute `execution_monitor::execute`].
-    
-[endsect]
-
-
-[/ ###########################################]
-[section Memory leaks detection]
-
-The Execution Monitor provides a limited ability to detect memory leaks during program execution, and to
-break program execution on specific memory allocation order-number (1 - first allocation of memory in program, 2 -
-second and so on). Unfortunately this feature is, at the moment, implemented only for the Microsoft family of
-compilers (and Intel, if it employs Microsoft C Runtime Library). Also it can not be tuned per instance of the
-monitor and is only triggered globally and reported after the whole program execution is done. In a future this
-ought to be improved. An interface is composed from two free functions residing in namespace boost::debug:
-
-``
-void detect_memory_leaks( bool on_off );
-void break_memory_alloc( long mem_alloc_order_num );
-``
-
-Use function detect_memory_leaks to switch memory leaks detection on/off. Use break_memory_alloc to break a
-program execution at allocation specified by mem_alloc_order_num argument. The Unit Test Framework
-provides a runtime parameter (`--detect_memory_leaks=0` or `1` or `N>1`, where N is memory allocation number) 
-allowing you to manage this feature during monitored unit tests.
-
-[endsect]
-
-[endsect] [/ user guide]
-
-
-[endsect]
\ No newline at end of file
diff --git a/doc/v2/component_minimal_testing.qbk b/doc/v2/component_minimal_testing.qbk
deleted file mode 100644
index 2a33c851..00000000
--- a/doc/v2/component_minimal_testing.qbk
+++ /dev/null
@@ -1,75 +0,0 @@
-[section:bt_minimal_testing Minimal testing facility]
-
-['Boost.Test minimal testing facility] provides the functionality previously implemented by the
-original version of Boost.Test. As the name suggest, it provides only minimal basic facilities for test creation. It 
-have no configuration parameters (either command line arguments or environment variables) and it supplies 
-a limited set of [link ref_mtf_testing_tool testing tools] which behaves similarly to ones defined amount 
-the [*Unit Test Framework Testing tools]. The __MTF__ supplies its own function
-`main()` (so can not be used for multi unit testing) and will execute the test program in a monitored environment.
-
- 
-As it follows from the name this component provides only minimal set of the testing capabilities and as a general
-rule the Unit Test Framework should be preferred. In a majority of the cases it provides you with much wider set of 
-testing tools (and other goods), while still being as easy to set up.
-
-[warning The use of the Minial Testing Facility is deprecated. The documentation is left for reference 
- and backward compatibility]
- 
-[section:bt_minimal_usage Usage]
-The __MTF__ is implemented inline in one header: ``#include <boost/test/minimal.hpp>``
-There are no special compilation instructions for this component.
-
-The second and last change you need to make to integrate your test module with __MTF__ is 
-the signature of your function `main()`. It should look like this:
- 
-``
-int test_main( int argc, char* argv[] )
-{
-  //...
-}
-``
-
-Once you apply the changes, the test automatically starts running in monitored environment. Also you can start using
-[link ref_mtf_testing_tool testing tools] provided by the __MTF__ and get uniform errors reporting.
-
-
- 
-[endsect] [/usage]
-
-
-[#ref_mtf_testing_tool][section:bt_minimal Testing tools]
-
-The __MTF__ supplies following four assertions:
- 
-    __BOOST_CHECK__(predicate)
-    __BOOST_REQUIRE__(predicate)
-    __BOOST_ERROR__(message)
-    __BOOST_FAIL__(message)
-
-Their behaviour is modelled after the similarly named tools supplied by the __UTF__.
-
-There is a single unit test program that validates __MTF__ functionality: minimal_test <!-- TO FIX: link to test -->
-[warning what is this sentence for?]
-[endsect] [/ tools]
-
-
-[section Example]
-The following example illustrates different approaches you can employ to detect and report errors using different
-testing tools
- 
-[import examples/example27.cpp]
-[import examples/example27.output]
-[table:id_example27 Minimal testing facility application
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example27]]
-    [[example27o]]
-  ]
-]
-
-[endsect] [/ Example]
-
-[endsect]
\ No newline at end of file
diff --git a/doc/v2/component_program_execution_monitor.qbk b/doc/v2/component_program_execution_monitor.qbk
deleted file mode 100644
index ac42f834..00000000
--- a/doc/v2/component_program_execution_monitor.qbk
+++ /dev/null
@@ -1,306 +0,0 @@
-[section:section_pem Program Execution Monitor]
- 
-The components of a C++ program may report user-detected errors in several ways, such as via a return value or 
-throwing an exception. System-detected errors such as dereferencing an invalid pointer are reported in other ways, 
-totally operating system and compiler dependent.
-   
-Yet many C++ programs, both production and test, must run in an environment where uniform reporting of errors is 
-necessary. For example, converting otherwise uncaught exceptions to non-zero program return codes allows many 
-command line, script, or batch environments to continue processing in a controlled manner. Even some 
-['GUI] environments benefit from the unification of errors into program return codes.
-
-   
-The Boost.Test Library's [*Program Execution Monitor] (__PEM__ for short) relieves users from messy error
-detection and reporting duties by providing a replacement function `main()` which calls a user-supplied `cpp_main()`
-function within a monitored environment. The supplied `main()` then uniformly detects and reports the occurrence of 
-several types of errors, reducing them to a uniform return code which is returned to the host environment.
-   
-Uniform error reporting is particularly useful for programs running unattended under control of scripts or batch 
-files. Some operating systems pop up message boxes if an uncaught exception occurs, and this requires manual 
-intervention. By converting such exceptions into non-zero program return codes, the library makes the program a 
-better citizen. More uniform reporting of errors isn't a benefit to some programs, particularly programs always 
-run by hand of a knowledgeable person. So the __PEM__ wouldn't be worth using in that environment.
-
-Uniform error reporting can be also useful in test environments such as the Boost regression tests. Be aware though 
-in such case it might be preferable to use the __UTF__, because it allows one 
-to use the __testing_tools__ and generate more detailed error information.
- 
-[section Usage]
-
-
-To facilitate uniform error reporting the __PEM__ supplies function `main()` as part if it's implementation. To use the 
-__PEM__ instead of regular function `main` your program is required to supply a function `cpp_main()` with same signature.
-   
-Here is the traditional ['Hello World] program implemented using the __PEM__:
-
-[import examples/example24.cpp]
-[import examples/example24.output]
-[table:id_example24 Hello World with the Program Execution Monitor
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example24]]
-    [[example24o]]
-  ]
-]
-
-     
-
-It really is that simple - just change the name of your initial function from `main()` to `cpp_main()`. Do make sure 
-the `argc` and `argv` parameters are specified (although you don't have to name them if you don't use them).
-  
-The __PEM__ treats as errors:
-  
-* Exceptions thrown from `cpp_main()`
-* Non-zero return from `cpp_main()`
-  
-So what if some function had thrown a `std::runtime_error` with the message "big trouble" and it is not trapped by any
-catch clause? Like in a following example:
-  
-  
-[import examples/example25.cpp]
-[import examples/example25.output]
-[table:id_example25 Standard exception detection within the Program Execution Monitor
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example25]]
-    [[example25o]]
-  ]
-]
-
-[note Note that in both examples above we used [link boost_test.components.section_pem.section_pem_compilation.section_pem_full_include single-header variant]
-of the __PEM__. Alternatively the binaries may be built and linked with
-a [link boost_test.components.section_pem.section_pem_compilation.section_pem_standalone standalone library] (in case of static library we are not required to include any __PEM__ related headers).
-]
-
-Let's consider an example where function `cpp_main()` had bubbled up a return code of 5:
-
-[import examples/example26.cpp]
-[import examples/example26.output]
-[table:id_example26 Error return code detection of the __PEM__
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example26]]
-    [[example26o]]
-  ]
-]
-  
-The __PEM__ reports errors to both `std::cout` (details) and `std::cerr` (summary). Primary detailed error 
-messages appear on standard output stream so that it is properly interlaced with other output, thus aiding error 
-analysis. While the final error notification message appears on standard error stream. This increases the 
-visibility of error notification if standard output and error streams are directed to different devices or files.
- 
-The __PEM__'s supplied `main()` will return following result codes:
-   
-* `boost::exit_success` - no errors
-* `boost::exit_failure` - non-zero and `non-boost::exit_success` return code from `cpp_main()`
-* `boost::exit_exception_failure` - `cpp_main()` throw an exception
-
-[endsect] [/ Usage]
-
-
-
-[/ ####################################################################################  configuration]
-[section Runtime configuration]
-  
-There are two aspects of the __PEM__ behavior that you can customize at runtime. Customization is performed using 
-environment variables.
-
-[table:id_pem_env The __PEM__ configuration environment variables
-  [
-    [Flag]
-    [Usage]
-  ]
-  [
-    [`BOOST_TEST_CATCH_SYSTEM_ERRORS`]
-    [allows customizing behavior of the __PEM__ in regards of catching system errors. For more details about the 
-     meaning of this option see the [classref boost::execution_monitor execution_monitor] class. If you
-     want to prevent the __PEM__ from catching system exception, set the value of this
-     variable to "no". The default value is "yes".]
-  ]
-  [
-    [`BOOST_PRG_MON_CONFIRM`]
-    [allows avoiding success confirmation message. Some users prefer to see a confirmation message in case if program
-       successfully executed. While others don't like the clutter or any output is prohibited by organization standards.
-       To avoid the message set the value of this variable to "no". The default value is "yes".]
-  ]
-
-]
-
-[note `BOOST_TEST_CATCH_SYSTEM_ERRORS` is similar to the __UTF__'s __param_catch_system__ command line parameter.]
-
-[endsect] [/ configuration]
-
-[/ ####################################################################################  implementation]
-[#ref_pem_implementation][section Implementation]
-
-To monitor execution of user supplied function `cpp_main()` the __PEM__ relies on the Boost.Test's
-[link boost_test.components.execution_monitor Execution Monitor]. Also the __PEM__ supplies the function `main()` to facilitate
-uniform error reporting. Following files constitute the __PEM__ implementation:
- 
- 
-[table:pem_implementation_file __PEM__ implementation files
-
-  [
-    [File name]
-    [Content]
-  ]
-  [
-    [`boost/test/impl/execution_monitor.ipp`]
-    [provides __EM__ implementation for all supported configurations]
-  ]
-  [
-    [`boost/test/impl/cpp_main.ipp`]
-    [supplies function `main()` for static library build]
-  ]
-  [
-    [`boost/test/included/prg_exec_monitor.hpp`]
-    [combines all implementation files into single header to be use as inlined version of component]
-  ]
-  [
-    [`boost/test/prg_exec_monitor.hpp`]
-    [contains definitions for `main()` function for dynamic library build and pragmas for auto-linking feature support]
-  ]
-]  
-
-The __PEM__ implementation wraps several system headers and is intended to be used as standalone library. While there
-exist an alternative variant to [link ref_pem_direct_include include the whole implementation 
-directly] into your program, for the long term usage the preferable solution is to 
-[link ref_pem_stanlone build library once] and reuse it.
-
-
-[endsect] [/implementation]
- 
-[section:section_pem_compilation Compilation]
- 
-In comparison with many other boost libraries, which are completely implemented in header files, compilation and
-linking with the __PEM__ may require additional steps. The __PEM__ presents you with options to either
-
-# built and link with a [link ref_pem_stanlone standalone library] or
-# include the implementation [link ref_pem_direct_include directly] into your program. 
-
-If you opt to use the library the __PEM__ header implements the 
-[*auto-linking support] and following flags can be used to configure 
-compilation of the __PEM__ library and your program:
-
-[table 
-  [
-    [Variable]
-    [Usage]
-  ]
-  [
-    [__BOOST_TEST_DYN_LINK__]
-    [Define this flag to build/use dynamic library]
-  ]
-  [
-    [__BOOST_TEST_NO_LIB__]
-    [Define this flag to prevent auto-linking]
-  ]
-]
-
-[#ref_pem_stanlone][section:section_pem_standalone Standalone library compilation]
-
-If you opted to link your program with the standalone library, you need to build it first. To build a standalone 
-library all C++ files (.cpp), that constitute __PEM__ [link ref_pem_implementation implementation] need to be
-listed as source files in your makefile [footnote There are varieties of make systems that can be used. To name 
-a few: ['GNU] make (and other make clones) and build systems integrated into ['IDE]s
-(for example ['Microsoft Visual Studio]). The Boost preferred solution is Boost.Build system that is based on top of 
-`bjam`  tool. Make  systems require some kind of configuration file that lists all files that constitute the library 
-and all build  options. For example the makefile that is used by make, or the Microsoft Visual Studio project file, 
-Jamfile is used by Boost.Build. For the sake of simplicity let's call this file the makefile.].
-
-
-The makefile for use with Boost.Build system is supplied in 
-
-``
-libs/test/build
-``
-
-directory. The __PEM__ can be built as either [link ref_pem_static static] or [link ref_pem_dynamic dynamic] library.
-
-
-
-[#ref_pem_static][section:section_pem_compilation_static Static library compilation]
-
-There are no additional build defines or options required to build static library. Using Boost.Build system you 
-can build the static library with a following command from `libs/test/build` directory:
-
-``
-bjam -sTOOLS=<your-tool-name> -sBUILD=boost_prg_exec_monitor 
-``
-
-Also on Windows you can use the Microsoft Visual Studio .NET project file provided.
-
-[endsect] [/ static compilation]
-
-[#ref_pem_dynamic][section:section_pem_compilation_dynamic Dynamic library compilation]
-
-To build the dynamic library [footnote What is meant by the term dynamic library is a ['dynamically
-loaded library], alternatively called a ['shared library].] you
-need to add __BOOST_TEST_DYN_LINK__ to the list of macro definitions in the
-``libs/test/build`` directory:
-
-``
-bjam -sTOOLS=<your-tool-name> -sBUILD=boost_prg_exec_monitor
-``
-
-Also on Windows you can use the Microsoft Visual Studio .NET project file provided.
-
-[caution 
-  For your program to successfully link with the dynamic library the flag
-  __BOOST_TEST_DYN_LINK__ needs to be defined both during dynamic library
-  build and during your program compilation.
-]
-
-
-[endsect] [/ dynamic compilation]
-[endsect] [/ standalone lib compilation]
-
-[#ref_pem_auto_link][section Support of the auto-linking feature]
-
-
-For the Microsoft family of compilers the __PEM__ provides an ability to automatically select proper library name
-and add it to the list of objects to be linked with. To employ this feature you required to include either header
-
-``
-#include <boost/test/prg_exec_monitor.hpp>
-``
-or header
-
-``
-#include <boost/test/included/prg_exec_monitor.hpp>
-``
-
-By default the feature is enabled. To disable it you have to define the flag __BOOST_TEST_NO_LIB__.
-
-
-[endsect] [/ autolink]
-
-[#ref_pem_direct_include][section:section_pem_full_include Including the __PEM__ directly into your program]
-   
-If you prefer to avoid the standalone library compilation you have two alternative usage variants: you can either 
-include all files that constitute the static library in your program's makefile or include them as a part of
-your program's source file. To facilitate the later variant the __PEM__ implementation presents the header
-``
-#include <boost/test/included/prg_exec_monitor.hpp>
-``
-
-In both variants neither __BOOST_TEST_DYN_LINK__ nor __BOOST_TEST_NO_LIB__ are applicable. This solution may not be the best choice
-in a long run, since it requires the __PEM__ sources recompilation for every program you use it with.
-
-[endsect] [/ direct include]
-
-
-[endsect] [/compilation]
-
-
-
-[endsect] [/program execution monitor]
diff --git a/doc/v2/examples/example01.cpp b/doc/v2/examples/example01.cpp
index 0aa1c4f2..bbcbac67 100755
--- a/doc/v2/examples/example01.cpp
+++ b/doc/v2/examples/example01.cpp
@@ -1,4 +1,4 @@
-//[example01
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
diff --git a/doc/v2/examples/example01.output b/doc/v2/examples/example01.output
index 09b90495..4d3388d0 100755
--- a/doc/v2/examples/example01.output
+++ b/doc/v2/examples/example01.output
@@ -1,4 +1,4 @@
-//[example01o
+//[example_output
 > example
 Running 1 test case...
 
diff --git a/doc/v2/examples/example02.cpp b/doc/v2/examples/example02.cpp
index e5791060..b4e2065b 100755
--- a/doc/v2/examples/example02.cpp
+++ b/doc/v2/examples/example02.cpp
@@ -1,4 +1,4 @@
-//[example02
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 #include <boost/bind.hpp>
 using namespace boost::unit_test;
diff --git a/doc/v2/examples/example02.output b/doc/v2/examples/example02.output
index 9508fe63..1edb5f72 100755
--- a/doc/v2/examples/example02.output
+++ b/doc/v2/examples/example02.output
@@ -1,4 +1,4 @@
-//[example02o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(11): error in "boost::bind( &test_class::test_method, &tester )": check false failed
diff --git a/doc/v2/examples/example03.cpp b/doc/v2/examples/example03.cpp
index 1cbd2143..57acb2a0 100755
--- a/doc/v2/examples/example03.cpp
+++ b/doc/v2/examples/example03.cpp
@@ -1,4 +1,4 @@
-//[example03
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 #include <boost/bind.hpp>
 using namespace boost::unit_test;
diff --git a/doc/v2/examples/example03.output b/doc/v2/examples/example03.output
index 0870c5cf..ebe3d6f7 100755
--- a/doc/v2/examples/example03.output
+++ b/doc/v2/examples/example03.output
@@ -1,4 +1,4 @@
-//[example03o
+//[example_output
 > example
 Running 2 test cases...
 test.cpp(15): error in "boost::bind( &test_class::test_method2, tester )": check false failed
diff --git a/doc/v2/examples/example04.cpp b/doc/v2/examples/example04.cpp
index 0b49f2c5..bd771d2e 100755
--- a/doc/v2/examples/example04.cpp
+++ b/doc/v2/examples/example04.cpp
@@ -1,4 +1,4 @@
-//[example04
+//[example_code
 #include<boost/test/included/unit_test.hpp>
 
 using namespace boost::unit_test; 
diff --git a/doc/v2/examples/example04.output b/doc/v2/examples/example04.output
index 5c9763c7..4d3388d0 100755
--- a/doc/v2/examples/example04.output
+++ b/doc/v2/examples/example04.output
@@ -1,4 +1,4 @@
-//[example04o
+//[example_output
 > example
 Running 1 test case...
 
diff --git a/doc/v2/examples/example05.cpp b/doc/v2/examples/example05.cpp
index e9c33830..7e4699ee 100755
--- a/doc/v2/examples/example05.cpp
+++ b/doc/v2/examples/example05.cpp
@@ -1,4 +1,4 @@
-//[example05
+//[example_code
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
diff --git a/doc/v2/examples/example05.output b/doc/v2/examples/example05.output
index 88c81aff..68aabbea 100755
--- a/doc/v2/examples/example05.output
+++ b/doc/v2/examples/example05.output
@@ -1,4 +1,4 @@
-//[example05o
+//[example_output
 > example
 Running 3 test cases...
 
diff --git a/doc/v2/examples/example06.cpp b/doc/v2/examples/example06.cpp
index 82faf2a0..6820e680 100755
--- a/doc/v2/examples/example06.cpp
+++ b/doc/v2/examples/example06.cpp
@@ -1,4 +1,4 @@
-//[example06
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example06.output b/doc/v2/examples/example06.output
index 019971d5..a2c9133a 100755
--- a/doc/v2/examples/example06.output
+++ b/doc/v2/examples/example06.output
@@ -1,4 +1,4 @@
-//[example06o
+//[example_output
 > example --log_level=test_suite
 Running 1 test case...
 Entering test suite "example"
diff --git a/doc/v2/examples/example07.cpp b/doc/v2/examples/example07.cpp
index d22e9332..de785204 100755
--- a/doc/v2/examples/example07.cpp
+++ b/doc/v2/examples/example07.cpp
@@ -1,4 +1,4 @@
-//[example07
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/parameterized_test.hpp>
 using namespace boost::unit_test;
diff --git a/doc/v2/examples/example07.output b/doc/v2/examples/example07.output
index 3cc6b055..1a04e940 100755
--- a/doc/v2/examples/example07.output
+++ b/doc/v2/examples/example07.output
@@ -1,4 +1,4 @@
-//[example07o
+//[example_output
 > example
 Running 5 test cases...
 test.cpp(9): error in "free_test_function": check i < 4 failed
diff --git a/doc/v2/examples/example08.cpp b/doc/v2/examples/example08.cpp
index 3635374a..31919c9b 100755
--- a/doc/v2/examples/example08.cpp
+++ b/doc/v2/examples/example08.cpp
@@ -1,4 +1,4 @@
-//[example08
+//[example_code
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
diff --git a/doc/v2/examples/example08.output b/doc/v2/examples/example08.output
index 2628989c..a9d19d09 100755
--- a/doc/v2/examples/example08.output
+++ b/doc/v2/examples/example08.output
@@ -1,4 +1,4 @@
-//[example08o
+//[example_output
 > example
 Running 5 test cases...
 test.cpp(14): error in "tm": difference between d * 100{100.1} and (double)(int)(d*100){100} exceeds 0.01%
diff --git a/doc/v2/examples/example09.cpp b/doc/v2/examples/example09.cpp
index 58a5d0ad..bceed248 100755
--- a/doc/v2/examples/example09.cpp
+++ b/doc/v2/examples/example09.cpp
@@ -1,4 +1,4 @@
-//[example09
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 #include <boost/mpl/list.hpp>
 using namespace boost::unit_test;
diff --git a/doc/v2/examples/example09.output b/doc/v2/examples/example09.output
index 36a4b887..470bdb48 100755
--- a/doc/v2/examples/example09.output
+++ b/doc/v2/examples/example09.output
@@ -1,4 +1,4 @@
-//[example09o
+//[example_output
 > example
 Running 3 test cases...
 test.cpp(10): error in "my_test<unsigned char>": check sizeof(T) == 4 failed [1 != 4]
diff --git a/doc/v2/examples/example10.cpp b/doc/v2/examples/example10.cpp
index 27ba9c8f..b617fc69 100755
--- a/doc/v2/examples/example10.cpp
+++ b/doc/v2/examples/example10.cpp
@@ -1,4 +1,4 @@
-//[example10
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/mpl/list.hpp>
diff --git a/doc/v2/examples/example10.output b/doc/v2/examples/example10.output
index 48ebf824..566e93b6 100755
--- a/doc/v2/examples/example10.output
+++ b/doc/v2/examples/example10.output
@@ -1,4 +1,4 @@
-//[example10o
+//[example_output
 > example
 Running 3 test cases...
 test.cpp(12): error in "my_test<unsigned char>": check sizeof(T) == 4 failed [1 != 4]
diff --git a/doc/v2/examples/example11.cpp b/doc/v2/examples/example11.cpp
index 0ebbfecf..96f7d5f1 100755
--- a/doc/v2/examples/example11.cpp
+++ b/doc/v2/examples/example11.cpp
@@ -1,4 +1,4 @@
-//[example11
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
diff --git a/doc/v2/examples/example11.output b/doc/v2/examples/example11.output
index 805e3936..f3ee56df 100755
--- a/doc/v2/examples/example11.output
+++ b/doc/v2/examples/example11.output
@@ -1,4 +1,4 @@
-//[example11o
+//[example_output
 > example --log_level=test_suite
 Running 4 test cases...
 Entering test suite "Master Test Suite"
diff --git a/doc/v2/examples/example12.cpp b/doc/v2/examples/example12.cpp
index ce9ae3d3..fcbdd527 100755
--- a/doc/v2/examples/example12.cpp
+++ b/doc/v2/examples/example12.cpp
@@ -1,4 +1,4 @@
-//[example12
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example12.output b/doc/v2/examples/example12.output
index b4c49d13..db0c71bd 100755
--- a/doc/v2/examples/example12.output
+++ b/doc/v2/examples/example12.output
@@ -1,4 +1,4 @@
-//[example12o
+//[example_output
 > example
 Running 4 test cases...
 test.cpp(12): fatal error in "test_case2": critical check 1 == 2 failed [1 != 2]
diff --git a/doc/v2/examples/example13.cpp b/doc/v2/examples/example13.cpp
index d936bcda..03ce76b5 100755
--- a/doc/v2/examples/example13.cpp
+++ b/doc/v2/examples/example13.cpp
@@ -1,4 +1,4 @@
-//[example13
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
diff --git a/doc/v2/examples/example13.output b/doc/v2/examples/example13.output
index 2cfa355c..dbdce96f 100755
--- a/doc/v2/examples/example13.output
+++ b/doc/v2/examples/example13.output
@@ -1,4 +1,4 @@
-//[example13o
+//[example_output
 > example 1
 Test setup error: test tree is empty
 //]
\ No newline at end of file
diff --git a/doc/v2/examples/example14.cpp b/doc/v2/examples/example14.cpp
index 6758adf3..f909a882 100755
--- a/doc/v2/examples/example14.cpp
+++ b/doc/v2/examples/example14.cpp
@@ -1,4 +1,4 @@
-//[example14
+//[example_code
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE my master test suite name
 #include <boost/test/included/unit_test.hpp>
diff --git a/doc/v2/examples/example14.output b/doc/v2/examples/example14.output
index 56197e07..39e6ce36 100755
--- a/doc/v2/examples/example14.output
+++ b/doc/v2/examples/example14.output
@@ -1,4 +1,4 @@
-//[example14o
+//[example_output
 > example --log_level=test_suite
 Running 1 test case...
 Entering test suite "my master test suite name"
diff --git a/doc/v2/examples/example15.cpp b/doc/v2/examples/example15.cpp
index 9dc97f0c..d5a41412 100755
--- a/doc/v2/examples/example15.cpp
+++ b/doc/v2/examples/example15.cpp
@@ -1,4 +1,4 @@
-//[example15
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
diff --git a/doc/v2/examples/example15.output b/doc/v2/examples/example15.output
index c5af6ce9..39e6ce36 100755
--- a/doc/v2/examples/example15.output
+++ b/doc/v2/examples/example15.output
@@ -1,4 +1,4 @@
-//[example15o
+//[example_output
 > example --log_level=test_suite
 Running 1 test case...
 Entering test suite "my master test suite name"
diff --git a/doc/v2/examples/example16.cpp b/doc/v2/examples/example16.cpp
index 301586af..caf3a497 100755
--- a/doc/v2/examples/example16.cpp
+++ b/doc/v2/examples/example16.cpp
@@ -1,4 +1,4 @@
-//[example16
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
diff --git a/doc/v2/examples/example16.output b/doc/v2/examples/example16.output
index 0339ddbb..074016b8 100755
--- a/doc/v2/examples/example16.output
+++ b/doc/v2/examples/example16.output
@@ -1,4 +1,4 @@
-//[example16o
+//[example_output
 > example --log_level=message
 Running 1 test case...
 test.cpp(8): error in "free_test_function": check 2 == 1 failed
diff --git a/doc/v2/examples/example17.cpp b/doc/v2/examples/example17.cpp
index 375c5afc..45e2f7c3 100755
--- a/doc/v2/examples/example17.cpp
+++ b/doc/v2/examples/example17.cpp
@@ -1,4 +1,4 @@
-//[example17
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example17.output b/doc/v2/examples/example17.output
index 73ee24b9..f23acc3a 100755
--- a/doc/v2/examples/example17.output
+++ b/doc/v2/examples/example17.output
@@ -1,4 +1,4 @@
-//[example17o
+//[example_output
 > example --report_level=short
 Running 2 test cases...
 test.cpp(10): error in "my_test1": check 2 == 1 failed
diff --git a/doc/v2/examples/example18.cpp b/doc/v2/examples/example18.cpp
index 3efacd60..39221cfb 100755
--- a/doc/v2/examples/example18.cpp
+++ b/doc/v2/examples/example18.cpp
@@ -1,4 +1,4 @@
-//[example18
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example18.output b/doc/v2/examples/example18.output
index e24086f8..ce13d104 100755
--- a/doc/v2/examples/example18.output
+++ b/doc/v2/examples/example18.output
@@ -1,4 +1,4 @@
-//[example18o
+//[example_output
 > example --log_level=message
 Running 3 test cases...
 setup fixture
diff --git a/doc/v2/examples/example19.cpp b/doc/v2/examples/example19.cpp
index 82bf9e2d..3789599a 100755
--- a/doc/v2/examples/example19.cpp
+++ b/doc/v2/examples/example19.cpp
@@ -1,4 +1,4 @@
-//[example19
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example19.output b/doc/v2/examples/example19.output
index 7fa07aec..7ff45672 100755
--- a/doc/v2/examples/example19.output
+++ b/doc/v2/examples/example19.output
@@ -1,4 +1,4 @@
-//[example19o
+//[example_output
 > example
 Running 2 test cases...                                                         
 test.cpp(17): error in "test_case1": check i == 1 failed
diff --git a/doc/v2/examples/example20.cpp b/doc/v2/examples/example20.cpp
index 3f56d135..47f5a67f 100755
--- a/doc/v2/examples/example20.cpp
+++ b/doc/v2/examples/example20.cpp
@@ -1,4 +1,4 @@
-//[example20
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <iostream>
diff --git a/doc/v2/examples/example20.output b/doc/v2/examples/example20.output
index 611e24f9..92affa99 100755
--- a/doc/v2/examples/example20.output
+++ b/doc/v2/examples/example20.output
@@ -1,4 +1,4 @@
-//[example20o
+//[example_output
 > example
 global setup
 Running 1 test case...
diff --git a/doc/v2/examples/example21.cpp b/doc/v2/examples/example21.cpp
index 71b4cca1..e2083b05 100755
--- a/doc/v2/examples/example21.cpp
+++ b/doc/v2/examples/example21.cpp
@@ -1,4 +1,4 @@
-//[example21
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example21.output b/doc/v2/examples/example21.output
index c509d2f2..a0ca7b44 100755
--- a/doc/v2/examples/example21.output
+++ b/doc/v2/examples/example21.output
@@ -1,4 +1,4 @@
-//[example21o
+//[example_output
 > example --log_level=message
 Running 2 test cases...
 Testing initialization :
diff --git a/doc/v2/examples/example22.cpp b/doc/v2/examples/example22.cpp
index 8c60478e..8fc47c04 100755
--- a/doc/v2/examples/example22.cpp
+++ b/doc/v2/examples/example22.cpp
@@ -1,4 +1,4 @@
-//[example22
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example22.output b/doc/v2/examples/example22.output
index b0c0238c..82c81e97 100755
--- a/doc/v2/examples/example22.output
+++ b/doc/v2/examples/example22.output
@@ -1,4 +1,4 @@
-//[example22o
+//[example_output
 > example
 Running 1 test case...
 unknown location(0): fatal error in "test_external_interface": signal: integer divide by zero; address of failing instruction: 0x00048090
diff --git a/doc/v2/examples/example23.cpp b/doc/v2/examples/example23.cpp
index 53ee19bf..891cc2a7 100755
--- a/doc/v2/examples/example23.cpp
+++ b/doc/v2/examples/example23.cpp
@@ -1,4 +1,4 @@
-//[example23
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example23.output b/doc/v2/examples/example23.output
index 303ac2d1..725e8c1e 100755
--- a/doc/v2/examples/example23.output
+++ b/doc/v2/examples/example23.output
@@ -1,4 +1,4 @@
-//[example23o
+//[example_output
 > example
 Running 1 test case...
 unknown location(0): fatal error in "test_case": memory access violation at address: 0x00000008: no mapping at fault address
diff --git a/doc/v2/examples/example24.cpp b/doc/v2/examples/example24.cpp
index 714b88eb..ae3a0b5e 100755
--- a/doc/v2/examples/example24.cpp
+++ b/doc/v2/examples/example24.cpp
@@ -1,4 +1,4 @@
-//[example24
+//[example_code
 #include <iostream>
 #include <boost/test/included/prg_exec_monitor.hpp> 
 
diff --git a/doc/v2/examples/example24.output b/doc/v2/examples/example24.output
index 80037448..fe04eb85 100755
--- a/doc/v2/examples/example24.output
+++ b/doc/v2/examples/example24.output
@@ -1,4 +1,4 @@
-//[example24o
+//[example_output
 Hello, world
 
 no errors detected
diff --git a/doc/v2/examples/example25.cpp b/doc/v2/examples/example25.cpp
index b2a7f68f..decdcf60 100755
--- a/doc/v2/examples/example25.cpp
+++ b/doc/v2/examples/example25.cpp
@@ -1,4 +1,4 @@
-//[example25
+//[example_code
 #include <stdexcept>
 #include <boost/test/included/prg_exec_monitor.hpp> 
 
diff --git a/doc/v2/examples/example25.output b/doc/v2/examples/example25.output
index 6fceec5b..95e47706 100755
--- a/doc/v2/examples/example25.output
+++ b/doc/v2/examples/example25.output
@@ -1,4 +1,4 @@
-//[example25o
+//[example_output
 **** exception(205): std::runtime_error: big trouble
 ******** errors detected; see standard output for details ********
 //]
\ No newline at end of file
diff --git a/doc/v2/examples/example26.cpp b/doc/v2/examples/example26.cpp
index d3ac2964..f64ceb94 100755
--- a/doc/v2/examples/example26.cpp
+++ b/doc/v2/examples/example26.cpp
@@ -1,4 +1,4 @@
-//[example26
+//[example_code
 #include <boost/test/prg_exec_monitor.hpp> // this header is optional
 
 int cpp_main( int, char* [] ) // note the name
diff --git a/doc/v2/examples/example26.output b/doc/v2/examples/example26.output
index 15ea00dd..b9f30743 100755
--- a/doc/v2/examples/example26.output
+++ b/doc/v2/examples/example26.output
@@ -1,4 +1,4 @@
-//[example26o
+//[example_output
 **** error return code: 5
 ******** errors detected; see standard output for details ********
 //]
\ No newline at end of file
diff --git a/doc/v2/examples/example27.cpp b/doc/v2/examples/example27.cpp
index d6d8f768..bc1e3729 100755
--- a/doc/v2/examples/example27.cpp
+++ b/doc/v2/examples/example27.cpp
@@ -1,4 +1,4 @@
-//[example27
+//[example_code
 #include <boost/test/minimal.hpp>
 
 //____________________________________________________________________________//
diff --git a/doc/v2/examples/example27.output b/doc/v2/examples/example27.output
index 58606c6e..ad186e73 100755
--- a/doc/v2/examples/example27.output
+++ b/doc/v2/examples/example27.output
@@ -1,3 +1,3 @@
-//[example27o
+//[example_output
 **** no errors detected
 //]
\ No newline at end of file
diff --git a/doc/v2/examples/example28.cpp b/doc/v2/examples/example28.cpp
index 1ef11043..12599853 100755
--- a/doc/v2/examples/example28.cpp
+++ b/doc/v2/examples/example28.cpp
@@ -1,4 +1,4 @@
-//[example28
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/output_test_stream.hpp> 
diff --git a/doc/v2/examples/example28.output b/doc/v2/examples/example28.output
index a1076adf..c06765c0 100755
--- a/doc/v2/examples/example28.output
+++ b/doc/v2/examples/example28.output
@@ -1,4 +1,4 @@
-//[example28o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(15): error in "test": check output.is_equal( "i=3" ) failed. Output content: "i=2"
diff --git a/doc/v2/examples/example29.cpp b/doc/v2/examples/example29.cpp
index 38a199dc..eee402ed 100755
--- a/doc/v2/examples/example29.cpp
+++ b/doc/v2/examples/example29.cpp
@@ -1,4 +1,4 @@
-//[example29
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/output_test_stream.hpp> 
diff --git a/doc/v2/examples/example29.output b/doc/v2/examples/example29.output
index 7a22ff19..dcc65503 100755
--- a/doc/v2/examples/example29.output
+++ b/doc/v2/examples/example29.output
@@ -1,4 +1,4 @@
-//[example29o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(16): error in "test": check output.match_pattern() failed. Mismatch at position 23
diff --git a/doc/v2/examples/example30.cpp b/doc/v2/examples/example30.cpp
index 32be39cc..85b2ac1c 100755
--- a/doc/v2/examples/example30.cpp
+++ b/doc/v2/examples/example30.cpp
@@ -1,4 +1,4 @@
-//[example30
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example30.output b/doc/v2/examples/example30.output
index 4eda9074..ee41ab5b 100755
--- a/doc/v2/examples/example30.output
+++ b/doc/v2/examples/example30.output
@@ -1,4 +1,4 @@
-//[example30o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(13): error in "test_is_even": check is_even( i ) failed for ( 17 )
diff --git a/doc/v2/examples/example31.cpp b/doc/v2/examples/example31.cpp
index 74ea99be..279dad80 100755
--- a/doc/v2/examples/example31.cpp
+++ b/doc/v2/examples/example31.cpp
@@ -1,4 +1,4 @@
-//[example31
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example31.output b/doc/v2/examples/example31.output
index 6a6f15af..21672a54 100755
--- a/doc/v2/examples/example31.output
+++ b/doc/v2/examples/example31.output
@@ -1,4 +1,4 @@
-//[example31o
+//[example_output
 Running 1 test case...
 test.cpp(28): error in "test_list_comparizon": check compare_lists( l1, l2 ) failed. Different sizes [2!=0]
 
diff --git a/doc/v2/examples/example32.cpp b/doc/v2/examples/example32.cpp
index bebab40f..76e3f4ed 100755
--- a/doc/v2/examples/example32.cpp
+++ b/doc/v2/examples/example32.cpp
@@ -1,4 +1,4 @@
-//[example32
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <utility>
diff --git a/doc/v2/examples/example32.output b/doc/v2/examples/example32.output
index 2a953664..74209078 100755
--- a/doc/v2/examples/example32.output
+++ b/doc/v2/examples/example32.output
@@ -1,4 +1,4 @@
-//[example32o
+//[example_output
 Running 1 test case...
 test.cpp(16): error in "test_list": check p1 == p2 failed [ != ]
 
diff --git a/doc/v2/examples/example33.cpp b/doc/v2/examples/example33.cpp
index 891648c0..abbc056d 100755
--- a/doc/v2/examples/example33.cpp
+++ b/doc/v2/examples/example33.cpp
@@ -1,4 +1,4 @@
-//[example33
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example33.output b/doc/v2/examples/example33.output
index 37347cad..a5467848 100755
--- a/doc/v2/examples/example33.output
+++ b/doc/v2/examples/example33.output
@@ -1,4 +1,4 @@
-//[example33o
+//[example_output
 > example
 Running 1 test case...                                                          
 test.cpp(8): error in "test": check (char)0x26 =.= 0x04 failed.                 
diff --git a/doc/v2/examples/example34.cpp b/doc/v2/examples/example34.cpp
index 422f128b..dbed8db8 100755
--- a/doc/v2/examples/example34.cpp
+++ b/doc/v2/examples/example34.cpp
@@ -1,4 +1,4 @@
-//[example34
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example34.output b/doc/v2/examples/example34.output
index abd4140c..2d2aa88f 100755
--- a/doc/v2/examples/example34.output
+++ b/doc/v2/examples/example34.output
@@ -1,4 +1,4 @@
-//[example34o
+//[example_output
 > example --log_level=warning
 Running 1 test case...
 test.cpp(9): warning in "test": condition sizeof(int) == sizeof(short) is not satisfied
diff --git a/doc/v2/examples/example35.cpp b/doc/v2/examples/example35.cpp
index 660154ff..c8d0772b 100755
--- a/doc/v2/examples/example35.cpp
+++ b/doc/v2/examples/example35.cpp
@@ -1,4 +1,4 @@
-//[example35
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example35.output b/doc/v2/examples/example35.output
index 96a59429..2e79b5cd 100755
--- a/doc/v2/examples/example35.output
+++ b/doc/v2/examples/example35.output
@@ -1,4 +1,4 @@
-//[example35o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(10): fatal error in "test": critical check i == j failed [2 != 1]
diff --git a/doc/v2/examples/example36.cpp b/doc/v2/examples/example36.cpp
index ff8b39c8..47c897ba 100755
--- a/doc/v2/examples/example36.cpp
+++ b/doc/v2/examples/example36.cpp
@@ -1,4 +1,4 @@
-//[example36
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example36.output b/doc/v2/examples/example36.output
index b322a1ab..92327c76 100755
--- a/doc/v2/examples/example36.output
+++ b/doc/v2/examples/example36.output
@@ -1,4 +1,4 @@
-//[example36o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(11): error in "test": check { col1, col1+7 } == { col2, col2+7 } failed. 
diff --git a/doc/v2/examples/example37.cpp b/doc/v2/examples/example37.cpp
index fd798971..563ff7cd 100755
--- a/doc/v2/examples/example37.cpp
+++ b/doc/v2/examples/example37.cpp
@@ -1,4 +1,4 @@
-//[example37
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example37.output b/doc/v2/examples/example37.output
index 8f811ffa..f8d2f396 100755
--- a/doc/v2/examples/example37.output
+++ b/doc/v2/examples/example37.output
@@ -1,4 +1,4 @@
-//[example37o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(16): error in "test": incorrect exception my_exception is caught
diff --git a/doc/v2/examples/example38.cpp b/doc/v2/examples/example38.cpp
index 766e180e..f6d801fb 100755
--- a/doc/v2/examples/example38.cpp
+++ b/doc/v2/examples/example38.cpp
@@ -1,4 +1,4 @@
-//[example38
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example38.output b/doc/v2/examples/example38.output
index ff8b69ef..4c31f2a2 100755
--- a/doc/v2/examples/example38.output
+++ b/doc/v2/examples/example38.output
@@ -1,4 +1,4 @@
-//[example38o
+//[example_output
 > example --log_level=warning
 Running 1 test case...
 test.cpp(12): warning in "test": sin(45){0.850904} is > 0.71. Arg is not in radian?
diff --git a/doc/v2/examples/example39.cpp b/doc/v2/examples/example39.cpp
index 04debc60..6e005eb7 100755
--- a/doc/v2/examples/example39.cpp
+++ b/doc/v2/examples/example39.cpp
@@ -1,4 +1,4 @@
-//[example39
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example39.output b/doc/v2/examples/example39.output
index a1759b66..5a42e17b 100755
--- a/doc/v2/examples/example39.output
+++ b/doc/v2/examples/example39.output
@@ -1,4 +1,4 @@
-//[example39o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(10): error in "test": exception thrown by throw my_exception()
diff --git a/doc/v2/examples/example40.cpp b/doc/v2/examples/example40.cpp
index d1b3b7eb..93948b73 100755
--- a/doc/v2/examples/example40.cpp
+++ b/doc/v2/examples/example40.cpp
@@ -1,4 +1,4 @@
-//[example40
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
diff --git a/doc/v2/examples/example40.output b/doc/v2/examples/example40.output
index 10719619..020a0372 100755
--- a/doc/v2/examples/example40.output
+++ b/doc/v2/examples/example40.output
@@ -1,4 +1,4 @@
-//[example40o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(14): warning in "test": condition moo( 12,i,j ) is not satisfied
diff --git a/doc/v2/examples/example41.cpp b/doc/v2/examples/example41.cpp
index 450966da..dc8f0904 100755
--- a/doc/v2/examples/example41.cpp
+++ b/doc/v2/examples/example41.cpp
@@ -1,4 +1,4 @@
-//[example41
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
diff --git a/doc/v2/examples/example41.output b/doc/v2/examples/example41.output
index 7f9367c0..c0fc6287 100755
--- a/doc/v2/examples/example41.output
+++ b/doc/v2/examples/example41.output
@@ -1,4 +1,4 @@
-//[example41o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(11): error in "test": absolute value of v{-0.00123456} exceeds 1e-006
diff --git a/doc/v2/examples/example42.cpp b/doc/v2/examples/example42.cpp
index f30c16a5..b0123ea6 100755
--- a/doc/v2/examples/example42.cpp
+++ b/doc/v2/examples/example42.cpp
@@ -1,4 +1,4 @@
-//[example42
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
diff --git a/doc/v2/examples/example42.output b/doc/v2/examples/example42.output
index 9a0d0dfe..bce97613 100755
--- a/doc/v2/examples/example42.output
+++ b/doc/v2/examples/example42.output
@@ -1,4 +1,4 @@
-//[example42o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(12): error in "test": difference between v1{1.23456e-010} and v2{1.23457e-010} exceeds 0.0001%
diff --git a/doc/v2/examples/example43.cpp b/doc/v2/examples/example43.cpp
index 228f2bf7..2035ae67 100755
--- a/doc/v2/examples/example43.cpp
+++ b/doc/v2/examples/example43.cpp
@@ -1,4 +1,4 @@
-//[example43
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
diff --git a/doc/v2/examples/example43.output b/doc/v2/examples/example43.output
index 08ff502d..4d3388d0 100755
--- a/doc/v2/examples/example43.output
+++ b/doc/v2/examples/example43.output
@@ -1,4 +1,4 @@
-//[example43o
+//[example_output
 > example
 Running 1 test case...
 
diff --git a/doc/v2/examples/example44.cpp b/doc/v2/examples/example44.cpp
index 561d5650..3e5f7e7e 100755
--- a/doc/v2/examples/example44.cpp
+++ b/doc/v2/examples/example44.cpp
@@ -1,4 +1,4 @@
-//[example44
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
diff --git a/doc/v2/examples/example44.output b/doc/v2/examples/example44.output
index 4d616c75..73bd8e08 100755
--- a/doc/v2/examples/example44.output
+++ b/doc/v2/examples/example44.output
@@ -1,4 +1,4 @@
-//[example44o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(12): error in "test": difference between v1{1.111e-010} and v2{1.112e-010} exceeds 0.0008999
diff --git a/doc/v2/examples/example45.cpp b/doc/v2/examples/example45.cpp
index 37a7c975..6c6b87ff 100755
--- a/doc/v2/examples/example45.cpp
+++ b/doc/v2/examples/example45.cpp
@@ -1,4 +1,4 @@
-//[example45
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example45.output b/doc/v2/examples/example45.output
index b14de0ed..82d42e43 100755
--- a/doc/v2/examples/example45.output
+++ b/doc/v2/examples/example45.output
@@ -1,4 +1,4 @@
-//[example45o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(11): error in "test": exception my_exception is expected
diff --git a/doc/v2/examples/example46.cpp b/doc/v2/examples/example46.cpp
index d253b1dc..6d159f9a 100755
--- a/doc/v2/examples/example46.cpp
+++ b/doc/v2/examples/example46.cpp
@@ -1,4 +1,4 @@
-//[example46
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example46.output b/doc/v2/examples/example46.output
index ee1bae19..594e45ef 100755
--- a/doc/v2/examples/example46.output
+++ b/doc/v2/examples/example46.output
@@ -1,4 +1,4 @@
-//[example46o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(8): error in "test": Nothing to test
diff --git a/doc/v2/examples/example47.cpp b/doc/v2/examples/example47.cpp
index 470c6d06..95d14b1f 100755
--- a/doc/v2/examples/example47.cpp
+++ b/doc/v2/examples/example47.cpp
@@ -1,4 +1,4 @@
-//[example47
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example47.output b/doc/v2/examples/example47.output
index 5cbe6ba9..f8c15ea9 100755
--- a/doc/v2/examples/example47.output
+++ b/doc/v2/examples/example47.output
@@ -1,4 +1,4 @@
-//[example47o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(8): fatal error in "test": Test is not ready yet
diff --git a/doc/v2/examples/example48.cpp b/doc/v2/examples/example48.cpp
index a8ad8130..83721548 100755
--- a/doc/v2/examples/example48.cpp
+++ b/doc/v2/examples/example48.cpp
@@ -1,4 +1,4 @@
-//[example48
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example48.output b/doc/v2/examples/example48.output
index f32c5e82..36afaa88 100755
--- a/doc/v2/examples/example48.output
+++ b/doc/v2/examples/example48.output
@@ -1,4 +1,4 @@
-//[example48o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(8): error in "test": check ::boost::test_tools::tt_detail::is_defined_impl( "SYMBOL1", "= SYMBOL1" ) failed
diff --git a/doc/v2/examples/example49.cpp b/doc/v2/examples/example49.cpp
index 64133340..97945357 100755
--- a/doc/v2/examples/example49.cpp
+++ b/doc/v2/examples/example49.cpp
@@ -1,4 +1,4 @@
-//[example49
+//[example_code
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
diff --git a/doc/v2/examples/example49.output b/doc/v2/examples/example49.output
index 41d630b3..374c8814 100755
--- a/doc/v2/examples/example49.output
+++ b/doc/v2/examples/example49.output
@@ -1,4 +1,4 @@
-//[example49o
+//[example_output
 > example --show_progress=yes --log_level=nothing
 
 0%   10   20   30   40   50   60   70   80   90   100%
diff --git a/doc/v2/examples/example50.cpp b/doc/v2/examples/example50.cpp
index 100ae47a..9bb4835d 100755
--- a/doc/v2/examples/example50.cpp
+++ b/doc/v2/examples/example50.cpp
@@ -1,4 +1,4 @@
-//[example50
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <fstream>
diff --git a/doc/v2/examples/example50.output b/doc/v2/examples/example50.output
index 7373cfd8..969dcb9d 100755
--- a/doc/v2/examples/example50.output
+++ b/doc/v2/examples/example50.output
@@ -1,4 +1,4 @@
-//[example50o
+//[example_output
 > example
 
 *** 1 failure detected in test suite "example"
diff --git a/doc/v2/examples/example51.cpp b/doc/v2/examples/example51.cpp
index 45000bae..9a4408e2 100755
--- a/doc/v2/examples/example51.cpp
+++ b/doc/v2/examples/example51.cpp
@@ -1,4 +1,4 @@
-//[example51
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/detail/unit_test_parameters.hpp>
diff --git a/doc/v2/examples/example51.output b/doc/v2/examples/example51.output
index d64c3605..00f085c2 100755
--- a/doc/v2/examples/example51.output
+++ b/doc/v2/examples/example51.output
@@ -1,4 +1,4 @@
-//[example51o
+//[example_output
 > example
 Running 1 test case...
 test.cpp(13): warning in "test_case0": condition sizeof(int) > 4 is not satisfied
diff --git a/doc/v2/examples/example52.cpp b/doc/v2/examples/example52.cpp
index 22e21280..9f1dafb2 100755
--- a/doc/v2/examples/example52.cpp
+++ b/doc/v2/examples/example52.cpp
@@ -1,4 +1,4 @@
-//[example52
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
diff --git a/doc/v2/examples/example52.output b/doc/v2/examples/example52.output
index ce5422d4..409f16aa 100755
--- a/doc/v2/examples/example52.output
+++ b/doc/v2/examples/example52.output
@@ -1,4 +1,4 @@
-//[example52o
+//[example_output
 > example --report_level=no
 <TestLog><Error file="test.cpp" line="18">check false failed</Error></TestLog>
 //]
\ No newline at end of file
diff --git a/doc/v2/examples/example53.cpp b/doc/v2/examples/example53.cpp
index 8733fb13..5b5f8b8b 100755
--- a/doc/v2/examples/example53.cpp
+++ b/doc/v2/examples/example53.cpp
@@ -1,4 +1,4 @@
-//[example53
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example53.output b/doc/v2/examples/example53.output
index fc633861..fa86b1a8 100755
--- a/doc/v2/examples/example53.output
+++ b/doc/v2/examples/example53.output
@@ -1,4 +1,4 @@
-//[example53o
+//[example_output
 >example --report_level=detailed
 Running 3 test cases...
 test.cpp(8): error in "test_case1": some error 1
diff --git a/doc/v2/examples/example54.cpp b/doc/v2/examples/example54.cpp
index 7b18acb5..fb07b41b 100755
--- a/doc/v2/examples/example54.cpp
+++ b/doc/v2/examples/example54.cpp
@@ -1,4 +1,4 @@
-//[example54
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example54.output b/doc/v2/examples/example54.output
index 82bf7654..584b98a9 100755
--- a/doc/v2/examples/example54.output
+++ b/doc/v2/examples/example54.output
@@ -1,4 +1,4 @@
-//[example54o
+//[example_output
 >example
 Running 1 test case...
 test.cpp(10): error in "test": check i != j failed [3 == 3]
diff --git a/doc/v2/examples/example55.cpp b/doc/v2/examples/example55.cpp
index 070d7a59..2757fe34 100755
--- a/doc/v2/examples/example55.cpp
+++ b/doc/v2/examples/example55.cpp
@@ -1,4 +1,4 @@
-//[example55
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example55.output b/doc/v2/examples/example55.output
index 123aa8a5..d3984832 100755
--- a/doc/v2/examples/example55.output
+++ b/doc/v2/examples/example55.output
@@ -1,4 +1,4 @@
-//[example55o
+//[example_output
 >example
 Running 1 test case...
 test.cpp(10): error in "test": check i <= j failed [9 > 6]
diff --git a/doc/v2/examples/example56.cpp b/doc/v2/examples/example56.cpp
index 758ae2b2..468a9f98 100755
--- a/doc/v2/examples/example56.cpp
+++ b/doc/v2/examples/example56.cpp
@@ -1,4 +1,4 @@
-//[example56
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example56.output b/doc/v2/examples/example56.output
index a4dec822..3ec005fc 100755
--- a/doc/v2/examples/example56.output
+++ b/doc/v2/examples/example56.output
@@ -1,4 +1,4 @@
-//[example56o
+//[example_output
 >example
 Running 1 test case...
 test.cpp(10): error in "test": check i < j failed [7 >= 7]
diff --git a/doc/v2/examples/example57.cpp b/doc/v2/examples/example57.cpp
index 4f06b5cf..27eae4e6 100755
--- a/doc/v2/examples/example57.cpp
+++ b/doc/v2/examples/example57.cpp
@@ -1,4 +1,4 @@
-//[example57
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example57.output b/doc/v2/examples/example57.output
index a233006c..eb59278b 100755
--- a/doc/v2/examples/example57.output
+++ b/doc/v2/examples/example57.output
@@ -1,4 +1,4 @@
-//[example57o
+//[example_output
 >example
 Running 1 test case...
 test.cpp(10): error in "test": check i >= j failed [1 < 4]
diff --git a/doc/v2/examples/example58.cpp b/doc/v2/examples/example58.cpp
index 9ea42217..d55d0128 100755
--- a/doc/v2/examples/example58.cpp
+++ b/doc/v2/examples/example58.cpp
@@ -1,4 +1,4 @@
-//[example58
+//[example_code
 #define BOOST_TEST_MODULE example
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/doc/v2/examples/example58.output b/doc/v2/examples/example58.output
index 8b17bbde..36fb4a0a 100755
--- a/doc/v2/examples/example58.output
+++ b/doc/v2/examples/example58.output
@@ -1,4 +1,4 @@
-//[example58o
+//[example_output
 >example
 Running 1 test case...
 test.cpp(10): error in "test": check i > j failed [2 < 14]
diff --git a/doc/v2/forewords.qbk b/doc/v2/forewords.qbk
deleted file mode 100644
index 61f17c97..00000000
--- a/doc/v2/forewords.qbk
+++ /dev/null
@@ -1,26 +0,0 @@
-
-[/ this file should be included in the top file. It should not contain a section command]
-
-
-[:[*Test everything that could possibly break] - ['XP maxim]]
-  
-The Boost.Test library provides a matched set of components for writing test programs, organizing tests into 
-simple test cases and test suites, and controlling their runtime execution. The Program Execution Monitor is also 
-useful in some production (non-test) environments. 
-
-[h2 About this documentation]
-
-This documentation is [*not] intended to be read though from the beginning to the end by 
-a novice user. You can do that if you are interested in detailed bottom-up description of all Boost.Test components.
-Otherwise you are better off jumping directly to the subject of your interest. 
-
-For example:
-
-* If you are interested in unit testing framework you may go directly <link linkend="utf">there</link>
-* For novice users I recommend to start from simple __section_tutorial__. 
-* Looking for quick help - check the __part_faq__ section for resolution to many popular issues you may be faced with. 
-  Most pages should link you directly to the terms that you need to understand it. 
-* For help with compilation see compilation sections of an appropriate component.
-
-
-
diff --git a/doc/v2/how_to_read_this_documentation.qbk b/doc/v2/how_to_read_this_documentation.qbk
deleted file mode 100644
index b2c928c4..00000000
--- a/doc/v2/how_to_read_this_documentation.qbk
+++ /dev/null
@@ -1,36 +0,0 @@
-[section How to read this documentation?]
-Without further ado, I'd like to start ... but where? It's not obvious what is the best order to describe the framework. 
-One can use bottom up approach, starting with with basics and going up to cover real interfaces based on them. The downside is 
-that you'll have to dig through the multiple pages of information you may not never need in real life. One can follow the order 
-of test program execution. From test initialization to test tree construction to the report and log generation. This also 
-unfortunately may not be most clear way. The Boost.Test __UTF__ is very flexible and a lot of details of various test initialization
-options may not necessarily be important for average user, while understanding test output is.
-
-Well ... This is a User's Guide after all. Let's go by what [*you] need to know to successfully use the __UTF__. Thus I follow
-the order of decisions you, as a user, have to make and order of complexity of the problems you have to solve. If you find yourself 
-faced with some unclear term feel free to jump directly to the __part_glossary__ section, 
-where short definitions for all used terms were collected. And again if you want to jump right into coding the 
-__section_tutorial__ section would be a better place to start.
-
-The __UTF__ has several usage variants. And the first decision you have to make is which one to use. These variants are covered in 
-section dedicated to [*Usage variants]. The next step, probably the most important 
-for you, is to start writing test cases, bind them in test suites and implement your checks. First two topics are covered in 
-__section_test_organization__ section, while __testing_tools__ section arms you with rich set of tools enough to implement almost arbitrary check you need.
-
-Next you'll learn how to understand and manipulate the __UTF__ output in a __test_outputs__ section. 
-At that point you should be able to build and run most simple test modules and almost inevitable find a need to configure 
-how the test module is executed. Whether you want to change output format, select which test case to run or run test cases in random order 
-these and may other runtime configuration parameters are described in [*Runtime configuration] section.
-
-One of the first non trivial things you might want to add to your test module is test fixture. Fixture support is covered in 
-__section_test_fixture__ section. Usually the default test module initialization will work just fine,
-but if you want to implement some custom initialization or change how default initialization behaves you need to first look in 
-[*Test module initialization] section. Here you'll learn about various options the __UTF__ provides for you to customize this behaviour.
-
-Finally you might want to learn about how the __UTF__ implements entry points into the test modules. This is especially important if you 
-intend to implement the `main` function yourself and not use the one provided by the __UTF__. The 
-[*Test runners] section covers this subject. Different usage variants employ slightly 
-different approached to implementing test module entry points and presents slightly different interfaces. This section intended for advanced 
-user some of the details of the implementation are described there.
-
-[endsect]
\ No newline at end of file
diff --git a/doc/v2/html/BOOST_LIB_NAME.html b/doc/v2/html/BOOST_LIB_NAME.html
old mode 100644
new mode 100755
index 6bb442ef..98408dce
--- a/doc/v2/html/BOOST_LIB_NAME.html
+++ b/doc/v2/html/BOOST_LIB_NAME.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macro BOOST_LIB_NAME</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Test">
 <link rel="up" href="header/boost/test/unit_test_hpp.html" title="Header &lt;boost/test/unit_test.hpp&gt;">
 <link rel="prev" href="header/boost/test/unit_test_hpp.html" title="Header &lt;boost/test/unit_test.hpp&gt;">
diff --git a/doc/v2/html/BOOST_PARAM_CLASS_TEST_CASE.html b/doc/v2/html/BOOST_PARAM_CLASS_TEST_CASE.html
old mode 100644
new mode 100755
index b89c2f56..f47f169e
--- a/doc/v2/html/BOOST_PARAM_CLASS_TEST_CASE.html
+++ b/doc/v2/html/BOOST_PARAM_CLASS_TEST_CASE.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macro BOOST_PARAM_CLASS_TEST_CASE</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Test">
 <link rel="up" href="header/boost/test/parameterized_test_hpp.html" title="Header &lt;boost/test/parameterized_test.hpp&gt;">
 <link rel="prev" href="BOOST_PARAM_TEST_CASE.html" title="Macro BOOST_PARAM_TEST_CASE">
diff --git a/doc/v2/html/BOOST_PARAM_TEST_CASE.html b/doc/v2/html/BOOST_PARAM_TEST_CASE.html
old mode 100644
new mode 100755
index d3a1e29b..85798e12
--- a/doc/v2/html/BOOST_PARAM_TEST_CASE.html
+++ b/doc/v2/html/BOOST_PARAM_TEST_CASE.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macro BOOST_PARAM_TEST_CASE</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Test">
 <link rel="up" href="header/boost/test/parameterized_test_hpp.html" title="Header &lt;boost/test/parameterized_test.hpp&gt;">
 <link rel="prev" href="header/boost/test/parameterized_test_hpp.html" title="Header &lt;boost/test/parameterized_test.hpp&gt;">
diff --git a/doc/v2/html/BOOST_TEST_SETUP_ASSERT.html b/doc/v2/html/BOOST_TEST_SETUP_ASSERT.html
old mode 100644
new mode 100755
index e3fc5072..9ef8323d
--- a/doc/v2/html/BOOST_TEST_SETUP_ASSERT.html
+++ b/doc/v2/html/BOOST_TEST_SETUP_ASSERT.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macro BOOST_TEST_SETUP_ASSERT</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Test">
 <link rel="up" href="header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="boost/unit_test/init_unit_test_func.html" title="Type definition init_unit_test_func">
diff --git a/doc/v2/html/BOOST_TEST_SYS_ASSERT.html b/doc/v2/html/BOOST_TEST_SYS_ASSERT.html
old mode 100644
new mode 100755
index 8e051273..9a52c53e
--- a/doc/v2/html/BOOST_TEST_SYS_ASSERT.html
+++ b/doc/v2/html/BOOST_TEST_SYS_ASSERT.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macro BOOST_TEST_SYS_ASSERT</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Test">
 <link rel="up" href="header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
 <link rel="prev" href="boost/system_error.html" title="Class system_error">
diff --git a/doc/v2/html/boost/debug/attach_debugger.html b/doc/v2/html/boost/debug/attach_debugger.html
old mode 100644
new mode 100755
index a8d3bec2..9cf58f05
--- a/doc/v2/html/boost/debug/attach_debugger.html
+++ b/doc/v2/html/boost/debug/attach_debugger.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function attach_debugger</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
 <link rel="prev" href="set_debugger.html" title="Function set_debugger">
@@ -34,23 +34,17 @@
 </span>
 <span class="keyword">bool</span> <span class="identifier">attach_debugger</span><span class="special">(</span><span class="keyword">bool</span> break_or_continue <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480679104"></a><h2>Description</h2>
+<a name="id940778"></a><h2>Description</h2>
 <p>Using currently selected debugger, this routine attempts to attach the debugger to this process. 
 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">break_or_continue</code></span></p></td>
 <td><p>tells what we wan to do aftr the debugger is attached. If true - process execution breaks in the point in invocation of this function. Otherwise execution continues, but now it is under the debugger </p></td>
diff --git a/doc/v2/html/boost/debug/break_memory_alloc.html b/doc/v2/html/boost/debug/break_memory_alloc.html
old mode 100644
new mode 100755
index 64537d2e..5afecf17
--- a/doc/v2/html/boost/debug/break_memory_alloc.html
+++ b/doc/v2/html/boost/debug/break_memory_alloc.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function break_memory_alloc</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
 <link rel="prev" href="detect_memory_leaks.html" title="Function detect_memory_leaks">
@@ -34,21 +34,15 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">break_memory_alloc</span><span class="special">(</span><span class="keyword">long</span> mem_alloc_order_num<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480649536"></a><h2>Description</h2>
+<a name="id941016"></a><h2>Description</h2>
 <p>On some platforms/memory managers (at the moment only on Windows/Visual Studio) one can tell a C Runtime to break on specific memory allocation. This can be used in combination with memory leak detection (which reports leaked memory allocation number) to locate the place where leak initiated. 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">mem_alloc_order_num</code></span></p></td>
 <td><p>Specific memory allocation number </p></td>
diff --git a/doc/v2/html/boost/debug/dbg_startup_info.html b/doc/v2/html/boost/debug/dbg_startup_info.html
old mode 100644
new mode 100755
index 4b7c994f..23c63997
--- a/doc/v2/html/boost/debug/dbg_startup_info.html
+++ b/doc/v2/html/boost/debug/dbg_startup_info.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct dbg_startup_info</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
 <link rel="prev" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
diff --git a/doc/v2/html/boost/debug/detect_memory_leaks.html b/doc/v2/html/boost/debug/detect_memory_leaks.html
old mode 100644
new mode 100755
index 3a235d43..273bfb35
--- a/doc/v2/html/boost/debug/detect_memory_leaks.html
+++ b/doc/v2/html/boost/debug/detect_memory_leaks.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function detect_memory_leaks</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
 <link rel="prev" href="attach_debugger.html" title="Function attach_debugger">
@@ -35,21 +35,15 @@
 <span class="keyword">void</span> <span class="identifier">detect_memory_leaks</span><span class="special">(</span><span class="keyword">bool</span> on_off<span class="special">,</span> 
                          <span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">const_string</span> report_file <span class="special">=</span> <span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">const_string</span><span class="special">(</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480661840"></a><h2>Description</h2>
+<a name="id940902"></a><h2>Description</h2>
 <p>On platforms where memory leak detection is possible inside of running application (at the moment this is only Windows family) you can switch this feature on and off using this interface. In addition you can specify the name of the file to write a report into. Otherwise the report is going to be generated in standard error stream. 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">on_off</code></span></p></td>
diff --git a/doc/v2/html/boost/debug/set_debugger.html b/doc/v2/html/boost/debug/set_debugger.html
old mode 100644
new mode 100755
index 258bcdb8..eeac1942
--- a/doc/v2/html/boost/debug/set_debugger.html
+++ b/doc/v2/html/boost/debug/set_debugger.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function set_debugger</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
 <link rel="prev" href="under_debugger.html" title="Function under_debugger">
@@ -35,28 +35,22 @@
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">set_debugger</span><span class="special">(</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">const_string</span> dbg_id<span class="special">,</span> 
                          <span class="identifier">dbg_starter</span> s <span class="special">=</span> <span class="identifier">dbg_starter</span><span class="special">(</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480695296"></a><h2>Description</h2>
+<a name="id940646"></a><h2>Description</h2>
 <p>There are many different debuggers avaialable for different platforms. Some of them also can be used in a different setups/configuratins. For example, gdb can be used in plain text mode, inside ddd, inside (x)emacs or in a separate xterm window. Boost.Test identifies each configuration with unique string. Also different debuggers configurations require different routines which is specifically tailored to start that debugger configuration. Boost.Test comes with set of predefined configuration names and corresponding routines for these configurations:</p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>TODO</p></li></ul></div>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>TODO</p></li></ul></div>
 <p>
 </p>
 <p>You can use this routine to select which one of the predefined debugger configurations to use in which case you do not need to provide starter routine (the one provided by Boost.Test will be used). You can also use this routine to select your own debugger by providing unique configuration id and starter routine for this configuration.</p>
 <p>
 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">dbg_id</code></span></p></td>
diff --git a/doc/v2/html/boost/debug/under_debugger.html b/doc/v2/html/boost/debug/under_debugger.html
old mode 100644
new mode 100755
index dfd7c189..4e083e7f
--- a/doc/v2/html/boost/debug/under_debugger.html
+++ b/doc/v2/html/boost/debug/under_debugger.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function under_debugger</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
 <link rel="prev" href="dbg_startup_info.html" title="Struct dbg_startup_info">
@@ -34,14 +34,11 @@
 </span>
 <span class="keyword">bool</span> <span class="identifier">under_debugger</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480710096"></a><h2>Description</h2>
+<a name="id940538"></a><h2>Description</h2>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Returns:</span></p></td>
 <td><p>true if current process is under debugger. False otherwise </p></td>
diff --git a/doc/v2/html/boost/execution_aborted.html b/doc/v2/html/boost/execution_aborted.html
old mode 100644
new mode 100755
index bd03e7fb..d1d163c7
--- a/doc/v2/html/boost/execution_aborted.html
+++ b/doc/v2/html/boost/execution_aborted.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class execution_aborted</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
-<link rel="prev" href="execution_monitor.html" title="Class execution_monitor">
-<link rel="next" href="system_error.html" title="Class system_error">
+<link rel="prev" href="../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
+<link rel="next" href="execution_exception.html" title="Class execution_exception">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="execution_monitor.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="system_error.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_exception.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.execution_aborted"></a><div class="titlepage"></div>
@@ -46,7 +46,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="execution_monitor.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="system_error.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_exception.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/execution_exception.html b/doc/v2/html/boost/execution_exception.html
old mode 100644
new mode 100755
index 57d1c3f3..765cd203
--- a/doc/v2/html/boost/execution_exception.html
+++ b/doc/v2/html/boost/execution_exception.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class execution_exception</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
-<link rel="prev" href="../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
+<link rel="prev" href="execution_aborted.html" title="Class execution_aborted">
 <link rel="next" href="execution_exception/location.html" title="Struct location">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_exception/location.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="execution_aborted.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_exception/location.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.execution_exception"></a><div class="titlepage"></div>
@@ -40,7 +40,7 @@
 
   <span class="keyword">struct</span> <a class="link" href="execution_exception/location.html" title="Struct location">location</a> <span class="special">{</span>
     <span class="comment">// <a class="link" href="execution_exception/location.html#boost.execution_exception.locationconstruct-copy-destruct">construct/copy/destruct</a></span>
-    <span class="keyword">explicit</span> <a class="link" href="execution_exception/location.html#idm18026381856-bb"><span class="identifier">location</span></a><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="identifier">size_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+    <span class="keyword">explicit</span> <a class="link" href="execution_exception/location.html#id327206-bb"><span class="identifier">location</span></a><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="identifier">size_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
 
     <span class="comment">// public data members</span>
     <span class="identifier">const_string</span> <span class="identifier">m_file_name</span><span class="special">;</span>    <span class="comment">// File name. </span>
@@ -49,33 +49,27 @@
   <span class="special">}</span><span class="special">;</span>
   <span class="keyword">enum</span> <a class="link" href="execution_exception/error_code.html" title="Type error_code">error_code</a><span class="special">;</span>
   <span class="comment">// <a class="link" href="execution_exception.html#boost.execution_exceptionconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="execution_exception.html#idm18026378608-bb"><span class="identifier">execution_exception</span></a><span class="special">(</span><span class="identifier">error_code</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <a class="link" href="execution_exception/location.html" title="Struct location">location</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="execution_exception.html#id327186-bb"><span class="identifier">execution_exception</span></a><span class="special">(</span><span class="identifier">error_code</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <a class="link" href="execution_exception/location.html" title="Struct location">location</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480568976"></a><h2>Description</h2>
+<a name="id942710"></a><h2>Description</h2>
 <p>The instance of this class is thrown out of execution_monitor::execute invocation when failure is detected. Regardless of a kind of failure occured the instance will provide a uniform way to catch and report it.</p>
 <p>One important design rationale for this class is that we should be ready to work after fatal memory corruptions or out of memory conditions. To facilitate this class never allocates any memory and assumes that strings it refers to are either some constants or live in a some kind of persistent (preallocated) memory. </p>
 <div class="refsect2">
-<a name="idm436480567520"></a><h3>
+<a name="id942702"></a><h3>
 <a name="boost.execution_exceptionconstruct-copy-destruct"></a><code class="computeroutput">execution_exception</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
-<pre class="literallayout"><a name="idm18026378608-bb"></a><span class="identifier">execution_exception</span><span class="special">(</span><span class="identifier">error_code</span> ec<span class="special">,</span> <span class="identifier">const_string</span> what_msg<span class="special">,</span> 
+<pre class="literallayout"><a name="id327186-bb"></a><span class="identifier">execution_exception</span><span class="special">(</span><span class="identifier">error_code</span> ec<span class="special">,</span> <span class="identifier">const_string</span> what_msg<span class="special">,</span> 
                     <a class="link" href="execution_exception/location.html" title="Struct location">location</a> <span class="keyword">const</span> <span class="special">&amp;</span> location<span class="special">)</span><span class="special">;</span></pre>Constructs instance based on message, location and error code. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">ec</code></span></p></td>
@@ -108,7 +102,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_exception/location.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="execution_aborted.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_exception/location.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/execution_exception/error_code.html b/doc/v2/html/boost/execution_exception/error_code.html
old mode 100644
new mode 100755
index 55141c80..6fdc539e
--- a/doc/v2/html/boost/execution_exception/error_code.html
+++ b/doc/v2/html/boost/execution_exception/error_code.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Type error_code</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../execution_exception.html#idm436480568976" title="Description">
+<link rel="up" href="../execution_exception.html#id942710" title="Description">
 <link rel="prev" href="location.html" title="Struct location">
 <link rel="next" href="../execution_monitor.html" title="Class execution_monitor">
 </head>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="location.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#idm436480568976"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../execution_monitor.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="location.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#id942710"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../execution_monitor.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.execution_exception.error_code"></a><div class="titlepage"></div>
@@ -37,7 +37,7 @@
                   <a class="link" href="error_code.html#boost.execution_exception.error_code.timeout_error">timeout_error</a> = = 215, <a class="link" href="error_code.html#boost.execution_exception.error_code.user_fatal_error">user_fatal_error</a> = = 220, 
                   <a class="link" href="error_code.html#boost.execution_exception.error_code.system_fatal_error">system_fatal_error</a> = = 225 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480492896"></a><h2>Description</h2>
+<a name="id943221"></a><h2>Description</h2>
 <div class="note"><table border="0" summary="Note">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
@@ -56,7 +56,7 @@ The implementation decides what is a system_fatal_error and what is just a syste
 </table></div>
 <p>
 </p>
-<div class="variablelist"><dl class="variablelist compact">
+<div class="variablelist"><dl>
 <dt><span class="term"><code class="computeroutput">no_error</code><a name="boost.execution_exception.error_code.no_error"></a></span></dt>
 <dd>for completeness only; never returned </dd>
 <dt><span class="term"><code class="computeroutput">user_error</code><a name="boost.execution_exception.error_code.user_error"></a></span></dt>
@@ -85,7 +85,7 @@ The implementation decides what is a system_fatal_error and what is just a syste
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="location.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#idm436480568976"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../execution_monitor.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="location.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#id942710"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../execution_monitor.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/execution_exception/location.html b/doc/v2/html/boost/execution_exception/location.html
old mode 100644
new mode 100755
index 74b32cb3..918bbd33
--- a/doc/v2/html/boost/execution_exception/location.html
+++ b/doc/v2/html/boost/execution_exception/location.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct location</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../execution_exception.html#idm436480568976" title="Description">
+<link rel="up" href="../execution_exception.html#id942710" title="Description">
 <link rel="prev" href="../execution_exception.html" title="Class execution_exception">
 <link rel="next" href="error_code.html" title="Type error_code">
 </head>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../execution_exception.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#idm436480568976"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="error_code.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../execution_exception.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#id942710"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="error_code.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.execution_exception.location"></a><div class="titlepage"></div>
@@ -37,7 +37,7 @@
 
 <span class="keyword">struct</span> <a class="link" href="location.html" title="Struct location">location</a> <span class="special">{</span>
   <span class="comment">// <a class="link" href="location.html#boost.execution_exception.locationconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <span class="keyword">explicit</span> <a class="link" href="location.html#idm18026381856-bb"><span class="identifier">location</span></a><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="identifier">size_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">explicit</span> <a class="link" href="location.html#id327206-bb"><span class="identifier">location</span></a><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="identifier">size_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">const_string</span> <span class="identifier">m_file_name</span><span class="special">;</span>  <span class="comment">// File name. </span>
@@ -45,13 +45,13 @@
   <span class="identifier">const_string</span> <span class="identifier">m_function</span><span class="special">;</span>  <span class="comment">// Function name. </span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480522576"></a><h2>Description</h2>
+<a name="id943059"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436480522176"></a><h3>
+<a name="id943046"></a><h3>
 <a name="boost.execution_exception.locationconstruct-copy-destruct"></a><code class="computeroutput">location</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18026381856-bb"></a><span class="identifier">location</span><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> file_name <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="identifier">size_t</span> line_num <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="id327206-bb"></a><span class="identifier">location</span><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> file_name <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="identifier">size_t</span> line_num <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
                   <span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> func <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
@@ -67,7 +67,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../execution_exception.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#idm436480568976"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="error_code.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../execution_exception.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_exception.html#id942710"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="error_code.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/execution_monitor.html b/doc/v2/html/boost/execution_monitor.html
old mode 100644
new mode 100755
index 6be2e29a..5ba274c6
--- a/doc/v2/html/boost/execution_monitor.html
+++ b/doc/v2/html/boost/execution_monitor.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class execution_monitor</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
 <link rel="prev" href="execution_exception/error_code.html" title="Type error_code">
-<link rel="next" href="execution_aborted.html" title="Class execution_aborted">
+<link rel="next" href="system_error.html" title="Class system_error">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="execution_exception/error_code.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_aborted.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="execution_exception/error_code.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="system_error.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.execution_monitor"></a><div class="titlepage"></div>
@@ -35,21 +35,21 @@
 <span class="keyword">class</span> <a class="link" href="execution_monitor.html" title="Class execution_monitor">execution_monitor</a> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
   <span class="comment">// <a class="link" href="execution_monitor.html#boost.execution_monitorconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="execution_monitor.html#idm18026318336-bb"><span class="identifier">execution_monitor</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="execution_monitor.html#id325400-bb"><span class="identifier">execution_monitor</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="execution_monitor.html#idm18026344496-bb">public member functions</a></span>
-  <span class="keyword">int</span> <a class="link" href="execution_monitor.html#idm18026343968-bb"><span class="identifier">execute</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="execution_monitor.html#idm18026337952-bb"><span class="identifier">vexecute</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="execution_monitor.html#id327461-bb">public member functions</a></span>
+  <span class="keyword">int</span> <a class="link" href="execution_monitor.html#id327462-bb"><span class="identifier">execute</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="execution_monitor.html#id327491-bb"><span class="identifier">vexecute</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> ExceptionType<span class="special">,</span> <span class="keyword">typename</span> ExceptionTranslator<span class="special">&gt;</span> 
-    <span class="keyword">void</span> <a class="link" href="execution_monitor.html#idm18026334208-bb"><span class="identifier">register_exception_translator</span></a><span class="special">(</span><span class="identifier">ExceptionTranslator</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
+    <span class="keyword">void</span> <a class="link" href="execution_monitor.html#id327538-bb"><span class="identifier">register_exception_translator</span></a><span class="special">(</span><span class="identifier">ExceptionTranslator</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
                                        <span class="identifier">const_string</span> <span class="special">=</span> <span class="identifier">const_string</span><span class="special">(</span><span class="special">)</span><span class="special">,</span> 
                                        <span class="identifier">boost</span><span class="special">::</span><span class="identifier">type</span><span class="special">&lt;</span> <span class="identifier">ExceptionType</span> <span class="special">&gt;</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="execution_monitor.html#idm18026324448-bb"><span class="identifier">erase_exception_translator</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="execution_monitor.html#id325354-bb"><span class="identifier">erase_exception_translator</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> ExceptionType<span class="special">&gt;</span> 
-    <span class="keyword">void</span> <a class="link" href="execution_monitor.html#idm18026321776-bb"><span class="identifier">erase_exception_translator</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">type</span><span class="special">&lt;</span> <span class="identifier">ExceptionType</span> <span class="special">&gt;</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+    <span class="keyword">void</span> <a class="link" href="execution_monitor.html#id325382-bb"><span class="identifier">erase_exception_translator</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">type</span><span class="special">&lt;</span> <span class="identifier">ExceptionType</span> <span class="special">&gt;</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="execution_monitor.html#idm18026317728-bb">private member functions</a></span>
-  <span class="keyword">int</span> <a class="link" href="execution_monitor.html#idm18026317200-bb"><span class="identifier">catch_signals</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="execution_monitor.html#id325409-bb">private member functions</a></span>
+  <span class="keyword">int</span> <a class="link" href="execution_monitor.html#id325380-bb"><span class="identifier">catch_signals</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// <a class="link" href="execution_monitor.html#boost.execution_monitorpublic-data-members">public data members</a></span>
   <span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">readwrite_property</span><span class="special">&lt;</span> <span class="keyword">bool</span> <span class="special">&gt;</span> <a class="link" href="execution_monitor.html#boost.execution_monitor.p_catch_system_errors"><span class="identifier">p_catch_system_errors</span></a><span class="special">;</span>  <span class="comment">// Should monitor catch system errors. </span>
@@ -59,23 +59,23 @@
   <span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">readwrite_property</span><span class="special">&lt;</span> <span class="keyword">unsigned</span> <span class="special">&gt;</span> <a class="link" href="execution_monitor.html#boost.execution_monitor.p_detect_fp_exceptions"><span class="identifier">p_detect_fp_exceptions</span></a><span class="special">;</span>  <span class="comment">// Should monitor try to detect hardware floating point exceptions (!= 0), and which specific exception to catch. </span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480372512"></a><h2>Description</h2>
+<a name="id941862"></a><h2>Description</h2>
 <p>This class is used to uniformly detect and report an occurrence of several types of signals and exceptions, reducing various errors to a uniform <a class="link" href="execution_exception.html" title="Class execution_exception">execution_exception</a> that is returned to a caller.</p>
 <p>The executiom_monitor behavior can be customised through a set of public parameters (properties) associated with the <a class="link" href="execution_monitor.html" title="Class execution_monitor">execution_monitor</a> instance. All parameters are implemented as public unit_test::readwrite_property data members of the class <a class="link" href="execution_monitor.html" title="Class execution_monitor">execution_monitor</a>. </p>
 <div class="refsect2">
-<a name="idm436480368864"></a><h3>
+<a name="id941846"></a><h3>
 <a name="boost.execution_monitorconstruct-copy-destruct"></a><code class="computeroutput">execution_monitor</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
-<pre class="literallayout"><a name="idm18026318336-bb"></a><span class="identifier">execution_monitor</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre>Default constructor initializes all execution monitor properties. </li></ol></div>
+<pre class="literallayout"><a name="id325400-bb"></a><span class="identifier">execution_monitor</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre>Default constructor initializes all execution monitor properties. </li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436480363200"></a><h3>
-<a name="idm18026344496-bb"></a><code class="computeroutput">execution_monitor</code> public member functions</h3>
+<a name="id941879"></a><h3>
+<a name="id327461-bb"></a><code class="computeroutput">execution_monitor</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">int</span> <a name="idm18026343968-bb"></a><span class="identifier">execute</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> F<span class="special">)</span><span class="special">;</span></pre>Execution monitor entry point for functions returning integer value. <p>This method executes supplied function F inside a try/catch block and also may include other unspecified platform dependent error detection code.</p>
+<pre class="literallayout"><span class="keyword">int</span> <a name="id327462-bb"></a><span class="identifier">execute</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> F<span class="special">)</span><span class="special">;</span></pre>Execution monitor entry point for functions returning integer value. <p>This method executes supplied function F inside a try/catch block and also may include other unspecified platform dependent error detection code.</p>
 <p>This method throws an <code class="computeroutput"><a class="link" href="execution_exception.html" title="Class execution_exception">execution_exception</a></code> on an uncaught C++ exception, a hardware or software signal, trap, or other user exception.</p>
 <div class="note"><table border="0" summary="Note">
 <tr>
@@ -92,19 +92,13 @@
 <p>vexecute </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">F</code></span></p></td>
 <td><p>Function to monitor </p></td>
@@ -119,24 +113,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">void</span> <a name="idm18026337952-bb"></a><span class="identifier">vexecute</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> F<span class="special">)</span><span class="special">;</span></pre>Execution monitor entry point for functions returning void. <p>This method is semantically identical to execution_monitor::execute, but des not produce any result code. 
+<pre class="literallayout"><span class="keyword">void</span> <a name="id327491-bb"></a><span class="identifier">vexecute</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> F<span class="special">)</span><span class="special">;</span></pre>Execution monitor entry point for functions returning void. <p>This method is semantically identical to execution_monitor::execute, but des not produce any result code. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>execute </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">F</code></span></p></td>
 <td><p>Function to monitor </p></td>
@@ -147,7 +135,7 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> ExceptionType<span class="special">,</span> <span class="keyword">typename</span> ExceptionTranslator<span class="special">&gt;</span> 
-  <span class="keyword">void</span> <a name="idm18026334208-bb"></a><span class="identifier">register_exception_translator</span><span class="special">(</span><span class="identifier">ExceptionTranslator</span> <span class="keyword">const</span> <span class="special">&amp;</span> tr<span class="special">,</span> 
+  <span class="keyword">void</span> <a name="id327538-bb"></a><span class="identifier">register_exception_translator</span><span class="special">(</span><span class="identifier">ExceptionTranslator</span> <span class="keyword">const</span> <span class="special">&amp;</span> tr<span class="special">,</span> 
                                      <span class="identifier">const_string</span> tag <span class="special">=</span> <span class="identifier">const_string</span><span class="special">(</span><span class="special">)</span><span class="special">,</span> 
                                      <span class="identifier">boost</span><span class="special">::</span><span class="identifier">type</span><span class="special">&lt;</span> <span class="identifier">ExceptionType</span> <span class="special">&gt;</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre>Registers custom (user supplied) exception translator. <p>This method template registers a translator for an exception type specified as a first template argument. For example </p>
 <pre class="programlisting"><span class="keyword">void</span> <span class="identifier">myExceptTr</span><span class="special">(</span> <span class="identifier">MyException</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">ex</span> <span class="special">)</span> <span class="special">{</span> <span class="comment">/*do something with the exception here*/</span><span class="special">}</span>
@@ -156,19 +144,13 @@
 <p> The translator should be any unary function/functor object which accepts MyException const&amp;. This can be free standing function or bound class method. The second argument is an optional string tag you can associate with this translator routine. The only reason to specify the tag is if you plan to erase the translator eventually. This can be usefull in scenario when you reuse the same <code class="computeroutput"><a class="link" href="execution_monitor.html" title="Class execution_monitor">execution_monitor</a></code> instance to monitor different routines and need to register a translator specific to the routine being monitored. While it is possible to erase the translator based on an exception type it was registered for, tag string provides simpler way of doing this. 
 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">tag</code></span></p></td>
@@ -183,11 +165,8 @@
 </tr>
 <tr>
 <td><p><span class="term">Template Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">ExceptionTranslator</code></span></p></td>
@@ -204,20 +183,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">void</span> <a name="idm18026324448-bb"></a><span class="identifier">erase_exception_translator</span><span class="special">(</span><span class="identifier">const_string</span> tag<span class="special">)</span><span class="special">;</span></pre>Erases custom exception translator based on a tag. <p>Use the same tag as the one used during translator registration 
+<pre class="literallayout"><span class="keyword">void</span> <a name="id325354-bb"></a><span class="identifier">erase_exception_translator</span><span class="special">(</span><span class="identifier">const_string</span> tag<span class="special">)</span><span class="special">;</span></pre>Erases custom exception translator based on a tag. <p>Use the same tag as the one used during translator registration 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">tag</code></span></p></td>
 <td><p>tag associated with translator you wants to erase </p></td>
@@ -228,17 +201,17 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> ExceptionType<span class="special">&gt;</span> 
-  <span class="keyword">void</span> <a name="idm18026321776-bb"></a><span class="identifier">erase_exception_translator</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">type</span><span class="special">&lt;</span> <span class="identifier">ExceptionType</span> <span class="special">&gt;</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre>Erases custom exception translator based on an exception type. <p>tparam ExceptionType Exception type for which you want to erase the translator </p>
+  <span class="keyword">void</span> <a name="id325382-bb"></a><span class="identifier">erase_exception_translator</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">type</span><span class="special">&lt;</span> <span class="identifier">ExceptionType</span> <span class="special">&gt;</span> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre>Erases custom exception translator based on an exception type. <p>tparam ExceptionType Exception type for which you want to erase the translator </p>
 </li>
 </ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436480267552"></a><h3>
-<a name="idm18026317728-bb"></a><code class="computeroutput">execution_monitor</code> private member functions</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">int</span> <a name="idm18026317200-bb"></a><span class="identifier">catch_signals</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> F<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<a name="id945824"></a><h3>
+<a name="id325409-bb"></a><code class="computeroutput">execution_monitor</code> private member functions</h3>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">int</span> <a name="id325380-bb"></a><span class="identifier">catch_signals</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">int</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> F<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436480255936"></a><h3>
+<a name="id945904"></a><h3>
 <a name="boost.execution_monitorpublic-data-members"></a><code class="computeroutput">execution_monitor</code> 
         public
        public data members</h3>
@@ -278,7 +251,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="execution_exception/error_code.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_aborted.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="execution_exception/error_code.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="system_error.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/system_error.html b/doc/v2/html/boost/system_error.html
old mode 100644
new mode 100755
index cbcd5199..bcd7bc11
--- a/doc/v2/html/boost/system_error.html
+++ b/doc/v2/html/boost/system_error.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class system_error</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">
-<link rel="prev" href="execution_aborted.html" title="Class execution_aborted">
+<link rel="prev" href="execution_monitor.html" title="Class execution_monitor">
 <link rel="next" href="../BOOST_TEST_SYS_ASSERT.html" title="Macro BOOST_TEST_SYS_ASSERT">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="execution_aborted.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../BOOST_TEST_SYS_ASSERT.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="execution_monitor.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../BOOST_TEST_SYS_ASSERT.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.system_error"></a><div class="titlepage"></div>
@@ -35,20 +35,20 @@
 <span class="keyword">class</span> <a class="link" href="system_error.html" title="Class system_error">system_error</a> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
   <span class="comment">// <a class="link" href="system_error.html#boost.system_errorconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <span class="keyword">explicit</span> <a class="link" href="system_error.html#idm18026312176-bb"><span class="identifier">system_error</span></a><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">explicit</span> <a class="link" href="system_error.html#id329310-bb"><span class="identifier">system_error</span></a><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">readonly_property</span><span class="special">&lt;</span> <span class="keyword">long</span> <span class="special">&gt;</span> <span class="identifier">p_errno</span><span class="special">;</span>
   <span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">readonly_property</span><span class="special">&lt;</span> <span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> <span class="special">&gt;</span> <span class="identifier">p_failed_exp</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436480181488"></a><h2>Description</h2>
+<a name="id946346"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436480181088"></a><h3>
+<a name="id946376"></a><h3>
 <a name="boost.system_errorconstruct-copy-destruct"></a><code class="computeroutput">system_error</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18026312176-bb"></a><span class="identifier">system_error</span><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> exp<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="id329310-bb"></a><span class="identifier">system_error</span><span class="special">(</span><span class="keyword">char</span> <span class="keyword">const</span> <span class="special">*</span> exp<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -63,7 +63,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="execution_aborted.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../BOOST_TEST_SYS_ASSERT.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="execution_monitor.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../header/boost/test/execution_monitor_hpp.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../BOOST_TEST_SYS_ASSERT.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/test_tools/assertion_result.html b/doc/v2/html/boost/test_tools/assertion_result.html
old mode 100644
new mode 100755
index 01423186..348af48b
--- a/doc/v2/html/boost/test_tools/assertion_result.html
+++ b/doc/v2/html/boost/test_tools/assertion_result.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class assertion_result</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/tools/assertion_result_hpp.html" title="Header &lt;boost/test/tools/assertion_result.hpp&gt;">
 <link rel="prev" href="../../header/boost/test/tools/assertion_result_hpp.html" title="Header &lt;boost/test/tools/assertion_result.hpp&gt;">
@@ -38,46 +38,46 @@
 
   <span class="keyword">struct</span> <a class="link" href="assertion_result/dummy.html" title="Struct dummy">dummy</a> <span class="special">{</span>
 
-    <span class="comment">// <a class="link" href="assertion_result/dummy.html#idm18025923344-bb">public member functions</a></span>
-    <span class="keyword">void</span> <a class="link" href="assertion_result/dummy.html#idm18025922816-bb"><span class="identifier">nonnull</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+    <span class="comment">// <a class="link" href="assertion_result/dummy.html#id333237-bb">public member functions</a></span>
+    <span class="keyword">void</span> <a class="link" href="assertion_result/dummy.html#id333212-bb"><span class="identifier">nonnull</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
   <span class="special">}</span><span class="special">;</span>
   <span class="comment">// <a class="link" href="assertion_result.html#boost.test_tools.assertion_resultconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="assertion_result.html#idm18025913920-bb"><span class="identifier">assertion_result</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> BoolConvertable<span class="special">&gt;</span> <a class="link" href="assertion_result.html#idm18025913008-bb"><span class="identifier">assertion_result</span></a><span class="special">(</span><span class="identifier">BoolConvertable</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="assertion_result.html#idm18025911296-bb"><span class="keyword">operator</span><span class="special">=</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="assertion_result.html#id333313-bb"><span class="identifier">assertion_result</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> BoolConvertable<span class="special">&gt;</span> <a class="link" href="assertion_result.html#id333314-bb"><span class="identifier">assertion_result</span></a><span class="special">(</span><span class="identifier">BoolConvertable</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="assertion_result.html#id333330-bb"><span class="keyword">operator</span><span class="special">=</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="assertion_result.html#idm18025921888-bb">public member functions</a></span>
-  <span class="keyword">bool</span> <a class="link" href="assertion_result.html#idm18025921360-bb"><span class="keyword">operator</span><span class="special">!</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <a class="link" href="assertion_result.html#idm18025920336-bb"><span class="keyword">operator</span> <span class="identifier">safe_bool</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-   <a class="link" href="assertion_result.html#idm18025919296-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> <span class="special">(</span><a class="link" href="assertion_result.html" title="Class assertion_result">assertion_result</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="assertion_result.html#idm18025916928-bb"><span class="identifier">has_empty_message</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="identifier">wrap_stringstream</span> <span class="special">&amp;</span> <a class="link" href="assertion_result.html#idm18025915888-bb"><span class="identifier">message</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
-  <span class="identifier">const_string</span> <a class="link" href="assertion_result.html#idm18025915088-bb"><span class="identifier">message</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="assertion_result.html#id333228-bb">public member functions</a></span>
+  <span class="keyword">bool</span> <a class="link" href="assertion_result.html#id333266-bb"><span class="keyword">operator</span><span class="special">!</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <a class="link" href="assertion_result.html#id333270-bb"><span class="keyword">operator</span> <span class="identifier">safe_bool</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+   <a class="link" href="assertion_result.html#id333242-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> <span class="special">(</span><a class="link" href="assertion_result.html" title="Class assertion_result">assertion_result</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="assertion_result.html#id333256-bb"><span class="identifier">has_empty_message</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="identifier">wrap_stringstream</span> <span class="special">&amp;</span> <a class="link" href="assertion_result.html#id333290-bb"><span class="identifier">message</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <span class="identifier">const_string</span> <a class="link" href="assertion_result.html#id333284-bb"><span class="identifier">message</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478164544"></a><h2>Description</h2>
+<a name="id966962"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436478164144"></a><h3>
+<a name="id966930"></a><h3>
 <a name="boost.test_tools.assertion_resultconstruct-copy-destruct"></a><code class="computeroutput">assertion_result</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><a name="idm18025913920-bb"></a><span class="identifier">assertion_result</span><span class="special">(</span><span class="keyword">bool</span> pv_<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><a name="id333313-bb"></a><span class="identifier">assertion_result</span><span class="special">(</span><span class="keyword">bool</span> pv_<span class="special">)</span><span class="special">;</span></pre></li>
 <li class="listitem"><pre class="literallayout"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> BoolConvertable<span class="special">&gt;</span> 
-  <a name="idm18025913008-bb"></a><span class="identifier">assertion_result</span><span class="special">(</span><span class="identifier">BoolConvertable</span> <span class="keyword">const</span> <span class="special">&amp;</span> pv_<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025911296-bb"></a><span class="keyword">operator</span><span class="special">=</span><span class="special">(</span><span class="keyword">bool</span> pv_<span class="special">)</span><span class="special">;</span></pre></li>
+  <a name="id333314-bb"></a><span class="identifier">assertion_result</span><span class="special">(</span><span class="identifier">BoolConvertable</span> <span class="keyword">const</span> <span class="special">&amp;</span> pv_<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id333330-bb"></a><span class="keyword">operator</span><span class="special">=</span><span class="special">(</span><span class="keyword">bool</span> pv_<span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436478145168"></a><h3>
-<a name="idm18025921888-bb"></a><code class="computeroutput">assertion_result</code> public member functions</h3>
+<a name="id967093"></a><h3>
+<a name="id333228-bb"></a><code class="computeroutput">assertion_result</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18025921360-bb"></a><span class="keyword">operator</span><span class="special">!</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><a name="idm18025920336-bb"></a><span class="keyword">operator</span> <span class="identifier">safe_bool</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"> <a name="idm18025919296-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> <span class="special">(</span><a class="link" href="assertion_result.html" title="Class assertion_result">assertion_result</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18025916928-bb"></a><span class="identifier">has_empty_message</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="identifier">wrap_stringstream</span> <span class="special">&amp;</span> <a name="idm18025915888-bb"></a><span class="identifier">message</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="identifier">const_string</span> <a name="idm18025915088-bb"></a><span class="identifier">message</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id333266-bb"></a><span class="keyword">operator</span><span class="special">!</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><a name="id333270-bb"></a><span class="keyword">operator</span> <span class="identifier">safe_bool</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"> <a name="id333242-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> <span class="special">(</span><a class="link" href="assertion_result.html" title="Class assertion_result">assertion_result</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id333256-bb"></a><span class="identifier">has_empty_message</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="identifier">wrap_stringstream</span> <span class="special">&amp;</span> <a name="id333290-bb"></a><span class="identifier">message</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="identifier">const_string</span> <a name="id333284-bb"></a><span class="identifier">message</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
diff --git a/doc/v2/html/boost/test_tools/assertion_result/dummy.html b/doc/v2/html/boost/test_tools/assertion_result/dummy.html
old mode 100644
new mode 100755
index 3df26042..f657d1e8
--- a/doc/v2/html/boost/test_tools/assertion_result/dummy.html
+++ b/doc/v2/html/boost/test_tools/assertion_result/dummy.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct dummy</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../assertion_result.html#idm436478164544" title="Description">
+<link rel="up" href="../assertion_result.html#id966962" title="Description">
 <link rel="prev" href="../assertion_result.html" title="Class assertion_result">
 <link rel="next" href="../../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
 </head>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../assertion_result.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../assertion_result.html#idm436478164544"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../assertion_result.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../assertion_result.html#id966962"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.test_tools.assertion_result.dummy"></a><div class="titlepage"></div>
@@ -35,15 +35,15 @@
 
 <span class="keyword">struct</span> <a class="link" href="dummy.html" title="Struct dummy">dummy</a> <span class="special">{</span>
 
-  <span class="comment">// <a class="link" href="dummy.html#idm18025923344-bb">public member functions</a></span>
-  <span class="keyword">void</span> <a class="link" href="dummy.html#idm18025922816-bb"><span class="identifier">nonnull</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="dummy.html#id333237-bb">public member functions</a></span>
+  <span class="keyword">void</span> <a class="link" href="dummy.html#id333212-bb"><span class="identifier">nonnull</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478101600"></a><h2>Description</h2>
+<a name="id967418"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436478101200"></a><h3>
-<a name="idm18025923344-bb"></a><code class="computeroutput">dummy</code> public member functions</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025922816-bb"></a><span class="identifier">nonnull</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<a name="id967407"></a><h3>
+<a name="id333237-bb"></a><code class="computeroutput">dummy</code> public member functions</h3>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id333212-bb"></a><span class="identifier">nonnull</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -58,7 +58,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../assertion_result.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../assertion_result.html#idm436478164544"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../assertion_result.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../assertion_result.html#id966962"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/add_context.html b/doc/v2/html/boost/unit_test/framework/add_context.html
old mode 100644
new mode 100755
index ebc92f73..eb50e426
--- a/doc/v2/html/boost/unit_test/framework/add_context.html
+++ b/doc/v2/html/boost/unit_test/framework/add_context.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function add_context</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="deregister_observer.html" title="Function deregister_observer">
@@ -34,23 +34,17 @@
 </span>
 <span class="keyword">int</span> <span class="identifier">add_context</span><span class="special">(</span><span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> context_descr<span class="special">,</span> <span class="keyword">bool</span> sticky<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479791152"></a><h2>Description</h2>
+<a name="id948803"></a><h2>Description</h2>
 <p>Some context frames are sticky - they can only explicetly cleared by specifying context id. Other (non sticky) context frames cleared after every assertion. 
 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">context_descr</code></span></p></td>
diff --git a/doc/v2/html/boost/unit_test/framework/clear_context.html b/doc/v2/html/boost/unit_test/framework/clear_context.html
old mode 100644
new mode 100755
index 910e49e8..48b3c9f7
--- a/doc/v2/html/boost/unit_test/framework/clear_context.html
+++ b/doc/v2/html/boost/unit_test/framework/clear_context.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function clear_context</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="add_context.html" title="Function add_context">
@@ -34,7 +34,7 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">clear_context</span><span class="special">(</span><span class="keyword">int</span> context_id <span class="special">=</span> <span class="special">-</span><span class="number">1</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479776624"></a><h2>Description</h2>
+<a name="id948911"></a><h2>Description</h2>
 <p>If context_id is passed clears that specific context frame identified by this id, otherwise clears all non sticky contexts </p>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/framework/context_generator.html b/doc/v2/html/boost/unit_test/framework/context_generator.html
old mode 100644
new mode 100755
index 5bee0465..d075e21b
--- a/doc/v2/html/boost/unit_test/framework/context_generator.html
+++ b/doc/v2/html/boost/unit_test/framework/context_generator.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct context_generator</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
@@ -34,29 +34,29 @@
 </span>
 <span class="keyword">struct</span> <a class="link" href="context_generator.html" title="Struct context_generator">context_generator</a> <span class="special">{</span>
   <span class="comment">// <a class="link" href="context_generator.html#boost.unit_test.framework.context_generatorconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="context_generator.html#idm18026294288-bb"><span class="identifier">context_generator</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="context_generator.html#id329466-bb"><span class="identifier">context_generator</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="context_generator.html#idm18026297600-bb">public member functions</a></span>
-  <span class="keyword">bool</span> <a class="link" href="context_generator.html#idm18026297072-bb"><span class="identifier">is_empty</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="identifier">const_string</span> <a class="link" href="context_generator.html#idm18026295760-bb"><span class="identifier">next</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="context_generator.html#id329456-bb">public member functions</a></span>
+  <span class="keyword">bool</span> <a class="link" href="context_generator.html#id329424-bb"><span class="identifier">is_empty</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="identifier">const_string</span> <a class="link" href="context_generator.html#id329428-bb"><span class="identifier">next</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479973440"></a><h2>Description</h2>
+<a name="id949728"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436479973040"></a><h3>
+<a name="id949721"></a><h3>
 <a name="boost.unit_test.framework.context_generatorconstruct-copy-destruct"></a><code class="computeroutput">context_generator</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18026294288-bb"></a><span class="identifier">context_generator</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id329466-bb"></a><span class="identifier">context_generator</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436479967488"></a><h3>
-<a name="idm18026297600-bb"></a><code class="computeroutput">context_generator</code> public member functions</h3>
+<a name="id949782"></a><h3>
+<a name="id329456-bb"></a><code class="computeroutput">context_generator</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">bool</span> <a name="idm18026297072-bb"></a><span class="identifier">is_empty</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Is there any context? </li>
+<pre class="literallayout"><span class="keyword">bool</span> <a name="id329424-bb"></a><span class="identifier">is_empty</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Is there any context? </li>
 <li class="listitem">
-<pre class="literallayout"><span class="identifier">const_string</span> <a name="idm18026295760-bb"></a><span class="identifier">next</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Give me next frame; empty - last frame. </li>
+<pre class="literallayout"><span class="identifier">const_string</span> <a name="id329428-bb"></a><span class="identifier">next</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Give me next frame; empty - last frame. </li>
 </ol></div>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/framework/current_auto_test_suite.html b/doc/v2/html/boost/unit_test/framework/current_auto_test_suite.html
old mode 100644
new mode 100755
index 4704fb56..8ffadd77
--- a/doc/v2/html/boost/unit_test/framework/current_auto_test_suite.html
+++ b/doc/v2/html/boost/unit_test/framework/current_auto_test_suite.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function current_auto_test_suite</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="shutdown.html" title="Function shutdown">
-<link rel="next" href="register_te_idm18026271216.html" title="Function register_test_unit">
+<link rel="next" href="register_test_uni_id329627.html" title="Function register_test_unit">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="shutdown.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_te_idm18026271216.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="shutdown.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_test_uni_id329627.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.current_auto_test_suite"></a><div class="titlepage"></div>
@@ -35,9 +35,9 @@
 <a class="link" href="../test_suite.html" title="Class test_suite">test_suite</a> <span class="special">&amp;</span> 
 <span class="identifier">current_auto_test_suite</span><span class="special">(</span><a class="link" href="../test_suite.html" title="Class test_suite">test_suite</a> <span class="special">*</span> ts <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">bool</span> push_or_pop <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479866416"></a><h2>Description</h2>
+<a name="id950493"></a><h2>Description</h2>
 <p>During auto-registration phase the framework maintain a FIFO queue of test units being registered. New test units become children of the current "leaf" test suite and if this is test suite it is pushed back into queue and becomes a new leaf. When test suite registration is completed, a test suite is poped from the back of the queue. Only automatically registered test suites should be added to this queue. Master test suite is always a zero element in this queue, so if no other test suites are registered all test cases are added to master test suite. This function facilitates all three possible actions:</p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><p>if no argument are provided it returns the current queue leaf test suite</p></li>
 <li class="listitem"><p>if test suite is provided and no second argument are set, test suite is added to the queue</p></li>
 <li class="listitem"><p>if no test suite are provided and last argument is false, the semantic of this function is similar to queue pop: last element is popped from the queue 
@@ -46,18 +46,12 @@
 </ul></div>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">push_or_pop</code></span></p></td>
@@ -84,7 +78,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="shutdown.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_te_idm18026271216.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="shutdown.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_test_uni_id329627.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/current_test_case.html b/doc/v2/html/boost/unit_test/framework/current_test_case.html
old mode 100644
new mode 100755
index de60b27c..66555855
--- a/doc/v2/html/boost/unit_test/framework/current_test_case.html
+++ b/doc/v2/html/boost/unit_test/framework/current_test_case.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function current_test_case</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="master_test_suite.html" title="Function master_test_suite">
@@ -34,7 +34,7 @@
 </span>
 <a class="link" href="../test_case.html" title="Class test_case">test_case</a> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">current_test_case</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479758224"></a><h2>Description</h2>
+<a name="id949052"></a><h2>Description</h2>
 <p>This function is only valid during test execution phase </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>current_test_case_id </p>
diff --git a/doc/v2/html/boost/unit_test/framework/current_test_case_id.html b/doc/v2/html/boost/unit_test/framework/current_test_case_id.html
old mode 100644
new mode 100755
index 5c5ed235..ec336165
--- a/doc/v2/html/boost/unit_test/framework/current_test_case_id.html
+++ b/doc/v2/html/boost/unit_test/framework/current_test_case_id.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function current_test_case_id</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="current_test_case.html" title="Function current_test_case">
-<link rel="next" href="get_idm18026239664.html" title="Function get">
+<link rel="next" href="get_id327620.html" title="Function get">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="current_test_case.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_idm18026239664.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="current_test_case.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_id327620.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.current_test_case_id"></a><div class="titlepage"></div>
@@ -34,7 +34,7 @@
 </span>
 <span class="identifier">test_unit_id</span> <span class="identifier">current_test_case_id</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479749728"></a><h2>Description</h2>
+<a name="id949101"></a><h2>Description</h2>
 <p>This function safer than current_test_case, cause if wont throw if no test case is being executed. </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>current_test_case </p>
@@ -53,7 +53,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="current_test_case.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_idm18026239664.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="current_test_case.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_id327620.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/deregister_observer.html b/doc/v2/html/boost/unit_test/framework/deregister_observer.html
old mode 100644
new mode 100755
index cdbe7823..b4bc80f2
--- a/doc/v2/html/boost/unit_test/framework/deregister_observer.html
+++ b/doc/v2/html/boost/unit_test/framework/deregister_observer.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function deregister_observer</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="register_observer.html" title="Function register_observer">
@@ -34,21 +34,15 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">deregister_observer</span><span class="special">(</span><span class="identifier">test_observer</span> <span class="special">&amp;</span> to<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479804432"></a><h2>Description</h2>
+<a name="id948715"></a><h2>Description</h2>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">to</code></span></p></td>
 <td><p>test observer object to exclude </p></td>
diff --git a/doc/v2/html/boost/unit_test/framework/deregister_test_unit.html b/doc/v2/html/boost/unit_test/framework/deregister_test_unit.html
old mode 100644
new mode 100755
index 07c5853f..0073fae0
--- a/doc/v2/html/boost/unit_test/framework/deregister_test_unit.html
+++ b/doc/v2/html/boost/unit_test/framework/deregister_test_unit.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function deregister_test_unit</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="register_te_idm18026268112.html" title="Function register_test_unit">
+<link rel="prev" href="register_test_uni_id329651.html" title="Function register_test_unit">
 <link rel="next" href="register_observer.html" title="Function register_observer">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="register_te_idm18026268112.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_observer.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="register_test_uni_id329651.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_observer.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.deregister_test_unit"></a><div class="titlepage"></div>
@@ -34,21 +34,15 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">deregister_test_unit</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479827488"></a><h2>Description</h2>
+<a name="id950751"></a><h2>Description</h2>
 <p>This function also assignes unique test unit id for every test case. LAter on one can use this id to located the test case if necessary. This is the way for the framework to maintain weak references between test units. 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">tu</code></span></p></td>
 <td><p>test unit to deregister </p></td>
@@ -69,7 +63,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="register_te_idm18026268112.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_observer.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="register_test_uni_id329651.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_observer.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/get_idm18026235296.html b/doc/v2/html/boost/unit_test/framework/get_idm18026235296.html
deleted file mode 100644
index 4e6f1a79..00000000
--- a/doc/v2/html/boost/unit_test/framework/get_idm18026235296.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function template get</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="get_idm18026239664.html" title="Function get">
-<link rel="next" href="run_idm18026230112.html" title="Function run">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="get_idm18026239664.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="run_idm18026230112.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.framework.get_idm18026235296"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function template get</span></h2>
-<p>boost::unit_test::framework::get &#8212; This function template provides access to a typed test unit by id. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">boost/test/framework.hpp</a>&gt;
-
-</span>
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> UnitType<span class="special">&gt;</span> <span class="identifier">UnitType</span> <span class="special">&amp;</span> <span class="identifier">get</span><span class="special">(</span><span class="identifier">test_unit_id</span> id<span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436479722848"></a><h2>Description</h2>
-<p>It will throw if you specify incorrect test unit type 
-
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><code class="computeroutput">id</code></span></p></td>
-<td><p>id of test unit to get </p></td>
-</tr></tbody>
-</table></div></td>
-</tr>
-<tr>
-<td><p><span class="term">Template Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><code class="computeroutput">UnitType</code></span></p></td>
-<td><p>compile time type of test unit to get (<code class="computeroutput"><a class="link" href="../test_suite.html" title="Class test_suite">test_suite</a></code> or <code class="computeroutput"><a class="link" href="../test_case.html" title="Class test_case">test_case</a></code>) </p></td>
-</tr></tbody>
-</table></div></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="get_idm18026239664.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="run_idm18026230112.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/framework/get_idm18026239664.html b/doc/v2/html/boost/unit_test/framework/get_idm18026239664.html
deleted file mode 100644
index 1de4dce2..00000000
--- a/doc/v2/html/boost/unit_test/framework/get_idm18026239664.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function get</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="current_test_case_id.html" title="Function current_test_case_id">
-<link rel="next" href="get_idm18026235296.html" title="Function template get">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="current_test_case_id.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_idm18026235296.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.framework.get_idm18026239664"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function get</span></h2>
-<p>boost::unit_test::framework::get &#8212; This function provides access to a test unit by id and type combination. It will throw if no test unit located. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">boost/test/framework.hpp</a>&gt;
-
-</span>
-<a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="special">&amp;</span> <span class="identifier">get</span><span class="special">(</span><span class="identifier">test_unit_id</span> tu_id<span class="special">,</span> <span class="identifier">test_unit_type</span> tu_type<span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436479738480"></a><h2>Description</h2>
-<p>
-
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term"><code class="computeroutput">tu_id</code></span></p></td>
-<td><p>id of a test unit to locate </p></td>
-</tr>
-<tr>
-<td><p><span class="term"><code class="computeroutput">tu_type</code></span></p></td>
-<td><p>type of a test unit to locate </p></td>
-</tr>
-</tbody>
-</table></div></td>
-</tr>
-<tr>
-<td><p><span class="term">Returns:</span></p></td>
-<td><p>located test unit </p></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="current_test_case_id.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_idm18026235296.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/framework/init.html b/doc/v2/html/boost/unit_test/framework/init.html
old mode 100644
new mode 100755
index 5ff67792..78c2e5cf
--- a/doc/v2/html/boost/unit_test/framework/init.html
+++ b/doc/v2/html/boost/unit_test/framework/init.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function init</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="nothing_to_test.html" title="Struct nothing_to_test">
+<link rel="prev" href="test_being_aborted.html" title="Struct test_being_aborted">
 <link rel="next" href="shutdown.html" title="Function shutdown">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="shutdown.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="shutdown.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.init"></a><div class="titlepage"></div>
@@ -34,27 +34,25 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">init</span><span class="special">(</span><span class="identifier">init_unit_test_func</span> init_func<span class="special">,</span> <span class="keyword">int</span> argc<span class="special">,</span> <span class="keyword">char</span> <span class="special">*</span> argv<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479891056"></a><h2>Description</h2>
+<a name="id950311"></a><h2>Description</h2>
 <p>It needs to be called every time before the test is started. 
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">argc</code></span></p></td>
 <td><p>command line arguments collection </p></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="computeroutput">argv</code></span></p></td>
+<td><p>command line arguments collection </p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="computeroutput">init_func</code></span></p></td>
 <td><p>test module initialization routine </p></td>
 </tr>
@@ -75,7 +73,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="shutdown.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="shutdown.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/internal_error.html b/doc/v2/html/boost/unit_test/framework/internal_error.html
old mode 100644
new mode 100755
index a3a4046e..8a74f35c
--- a/doc/v2/html/boost/unit_test/framework/internal_error.html
+++ b/doc/v2/html/boost/unit_test/framework/internal_error.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct internal_error</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="context_generator.html" title="Struct context_generator">
-<link rel="next" href="setup_error.html" title="Struct setup_error">
+<link rel="next" href="nothing_to_test.html" title="Struct nothing_to_test">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="context_generator.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="setup_error.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="context_generator.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.internal_error"></a><div class="titlepage"></div>
@@ -34,16 +34,16 @@
 </span>
 <span class="keyword">struct</span> <a class="link" href="internal_error.html" title="Struct internal_error">internal_error</a> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">runtime_error</span> <span class="special">{</span>
   <span class="comment">// <a class="link" href="internal_error.html#boost.unit_test.framework.internal_errorconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="internal_error.html#idm18026292128-bb"><span class="identifier">internal_error</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="internal_error.html#id329465-bb"><span class="identifier">internal_error</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479942064"></a><h2>Description</h2>
+<a name="id949934"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436479941664"></a><h3>
+<a name="id949953"></a><h3>
 <a name="boost.unit_test.framework.internal_errorconstruct-copy-destruct"></a><code class="computeroutput">internal_error</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18026292128-bb"></a><span class="identifier">internal_error</span><span class="special">(</span><span class="identifier">const_string</span> m<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id329465-bb"></a><span class="identifier">internal_error</span><span class="special">(</span><span class="identifier">const_string</span> m<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -58,7 +58,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="context_generator.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="setup_error.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="context_generator.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/master_test_suite.html b/doc/v2/html/boost/unit_test/framework/master_test_suite.html
old mode 100644
new mode 100755
index 388e9e59..99b0d306
--- a/doc/v2/html/boost/unit_test/framework/master_test_suite.html
+++ b/doc/v2/html/boost/unit_test/framework/master_test_suite.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function master_test_suite</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="clear_context.html" title="Function clear_context">
@@ -34,14 +34,11 @@
 </span>
 <a class="link" href="../master_test_suite_t.html" title="Class master_test_suite_t">master_test_suite_t</a> <span class="special">&amp;</span> <span class="identifier">master_test_suite</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479768304"></a><h2>Description</h2>
+<a name="id948968"></a><h2>Description</h2>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Returns:</span></p></td>
 <td><p>a reference the master test suite instance </p></td>
diff --git a/doc/v2/html/boost/unit_test/framework/nothing_to_test.html b/doc/v2/html/boost/unit_test/framework/nothing_to_test.html
old mode 100644
new mode 100755
index f9862d86..9af7b0c6
--- a/doc/v2/html/boost/unit_test/framework/nothing_to_test.html
+++ b/doc/v2/html/boost/unit_test/framework/nothing_to_test.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct nothing_to_test</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="test_being_aborted.html" title="Struct test_being_aborted">
-<link rel="next" href="init.html" title="Function init">
+<link rel="prev" href="internal_error.html" title="Struct internal_error">
+<link rel="next" href="setup_error.html" title="Struct setup_error">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="init.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="internal_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="setup_error.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.nothing_to_test"></a><div class="titlepage"></div>
@@ -46,7 +46,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="init.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="internal_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="setup_error.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/register_observer.html b/doc/v2/html/boost/unit_test/framework/register_observer.html
old mode 100644
new mode 100755
index 6cc0c1de..08fcd8bb
--- a/doc/v2/html/boost/unit_test/framework/register_observer.html
+++ b/doc/v2/html/boost/unit_test/framework/register_observer.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function register_observer</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="deregister_test_unit.html" title="Function deregister_test_unit">
@@ -34,21 +34,15 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">register_observer</span><span class="special">(</span><span class="identifier">test_observer</span> <span class="special">&amp;</span> to<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479815856"></a><h2>Description</h2>
+<a name="id948611"></a><h2>Description</h2>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">to</code></span></p></td>
 <td><p>test observer object to add </p></td>
diff --git a/doc/v2/html/boost/unit_test/framework/register_te_idm18026268112.html b/doc/v2/html/boost/unit_test/framework/register_te_idm18026268112.html
deleted file mode 100644
index f3301e93..00000000
--- a/doc/v2/html/boost/unit_test/framework/register_te_idm18026268112.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function register_test_unit</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="register_te_idm18026271216.html" title="Function register_test_unit">
-<link rel="next" href="deregister_test_unit.html" title="Function deregister_test_unit">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="register_te_idm18026271216.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="deregister_test_unit.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.framework.register_te_idm18026268112"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function register_test_unit</span></h2>
-<p>boost::unit_test::framework::register_test_unit &#8212; This function add new test suite into the global collection of test units the framework aware of. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">boost/test/framework.hpp</a>&gt;
-
-</span>
-<span class="keyword">void</span> <span class="identifier">register_test_unit</span><span class="special">(</span><a class="link" href="../test_suite.html" title="Class test_suite">test_suite</a> <span class="special">*</span> ts<span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436479839312"></a><h2>Description</h2>
-<p>This function also assignes unique test unit id for every test suite. Later on one can use this id to locate the test case if necessary. This is the way for the framework to maintain weak references between test units. 
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><code class="computeroutput">ts</code></span></p></td>
-<td><p>test suite to register </p></td>
-</tr></tbody>
-</table></div></td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="register_te_idm18026271216.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="deregister_test_unit.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/framework/register_te_idm18026271216.html b/doc/v2/html/boost/unit_test/framework/register_te_idm18026271216.html
deleted file mode 100644
index 31b0edc5..00000000
--- a/doc/v2/html/boost/unit_test/framework/register_te_idm18026271216.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function register_test_unit</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="current_auto_test_suite.html" title="Function current_auto_test_suite">
-<link rel="next" href="register_te_idm18026268112.html" title="Function register_test_unit">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="current_auto_test_suite.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_te_idm18026268112.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.framework.register_te_idm18026271216"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function register_test_unit</span></h2>
-<p>boost::unit_test::framework::register_test_unit &#8212; This function add new test case into the global collection of test units the framework aware of. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">boost/test/framework.hpp</a>&gt;
-
-</span>
-<span class="keyword">void</span> <span class="identifier">register_test_unit</span><span class="special">(</span><a class="link" href="../test_case.html" title="Class test_case">test_case</a> <span class="special">*</span> tc<span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436479851120"></a><h2>Description</h2>
-<p>This function also assignes unique test unit id for every test case. Later on one can use this id to locate the test case if necessary. This is the way for the framework to maintain weak references between test units. 
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><code class="computeroutput">tc</code></span></p></td>
-<td><p>test case to register </p></td>
-</tr></tbody>
-</table></div></td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="current_auto_test_suite.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="register_te_idm18026268112.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/framework/run_idm18026230112.html b/doc/v2/html/boost/unit_test/framework/run_idm18026230112.html
deleted file mode 100644
index 12b1846a..00000000
--- a/doc/v2/html/boost/unit_test/framework/run_idm18026230112.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function run</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="get_idm18026235296.html" title="Function template get">
-<link rel="next" href="../init_unit_test_func.html" title="Type definition init_unit_test_func">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="get_idm18026235296.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../init_unit_test_func.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.framework.run_idm18026230112"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function run</span></h2>
-<p>boost::unit_test::framework::run &#8212; Initiates test execution. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">boost/test/framework.hpp</a>&gt;
-
-</span>
-<span class="keyword">void</span> <span class="identifier">run</span><span class="special">(</span><span class="identifier">test_unit_id</span> tu <span class="special">=</span> <span class="identifier">INV_TEST_UNIT_ID</span><span class="special">,</span> <span class="keyword">bool</span> continue_test <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436479703920"></a><h2>Description</h2>
-<p>This function is used to start the test execution from a specific "root" test unit. If no root provided, test is started from master test suite. This second argument facilitates an ability of the test cases to start some other test units (primirilly used internally for self testing) 
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term"><code class="computeroutput">continue_test</code></span></p></td>
-<td><p>true == continue test if it was already started, false == restart the test from scratch regardless </p></td>
-</tr>
-<tr>
-<td><p><span class="term"><code class="computeroutput">tu</code></span></p></td>
-<td><p>Optional id of the test unit or test unit itself from which the test is started. If absent, master test suite is used </p></td>
-</tr>
-</tbody>
-</table></div></td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="get_idm18026235296.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../init_unit_test_func.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/framework/setup_error.html b/doc/v2/html/boost/unit_test/framework/setup_error.html
old mode 100644
new mode 100755
index 0bfa47a0..0395b4ee
--- a/doc/v2/html/boost/unit_test/framework/setup_error.html
+++ b/doc/v2/html/boost/unit_test/framework/setup_error.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct setup_error</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="internal_error.html" title="Struct internal_error">
+<link rel="prev" href="nothing_to_test.html" title="Struct nothing_to_test">
 <link rel="next" href="test_being_aborted.html" title="Struct test_being_aborted">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="internal_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.setup_error"></a><div class="titlepage"></div>
@@ -34,16 +34,16 @@
 </span>
 <span class="keyword">struct</span> <a class="link" href="setup_error.html" title="Struct setup_error">setup_error</a> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">runtime_error</span> <span class="special">{</span>
   <span class="comment">// <a class="link" href="setup_error.html#boost.unit_test.framework.setup_errorconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="setup_error.html#idm18026289328-bb"><span class="identifier">setup_error</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="setup_error.html#id329510-bb"><span class="identifier">setup_error</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479921760"></a><h2>Description</h2>
+<a name="id950114"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436479921360"></a><h3>
+<a name="id950160"></a><h3>
 <a name="boost.unit_test.framework.setup_errorconstruct-copy-destruct"></a><code class="computeroutput">setup_error</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18026289328-bb"></a><span class="identifier">setup_error</span><span class="special">(</span><span class="identifier">const_string</span> m<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id329510-bb"></a><span class="identifier">setup_error</span><span class="special">(</span><span class="identifier">const_string</span> m<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -58,7 +58,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="internal_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_being_aborted.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/framework/shutdown.html b/doc/v2/html/boost/unit_test/framework/shutdown.html
old mode 100644
new mode 100755
index f6e89136..2fa36e22
--- a/doc/v2/html/boost/unit_test/framework/shutdown.html
+++ b/doc/v2/html/boost/unit_test/framework/shutdown.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function shutdown</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="init.html" title="Function init">
@@ -34,7 +34,7 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">shutdown</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479879648"></a><h2>Description</h2>
+<a name="id950389"></a><h2>Description</h2>
 <p>It needs to be at the very end of test module execution </p>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/framework/test_being_aborted.html b/doc/v2/html/boost/unit_test/framework/test_being_aborted.html
old mode 100644
new mode 100755
index c5dfcbd1..7581798b
--- a/doc/v2/html/boost/unit_test/framework/test_being_aborted.html
+++ b/doc/v2/html/boost/unit_test/framework/test_being_aborted.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct test_being_aborted</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
 <link rel="prev" href="setup_error.html" title="Struct setup_error">
-<link rel="next" href="nothing_to_test.html" title="Struct nothing_to_test">
+<link rel="next" href="init.html" title="Function init">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="setup_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="setup_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="init.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.framework.test_being_aborted"></a><div class="titlepage"></div>
@@ -46,7 +46,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="setup_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="nothing_to_test.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="setup_error.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/framework_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="init.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/init_unit_test_func.html b/doc/v2/html/boost/unit_test/init_unit_test_func.html
old mode 100644
new mode 100755
index 9d1bc294..e7007ce7
--- a/doc/v2/html/boost/unit_test/init_unit_test_func.html
+++ b/doc/v2/html/boost/unit_test/init_unit_test_func.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Type definition init_unit_test_func</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/framework_hpp.html" title="Header &lt;boost/test/framework.hpp&gt;">
-<link rel="prev" href="framework/run_idm18026230112.html" title="Function run">
+<link rel="prev" href="framework/run_id327716.html" title="Function run">
 <link rel="next" href="../../BOOST_TEST_SETUP_ASSERT.html" title="Macro BOOST_TEST_SETUP_ASSERT">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="framework/run_idm18026230112.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/framework_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../BOOST_TEST_SETUP_ASSERT.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="framework/run_id327716.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/framework_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../BOOST_TEST_SETUP_ASSERT.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.init_unit_test_func"></a><div class="titlepage"></div>
@@ -34,7 +34,7 @@
 </span>
 <span class="keyword">typedef</span> <a class="link" href="test_suite.html" title="Class test_suite">test_suite</a> <span class="special">*</span><span class="special">(</span><span class="special">*</span> <span class="identifier">init_unit_test_func</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479690784"></a><h2>Description</h2>
+<a name="id949537"></a><h2>Description</h2>
 <p>Different depending on whether BOOST_TEST_ALTERNATIVE_INIT_API is defined or not </p>
 </div>
 </div>
@@ -49,7 +49,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="framework/run_idm18026230112.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/framework_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../BOOST_TEST_SETUP_ASSERT.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="framework/run_id327716.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/framework_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../BOOST_TEST_SETUP_ASSERT.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/log_checkpoint_data.html b/doc/v2/html/boost/unit_test/log_checkpoint_data.html
old mode 100644
new mode 100755
index 4088fd30..387fcaed
--- a/doc/v2/html/boost/unit_test/log_checkpoint_data.html
+++ b/doc/v2/html/boost/unit_test/log_checkpoint_data.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct log_checkpoint_data</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/unit_test_log_formatter_hpp.html" title="Header &lt;boost/test/unit_test_log_formatter.hpp&gt;">
-<link rel="prev" href="log_entry_data.html" title="Struct log_entry_data">
-<link rel="next" href="unit_test_log_formatter.html" title="Class unit_test_log_formatter">
+<link rel="prev" href="../../header/boost/test/unit_test_log_formatter_hpp.html" title="Header &lt;boost/test/unit_test_log_formatter.hpp&gt;">
+<link rel="next" href="log_entry_data.html" title="Struct log_entry_data">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_entry_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="unit_test_log_formatter.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_entry_data.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.log_checkpoint_data"></a><div class="titlepage"></div>
@@ -34,8 +34,8 @@
 </span>
 <span class="keyword">struct</span> <a class="link" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="special">{</span>
 
-  <span class="comment">// <a class="link" href="log_checkpoint_data.html#idm18020447824-bb">public member functions</a></span>
-  <span class="keyword">void</span> <a class="link" href="log_checkpoint_data.html#idm18020447296-bb"><span class="identifier">clear</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="log_checkpoint_data.html#id334832-bb">public member functions</a></span>
+  <span class="keyword">void</span> <a class="link" href="log_checkpoint_data.html#id334828-bb"><span class="identifier">clear</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">const_string</span> <span class="identifier">m_file_name</span><span class="special">;</span>  <span class="comment">// log checkpoint file name </span>
@@ -43,11 +43,11 @@
   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">m_message</span><span class="special">;</span>  <span class="comment">// log checkpoint message </span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436476921664"></a><h2>Description</h2>
+<a name="id981598"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436476921264"></a><h3>
-<a name="idm18020447824-bb"></a><code class="computeroutput">log_checkpoint_data</code> public member functions</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020447296-bb"></a><span class="identifier">clear</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<a name="id981614"></a><h3>
+<a name="id334832-bb"></a><code class="computeroutput">log_checkpoint_data</code> public member functions</h3>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id334828-bb"></a><span class="identifier">clear</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -62,7 +62,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_entry_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="unit_test_log_formatter.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_entry_data.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/log_entry_data.html b/doc/v2/html/boost/unit_test/log_entry_data.html
old mode 100644
new mode 100755
index b9102dae..0d80a579
--- a/doc/v2/html/boost/unit_test/log_entry_data.html
+++ b/doc/v2/html/boost/unit_test/log_entry_data.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Struct log_entry_data</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/unit_test_log_formatter_hpp.html" title="Header &lt;boost/test/unit_test_log_formatter.hpp&gt;">
-<link rel="prev" href="../../header/boost/test/unit_test_log_formatter_hpp.html" title="Header &lt;boost/test/unit_test_log_formatter.hpp&gt;">
-<link rel="next" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">
+<link rel="prev" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">
+<link rel="next" href="unit_test_log_formatter.html" title="Class unit_test_log_formatter">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_checkpoint_data.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="log_checkpoint_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="unit_test_log_formatter.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.log_entry_data"></a><div class="titlepage"></div>
@@ -34,10 +34,10 @@
 </span>
 <span class="keyword">struct</span> <a class="link" href="log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="special">{</span>
   <span class="comment">// <a class="link" href="log_entry_data.html#boost.unit_test.log_entry_dataconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="log_entry_data.html#idm18020452000-bb"><span class="identifier">log_entry_data</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="log_entry_data.html#id334840-bb"><span class="identifier">log_entry_data</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="log_entry_data.html#idm18020453456-bb">public member functions</a></span>
-  <span class="keyword">void</span> <a class="link" href="log_entry_data.html#idm18020452928-bb"><span class="identifier">clear</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="log_entry_data.html#id334848-bb">public member functions</a></span>
+  <span class="keyword">void</span> <a class="link" href="log_entry_data.html#id334877-bb"><span class="identifier">clear</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">m_file_name</span><span class="special">;</span>  <span class="comment">// log entry file name </span>
@@ -45,18 +45,18 @@
   <span class="identifier">log_level</span> <span class="identifier">m_level</span><span class="special">;</span>  <span class="comment">// log entry level </span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436476955520"></a><h2>Description</h2>
+<a name="id981813"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436476955120"></a><h3>
+<a name="id981829"></a><h3>
 <a name="boost.unit_test.log_entry_dataconstruct-copy-destruct"></a><code class="computeroutput">log_entry_data</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18020452000-bb"></a><span class="identifier">log_entry_data</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id334840-bb"></a><span class="identifier">log_entry_data</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436476949584"></a><h3>
-<a name="idm18020453456-bb"></a><code class="computeroutput">log_entry_data</code> public member functions</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020452928-bb"></a><span class="identifier">clear</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<a name="id981879"></a><h3>
+<a name="id334848-bb"></a><code class="computeroutput">log_entry_data</code> public member functions</h3>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id334877-bb"></a><span class="identifier">clear</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -71,7 +71,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_checkpoint_data.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="log_checkpoint_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="unit_test_log_formatter.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/master_test_suite_t.html b/doc/v2/html/boost/unit_test/master_test_suite_t.html
old mode 100644
new mode 100755
index 94a1cc78..c3475c58
--- a/doc/v2/html/boost/unit_test/master_test_suite_t.html
+++ b/doc/v2/html/boost/unit_test/master_test_suite_t.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class master_test_suite_t</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
-<link rel="prev" href="test_suite.html" title="Class test_suite">
-<link rel="next" href="../../header/boost/test/unit_test_hpp.html" title="Header &lt;boost/test/unit_test.hpp&gt;">
+<link rel="prev" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
+<link rel="next" href="test_case.html" title="Class test_case">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_suite.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/unit_test_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_case.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.master_test_suite_t"></a><div class="titlepage"></div>
@@ -44,22 +44,22 @@
   <span class="keyword">enum</span> <a name="boost.unit_test.master_test_suite_t.@0"></a>@0 <span class="special">{</span> type = = TUT_ANY <span class="special">}</span><span class="special">;</span>
 
   <span class="comment">// <a class="link" href="master_test_suite_t.html#boost.unit_test.master_test_suite_tconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="master_test_suite_t.html#idm18020480288-bb"><span class="identifier">master_test_suite_t</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="master_test_suite_t.html#id331401-bb"><span class="identifier">master_test_suite_t</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="master_test_suite_t.html#idm18020506256-bb">public member functions</a></span>
-  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#idm18020505728-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">,</span> <span class="identifier">counter_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#idm18020501824-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#idm18020499200-bb"><span class="identifier">remove</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span><span class="special">;</span>
-  <span class="identifier">test_unit_id</span> <a class="link" href="master_test_suite_t.html#idm18020497472-bb"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a class="link" href="master_test_suite_t.html#idm18020495808-bb"><span class="identifier">size</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#idm18020494784-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="master_test_suite_t.html#idm18020493088-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#idm18020492048-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="master_test_suite_t.html#idm18020490624-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#idm18020488960-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="master_test_suite_t.html#idm18020487520-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="master_test_suite_t.html#idm18020485424-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="master_test_suite_t.html#idm18020482928-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="master_test_suite_t.html#id331189-bb">public member functions</a></span>
+  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#id331239-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">,</span> <span class="identifier">counter_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#id331227-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#id331246-bb"><span class="identifier">remove</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span><span class="special">;</span>
+  <span class="identifier">test_unit_id</span> <a class="link" href="master_test_suite_t.html#id331255-bb"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a class="link" href="master_test_suite_t.html#id331288-bb"><span class="identifier">size</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#id331299-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="master_test_suite_t.html#id331286-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#id331316-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="master_test_suite_t.html#id331323-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="master_test_suite_t.html#id331347-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="master_test_suite_t.html#id331334-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="master_test_suite_t.html#id331359-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="master_test_suite_t.html#id331371-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">;</span>
@@ -80,34 +80,34 @@
   <span class="identifier">readwrite_property</span><span class="special">&lt;</span> <span class="identifier">fixture_list</span> <span class="special">&gt;</span> <span class="identifier">p_fixtures</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436477103392"></a><h2>Description</h2>
+<a name="id971962"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436477102992"></a><h3>
+<a name="id971977"></a><h3>
 <a name="boost.unit_test.master_test_suite_tconstruct-copy-destruct"></a><code class="computeroutput">master_test_suite_t</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18020480288-bb"></a><span class="identifier">master_test_suite_t</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id331401-bb"></a><span class="identifier">master_test_suite_t</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436477097456"></a><h3>
-<a name="idm18020506256-bb"></a><code class="computeroutput">master_test_suite_t</code> public member functions</h3>
+<a name="id971996"></a><h3>
+<a name="id331189-bb"></a><code class="computeroutput">master_test_suite_t</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">void</span> <a name="idm18020505728-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">,</span> <span class="identifier">counter_t</span> expected_failures <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+<pre class="literallayout"><span class="keyword">void</span> <a name="id331239-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">,</span> <span class="identifier">counter_t</span> expected_failures <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
          <span class="keyword">unsigned</span> timeout <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre>Adds a test unit to a test suite, with possibility to specify the timeout and the expected failures. </li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020501824-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span> gen<span class="special">,</span> <span class="keyword">unsigned</span> timeout <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331227-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span> gen<span class="special">,</span> <span class="keyword">unsigned</span> timeout <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre></li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">void</span> <a name="idm18020499200-bb"></a><span class="identifier">remove</span><span class="special">(</span><span class="identifier">test_unit_id</span> id<span class="special">)</span><span class="special">;</span></pre>Removes a test from the test suite. </li>
-<li class="listitem"><pre class="literallayout"><span class="identifier">test_unit_id</span> <a name="idm18020497472-bb"></a><span class="identifier">get</span><span class="special">(</span><span class="identifier">const_string</span> tu_name<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a name="idm18020495808-bb"></a><span class="identifier">size</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020494784-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18020493088-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020492048-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18020490624-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020488960-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18020487520-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18020485424-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18020482928-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<pre class="literallayout"><span class="keyword">void</span> <a name="id331246-bb"></a><span class="identifier">remove</span><span class="special">(</span><span class="identifier">test_unit_id</span> id<span class="special">)</span><span class="special">;</span></pre>Removes a test from the test suite. </li>
+<li class="listitem"><pre class="literallayout"><span class="identifier">test_unit_id</span> <a name="id331255-bb"></a><span class="identifier">get</span><span class="special">(</span><span class="identifier">const_string</span> tu_name<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a name="id331288-bb"></a><span class="identifier">size</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331299-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id331286-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331316-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id331323-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331347-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331334-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331359-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331371-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
@@ -123,7 +123,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_suite.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/unit_test_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_case.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/output/compiler_log_formatter.html b/doc/v2/html/boost/unit_test/output/compiler_log_formatter.html
old mode 100644
new mode 100755
index 9824382a..3434c1e6
--- a/doc/v2/html/boost/unit_test/output/compiler_log_formatter.html
+++ b/doc/v2/html/boost/unit_test/output/compiler_log_formatter.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class compiler_log_formatter</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/output/compiler_log_formatter_hpp.html" title="Header &lt;boost/test/output/compiler_log_formatter.hpp&gt;">
 <link rel="prev" href="../../../header/boost/test/output/compiler_log_formatter_hpp.html" title="Header &lt;boost/test/output/compiler_log_formatter.hpp&gt;">
@@ -37,55 +37,49 @@
 <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
 
-  <span class="comment">// <a class="link" href="compiler_log_formatter.html#idm18026210112-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026209584-bb"><span class="identifier">log_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">counter_t</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026204624-bb"><span class="identifier">log_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026200768-bb"><span class="identifier">log_build_info</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026197936-bb"><span class="identifier">test_unit_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="compiler_log_formatter.html#id327849-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id327874-bb"><span class="identifier">log_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">counter_t</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id327896-bb"><span class="identifier">log_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id327939-bb"><span class="identifier">log_build_info</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id327924-bb"><span class="identifier">test_unit_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="compiler_log_formatter.html#idm18026192720-bb"><span class="identifier">test_unit_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">long</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026186416-bb"><span class="identifier">test_unit_skipped</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="compiler_log_formatter.html#id327996-bb"><span class="identifier">test_unit_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">long</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328046-bb"><span class="identifier">test_unit_skipped</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="compiler_log_formatter.html#idm18026182272-bb"><span class="identifier">log_exception_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
+  <a class="link" href="compiler_log_formatter.html#id328114-bb"><span class="identifier">log_exception_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
                       <a class="link" href="../../execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026175472-bb"><span class="identifier">log_exception_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328130-bb"><span class="identifier">log_exception_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="compiler_log_formatter.html#idm18026171520-bb"><span class="identifier">log_entry_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">log_entry_types</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026164880-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026159808-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026154544-bb"><span class="identifier">log_entry_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026150624-bb"><span class="identifier">entry_context_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026146432-bb"><span class="identifier">log_entry_context</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026141360-bb"><span class="identifier">entry_context_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="compiler_log_formatter.html#id328158-bb"><span class="identifier">log_entry_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">log_entry_types</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328214-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328257-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328296-bb"><span class="identifier">log_entry_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328341-bb"><span class="identifier">entry_context_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328377-bb"><span class="identifier">log_entry_context</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328408-bb"><span class="identifier">entry_context_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="compiler_log_formatter.html#idm18026137280-bb">protected member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#idm18026136752-bb"><span class="identifier">print_prefix</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="compiler_log_formatter.html#id328426-bb">protected member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="compiler_log_formatter.html#id328440-bb"><span class="identifier">print_prefix</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479532672"></a><h2>Description</h2>
+<a name="id952828"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436479532272"></a><h3>
-<a name="idm18026210112-bb"></a><code class="computeroutput">compiler_log_formatter</code> public member functions</h3>
+<a name="id952836"></a><h3>
+<a name="id327849-bb"></a><code class="computeroutput">compiler_log_formatter</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026209584-bb"></a><span class="identifier">log_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">counter_t</span> test_cases_amount<span class="special">)</span><span class="special">;</span></pre>Invoked at the begining of test module execution. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id327874-bb"></a><span class="identifier">log_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">counter_t</span> test_cases_amount<span class="special">)</span><span class="special">;</span></pre>Invoked at the begining of test module execution. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -101,24 +95,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026204624-bb"></a><span class="identifier">log_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked at the end of test module execution. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id327896-bb"></a><span class="identifier">log_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked at the end of test module execution. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -128,20 +116,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026200768-bb"></a><span class="identifier">log_build_info</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework build information is requested. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id327939-bb"></a><span class="identifier">log_build_info</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework build information is requested. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -151,24 +133,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026197936-bb"></a><span class="identifier">test_unit_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked when test unit starts (either test suite or test case) <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id327924-bb"></a><span class="identifier">test_unit_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked when test unit starts (either test suite or test case) <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>test_unit_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -185,25 +161,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18026192720-bb"></a><span class="identifier">test_unit_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">,</span> 
+<a name="id327996-bb"></a><span class="identifier">test_unit_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">,</span> 
                  <span class="keyword">unsigned</span> <span class="keyword">long</span> elapsed<span class="special">)</span><span class="special">;</span></pre>Invoked when test unit finishes. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>test_unit_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">elapsed</code></span></p></td>
@@ -223,20 +193,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026186416-bb"></a><span class="identifier">test_unit_skipped</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked if test unit skipped for any reason. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328046-bb"></a><span class="identifier">test_unit_skipped</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked if test unit skipped for any reason. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -253,25 +217,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18026182272-bb"></a><span class="identifier">log_exception_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> lcd<span class="special">,</span> 
+<a name="id328114-bb"></a><span class="identifier">log_exception_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> lcd<span class="special">,</span> 
                     <a class="link" href="../../execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span> ex<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function starts uncaught exception report. It is going to followed by context information. Report is finilized by call to log_exception_finish. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_exception_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">ex</code></span></p></td>
@@ -291,24 +249,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026175472-bb"></a><span class="identifier">log_exception_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function finishes uncaught exception report. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328130-bb"></a><span class="identifier">log_exception_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function finishes uncaught exception report. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_exception_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -319,25 +271,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18026171520-bb"></a><span class="identifier">log_entry_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> led<span class="special">,</span> 
+<a name="id328158-bb"></a><span class="identifier">log_entry_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> led<span class="special">,</span> 
                 <span class="identifier">log_entry_types</span> let<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start new log entry. <p>Call to this function starts new log entry. It is followed by series of log_entry_value calls and finally call to log_entry_finish. A log entry may consist of one or more values being reported. Some of these values will be plain strings, while others can be complicated expressions in a form of "lazy" expression template lazy_ostream. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_value, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">led</code></span></p></td>
@@ -357,24 +303,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026164880-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two overloaded methods to report log entry content. This one is used to report plain string value. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328214-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two overloaded methods to report log entry content. This one is used to report plain string value. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -390,24 +330,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026159808-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two ovrloaded methods to report log entry content. This one is used to report some complicated expression passed as an expression template lazy_ostream. In most cases default implementation provided by the framework should work as is (it just converts the lazy expression into a string. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328257-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two ovrloaded methods to report log entry content. This one is used to report some complicated expression passed as an expression template lazy_ostream. In most cases default implementation provided by the framework should work as is (it just converts the lazy expression into a string. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -423,24 +357,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026154544-bb"></a><span class="identifier">log_entry_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish a log entry report. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328296-bb"></a><span class="identifier">log_entry_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish a log entry report. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -450,24 +378,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026150624-bb"></a><span class="identifier">entry_context_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start log entry context report. <p>Unit Test Framewrk logs for failed assertons and uncaught exceptions context if one was defined by a test mofule. Context consists of multiple "scopes" identified by description messages assigned by the test module using BOOST_TEST_INFO/BOOST_TEST_CONTEXT statements. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328341-bb"></a><span class="identifier">entry_context_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start log entry context report. <p>Unit Test Framewrk logs for failed assertons and uncaught exceptions context if one was defined by a test mofule. Context consists of multiple "scopes" identified by description messages assigned by the test module using BOOST_TEST_INFO/BOOST_TEST_CONTEXT statements. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_context, entry_context_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -477,24 +399,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026146432-bb"></a><span class="identifier">log_entry_context</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report log entry context "scope" description. <p>Each "scope" description is reported by separate call to log_entry_context. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328377-bb"></a><span class="identifier">log_entry_context</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report log entry context "scope" description. <p>Each "scope" description is reported by separate call to log_entry_context. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, entry_context_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -510,24 +426,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026141360-bb"></a><span class="identifier">entry_context_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish log entry context report. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328408-bb"></a><span class="identifier">entry_context_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish log entry context report. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, entry_context_context </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -539,9 +449,9 @@
 </ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436479322128"></a><h3>
-<a name="idm18026137280-bb"></a><code class="computeroutput">compiler_log_formatter</code> protected member functions</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026136752-bb"></a><span class="identifier">print_prefix</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span> file<span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> line<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<a name="id958706"></a><h3>
+<a name="id328426-bb"></a><code class="computeroutput">compiler_log_formatter</code> protected member functions</h3>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328440-bb"></a><span class="identifier">print_prefix</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span> file<span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> line<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/output/plain_report_formatter.html b/doc/v2/html/boost/unit_test/output/plain_report_formatter.html
old mode 100644
new mode 100755
index 16440e4e..7e0de138
--- a/doc/v2/html/boost/unit_test/output/plain_report_formatter.html
+++ b/doc/v2/html/boost/unit_test/output/plain_report_formatter.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class plain_report_formatter</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/output/plain_report_formatter_hpp.html" title="Header &lt;boost/test/output/plain_report_formatter.hpp&gt;">
 <link rel="prev" href="../../../header/boost/test/output/plain_report_formatter_hpp.html" title="Header &lt;boost/test/output/plain_report_formatter.hpp&gt;">
@@ -37,24 +37,24 @@
 <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
 
-  <span class="comment">// <a class="link" href="plain_report_formatter.html#idm18026130080-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#idm18026129552-bb"><span class="identifier">results_report_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#idm18026127872-bb"><span class="identifier">results_report_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#idm18026126192-bb"><span class="identifier">test_unit_report_start</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#idm18026123600-bb"><span class="identifier">test_unit_report_finish</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#idm18026121008-bb"><span class="identifier">do_confirmation_report</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="plain_report_formatter.html#id328463-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#id328492-bb"><span class="identifier">results_report_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#id328478-bb"><span class="identifier">results_report_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#id328526-bb"><span class="identifier">test_unit_report_start</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#id328518-bb"><span class="identifier">test_unit_report_finish</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="plain_report_formatter.html#id328568-bb"><span class="identifier">do_confirmation_report</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479244560"></a><h2>Description</h2>
+<a name="id959268"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436479244160"></a><h3>
-<a name="idm18026130080-bb"></a><code class="computeroutput">plain_report_formatter</code> public member functions</h3>
+<a name="id959274"></a><h3>
+<a name="id328463-bb"></a><code class="computeroutput">plain_report_formatter</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026129552-bb"></a><span class="identifier">results_report_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026127872-bb"></a><span class="identifier">results_report_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026126192-bb"></a><span class="identifier">test_unit_report_start</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026123600-bb"></a><span class="identifier">test_unit_report_finish</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026121008-bb"></a><span class="identifier">do_confirmation_report</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328492-bb"></a><span class="identifier">results_report_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328478-bb"></a><span class="identifier">results_report_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328526-bb"></a><span class="identifier">test_unit_report_start</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328518-bb"></a><span class="identifier">test_unit_report_finish</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328568-bb"></a><span class="identifier">do_confirmation_report</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/output/xml_log_formatter.html b/doc/v2/html/boost/unit_test/output/xml_log_formatter.html
old mode 100644
new mode 100755
index bae1c6b0..939c19ec
--- a/doc/v2/html/boost/unit_test/output/xml_log_formatter.html
+++ b/doc/v2/html/boost/unit_test/output/xml_log_formatter.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class xml_log_formatter</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/output/xml_log_formatter_hpp.html" title="Header &lt;boost/test/output/xml_log_formatter.hpp&gt;">
 <link rel="prev" href="../../../header/boost/test/output/xml_log_formatter_hpp.html" title="Header &lt;boost/test/output/xml_log_formatter.hpp&gt;">
@@ -35,52 +35,46 @@
 <span class="keyword">class</span> <a class="link" href="xml_log_formatter.html" title="Class xml_log_formatter">xml_log_formatter</a> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log_formatter</span> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
 
-  <span class="comment">// <a class="link" href="xml_log_formatter.html#idm18026114688-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026114160-bb"><span class="identifier">log_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">counter_t</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026109200-bb"><span class="identifier">log_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026105344-bb"><span class="identifier">log_build_info</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026102512-bb"><span class="identifier">test_unit_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="xml_log_formatter.html#id328581-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328595-bb"><span class="identifier">log_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">counter_t</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328618-bb"><span class="identifier">log_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328672-bb"><span class="identifier">log_build_info</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328682-bb"><span class="identifier">test_unit_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="xml_log_formatter.html#idm18026097296-bb"><span class="identifier">test_unit_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">long</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026090992-bb"><span class="identifier">test_unit_skipped</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="xml_log_formatter.html#id328692-bb"><span class="identifier">test_unit_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">long</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328772-bb"><span class="identifier">test_unit_skipped</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="xml_log_formatter.html#idm18026086848-bb"><span class="identifier">log_exception_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
+  <a class="link" href="xml_log_formatter.html#id328793-bb"><span class="identifier">log_exception_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
                       <a class="link" href="../../execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026080048-bb"><span class="identifier">log_exception_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328854-bb"><span class="identifier">log_exception_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="xml_log_formatter.html#idm18026076096-bb"><span class="identifier">log_entry_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">log_entry_types</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026069456-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026064384-bb"><span class="identifier">log_entry_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026060464-bb"><span class="identifier">entry_context_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026056272-bb"><span class="identifier">log_entry_context</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026051200-bb"><span class="identifier">entry_context_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#idm18026047264-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="xml_log_formatter.html#id328888-bb"><span class="identifier">log_entry_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">log_entry_types</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328943-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id328986-bb"><span class="identifier">log_entry_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id329031-bb"><span class="identifier">entry_context_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id329060-bb"><span class="identifier">log_entry_context</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id329106-bb"><span class="identifier">entry_context_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_log_formatter.html#id329078-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436479057520"></a><h2>Description</h2>
+<a name="id958331"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436479057120"></a><h3>
-<a name="idm18026114688-bb"></a><code class="computeroutput">xml_log_formatter</code> public member functions</h3>
+<a name="id958350"></a><h3>
+<a name="id328581-bb"></a><code class="computeroutput">xml_log_formatter</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026114160-bb"></a><span class="identifier">log_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">counter_t</span> test_cases_amount<span class="special">)</span><span class="special">;</span></pre>Invoked at the begining of test module execution. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328595-bb"></a><span class="identifier">log_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">counter_t</span> test_cases_amount<span class="special">)</span><span class="special">;</span></pre>Invoked at the begining of test module execution. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -96,24 +90,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026109200-bb"></a><span class="identifier">log_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked at the end of test module execution. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328618-bb"></a><span class="identifier">log_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked at the end of test module execution. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -123,20 +111,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026105344-bb"></a><span class="identifier">log_build_info</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework build information is requested. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328672-bb"></a><span class="identifier">log_build_info</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework build information is requested. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -146,24 +128,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026102512-bb"></a><span class="identifier">test_unit_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked when test unit starts (either test suite or test case) <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328682-bb"></a><span class="identifier">test_unit_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked when test unit starts (either test suite or test case) <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>test_unit_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -180,25 +156,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18026097296-bb"></a><span class="identifier">test_unit_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">,</span> 
+<a name="id328692-bb"></a><span class="identifier">test_unit_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">,</span> 
                  <span class="keyword">unsigned</span> <span class="keyword">long</span> elapsed<span class="special">)</span><span class="special">;</span></pre>Invoked when test unit finishes. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>test_unit_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">elapsed</code></span></p></td>
@@ -218,20 +188,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026090992-bb"></a><span class="identifier">test_unit_skipped</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked if test unit skipped for any reason. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328772-bb"></a><span class="identifier">test_unit_skipped</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span><span class="special">;</span></pre>Invoked if test unit skipped for any reason. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -248,25 +212,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18026086848-bb"></a><span class="identifier">log_exception_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> lcd<span class="special">,</span> 
+<a name="id328793-bb"></a><span class="identifier">log_exception_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> lcd<span class="special">,</span> 
                     <a class="link" href="../../execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span> ex<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function starts uncaught exception report. It is going to followed by context information. Report is finilized by call to log_exception_finish. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_exception_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">ex</code></span></p></td>
@@ -286,24 +244,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026080048-bb"></a><span class="identifier">log_exception_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function finishes uncaught exception report. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328854-bb"></a><span class="identifier">log_exception_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function finishes uncaught exception report. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_exception_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -314,25 +266,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18026076096-bb"></a><span class="identifier">log_entry_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> led<span class="special">,</span> 
+<a name="id328888-bb"></a><span class="identifier">log_entry_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="../log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> led<span class="special">,</span> 
                 <span class="identifier">log_entry_types</span> let<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start new log entry. <p>Call to this function starts new log entry. It is followed by series of log_entry_value calls and finally call to log_entry_finish. A log entry may consist of one or more values being reported. Some of these values will be plain strings, while others can be complicated expressions in a form of "lazy" expression template lazy_ostream. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_value, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">led</code></span></p></td>
@@ -352,24 +298,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026069456-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two overloaded methods to report log entry content. This one is used to report plain string value. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328943-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two overloaded methods to report log entry content. This one is used to report plain string value. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -385,24 +325,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026064384-bb"></a><span class="identifier">log_entry_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish a log entry report. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id328986-bb"></a><span class="identifier">log_entry_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish a log entry report. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -412,24 +346,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026060464-bb"></a><span class="identifier">entry_context_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start log entry context report. <p>Unit Test Framewrk logs for failed assertons and uncaught exceptions context if one was defined by a test mofule. Context consists of multiple "scopes" identified by description messages assigned by the test module using BOOST_TEST_INFO/BOOST_TEST_CONTEXT statements. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329031-bb"></a><span class="identifier">entry_context_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start log entry context report. <p>Unit Test Framewrk logs for failed assertons and uncaught exceptions context if one was defined by a test mofule. Context consists of multiple "scopes" identified by description messages assigned by the test module using BOOST_TEST_INFO/BOOST_TEST_CONTEXT statements. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_context, entry_context_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -439,24 +367,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026056272-bb"></a><span class="identifier">log_entry_context</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report log entry context "scope" description. <p>Each "scope" description is reported by separate call to log_entry_context. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329060-bb"></a><span class="identifier">log_entry_context</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report log entry context "scope" description. <p>Each "scope" description is reported by separate call to log_entry_context. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, entry_context_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -472,24 +394,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026051200-bb"></a><span class="identifier">entry_context_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish log entry context report. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329106-bb"></a><span class="identifier">entry_context_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish log entry context report. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, entry_context_context </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -499,24 +415,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026047264-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two ovrloaded methods to report log entry content. This one is used to report some complicated expression passed as an expression template lazy_ostream. In most cases default implementation provided by the framework should work as is (it just converts the lazy expression into a string. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329078-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two ovrloaded methods to report log entry content. This one is used to report some complicated expression passed as an expression template lazy_ostream. In most cases default implementation provided by the framework should work as is (it just converts the lazy expression into a string. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
diff --git a/doc/v2/html/boost/unit_test/output/xml_report_formatter.html b/doc/v2/html/boost/unit_test/output/xml_report_formatter.html
old mode 100644
new mode 100755
index 949a987d..68a31d38
--- a/doc/v2/html/boost/unit_test/output/xml_report_formatter.html
+++ b/doc/v2/html/boost/unit_test/output/xml_report_formatter.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class xml_report_formatter</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/output/xml_report_formatter_hpp.html" title="Header &lt;boost/test/output/xml_report_formatter.hpp&gt;">
 <link rel="prev" href="../../../header/boost/test/output/xml_report_formatter_hpp.html" title="Header &lt;boost/test/output/xml_report_formatter.hpp&gt;">
@@ -37,24 +37,24 @@
 <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
 
-  <span class="comment">// <a class="link" href="xml_report_formatter.html#idm18026038272-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#idm18026037744-bb"><span class="identifier">results_report_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#idm18026036064-bb"><span class="identifier">results_report_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#idm18026034384-bb"><span class="identifier">test_unit_report_start</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#idm18026031792-bb"><span class="identifier">test_unit_report_finish</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#idm18026029200-bb"><span class="identifier">do_confirmation_report</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="xml_report_formatter.html#id329183-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#id329178-bb"><span class="identifier">results_report_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#id329171-bb"><span class="identifier">results_report_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#id329196-bb"><span class="identifier">test_unit_report_start</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#id329207-bb"><span class="identifier">test_unit_report_finish</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="xml_report_formatter.html#id329236-bb"><span class="identifier">do_confirmation_report</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478765712"></a><h2>Description</h2>
+<a name="id960617"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436478765312"></a><h3>
-<a name="idm18026038272-bb"></a><code class="computeroutput">xml_report_formatter</code> public member functions</h3>
+<a name="id960627"></a><h3>
+<a name="id329183-bb"></a><code class="computeroutput">xml_report_formatter</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026037744-bb"></a><span class="identifier">results_report_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026036064-bb"></a><span class="identifier">results_report_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026034384-bb"></a><span class="identifier">test_unit_report_start</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026031792-bb"></a><span class="identifier">test_unit_report_finish</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18026029200-bb"></a><span class="identifier">do_confirmation_report</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329178-bb"></a><span class="identifier">results_report_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329171-bb"></a><span class="identifier">results_report_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329196-bb"></a><span class="identifier">test_unit_report_start</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329207-bb"></a><span class="identifier">test_unit_report_finish</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id329236-bb"></a><span class="identifier">do_confirmation_report</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/progress_monitor_t.html b/doc/v2/html/boost/unit_test/progress_monitor_t.html
old mode 100644
new mode 100755
index bab8712e..f34c35e3
--- a/doc/v2/html/boost/unit_test/progress_monitor_t.html
+++ b/doc/v2/html/boost/unit_test/progress_monitor_t.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class progress_monitor_t</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/progress_monitor_hpp.html" title="Header &lt;boost/test/progress_monitor.hpp&gt;">
 <link rel="prev" href="../../header/boost/test/progress_monitor_hpp.html" title="Header &lt;boost/test/progress_monitor.hpp&gt;">
diff --git a/doc/v2/html/boost/unit_test/results_collector_t.html b/doc/v2/html/boost/unit_test/results_collector_t.html
old mode 100644
new mode 100755
index 2315fdd4..8ee4cbec
--- a/doc/v2/html/boost/unit_test/results_collector_t.html
+++ b/doc/v2/html/boost/unit_test/results_collector_t.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class results_collector_t</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/results_collector_hpp.html" title="Header &lt;boost/test/results_collector.hpp&gt;">
-<link rel="prev" href="test_results.html" title="Class test_results">
-<link rel="next" href="../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
+<link rel="prev" href="../../header/boost/test/results_collector_hpp.html" title="Header &lt;boost/test/results_collector.hpp&gt;">
+<link rel="next" href="test_results.html" title="Class test_results">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_results.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_results.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.results_collector_t"></a><div class="titlepage"></div>
@@ -37,29 +37,23 @@
 <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
 
-  <span class="comment">// <a class="link" href="results_collector_t.html#idm18025972016-bb">public member functions</a></span>
-  <a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span> <a class="link" href="results_collector_t.html#idm18025971488-bb"><span class="identifier">results</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="results_collector_t.html#id332736-bb">public member functions</a></span>
+  <a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span> <a class="link" href="results_collector_t.html#id332727-bb"><span class="identifier">results</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478482272"></a><h2>Description</h2>
+<a name="id965832"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436478481872"></a><h3>
-<a name="idm18025972016-bb"></a><code class="computeroutput">results_collector_t</code> public member functions</h3>
+<a name="id965833"></a><h3>
+<a name="id332736-bb"></a><code class="computeroutput">results_collector_t</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
-<pre class="literallayout"><a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span> <a name="idm18025971488-bb"></a><span class="identifier">results</span><span class="special">(</span><span class="identifier">test_unit_id</span> tu_id<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Results access per test unit. <p>
+<pre class="literallayout"><a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span> <a name="id332727-bb"></a><span class="identifier">results</span><span class="special">(</span><span class="identifier">test_unit_id</span> tu_id<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre>Results access per test unit. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">tu_id</code></span></p></td>
 <td><p>id of a test unit </p></td>
@@ -82,7 +76,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_results.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_results.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/results_reporter/format.html b/doc/v2/html/boost/unit_test/results_reporter/format.html
old mode 100644
new mode 100755
index c0acac98..5a437989
--- a/doc/v2/html/boost/unit_test/results_reporter/format.html
+++ b/doc/v2/html/boost/unit_test/results_reporter/format.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class format</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
 <link rel="prev" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
@@ -35,37 +35,37 @@
 <span class="keyword">class</span> <a class="link" href="format.html" title="Class format">format</a> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
   <span class="comment">// <a class="link" href="format.html#boost.unit_test.results_reporter.formatconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="format.html#idm18025950576-bb"><span class="special">~</span><span class="identifier">format</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="format.html#id333013-bb"><span class="special">~</span><span class="identifier">format</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="format.html#idm18025963584-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#idm18025963056-bb"><span class="identifier">results_report_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#idm18025961136-bb"><span class="identifier">results_report_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#idm18025959216-bb"><span class="identifier">test_unit_report_start</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#idm18025956384-bb"><span class="identifier">test_unit_report_finish</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#idm18025953552-bb"><span class="identifier">do_confirmation_report</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="format.html#id332906-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#id332924-bb"><span class="identifier">results_report_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#id332943-bb"><span class="identifier">results_report_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#id332938-bb"><span class="identifier">test_unit_report_start</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#id332996-bb"><span class="identifier">test_unit_report_finish</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="format.html#id332977-bb"><span class="identifier">do_confirmation_report</span></a><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478351520"></a><h2>Description</h2>
+<a name="id967881"></a><h2>Description</h2>
 <p>This is abstract interface for the report formatter used by results reporter routines. You can define a custom formatter by implementing this interface and setting the formatter using set_format function. This is usually done during test module initialization </p>
 <div class="refsect2">
-<a name="idm436478350592"></a><h3>
+<a name="id967917"></a><h3>
 <a name="boost.unit_test.results_reporter.formatconstruct-copy-destruct"></a><code class="computeroutput">format</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18025950576-bb"></a><span class="special">~</span><span class="identifier">format</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id333013-bb"></a><span class="special">~</span><span class="identifier">format</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436478344592"></a><h3>
-<a name="idm18025963584-bb"></a><code class="computeroutput">format</code> public member functions</h3>
+<a name="id967956"></a><h3>
+<a name="id332906-bb"></a><code class="computeroutput">format</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18025963056-bb"></a><span class="identifier">results_report_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18025961136-bb"></a><span class="identifier">results_report_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id332924-bb"></a><span class="identifier">results_report_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id332943-bb"></a><span class="identifier">results_report_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
 <li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18025959216-bb"></a><span class="identifier">test_unit_report_start</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
+<a name="id332938-bb"></a><span class="identifier">test_unit_report_start</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
 <li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18025956384-bb"></a><span class="identifier">test_unit_report_finish</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
+<a name="id332996-bb"></a><span class="identifier">test_unit_report_finish</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
 <li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18025953552-bb"></a><span class="identifier">do_confirmation_report</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
+<a name="id332977-bb"></a><span class="identifier">do_confirmation_report</span><span class="special">(</span><a class="link" href="../test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> ostr<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
diff --git a/doc/v2/html/boost/unit_test/results_reporter/get_stream.html b/doc/v2/html/boost/unit_test/results_reporter/get_stream.html
old mode 100644
new mode 100755
index 942f5d91..34666396
--- a/doc/v2/html/boost/unit_test/results_reporter/get_stream.html
+++ b/doc/v2/html/boost/unit_test/results_reporter/get_stream.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function get_stream</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
-<link rel="prev" href="set_format_idm18025938864.html" title="Function set_format">
+<link rel="prev" href="set_format_id333122.html" title="Function set_format">
 <link rel="next" href="../../../header/boost/test/tools/assertion_result_hpp.html" title="Header &lt;boost/test/tools/assertion_result.hpp&gt;">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="set_format_idm18025938864.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tools/assertion_result_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="set_format_id333122.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tools/assertion_result_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.results_reporter.get_stream"></a><div class="titlepage"></div>
@@ -34,7 +34,7 @@
 </span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> <span class="identifier">get_stream</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478238592"></a><h2>Description</h2>
+<a name="id966458"></a><h2>Description</h2>
 <p>Use this stream to report additional information abut test module execution </p>
 </div>
 </div>
@@ -49,7 +49,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="set_format_idm18025938864.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tools/assertion_result_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="set_format_id333122.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../header/boost/test/tools/assertion_result_hpp.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/results_reporter/set_format_idm18025938864.html b/doc/v2/html/boost/unit_test/results_reporter/set_format_idm18025938864.html
deleted file mode 100644
index d77810fe..00000000
--- a/doc/v2/html/boost/unit_test/results_reporter/set_format_idm18025938864.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function set_format</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
-<link rel="prev" href="set_format_idm18025942784.html" title="Function set_format">
-<link rel="next" href="get_stream.html" title="Function get_stream">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="set_format_idm18025942784.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_stream.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.results_reporter.set_format_idm18025938864"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function set_format</span></h2>
-<p>boost::unit_test::results_reporter::set_format &#8212; Sets custom report formatter. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">boost/test/results_reporter.hpp</a>&gt;
-
-</span>
-<span class="keyword">void</span> <span class="identifier">set_format</span><span class="special">(</span><a class="link" href="format.html" title="Class format">results_reporter::format</a> <span class="special">*</span> f<span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436478250512"></a><h2>Description</h2>
-<p>The framework takes ownership of the pointer passed as an argument. So this should be a pointer to a heap allocated object 
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><code class="computeroutput">f</code></span></p></td>
-<td><p>pointer to heap allocated instance of custom report formatter class </p></td>
-</tr></tbody>
-</table></div></td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="set_format_idm18025942784.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="get_stream.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/results_reporter/set_format_idm18025942784.html b/doc/v2/html/boost/unit_test/results_reporter/set_format_idm18025942784.html
deleted file mode 100644
index a72798bf..00000000
--- a/doc/v2/html/boost/unit_test/results_reporter/set_format_idm18025942784.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Function set_format</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
-<link rel="prev" href="set_stream.html" title="Function set_stream">
-<link rel="next" href="set_format_idm18025938864.html" title="Function set_format">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="set_stream.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="set_format_idm18025938864.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="boost.unit_test.results_reporter.set_format_idm18025942784"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Function set_format</span></h2>
-<p>boost::unit_test::results_reporter::set_format &#8212; Sets one of the predefined formats. </p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">boost/test/results_reporter.hpp</a>&gt;
-
-</span>
-<span class="keyword">void</span> <span class="identifier">set_format</span><span class="special">(</span><span class="identifier">output_format</span> of<span class="special">)</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436478263472"></a><h2>Description</h2>
-<p>The framework implements two results report formats:</p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p>plain human readable format (boost::unit_test::OF_CLF)</p></li>
-<li class="listitem"><p>XML format (boost::unit_test::OF_XML) 
-</p></li>
-</ul></div>
-<p>
-</p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><code class="computeroutput">of</code></span></p></td>
-<td><p>one of the presefined enumeration values for output formats </p></td>
-</tr></tbody>
-</table></div></td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="set_stream.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="set_format_idm18025938864.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost/unit_test/results_reporter/set_level.html b/doc/v2/html/boost/unit_test/results_reporter/set_level.html
old mode 100644
new mode 100755
index e9b4efe0..cd525862
--- a/doc/v2/html/boost/unit_test/results_reporter/set_level.html
+++ b/doc/v2/html/boost/unit_test/results_reporter/set_level.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function set_level</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
 <link rel="prev" href="format.html" title="Class format">
@@ -34,9 +34,9 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">set_level</span><span class="special">(</span><span class="identifier">report_level</span> l<span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478286624"></a><h2>Description</h2>
+<a name="id968334"></a><h2>Description</h2>
 <p>There are only four possible levels for results report:</p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><p>confirmation report (boost::unit_test::CONFIRMATION_REPORT). This report level only produces short confirmation message about test module pass/fail status</p></li>
 <li class="listitem"><p>short report (boost::unit_test::SHORT_REPORT). This report level produces short summary report for failed/passed assertions and test units.</p></li>
 <li class="listitem"><p>detailed report (boost::unit_test::DETAILED_REPORT). This report level produces detailed report per test unit for passed/failed assertions and uncaught exceptions</p></li>
@@ -45,18 +45,12 @@
 </ul></div>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">l</code></span></p></td>
 <td><p>report level </p></td>
diff --git a/doc/v2/html/boost/unit_test/results_reporter/set_stream.html b/doc/v2/html/boost/unit_test/results_reporter/set_stream.html
old mode 100644
new mode 100755
index 80770825..787790b6
--- a/doc/v2/html/boost/unit_test/results_reporter/set_stream.html
+++ b/doc/v2/html/boost/unit_test/results_reporter/set_stream.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Function set_stream</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
 <link rel="prev" href="set_level.html" title="Function set_level">
-<link rel="next" href="set_format_idm18025942784.html" title="Function set_format">
+<link rel="next" href="set_format_id333050.html" title="Function set_format">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="set_level.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="set_format_idm18025942784.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="set_level.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="set_format_id333050.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.results_reporter.set_stream"></a><div class="titlepage"></div>
@@ -34,7 +34,7 @@
 </span>
 <span class="keyword">void</span> <span class="identifier">set_stream</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478271728"></a><h2>Description</h2>
+<a name="id966196"></a><h2>Description</h2>
 <p>By default std::cerr is used. Use this function to set a different stream. The framework refers to the stream by reference, so you need to make sure the stream object lifetime exceeds the testing main scope. </p>
 </div>
 </div>
@@ -49,7 +49,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="set_level.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="set_format_idm18025942784.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="set_level.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="set_format_id333050.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/test_case.html b/doc/v2/html/boost/unit_test/test_case.html
old mode 100644
new mode 100755
index 9098c53a..d2b64f2d
--- a/doc/v2/html/boost/unit_test/test_case.html
+++ b/doc/v2/html/boost/unit_test/test_case.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class test_case</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
-<link rel="prev" href="test_unit_generator.html" title="Class test_unit_generator">
+<link rel="prev" href="master_test_suite_t.html" title="Class master_test_suite_t">
 <link rel="next" href="test_suite.html" title="Class test_suite">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_unit_generator.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="master_test_suite_t.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.test_case"></a><div class="titlepage"></div>
@@ -44,21 +44,21 @@
   <span class="keyword">enum</span> <a name="boost.unit_test.test_case.@0"></a>@0 <span class="special">{</span> type = = TUT_ANY <span class="special">}</span><span class="special">;</span>
 
   <span class="comment">// <a class="link" href="test_case.html#boost.unit_test.test_caseconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="test_case.html#idm18025832752-bb"><span class="identifier">test_case</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <a class="link" href="test_case.html#idm18025831168-bb"><span class="identifier">test_case</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">,</span> 
+  <a class="link" href="test_case.html#id331687-bb"><span class="identifier">test_case</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_case.html#id331719-bb"><span class="identifier">test_case</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">,</span> 
             <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <a class="link" href="test_case.html#idm18025827632-bb"><span class="special">~</span><span class="identifier">test_case</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_case.html#id331718-bb"><span class="special">~</span><span class="identifier">test_case</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="test_case.html#idm18025850288-bb">public member functions</a></span>
-  <span class="keyword">typedef</span> <a class="link" href="test_case.html#idm18025849760-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_case.html" title="Class test_case">test_case</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_case.html#idm18025847248-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="test_case.html#idm18025845552-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_case.html#idm18025844512-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="test_case.html#idm18025843088-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_case.html#idm18025841424-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_case.html#idm18025839984-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_case.html#idm18025837888-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_case.html#idm18025835392-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="test_case.html#id331586-bb">public member functions</a></span>
+  <span class="keyword">typedef</span> <a class="link" href="test_case.html#id331574-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_case.html" title="Class test_case">test_case</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_case.html#id331611-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="test_case.html#id331591-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_case.html#id331612-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="test_case.html#id331624-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_case.html#id331658-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_case.html#id331635-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_case.html#id331636-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_case.html#id331675-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">test_func</span> <span class="identifier">p_test_func</span><span class="special">;</span>
@@ -78,32 +78,32 @@
   <span class="identifier">readwrite_property</span><span class="special">&lt;</span> <span class="identifier">fixture_list</span> <span class="special">&gt;</span> <span class="identifier">p_fixtures</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436477626960"></a><h2>Description</h2>
+<a name="id973701"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436477626560"></a><h3>
+<a name="id973718"></a><h3>
 <a name="boost.unit_test.test_caseconstruct-copy-destruct"></a><code class="computeroutput">test_case</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><a name="idm18025832752-bb"></a><span class="identifier">test_case</span><span class="special">(</span><span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><a name="idm18025831168-bb"></a><span class="identifier">test_case</span><span class="special">(</span><span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> 
+<li class="listitem"><pre class="literallayout"><a name="id331687-bb"></a><span class="identifier">test_case</span><span class="special">(</span><span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><a name="id331719-bb"></a><span class="identifier">test_case</span><span class="special">(</span><span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> 
           <span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><a name="idm18025827632-bb"></a><span class="special">~</span><span class="identifier">test_case</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><a name="id331718-bb"></a><span class="special">~</span><span class="identifier">test_case</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436477596464"></a><h3>
-<a name="idm18025850288-bb"></a><code class="computeroutput">test_case</code> public member functions</h3>
+<a name="id973903"></a><h3>
+<a name="id331586-bb"></a><code class="computeroutput">test_case</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025849760-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_case.html" title="Class test_case">test_case</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025847248-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18025845552-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025844512-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18025843088-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025841424-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025839984-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025837888-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025835392-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331574-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_case.html" title="Class test_case">test_case</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331611-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id331591-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331612-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id331624-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331658-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331635-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331636-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331675-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
@@ -119,7 +119,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_unit_generator.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="master_test_suite_t.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/test_results.html b/doc/v2/html/boost/unit_test/test_results.html
old mode 100644
new mode 100755
index 6ca69561..14e86e1b
--- a/doc/v2/html/boost/unit_test/test_results.html
+++ b/doc/v2/html/boost/unit_test/test_results.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class test_results</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/results_collector_hpp.html" title="Header &lt;boost/test/results_collector.hpp&gt;">
-<link rel="prev" href="../../header/boost/test/results_collector_hpp.html" title="Header &lt;boost/test/results_collector.hpp&gt;">
-<link rel="next" href="results_collector_t.html" title="Class results_collector_t">
+<link rel="prev" href="results_collector_t.html" title="Class results_collector_t">
+<link rel="next" href="../../header/boost/test/results_reporter_hpp.html" title="Header &lt;boost/test/results_reporter.hpp&gt;">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="results_collector_t.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="results_collector_t.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.test_results"></a><div class="titlepage"></div>
@@ -35,15 +35,15 @@
 <span class="keyword">class</span> <a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
   <span class="comment">// <a class="link" href="test_results.html#boost.unit_test.test_resultsconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="test_results.html#idm18025974080-bb"><span class="identifier">test_results</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_results.html#id332870-bb"><span class="identifier">test_results</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="test_results.html#idm18025983760-bb">public member functions</a></span>
-  <span class="keyword">typedef</span> <a class="link" href="test_results.html#idm18025983232-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">counter_t</span><span class="special">,</span> 
+  <span class="comment">// <a class="link" href="test_results.html#id332818-bb">public member functions</a></span>
+  <span class="keyword">typedef</span> <a class="link" href="test_results.html#id332824-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">counter_t</span><span class="special">,</span> 
                                   <span class="special">(</span><a class="link" href="results_collector_t.html" title="Class results_collector_t">results_collector_t</a><span class="special">)</span><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a><span class="special">)</span><span class="special">(</span><span class="identifier">results_collect_helper</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_results.html#idm18025979968-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> 
+  <span class="keyword">typedef</span> <a class="link" href="test_results.html#id332844-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> 
                                   <span class="special">(</span><a class="link" href="results_collector_t.html" title="Class results_collector_t">results_collector_t</a><span class="special">)</span><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a><span class="special">)</span><span class="special">(</span><span class="identifier">results_collect_helper</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_results.html#idm18025976704-bb"><span class="keyword">operator</span><span class="special">+=</span></a><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_results.html#idm18025975008-bb"><span class="identifier">clear</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_results.html#id332881-bb"><span class="keyword">operator</span><span class="special">+=</span></a><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_results.html#id332872-bb"><span class="identifier">clear</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">counter_prop</span> <span class="identifier">p_assertions_passed</span><span class="special">;</span>
@@ -59,27 +59,27 @@
   <span class="identifier">bool_prop</span> <span class="identifier">p_skipped</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436478542288"></a><h2>Description</h2>
+<a name="id964113"></a><h2>Description</h2>
 <p>This class is a collection of attributes describing testing results. The atributes presented as public properties on an instance of the class. In addition summary conclusion methods are presented to generate simple answer to pass/fail question </p>
 <div class="refsect2">
-<a name="idm436478541376"></a><h3>
+<a name="id964117"></a><h3>
 <a name="boost.unit_test.test_resultsconstruct-copy-destruct"></a><code class="computeroutput">test_results</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18025974080-bb"></a><span class="identifier">test_results</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id332870-bb"></a><span class="identifier">test_results</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436478535840"></a><h3>
-<a name="idm18025983760-bb"></a><code class="computeroutput">test_results</code> public member functions</h3>
+<a name="id964175"></a><h3>
+<a name="id332818-bb"></a><code class="computeroutput">test_results</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025983232-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">counter_t</span><span class="special">,</span> 
+<pre class="literallayout"><span class="keyword">typedef</span> <a name="id332824-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">counter_t</span><span class="special">,</span> 
                                 <span class="special">(</span><a class="link" href="results_collector_t.html" title="Class results_collector_t">results_collector_t</a><span class="special">)</span><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a><span class="special">)</span><span class="special">(</span><span class="identifier">results_collect_helper</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre>Type representing counter like public property. </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025979968-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> 
+<pre class="literallayout"><span class="keyword">typedef</span> <a name="id332844-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="keyword">bool</span><span class="special">,</span> 
                                 <span class="special">(</span><a class="link" href="results_collector_t.html" title="Class results_collector_t">results_collector_t</a><span class="special">)</span><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a><span class="special">)</span><span class="special">(</span><span class="identifier">results_collect_helper</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre>Type representing boolean like public property. </li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025976704-bb"></a><span class="keyword">operator</span><span class="special">+=</span><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025975008-bb"></a><span class="identifier">clear</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id332881-bb"></a><span class="keyword">operator</span><span class="special">+=</span><span class="special">(</span><a class="link" href="test_results.html" title="Class test_results">test_results</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id332872-bb"></a><span class="identifier">clear</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
@@ -95,7 +95,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="results_collector_t.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="results_collector_t.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/results_collector_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/results_reporter_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/test_suite.html b/doc/v2/html/boost/unit_test/test_suite.html
old mode 100644
new mode 100755
index 250a36e8..9f1acd66
--- a/doc/v2/html/boost/unit_test/test_suite.html
+++ b/doc/v2/html/boost/unit_test/test_suite.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class test_suite</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
 <link rel="prev" href="test_case.html" title="Class test_case">
-<link rel="next" href="master_test_suite_t.html" title="Class master_test_suite_t">
+<link rel="next" href="test_unit.html" title="Class test_unit">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_case.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="master_test_suite_t.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_case.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_unit.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.test_suite"></a><div class="titlepage"></div>
@@ -44,24 +44,24 @@
   <span class="keyword">enum</span> <a name="boost.unit_test.test_suite.@0"></a>@0 <span class="special">{</span> type = = TUT_ANY <span class="special">}</span><span class="special">;</span>
 
   <span class="comment">// <a class="link" href="test_suite.html#boost.unit_test.test_suiteconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <span class="keyword">explicit</span> <a class="link" href="test_suite.html#idm18020536336-bb"><span class="identifier">test_suite</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">explicit</span> <a class="link" href="test_suite.html#idm18020533232-bb"><span class="identifier">test_suite</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <a class="link" href="test_suite.html#idm18020532080-bb"><span class="special">~</span><span class="identifier">test_suite</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">explicit</span> <a class="link" href="test_suite.html#id332004-bb"><span class="identifier">test_suite</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">explicit</span> <a class="link" href="test_suite.html#id332007-bb"><span class="identifier">test_suite</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_suite.html#id332016-bb"><span class="special">~</span><span class="identifier">test_suite</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="test_suite.html#idm18025821440-bb">public member functions</a></span>
-  <span class="keyword">void</span> <a class="link" href="test_suite.html#idm18025820912-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">,</span> <span class="identifier">counter_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_suite.html#idm18025817008-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_suite.html#idm18025814384-bb"><span class="identifier">remove</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span><span class="special">;</span>
-  <span class="identifier">test_unit_id</span> <a class="link" href="test_suite.html#idm18020553520-bb"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a class="link" href="test_suite.html#idm18020551856-bb"><span class="identifier">size</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_suite.html#idm18020550832-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="test_suite.html#idm18020549136-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_suite.html#idm18020548096-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="test_suite.html#idm18020546672-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_suite.html#idm18020545008-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_suite.html#idm18020543568-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_suite.html#idm18020541472-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_suite.html#idm18020538976-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="test_suite.html#id331795-bb">public member functions</a></span>
+  <span class="keyword">void</span> <a class="link" href="test_suite.html#id331790-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">,</span> <span class="identifier">counter_t</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_suite.html#id331789-bb"><span class="identifier">add</span></a><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_suite.html#id331845-bb"><span class="identifier">remove</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span><span class="special">;</span>
+  <span class="identifier">test_unit_id</span> <a class="link" href="test_suite.html#id331828-bb"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a class="link" href="test_suite.html#id331862-bb"><span class="identifier">size</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_suite.html#id331892-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="test_suite.html#id331878-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_suite.html#id331879-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="test_suite.html#id331926-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_suite.html#id331912-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_suite.html#id331933-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_suite.html#id331935-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_suite.html#id331957-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">readonly_property</span><span class="special">&lt;</span> <span class="identifier">test_unit_type</span> <span class="special">&gt;</span> <span class="identifier">p_type</span><span class="special">;</span>
@@ -80,39 +80,39 @@
   <span class="identifier">readwrite_property</span><span class="special">&lt;</span> <span class="identifier">fixture_list</span> <span class="special">&gt;</span> <span class="identifier">p_fixtures</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436477368336"></a><h2>Description</h2>
+<a name="id978039"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436477367936"></a><h3>
+<a name="id978032"></a><h3>
 <a name="boost.unit_test.test_suiteconstruct-copy-destruct"></a><code class="computeroutput">test_suite</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18020536336-bb"></a><span class="identifier">test_suite</span><span class="special">(</span><span class="identifier">const_string</span> ts_name<span class="special">,</span> <span class="identifier">const_string</span> ts_file<span class="special">,</span> 
+<li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="id332004-bb"></a><span class="identifier">test_suite</span><span class="special">(</span><span class="identifier">const_string</span> ts_name<span class="special">,</span> <span class="identifier">const_string</span> ts_file<span class="special">,</span> 
                     <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> ts_line<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18020533232-bb"></a><span class="identifier">test_suite</span><span class="special">(</span><span class="identifier">const_string</span> module_name<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><a name="idm18020532080-bb"></a><span class="special">~</span><span class="identifier">test_suite</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="id332007-bb"></a><span class="identifier">test_suite</span><span class="special">(</span><span class="identifier">const_string</span> module_name<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><a name="id332016-bb"></a><span class="special">~</span><span class="identifier">test_suite</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436477349008"></a><h3>
-<a name="idm18025821440-bb"></a><code class="computeroutput">test_suite</code> public member functions</h3>
+<a name="id978171"></a><h3>
+<a name="id331795-bb"></a><code class="computeroutput">test_suite</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">void</span> <a name="idm18025820912-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">,</span> <span class="identifier">counter_t</span> expected_failures <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
+<pre class="literallayout"><span class="keyword">void</span> <a name="id331790-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">,</span> <span class="identifier">counter_t</span> expected_failures <span class="special">=</span> <span class="number">0</span><span class="special">,</span> 
          <span class="keyword">unsigned</span> timeout <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre>Adds a test unit to a test suite, with possibility to specify the timeout and the expected failures. </li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025817008-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span> gen<span class="special">,</span> <span class="keyword">unsigned</span> timeout <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331789-bb"></a><span class="identifier">add</span><span class="special">(</span><a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="keyword">const</span> <span class="special">&amp;</span> gen<span class="special">,</span> <span class="keyword">unsigned</span> timeout <span class="special">=</span> <span class="number">0</span><span class="special">)</span><span class="special">;</span></pre></li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">void</span> <a name="idm18025814384-bb"></a><span class="identifier">remove</span><span class="special">(</span><span class="identifier">test_unit_id</span> id<span class="special">)</span><span class="special">;</span></pre>Removes a test from the test suite. </li>
-<li class="listitem"><pre class="literallayout"><span class="identifier">test_unit_id</span> <a name="idm18020553520-bb"></a><span class="identifier">get</span><span class="special">(</span><span class="identifier">const_string</span> tu_name<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a name="idm18020551856-bb"></a><span class="identifier">size</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020550832-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18020549136-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020548096-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18020546672-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18020545008-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18020543568-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18020541472-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18020538976-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<pre class="literallayout"><span class="keyword">void</span> <a name="id331845-bb"></a><span class="identifier">remove</span><span class="special">(</span><span class="identifier">test_unit_id</span> id<span class="special">)</span><span class="special">;</span></pre>Removes a test from the test suite. </li>
+<li class="listitem"><pre class="literallayout"><span class="identifier">test_unit_id</span> <a name="id331828-bb"></a><span class="identifier">get</span><span class="special">(</span><span class="identifier">const_string</span> tu_name<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> <a name="id331862-bb"></a><span class="identifier">size</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331892-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id331878-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331879-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id331926-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id331912-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331933-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331935-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id331957-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
@@ -128,7 +128,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_case.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="master_test_suite_t.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_case.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_unit.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/test_unit.html b/doc/v2/html/boost/unit_test/test_unit.html
old mode 100644
new mode 100755
index 2347336f..5cc85c2d
--- a/doc/v2/html/boost/unit_test/test_unit.html
+++ b/doc/v2/html/boost/unit_test/test_unit.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class test_unit</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
-<link rel="prev" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
+<link rel="prev" href="test_suite.html" title="Class test_suite">
 <link rel="next" href="test_unit_generator.html" title="Class test_unit_generator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_unit_generator.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_suite.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_unit_generator.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.test_unit"></a><div class="titlepage"></div>
@@ -42,19 +42,19 @@
   <span class="keyword">enum</span> <a name="boost.unit_test.test_unit.@0"></a>@0 <span class="special">{</span> type = = TUT_ANY <span class="special">}</span><span class="special">;</span>
 
   <span class="comment">// <a class="link" href="test_unit.html#boost.unit_test.test_unitconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="test_unit.html#idm18025875744-bb"><span class="identifier">test_unit</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">,</span> <span class="identifier">test_unit_type</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">explicit</span> <a class="link" href="test_unit.html#idm18025872912-bb"><span class="identifier">test_unit</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <a class="link" href="test_unit.html#idm18025876016-bb"><span class="special">~</span><span class="identifier">test_unit</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_unit.html#id332342-bb"><span class="identifier">test_unit</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span><span class="special">,</span> <span class="identifier">test_unit_type</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">explicit</span> <a class="link" href="test_unit.html#id332331-bb"><span class="identifier">test_unit</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_unit.html#id332338-bb"><span class="special">~</span><span class="identifier">test_unit</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="test_unit.html#idm18025891712-bb">public member functions</a></span>
-  <span class="keyword">void</span> <a class="link" href="test_unit.html#idm18025891184-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="test_unit.html#idm18025889488-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_unit.html#idm18025888448-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">bool</span> <a class="link" href="test_unit.html#idm18025887024-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">void</span> <a class="link" href="test_unit.html#idm18025885360-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_unit.html#idm18025883920-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_unit.html#idm18025881824-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">typedef</span> <a class="link" href="test_unit.html#idm18025879328-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="test_unit.html#id332208-bb">public member functions</a></span>
+  <span class="keyword">void</span> <a class="link" href="test_unit.html#id332236-bb"><span class="identifier">depends_on</span></a><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="test_unit.html#id332229-bb"><span class="identifier">check_dependencies</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_unit.html#id332217-bb"><span class="identifier">add_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">bool</span> <a class="link" href="test_unit.html#id332252-bb"><span class="identifier">has_label</span></a><span class="special">(</span><span class="identifier">const_string</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
+  <span class="keyword">void</span> <a class="link" href="test_unit.html#id332260-bb"><span class="identifier">increase_exp_fail</span></a><span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_unit.html#id332278-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_unit.html#id332308-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">typedef</span> <a class="link" href="test_unit.html#id332288-bb"><span class="identifier">BOOST_READONLY_PROPERTY</span></a><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span>
 
   <span class="comment">// public data members</span>
   <span class="identifier">readonly_property</span><span class="special">&lt;</span> <span class="identifier">test_unit_type</span> <span class="special">&gt;</span> <span class="identifier">p_type</span><span class="special">;</span>
@@ -73,31 +73,31 @@
   <span class="identifier">readwrite_property</span><span class="special">&lt;</span> <span class="identifier">fixture_list</span> <span class="special">&gt;</span> <span class="identifier">p_fixtures</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436477909120"></a><h2>Description</h2>
+<a name="id977426"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436477908720"></a><h3>
+<a name="id977429"></a><h3>
 <a name="boost.unit_test.test_unitconstruct-copy-destruct"></a><code class="computeroutput">test_unit</code> 
         public
        construct/copy/destruct</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><a name="idm18025875744-bb"></a><span class="identifier">test_unit</span><span class="special">(</span><span class="identifier">const_string</span> tu_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> 
+<li class="listitem"><pre class="literallayout"><a name="id332342-bb"></a><span class="identifier">test_unit</span><span class="special">(</span><span class="identifier">const_string</span> tu_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> 
           <span class="identifier">test_unit_type</span> t<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18025872912-bb"></a><span class="identifier">test_unit</span><span class="special">(</span><span class="identifier">const_string</span> module_name<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><a name="idm18025876016-bb"></a><span class="special">~</span><span class="identifier">test_unit</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="id332331-bb"></a><span class="identifier">test_unit</span><span class="special">(</span><span class="identifier">const_string</span> module_name<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><a name="id332338-bb"></a><span class="special">~</span><span class="identifier">test_unit</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436477872896"></a><h3>
-<a name="idm18025891712-bb"></a><code class="computeroutput">test_unit</code> public member functions</h3>
+<a name="id980648"></a><h3>
+<a name="id332208-bb"></a><code class="computeroutput">test_unit</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025891184-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18025889488-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025888448-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="idm18025887024-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="idm18025885360-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025883920-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025881824-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
-<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="idm18025879328-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id332236-bb"></a><span class="identifier">depends_on</span><span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> tu<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id332229-bb"></a><span class="identifier">check_dependencies</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id332217-bb"></a><span class="identifier">add_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">bool</span> <a name="id332252-bb"></a><span class="identifier">has_label</span><span class="special">(</span><span class="identifier">const_string</span> l<span class="special">)</span> <span class="keyword">const</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">void</span> <a name="id332260-bb"></a><span class="identifier">increase_exp_fail</span><span class="special">(</span><span class="keyword">unsigned</span> num<span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id332278-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><span class="identifier">framework_impl</span><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id332308-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_suite.html" title="Class test_suite">test_suite</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
+<li class="listitem"><pre class="literallayout"><span class="keyword">typedef</span> <a name="id332288-bb"></a><span class="identifier">BOOST_READONLY_PROPERTY</span><span class="special">(</span><span class="identifier">id_list</span><span class="special">,</span> <span class="special">(</span><a class="link" href="test_unit.html" title="Class test_unit">test_unit</a><span class="special">)</span><span class="special">)</span><span class="special">;</span></pre></li>
 </ol></div>
 </div>
 </div>
@@ -113,7 +113,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_unit_generator.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_suite.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_unit_generator.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/test_unit_generator.html b/doc/v2/html/boost/unit_test/test_unit_generator.html
old mode 100644
new mode 100755
index a9c8f088..248d2087
--- a/doc/v2/html/boost/unit_test/test_unit_generator.html
+++ b/doc/v2/html/boost/unit_test/test_unit_generator.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class test_unit_generator</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/tree/test_unit_hpp.html" title="Header &lt;boost/test/tree/test_unit.hpp&gt;">
 <link rel="prev" href="test_unit.html" title="Class test_unit">
-<link rel="next" href="test_case.html" title="Class test_case">
+<link rel="next" href="../../header/boost/test/unit_test_hpp.html" title="Header &lt;boost/test/unit_test.hpp&gt;">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_unit.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_case.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_unit.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/unit_test_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.test_unit_generator"></a><div class="titlepage"></div>
@@ -35,24 +35,24 @@
 <span class="keyword">class</span> <a class="link" href="test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a> <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
   <span class="comment">// <a class="link" href="test_unit_generator.html#boost.unit_test.test_unit_generatorconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="test_unit_generator.html#idm18025868496-bb"><span class="special">~</span><span class="identifier">test_unit_generator</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="test_unit_generator.html#id332366-bb"><span class="special">~</span><span class="identifier">test_unit_generator</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="test_unit_generator.html#idm18025871376-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> <a class="link" href="test_unit_generator.html#idm18025870848-bb"><span class="identifier">next</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="test_unit_generator.html#id332373-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> <a class="link" href="test_unit_generator.html#id332356-bb"><span class="identifier">next</span></a><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436477805024"></a><h2>Description</h2>
+<a name="id981110"></a><h2>Description</h2>
 <div class="refsect2">
-<a name="idm436477804624"></a><h3>
+<a name="id981104"></a><h3>
 <a name="boost.unit_test.test_unit_generatorconstruct-copy-destruct"></a><code class="computeroutput">test_unit_generator</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18025868496-bb"></a><span class="special">~</span><span class="identifier">test_unit_generator</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id332366-bb"></a><span class="special">~</span><span class="identifier">test_unit_generator</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436477798624"></a><h3>
-<a name="idm18025871376-bb"></a><code class="computeroutput">test_unit_generator</code> public member functions</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> <a name="idm18025870848-bb"></a><span class="identifier">next</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li></ol></div>
+<a name="id981128"></a><h3>
+<a name="id332373-bb"></a><code class="computeroutput">test_unit_generator</code> public member functions</h3>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">virtual</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span> <a name="id332356-bb"></a><span class="identifier">next</span><span class="special">(</span><span class="special">)</span> <span class="keyword">const</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre></li></ol></div>
 </div>
 </div>
 </div>
@@ -67,7 +67,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_unit.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_case.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_unit.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/tree/test_unit_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../header/boost/test/unit_test_hpp.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost/unit_test/unit_test_log_formatter.html b/doc/v2/html/boost/unit_test/unit_test_log_formatter.html
old mode 100644
new mode 100755
index 327240f5..decd8617
--- a/doc/v2/html/boost/unit_test/unit_test_log_formatter.html
+++ b/doc/v2/html/boost/unit_test/unit_test_log_formatter.html
@@ -2,11 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class unit_test_log_formatter</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
 <link rel="up" href="../../header/boost/test/unit_test_log_formatter_hpp.html" title="Header &lt;boost/test/unit_test_log_formatter.hpp&gt;">
-<link rel="prev" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">
+<link rel="prev" href="log_entry_data.html" title="Struct log_entry_data">
+<link rel="next" href="../../boost_test/tutorials.html" title="Tutorials">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -19,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_checkpoint_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a>
+<a accesskey="p" href="log_entry_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../boost_test/tutorials.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="refentry">
 <a name="boost.unit_test.unit_test_log_formatter"></a><div class="titlepage"></div>
@@ -39,63 +40,57 @@
                          BOOST_UTL_ET_WARNING, BOOST_UTL_ET_ERROR, 
                          BOOST_UTL_ET_FATAL_ERROR <span class="special">}</span><span class="special">;</span>
   <span class="comment">// <a class="link" href="unit_test_log_formatter.html#boost.unit_test.unit_test_log_formatterconstruct-copy-destruct">construct/copy/destruct</a></span>
-  <a class="link" href="unit_test_log_formatter.html#idm18020362560-bb"><span class="special">~</span><span class="identifier">unit_test_log_formatter</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
+  <a class="link" href="unit_test_log_formatter.html#id335455-bb"><span class="special">~</span><span class="identifier">unit_test_log_formatter</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
 
-  <span class="comment">// <a class="link" href="unit_test_log_formatter.html#idm18020438752-bb">public member functions</a></span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020438224-bb"><span class="identifier">log_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">counter_t</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020433024-bb"><span class="identifier">log_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020428928-bb"><span class="identifier">log_build_info</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020425856-bb"><span class="identifier">test_unit_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="comment">// <a class="link" href="unit_test_log_formatter.html#id334896-bb">public member functions</a></span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id334897-bb"><span class="identifier">log_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">counter_t</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id334925-bb"><span class="identifier">log_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id334955-bb"><span class="identifier">log_build_info</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335027-bb"><span class="identifier">test_unit_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="unit_test_log_formatter.html#idm18020420400-bb"><span class="identifier">test_unit_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">long</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020413856-bb"><span class="identifier">test_unit_skipped</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <a class="link" href="unit_test_log_formatter.html#id335069-bb"><span class="identifier">test_unit_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="keyword">unsigned</span> <span class="keyword">long</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335094-bb"><span class="identifier">test_unit_skipped</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="unit_test_log_formatter.html#idm18020409472-bb"><span class="identifier">log_exception_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
+  <a class="link" href="unit_test_log_formatter.html#id335137-bb"><span class="identifier">log_exception_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> 
                       <a class="link" href="../execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020402432-bb"><span class="identifier">log_exception_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335174-bb"><span class="identifier">log_exception_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
   <span class="keyword">virtual</span> <span class="keyword">void</span> 
-  <a class="link" href="unit_test_log_formatter.html#idm18020398240-bb"><span class="identifier">log_entry_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">log_entry_types</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020391360-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020386048-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020380784-bb"><span class="identifier">log_entry_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020376624-bb"><span class="identifier">entry_context_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020372192-bb"><span class="identifier">log_entry_context</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
-  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#idm18020366880-bb"><span class="identifier">entry_context_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <a class="link" href="unit_test_log_formatter.html#id335222-bb"><span class="identifier">log_entry_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <a class="link" href="log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">log_entry_types</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335284-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335332-bb"><span class="identifier">log_entry_value</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335364-bb"><span class="identifier">log_entry_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335402-bb"><span class="identifier">entry_context_start</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335382-bb"><span class="identifier">log_entry_context</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">,</span> <span class="identifier">const_string</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
+  <span class="keyword">virtual</span> <span class="keyword">void</span> <a class="link" href="unit_test_log_formatter.html#id335429-bb"><span class="identifier">entry_context_finish</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span>
 <span class="special">}</span><span class="special">;</span></pre></div>
 <div class="refsect1">
-<a name="idm436476746256"></a><h2>Description</h2>
+<a name="id982971"></a><h2>Description</h2>
 <p>During the test module execution Unit Test Framework can report messages about success or failure of assertions, which test suites are being run and more (specifically which messages are reported depends on log level threashold selected by the user). All these messages constitute Unit Test Framework log. There are many ways (formats) to present these messages to the user. Boost.Test comes with two formats: "Compiler-like log format" and "XML based log format". Former is intended for human consumption and later is intended for processing by automated regression test systems. If you want to produce some other format you need to implement class with specific interface and use method unit_test_log_t::set_formatter during a test module initialization to set an active formatter. The class <a class="link" href="unit_test_log_formatter.html" title="Class unit_test_log_formatter">unit_test_log_formatter</a> defines this interface.</p>
 <p>This interface requires you to format all possible messages being produced in the log. These includes error messages about failed assertions, messages about caught exceptions and information messages about test units being started/ended. All the methods in this interface takes a reference to standard stream as a first argument. This is where final messages needs to be directed to. Also you are givn all the informaion necessary to produce a message. </p>
 <div class="refsect2">
-<a name="idm436476743184"></a><h3>
+<a name="id982957"></a><h3>
 <a name="boost.unit_test.unit_test_log_formatterconstruct-copy-destruct"></a><code class="computeroutput">unit_test_log_formatter</code> 
         public
        construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="idm18020362560-bb"></a><span class="special">~</span><span class="identifier">unit_test_log_formatter</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
+<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><a name="id335455-bb"></a><span class="special">~</span><span class="identifier">unit_test_log_formatter</span><span class="special">(</span><span class="special">)</span><span class="special">;</span></pre></li></ol></div>
 </div>
 <div class="refsect2">
-<a name="idm436476737200"></a><h3>
-<a name="idm18020438752-bb"></a><code class="computeroutput">unit_test_log_formatter</code> public member functions</h3>
+<a name="id982999"></a><h3>
+<a name="id334896-bb"></a><code class="computeroutput">unit_test_log_formatter</code> public member functions</h3>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020438224-bb"></a><span class="identifier">log_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">counter_t</span> test_cases_amount<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked at the begining of test module execution. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id334897-bb"></a><span class="identifier">log_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">counter_t</span> test_cases_amount<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked at the begining of test module execution. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -111,24 +106,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020433024-bb"></a><span class="identifier">log_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked at the end of test module execution. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id334925-bb"></a><span class="identifier">log_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked at the end of test module execution. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -138,20 +127,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020428928-bb"></a><span class="identifier">log_build_info</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when Unit Test Framework build information is requested. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id334955-bb"></a><span class="identifier">log_build_info</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when Unit Test Framework build information is requested. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -161,24 +144,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020425856-bb"></a><span class="identifier">test_unit_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when test unit starts (either test suite or test case) <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335027-bb"></a><span class="identifier">test_unit_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when test unit starts (either test suite or test case) <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>test_unit_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -195,25 +172,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18020420400-bb"></a><span class="identifier">test_unit_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">,</span> 
+<a name="id335069-bb"></a><span class="identifier">test_unit_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">,</span> 
                  <span class="keyword">unsigned</span> <span class="keyword">long</span> elapsed<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when test unit finishes. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>test_unit_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">elapsed</code></span></p></td>
@@ -233,20 +204,14 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020413856-bb"></a><span class="identifier">test_unit_skipped</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked if test unit skipped for any reason. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335094-bb"></a><span class="identifier">test_unit_skipped</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">&amp;</span> tu<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked if test unit skipped for any reason. <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -263,25 +228,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18020409472-bb"></a><span class="identifier">log_exception_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> lcd<span class="special">,</span> 
+<a name="id335137-bb"></a><span class="identifier">log_exception_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> lcd<span class="special">,</span> 
                     <a class="link" href="../execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span> ex<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function starts uncaught exception report. It is going to followed by context information. Report is finilized by call to log_exception_finish. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_exception_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">ex</code></span></p></td>
@@ -301,24 +260,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020402432-bb"></a><span class="identifier">log_exception_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function finishes uncaught exception report. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335174-bb"></a><span class="identifier">log_exception_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked when Unit Test Framework detects uncaught exception. <p>Call to this function finishes uncaught exception report. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_exception_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -329,25 +282,19 @@
 </li>
 <li class="listitem">
 <pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> 
-<a name="idm18020398240-bb"></a><span class="identifier">log_entry_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> led<span class="special">,</span> 
+<a name="id335222-bb"></a><span class="identifier">log_entry_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <a class="link" href="log_entry_data.html" title="Struct log_entry_data">log_entry_data</a> <span class="keyword">const</span> <span class="special">&amp;</span> led<span class="special">,</span> 
                 <span class="identifier">log_entry_types</span> let<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start new log entry. <p>Call to this function starts new log entry. It is followed by series of log_entry_value calls and finally call to log_entry_finish. A log entry may consist of one or more values being reported. Some of these values will be plain strings, while others can be complicated expressions in a form of "lazy" expression template lazy_ostream. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_value, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">led</code></span></p></td>
@@ -367,24 +314,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020391360-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two overloaded methods to report log entry content. This one is used to report plain string value. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335284-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two overloaded methods to report log entry content. This one is used to report plain string value. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -400,24 +341,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020386048-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two ovrloaded methods to report log entry content. This one is used to report some complicated expression passed as an expression template lazy_ostream. In most cases default implementation provided by the framework should work as is (it just converts the lazy expression into a string. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335332-bb"></a><span class="identifier">log_entry_value</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">lazy_ostream</span> <span class="keyword">const</span> <span class="special">&amp;</span> value<span class="special">)</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report a log entry content. <p>This is one of two ovrloaded methods to report log entry content. This one is used to report some complicated expression passed as an expression template lazy_ostream. In most cases default implementation provided by the framework should work as is (it just converts the lazy expression into a string. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -433,24 +368,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020380784-bb"></a><span class="identifier">log_entry_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish a log entry report. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335364-bb"></a><span class="identifier">log_entry_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish a log entry report. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, log_entry_start </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -460,24 +389,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020376624-bb"></a><span class="identifier">entry_context_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start log entry context report. <p>Unit Test Framewrk logs for failed assertons and uncaught exceptions context if one was defined by a test mofule. Context consists of multiple "scopes" identified by description messages assigned by the test module using BOOST_TEST_INFO/BOOST_TEST_CONTEXT statements. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335402-bb"></a><span class="identifier">entry_context_start</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to start log entry context report. <p>Unit Test Framewrk logs for failed assertons and uncaught exceptions context if one was defined by a test mofule. Context consists of multiple "scopes" identified by description messages assigned by the test module using BOOST_TEST_INFO/BOOST_TEST_CONTEXT statements. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_context, entry_context_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -487,24 +410,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020372192-bb"></a><span class="identifier">log_entry_context</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report log entry context "scope" description. <p>Each "scope" description is reported by separate call to log_entry_context. 
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335382-bb"></a><span class="identifier">log_entry_context</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">,</span> <span class="identifier">const_string</span> value<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to report log entry context "scope" description. <p>Each "scope" description is reported by separate call to log_entry_context. 
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, entry_context_finish </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
@@ -520,24 +437,18 @@
 </table></div>
 </li>
 <li class="listitem">
-<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="idm18020366880-bb"></a><span class="identifier">entry_context_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish log entry context report. <p>
+<pre class="literallayout"><span class="keyword">virtual</span> <span class="keyword">void</span> <a name="id335429-bb"></a><span class="identifier">entry_context_finish</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> os<span class="special">)</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span></pre>Invoked by Unit Test Framework to finish log entry context report. <p>
 </p>
 <p><span class="bold"><strong>See Also:</strong></span></p>
 <p>log_entry_start, entry_context_context </p>
 <p>
 </p>
-<div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term">Parameters:</span></p></td>
-<td><div class="variablelist"><table border="0" class="variablelist compact">
-<colgroup>
+<td><div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<col>
-</colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="computeroutput">os</code></span></p></td>
 <td><p>output stream to write a messages into </p></td>
@@ -561,7 +472,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_checkpoint_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a>
+<a accesskey="p" href="log_entry_data.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../header/boost/test/unit_test_log_formatter_hpp.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../boost_test/tutorials.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/acknowledgements.html b/doc/v2/html/boost_test/acknowledgements.html
old mode 100644
new mode 100755
index c241e89a..f45d4e7e
--- a/doc/v2/html/boost_test/acknowledgements.html
+++ b/doc/v2/html/boost_test/acknowledgements.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Acknowledgements</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
 <link rel="prev" href="open_issues.html" title="Open issues">
-<link rel="next" href="components.html" title="Components">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +19,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="open_issues.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="components.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="open_issues.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -28,7 +27,7 @@
 </h2></div></div></div>
 <h5>
 <a name="boost_test.acknowledgements.h0"></a>
-      <span class="phrase"><a name="boost_test.acknowledgements.original_test_library"></a></span><a class="link" href="acknowledgements.html#boost_test.acknowledgements.original_test_library">Original
+      <span><a name="boost_test.acknowledgements.original_test_library"></a></span><a class="link" href="acknowledgements.html#boost_test.acknowledgements.original_test_library">Original
       Test Library</a>
     </h5>
 <p>
@@ -39,7 +38,7 @@
     </p>
 <h5>
 <a name="boost_test.acknowledgements.h1"></a>
-      <span class="phrase"><a name="boost_test.acknowledgements.second_incarnation_including_the"></a></span><a class="link" href="acknowledgements.html#boost_test.acknowledgements.second_incarnation_including_the">Second
+      <span><a name="boost_test.acknowledgements.second_incarnation_including_the"></a></span><a class="link" href="acknowledgements.html#boost_test.acknowledgements.second_incarnation_including_the">Second
       incarnation including the Unit Test Framework</a>
     </h5>
 <p>
@@ -51,7 +50,7 @@
     </p>
 <h5>
 <a name="boost_test.acknowledgements.h2"></a>
-      <span class="phrase"><a name="boost_test.acknowledgements.new_documentation"></a></span><a class="link" href="acknowledgements.html#boost_test.acknowledgements.new_documentation">New
+      <span><a name="boost_test.acknowledgements.new_documentation"></a></span><a class="link" href="acknowledgements.html#boost_test.acknowledgements.new_documentation">New
       documentation</a>
     </h5>
 <p>
@@ -69,7 +68,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="open_issues.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="components.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="open_issues.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/boost.test.logo.png b/doc/v2/html/boost_test/boost.test.logo.png
deleted file mode 100644
index 89467d97..00000000
Binary files a/doc/v2/html/boost_test/boost.test.logo.png and /dev/null differ
diff --git a/doc/v2/html/boost_test/change_log.html b/doc/v2/html/boost_test/change_log.html
old mode 100644
new mode 100755
index 2918b6e2..c67971e4
--- a/doc/v2/html/boost_test/change_log.html
+++ b/doc/v2/html/boost_test/change_log.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Change log</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
 <link rel="prev" href="section_glossary.html" title="Glossary">
@@ -28,7 +28,7 @@
 </h2></div></div></div>
 <h5>
 <a name="boost_test.change_log.h0"></a>
-      <span class="phrase"><a name="boost_test.change_log.boost_release_xxx"></a></span><a class="link" href="change_log.html#boost_test.change_log.boost_release_xxx">Boost
+      <span><a name="boost_test.change_log.boost_release_xxx"></a></span><a class="link" href="change_log.html#boost_test.change_log.boost_release_xxx">Boost
       release XXX</a>
     </h5>
 <div class="orderedlist"><ol class="orderedlist" type="1">
diff --git a/doc/v2/html/boost_test/class-hier.jpg b/doc/v2/html/boost_test/class-hier.jpg
deleted file mode 100644
index f5cccfc6..00000000
Binary files a/doc/v2/html/boost_test/class-hier.jpg and /dev/null differ
diff --git a/doc/v2/html/boost_test/components.html b/doc/v2/html/boost_test/components.html
deleted file mode 100644
index a29692c6..00000000
--- a/doc/v2/html/boost_test/components.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Components</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="acknowledgements.html" title="Acknowledgements">
-<link rel="next" href="components/bt_minimal_testing.html" title="Minimal testing facility">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="acknowledgements.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="components/bt_minimal_testing.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.components"></a><a class="link" href="components.html" title="Components">Components</a>
-</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="components/bt_minimal_testing.html">Minimal testing
-      facility</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="components/bt_minimal_testing/bt_minimal_usage.html">Usage</a></span></dt>
-<dt><span class="section"><a href="components/bt_minimal_testing/bt_minimal.html">Testing
-        tools</a></span></dt>
-<dt><span class="section"><a href="components/bt_minimal_testing/example.html">Example</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="components/execution_monitor.html">The
-      Execution Monitor</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="components/execution_monitor/compilation_variants_and_procedu.html">Compilation
-        variants and procedures</a></span></dt>
-<dt><span class="section"><a href="components/execution_monitor/section_em_users_guide.html">The
-        Execution Monitor user's guide</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="components/section_pem.html">Program Execution
-      Monitor</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="components/section_pem/usage.html">Usage</a></span></dt>
-<dt><span class="section"><a href="components/section_pem/runtime_configuration.html">Runtime
-        configuration</a></span></dt>
-<dt><span class="section"><a href="components/section_pem/implementation.html">Implementation</a></span></dt>
-<dt><span class="section"><a href="components/section_pem/section_pem_compilation.html">Compilation</a></span></dt>
-</dl></dd>
-</dl></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="acknowledgements.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="components/bt_minimal_testing.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/bt_minimal_testing.html b/doc/v2/html/boost_test/components/bt_minimal_testing.html
deleted file mode 100644
index b39ee0f8..00000000
--- a/doc/v2/html/boost_test/components/bt_minimal_testing.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Minimal testing facility</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../components.html" title="Components">
-<link rel="prev" href="../components.html" title="Components">
-<link rel="next" href="bt_minimal_testing/bt_minimal_usage.html" title="Usage">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../components.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../components.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="bt_minimal_testing/bt_minimal_usage.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.components.bt_minimal_testing"></a><a class="link" href="bt_minimal_testing.html" title="Minimal testing facility">Minimal testing
-      facility</a>
-</h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="bt_minimal_testing/bt_minimal_usage.html">Usage</a></span></dt>
-<dt><span class="section"><a href="bt_minimal_testing/bt_minimal.html">Testing
-        tools</a></span></dt>
-<dt><span class="section"><a href="bt_minimal_testing/example.html">Example</a></span></dt>
-</dl></div>
-<p>
-        <span class="emphasis"><em>Boost.Test minimal testing facility</em></span> provides the functionality
-        previously implemented by the original version of Boost.Test. As the name
-        suggest, it provides only minimal basic facilities for test creation. It
-        have no configuration parameters (either command line arguments or environment
-        variables) and it supplies a limited set of <a class="link" href="bt_minimal_testing/bt_minimal.html#ref_mtf_testing_tool">testing
-        tools</a> which behaves similarly to ones defined amount the <span class="bold"><strong>Unit Test Framework Testing tools</strong></span>. The <span class="emphasis"><em>Minimal
-        Testing Facility</em></span> supplies its own function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> (so can not be used for multi unit testing)
-        and will execute the test program in a monitored environment.
-      </p>
-<p>
-        As it follows from the name this component provides only minimal set of the
-        testing capabilities and as a general rule the Unit Test Framework should
-        be preferred. In a majority of the cases it provides you with much wider
-        set of testing tools (and other goods), while still being as easy to set
-        up.
-      </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          The use of the Minial Testing Facility is deprecated. The documentation
-          is left for reference and backward compatibility
-        </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../components.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../components.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="bt_minimal_testing/bt_minimal_usage.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/bt_minimal_testing/bt_minimal.html b/doc/v2/html/boost_test/components/bt_minimal_testing/bt_minimal.html
deleted file mode 100644
index 81f7e6d2..00000000
--- a/doc/v2/html/boost_test/components/bt_minimal_testing/bt_minimal.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Testing tools</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../bt_minimal_testing.html" title="Minimal testing facility">
-<link rel="prev" href="bt_minimal_usage.html" title="Usage">
-<link rel="next" href="example.html" title="Example">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="bt_minimal_usage.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="example.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.bt_minimal_testing.bt_minimal"></a><a name="ref_mtf_testing_tool"></a><a class="link" href="bt_minimal.html" title="Testing tools">Testing
-        tools</a>
-</h4></div></div></div>
-<p>
-          The <span class="emphasis"><em>Minimal Testing Facility</em></span> supplies following four
-          assertions:
-        </p>
-<pre class="programlisting"><a class="link" href="../../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_CHECK</span></code></a><span class="special">(</span><span class="identifier">predicate</span><span class="special">)</span>
-<a class="link" href="../../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_REQUIRE</span></code></a><span class="special">(</span><span class="identifier">predicate</span><span class="special">)</span>
-<a class="link" href="../../testing_tool_ref/assertion_boost_error.html" title="BOOST_ERROR"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a><span class="special">(</span><span class="identifier">message</span><span class="special">)</span>
-<a class="link" href="../../testing_tool_ref/assertion_boost_fail.html" title="BOOST_FAIL"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a><span class="special">(</span><span class="identifier">message</span><span class="special">)</span>
-</pre>
-<p>
-          Their behaviour is modelled after the similarly named tools supplied by
-          the <span class="emphasis"><em>UTF</em></span>.
-        </p>
-<p>
-          There is a single unit test program that validates <span class="emphasis"><em>Minimal Testing
-          Facility</em></span> functionality: minimal_test &lt;!-- TO FIX: link to
-          test --&gt;
-        </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            what is this sentence for?
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="bt_minimal_usage.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="example.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/bt_minimal_testing/bt_minimal_usage.html b/doc/v2/html/boost_test/components/bt_minimal_testing/bt_minimal_usage.html
deleted file mode 100644
index 8491729d..00000000
--- a/doc/v2/html/boost_test/components/bt_minimal_testing/bt_minimal_usage.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Usage</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../bt_minimal_testing.html" title="Minimal testing facility">
-<link rel="prev" href="../bt_minimal_testing.html" title="Minimal testing facility">
-<link rel="next" href="bt_minimal.html" title="Testing tools">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="bt_minimal.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.bt_minimal_testing.bt_minimal_usage"></a><a class="link" href="bt_minimal_usage.html" title="Usage">Usage</a>
-</h4></div></div></div>
-<p>
-          The <span class="emphasis"><em>Minimal Testing Facility</em></span> is implemented inline
-          in one header:
-        </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">minimal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></pre>
-<p>
-          There are no special compilation instructions for this component.
-        </p>
-<p>
-          The second and last change you need to make to integrate your test module
-          with <span class="emphasis"><em>Minimal Testing Facility</em></span> is the signature of
-          your function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code>.
-          It should look like this:
-        </p>
-<pre class="programlisting"><span class="keyword">int</span> <span class="identifier">test_main</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="comment">//...</span>
-<span class="special">}</span>
-</pre>
-<p>
-          Once you apply the changes, the test automatically starts running in monitored
-          environment. Also you can start using <a class="link" href="bt_minimal.html#ref_mtf_testing_tool">testing
-          tools</a> provided by the <span class="emphasis"><em>Minimal Testing Facility</em></span>
-          and get uniform errors reporting.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="bt_minimal.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/bt_minimal_testing/example.html b/doc/v2/html/boost_test/components/bt_minimal_testing/example.html
deleted file mode 100644
index 1375a5b7..00000000
--- a/doc/v2/html/boost_test/components/bt_minimal_testing/example.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Example</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../bt_minimal_testing.html" title="Minimal testing facility">
-<link rel="prev" href="bt_minimal.html" title="Testing tools">
-<link rel="next" href="../execution_monitor.html" title="The Execution Monitor">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="bt_minimal.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.bt_minimal_testing.example"></a><a class="link" href="example.html" title="Example">Example</a>
-</h4></div></div></div>
-<p>
-          The following example illustrates different approaches you can employ to
-          detect and report errors using different testing tools
-        </p>
-<div class="table">
-<a name="boost_test.components.bt_minimal_testing.example.id_example27"></a><p class="title"><b>Table&#160;36.&#160;Minimal testing facility application</b></p>
-<div class="table-contents"><table class="table" summary="Minimal testing facility application">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">minimal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="keyword">int</span> <span class="identifier">add</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="identifier">i</span><span class="special">+</span><span class="identifier">j</span><span class="special">;</span> <span class="special">}</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="keyword">int</span> <span class="identifier">test_main</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span> <span class="special">*[]</span> <span class="special">)</span>             <span class="comment">// note the name!</span>
-<span class="special">{</span>
-  <span class="comment">// six ways to detect and report the same error:</span>
-
-  <span class="comment">// continues on error</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="special">);</span>  <a class="co" name="boost_test.components.bt_minimal_testing.example.c0" href="example.html#boost_test.components.bt_minimal_testing.example.c1"><img src="../../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a>
-
-  <span class="comment">// throws on error</span>
-  <span class="identifier">BOOST_REQUIRE</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="special">);</span> <a class="co" name="boost_test.components.bt_minimal_testing.example.c2" href="example.html#boost_test.components.bt_minimal_testing.example.c3"><img src="../../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a>
-
-  <span class="comment">// continues on error</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">!=</span> <span class="number">4</span> <span class="special">)</span>
-    <span class="identifier">BOOST_ERROR</span><span class="special">(</span> <span class="string">"Ouch..."</span> <span class="special">);</span>       <a class="co" name="boost_test.components.bt_minimal_testing.example.c4" href="example.html#boost_test.components.bt_minimal_testing.example.c5"><img src="../../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a>
-
-  <span class="comment">// throws on error</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">!=</span> <span class="number">4</span> <span class="special">)</span>
-    <span class="identifier">BOOST_FAIL</span><span class="special">(</span> <span class="string">"Ouch..."</span> <span class="special">);</span>        <a class="co" name="boost_test.components.bt_minimal_testing.example.c6" href="example.html#boost_test.components.bt_minimal_testing.example.c7"><img src="../../../../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a>
-
-  <span class="comment">// throws on error</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">!=</span> <span class="number">4</span> <span class="special">)</span>
-    <span class="keyword">throw</span> <span class="string">"Oops..."</span><span class="special">;</span>                <a class="co" name="boost_test.components.bt_minimal_testing.example.c8" href="example.html#boost_test.components.bt_minimal_testing.example.c9"><img src="../../../../../../../../doc/src/images/callouts/5.png" alt="5" border="0"></a>
-
-  <span class="comment">// returns error code</span>
-  <span class="keyword">return</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span> <span class="number">2</span> <span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="special">?</span> <span class="number">0</span> <span class="special">:</span> <span class="number">1</span><span class="special">;</span>  <a class="co" name="boost_test.components.bt_minimal_testing.example.c10" href="example.html#boost_test.components.bt_minimal_testing.example.c11"><img src="../../../../../../../../doc/src/images/callouts/6.png" alt="6" border="0"></a>
-<span class="special">}</span>
-</pre>
-                  <div class="calloutlist"><table border="0" summary="Callout list">
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.components.bt_minimal_testing.example.c1"></a><a href="#boost_test.components.bt_minimal_testing.example.c0"><img src="../../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                        This approach uses the <code class="computeroutput"><span class="identifier">BOOST_CHECK</span></code>
-                        tool, which displays an error message on std::cout that includes
-                        the expression that failed, the source file name, and the
-                        source file line number. It also increments the error count.
-                        At program termination, the error count will be displayed
-                        automatically by the <span class="emphasis"><em>Minimal Testing Facility</em></span>.
-                      </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.components.bt_minimal_testing.example.c3"></a><a href="#boost_test.components.bt_minimal_testing.example.c2"><img src="../../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                        This approach using the <code class="computeroutput"><span class="identifier">BOOST_REQUIRE</span></code>
-                        tool, is similar to #1, except that after displaying the
-                        error, an exception is thrown, to be caught by the <span class="emphasis"><em>Minimal
-                        Testing Facility</em></span>. This approach is suitable when
-                        writing an explicit test program, and the error would be
-                        so severe as to make further testing impractical. <code class="computeroutput"><span class="identifier">BOOST_REQUIRE</span></code> differs from
-                        the C++ Standard Library's <code class="computeroutput"><span class="identifier">assert</span><span class="special">()</span></code> macro in that it is always
-                        generated, and channels error detection into the uniform
-                        reporting procedure.
-                      </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.components.bt_minimal_testing.example.c5"></a><a href="#boost_test.components.bt_minimal_testing.example.c4"><img src="../../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                        This approach is similar to #1, except that the error detection
-                        is coded separately. This is most useful when the specific
-                        condition being tested is not indicative of the reason for
-                        failure.
-                      </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.components.bt_minimal_testing.example.c7"></a><a href="#boost_test.components.bt_minimal_testing.example.c6"><img src="../../../../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                        This approach is similar to #2, except that the error detection
-                        is coded separately. This is most useful when the specific
-                        condition being tested is not indicative of the reason for
-                        failure.
-                      </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.components.bt_minimal_testing.example.c9"></a><a href="#boost_test.components.bt_minimal_testing.example.c8"><img src="../../../../../../../../doc/src/images/callouts/5.png" alt="5" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                        This approach throws an exception, which will be caught and
-                        reported by the <span class="emphasis"><em>Minimal Testing Facility</em></span>.
-                        This approach is suitable for both production and test code,
-                        in libraries or not. The error message displayed when the
-                        exception is caught will be most meaningful if the exception
-                        is derived from <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">exception</span></code>,
-                        or is a <code class="computeroutput"><span class="keyword">char</span><span class="special">*</span></code> or <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code>.
-                      </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.components.bt_minimal_testing.example.c11"></a><a href="#boost_test.components.bt_minimal_testing.example.c10"><img src="../../../../../../../../doc/src/images/callouts/6.png" alt="6" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                        An error code may be returned by the <span class="emphasis"><em>Minimal Testing
-                        Facility</em></span>
-                      </p></td>
-</tr>
-</table></div>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">****</span> <span class="identifier">no</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="bt_minimal.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../bt_minimal_testing.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor.html b/doc/v2/html/boost_test/components/execution_monitor.html
deleted file mode 100644
index 34d42917..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The Execution Monitor</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../components.html" title="Components">
-<link rel="prev" href="bt_minimal_testing/example.html" title="Example">
-<link rel="next" href="execution_monitor/compilation_variants_and_procedu.html" title="Compilation variants and procedures">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="bt_minimal_testing/example.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../components.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_monitor/compilation_variants_and_procedu.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.components.execution_monitor"></a><a name="ref_execution_monitor"></a><a class="link" href="execution_monitor.html" title="The Execution Monitor">The
-      Execution Monitor</a>
-</h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="execution_monitor/compilation_variants_and_procedu.html">Compilation
-        variants and procedures</a></span></dt>
-<dt><span class="section"><a href="execution_monitor/section_em_users_guide.html">The
-        Execution Monitor user's guide</a></span></dt>
-</dl></div>
-<p>
-        Sometimes we need to call a function and make sure that no user or system
-        originated exceptions are being thrown by it. Uniform exception reporting
-        is also may be convenient. That's the purpose of the Boost.Test's <span class="emphasis"><em>Execution
-        Monitor</em></span>.
-      </p>
-<p>
-        The Execution Monitor is a lower-level component of the Boost Test Library.
-        It is the base for implementing all other Boost.Test components, but also
-        can be used standalone to get controlled execution of error-prone functions
-        with a uniform error notification. The Execution Monitor calls a user-supplied
-        function in a controlled environment, relieving users from messy error detection.
-      </p>
-<p>
-        The Execution Monitor usage is demonstrated in the example <a href="../../../../../example/exec_mon_example.cpp" target="_top"><code class="literal">exec_mon_example.cpp</code></a>.
-        Additional examples are in <a class="link" href="section_pem.html" title="Program Execution Monitor">Program
-        Execution Monitor</a> or <span class="emphasis"><em>UTF</em></span>.
-      </p>
-<h5>
-<a name="boost_test.components.execution_monitor.h0"></a>
-        <span class="phrase"><a name="boost_test.components.execution_monitor.design_rationale"></a></span><a class="link" href="execution_monitor.html#boost_test.components.execution_monitor.design_rationale">Design
-        Rationale</a>
-      </h5>
-<p>
-        The Execution Monitor design assumes that it can be used when no (or almost
-        no) memory available. Also the Execution Monitor is intended to be portable
-        to as many platforms as possible.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="bt_minimal_testing/example.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../components.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="execution_monitor/compilation_variants_and_procedu.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor/compilation_variants_and_procedu.html b/doc/v2/html/boost_test/components/execution_monitor/compilation_variants_and_procedu.html
deleted file mode 100644
index 4cf3de6b..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor/compilation_variants_and_procedu.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Compilation variants and procedures</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../execution_monitor.html" title="The Execution Monitor">
-<link rel="prev" href="../execution_monitor.html" title="The Execution Monitor">
-<link rel="next" href="section_em_users_guide.html" title="The Execution Monitor user's guide">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_users_guide.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.execution_monitor.compilation_variants_and_procedu"></a><a class="link" href="compilation_variants_and_procedu.html" title="Compilation variants and procedures">Compilation
-        variants and procedures</a>
-</h4></div></div></div>
-<h6>
-<a name="boost_test.components.execution_monitor.compilation_variants_and_procedu.h0"></a>
-          <span class="phrase"><a name="boost_test.components.execution_monitor.compilation_variants_and_procedu.implementation"></a></span><a class="link" href="compilation_variants_and_procedu.html#boost_test.components.execution_monitor.compilation_variants_and_procedu.implementation">Implementation</a>
-        </h6>
-<p>
-          The Execution Monitor is implemented in two modules: one header file and
-          one source file.
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              <code class="computeroutput"><a class="link" href="../../../header/boost/test/execution_monitor_hpp.html" title="Header &lt;boost/test/execution_monitor.hpp&gt;">boost/test/execution_monitor.hpp</a></code>:
-              defines abstract execution monitor interfaces and implements execution
-              exception.
-            </li>
-<li class="listitem">
-              <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">impl</span><span class="special">/</span><span class="identifier">execution_monitor</span><span class="special">.</span><span class="identifier">ipp</span></code>: provides the Execution Monitor
-              implementation for all supported configurations, including Microsoft
-              structured exception based, UNIX signals.
-            </li>
-</ul></div>
-<p>
-          You may use this component in both debug and release modes, but in release
-          mode the Execution Monitor won't catch Microsoft C runtime debug events.
-        </p>
-<h6>
-<a name="boost_test.components.execution_monitor.compilation_variants_and_procedu.h1"></a>
-          <span class="phrase"><a name="boost_test.components.execution_monitor.compilation_variants_and_procedu.standalone_library_compilation"></a></span><a class="link" href="compilation_variants_and_procedu.html#boost_test.components.execution_monitor.compilation_variants_and_procedu.standalone_library_compilation">Standalone
-          library compilation</a>
-        </h6>
-<p>
-          To compile the Execution Monitor as standalone library compose it using
-          only <code class="computeroutput"><span class="identifier">execution_monitor</span><span class="special">.</span><span class="identifier">cpp</span></code>
-          as a source file. Alternatively you can add this file directly to the list
-          of source files for your project. Boost Test Library's components include
-          this file as a part of their compilation procedure.
-        </p>
-<h6>
-<a name="boost_test.components.execution_monitor.compilation_variants_and_procedu.h2"></a>
-          <span class="phrase"><a name="boost_test.components.execution_monitor.compilation_variants_and_procedu.direct_include"></a></span><a class="link" href="compilation_variants_and_procedu.html#boost_test.components.execution_monitor.compilation_variants_and_procedu.direct_include">Direct
-          include</a>
-        </h6>
-<p>
-          In some cases you may want to include the source file along with header
-          file into your sources. But be aware that to be able to catch all kinds
-          of standard exceptions and to implement signal handling logic this file
-          will bring a lot of dependencies.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_users_guide.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide.html b/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide.html
deleted file mode 100644
index 16eeb999..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The Execution Monitor user's guide</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../execution_monitor.html" title="The Execution Monitor">
-<link rel="prev" href="compilation_variants_and_procedu.html" title="Compilation variants and procedures">
-<link rel="next" href="section_em_users_guide/section_em_monitored_functions.html" title="Monitored function execution">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="compilation_variants_and_procedu.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_users_guide/section_em_monitored_functions.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.execution_monitor.section_em_users_guide"></a><a class="link" href="section_em_users_guide.html" title="The Execution Monitor user's guide">The
-        Execution Monitor user's guide</a>
-</h4></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="section_em_users_guide/section_em_monitored_functions.html">Monitored
-          function execution</a></span></dt>
-<dt><span class="section"><a href="section_em_users_guide/section_em_parameters.html">The
-          execution monitor parameters</a></span></dt>
-<dt><span class="section"><a href="section_em_users_guide/section_em_error_reporting.html">Errors
-          reporting and translation</a></span></dt>
-<dt><span class="section"><a href="section_em_users_guide/memory_leaks_detection.html">Memory
-          leaks detection</a></span></dt>
-</dl></div>
-<p>
-          The Execution Monitor is designed to solve the problem of executing potentially
-          dangerous function that may result in any number of error conditions, in
-          monitored environment that should prevent any undesirable exceptions to
-          propagate out of function call and produce consistent result report for
-          all <a class="link" href="section_em_users_guide/section_em_monitored_functions.html" title="Monitored function execution">outcomes</a>.
-          The Execution Monitor is able to produce informative report for all standard
-          C++ exceptions and intrinsic types. All other exceptions are reported as
-          unknown. If you prefer different message for your exception class or need
-          to perform any action, the Execution Monitor supports <a class="link" href="section_em_users_guide/section_em_error_reporting.html" title="Errors reporting and translation">custom
-          exception translators</a>. There are several other <a class="link" href="section_em_users_guide/section_em_parameters.html" title="The execution monitor parameters">parameters</a>
-          of the monitored environment can be configured by setting appropriate properties
-          of the Execution Monitor.
-        </p>
-<p>
-          All symbols in the Execution Monitor implementation are located in the
-          namespace boost. To use the Execution Monitor you need to:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              <code class="computeroutput"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">execution_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>
-            </li>
-<li class="listitem">
-              Make an instance of <code class="computeroutput"><a class="link" href="../../../boost/execution_monitor.html" title="Class execution_monitor">execution_monitor</a></code>
-            </li>
-<li class="listitem">
-              Optionally register custom exception translators for exception classes
-              which require special processing.
-            </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="compilation_variants_and_procedu.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../execution_monitor.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_users_guide/section_em_monitored_functions.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/memory_leaks_detection.html b/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/memory_leaks_detection.html
deleted file mode 100644
index a03a3f2e..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/memory_leaks_detection.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Memory leaks detection</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_em_users_guide.html" title="The Execution Monitor user's guide">
-<link rel="prev" href="section_em_error_reporting.html" title="Errors reporting and translation">
-<link rel="next" href="../../section_pem.html" title="Program Execution Monitor">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_em_error_reporting.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../section_pem.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.execution_monitor.section_em_users_guide.memory_leaks_detection"></a><a class="link" href="memory_leaks_detection.html" title="Memory leaks detection">Memory
-          leaks detection</a>
-</h5></div></div></div>
-<p>
-            The Execution Monitor provides a limited ability to detect memory leaks
-            during program execution, and to break program execution on specific
-            memory allocation order-number (1 - first allocation of memory in program,
-            2 - second and so on). Unfortunately this feature is, at the moment,
-            implemented only for the Microsoft family of compilers (and Intel, if
-            it employs Microsoft C Runtime Library). Also it can not be tuned per
-            instance of the monitor and is only triggered globally and reported after
-            the whole program execution is done. In a future this ought to be improved.
-            An interface is composed from two free functions residing in namespace
-            boost::debug:
-          </p>
-<pre class="programlisting"><span class="keyword">void</span> <span class="identifier">detect_memory_leaks</span><span class="special">(</span> <span class="keyword">bool</span> <span class="identifier">on_off</span> <span class="special">);</span>
-<span class="keyword">void</span> <span class="identifier">break_memory_alloc</span><span class="special">(</span> <span class="keyword">long</span> <span class="identifier">mem_alloc_order_num</span> <span class="special">);</span>
-</pre>
-<p>
-            Use function detect_memory_leaks to switch memory leaks detection on/off.
-            Use break_memory_alloc to break a program execution at allocation specified
-            by mem_alloc_order_num argument. The Unit Test Framework provides a runtime
-            parameter (<code class="computeroutput"><span class="special">--</span><span class="identifier">detect_memory_leaks</span><span class="special">=</span><span class="number">0</span></code> or
-            <code class="computeroutput"><span class="number">1</span></code> or <code class="computeroutput"><span class="identifier">N</span><span class="special">&gt;</span><span class="number">1</span></code>,
-            where N is memory allocation number) allowing you to manage this feature
-            during monitored unit tests.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_em_error_reporting.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../section_pem.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_error_reporting.html b/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_error_reporting.html
deleted file mode 100644
index a17c2c72..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_error_reporting.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Errors reporting and translation</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_em_users_guide.html" title="The Execution Monitor user's guide">
-<link rel="prev" href="section_em_parameters.html" title="The execution monitor parameters">
-<link rel="next" href="memory_leaks_detection.html" title="Memory leaks detection">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_em_parameters.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="memory_leaks_detection.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.execution_monitor.section_em_users_guide.section_em_error_reporting"></a><a class="link" href="section_em_error_reporting.html" title="Errors reporting and translation">Errors
-          reporting and translation</a>
-</h5></div></div></div>
-<p>
-            If you need to report an error inside monitored function execution you
-            have to throw an exception. Do not use the <code class="computeroutput"><a class="link" href="../../../../boost/execution_exception.html" title="Class execution_exception">boost::execution_exception</a></code>
-            - it's not intended to be used for this purpose. The simplest choice
-            is to use one of the following C++ types as an exception:
-          </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-                C string
-              </li>
-<li class="listitem">
-                <code class="computeroutput"><span class="identifier">std</span><span class="special">:</span><span class="identifier">string</span></code>
-              </li>
-<li class="listitem">
-                any exception class in std::exception hierarchy
-              </li>
-</ul></div>
-<p>
-            In case if you prefer to use your own exception classes or can't govern
-            what exceptions are generated by monitored function and would like to
-            see proper error message in a report, the Execution Monitor allows you
-            to register the translator for any exception class. You can register
-            as many independent translators as you like. See <code class="computeroutput"><span class="identifier">execution_monitor</span></code>
-            specification for requirements on translator function. Also see below
-            for usage example.
-          </p>
-<p>
-            Finally, if you need to abort the monitored function execution without
-            reporting any errors, you can throw an exception <code class="computeroutput"><a class="link" href="../../../../boost/execution_aborted.html" title="Class execution_aborted">execution_aborted</a></code>.
-            As a result the execution is aborted and zero result code is produced
-            by the method <code class="computeroutput"><a class="link" href="../../../../boost/execution_monitor.html#idm18026343968-bb">execution_monitor::execute</a></code>.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_em_parameters.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="memory_leaks_detection.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_monitored_functions.html b/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_monitored_functions.html
deleted file mode 100644
index 26c4d891..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_monitored_functions.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Monitored function execution</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_em_users_guide.html" title="The Execution Monitor user's guide">
-<link rel="prev" href="../section_em_users_guide.html" title="The Execution Monitor user's guide">
-<link rel="next" href="section_em_parameters.html" title="The execution monitor parameters">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_parameters.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.execution_monitor.section_em_users_guide.section_em_monitored_functions"></a><a class="link" href="section_em_monitored_functions.html" title="Monitored function execution">Monitored
-          function execution</a>
-</h5></div></div></div>
-<p>
-            To start the monitored function, invoke the method <code class="computeroutput"><a class="link" href="../../../../boost/execution_monitor.html#idm18026343968-bb">boost::execution_monitor::execute</a></code>
-            and pass the monitored function as an argument. If the call succeeds,
-            the method returns the result code produced by the monitored function.
-            If any of the following conditions occur:
-          </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-                Uncaught C++ exception
-              </li>
-<li class="listitem">
-                Hardware or software signal, trap, or other exception
-              </li>
-<li class="listitem">
-                Timeout reached
-              </li>
-<li class="listitem">
-                Debug assert event occurred (under Microsoft Visual C++ or compatible
-                compiler)
-              </li>
-</ul></div>
-<p>
-            then the method throws the <code class="computeroutput"><a class="link" href="../../../../boost/execution_exception.html" title="Class execution_exception">execution_exception</a></code>.
-            The exception contains unique <code class="computeroutput"><a class="link" href="../../../../boost/execution_exception/error_code.html" title="Type error_code">error_code</a></code>
-            value identifying the error condition and the detailed message that can
-            be used to report the error.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_parameters.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_parameters.html b/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_parameters.html
deleted file mode 100644
index 708652a7..00000000
--- a/doc/v2/html/boost_test/components/execution_monitor/section_em_users_guide/section_em_parameters.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The execution monitor parameters</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_em_users_guide.html" title="The Execution Monitor user's guide">
-<link rel="prev" href="section_em_monitored_functions.html" title="Monitored function execution">
-<link rel="next" href="section_em_error_reporting.html" title="Errors reporting and translation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_em_monitored_functions.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_error_reporting.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.execution_monitor.section_em_users_guide.section_em_parameters"></a><a class="link" href="section_em_parameters.html" title="The execution monitor parameters">The
-          execution monitor parameters</a>
-</h5></div></div></div>
-<p>
-            All parameters are implemented as public read-write properties of class
-            <code class="computeroutput"><a class="link" href="../../../../boost/execution_monitor.html" title="Class execution_monitor">boost::execution_monitor</a></code>.
-          </p>
-<p>
-            The <code class="computeroutput"><span class="identifier">p_catch_system_errors</span></code>
-            property is a boolean flag (default value is true) specifying whether
-            or not <code class="computeroutput"><span class="identifier">execution_monitor</span></code>
-            should trap system level exceptions (second category in above list).
-            Set this property to false, for example, if you wish to force coredump
-            file creation. The Unit Test Framework provides a runtime parameter
-            <code class="computeroutput"><span class="special">--</span><span class="identifier">catch_system_errors</span><span class="special">=</span><span class="identifier">yes</span></code>
-            to alter the behavior in monitored test cases.
-          </p>
-<p>
-            The <code class="computeroutput"><span class="identifier">p_auto_start_dbg</span></code>
-            property is a boolean flag (default value is false) specifying whether
-            or not <code class="computeroutput"><span class="identifier">execution_monitor</span></code>
-            should try to attach debugger in case system error is caught.
-          </p>
-<p>
-            The <code class="computeroutput"><span class="identifier">p_timeout</span></code> property
-            is an integer timeout (in seconds) for monitored function execution.
-            Use this parameter to monitor code with possible deadlocks or indefinite
-            loops. This feature is only available for some operating systems (not
-            yet Microsoft Windows).
-          </p>
-<p>
-            The <code class="computeroutput"><span class="identifier">p_use_alt_stack</span></code> property
-            is a boolean flag (default value is false) specifying whether or not
-            <code class="computeroutput"><span class="identifier">execution_monitor</span></code> should
-            use an alternative stack for the <code class="computeroutput"><span class="identifier">sigaction</span></code>
-            based signal catching. When enabled the signals are delivered to the
-            <code class="computeroutput"><span class="identifier">execution_monitor</span></code> on
-            a stack different from current execution stack, which is safer in case
-            if it is corrupted by monitored function. For more details on alternative
-            stack handling see appropriate <a href="http://www.opengroup.org/onlinepubs/000095399/functions/sigaltstack.html" target="_top">manuals</a>.
-          </p>
-<p>
-            The <code class="computeroutput"><span class="identifier">p_detect_fp_exceptions</span></code>
-            property is a boolean flag (default value is false) specifying whether
-            or not <code class="computeroutput"><span class="identifier">execution_monitor</span></code>
-            should install hardware traps for the floating point exception on platforms
-            where it's supported.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_em_monitored_functions.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_em_users_guide.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_em_error_reporting.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem.html b/doc/v2/html/boost_test/components/section_pem.html
deleted file mode 100644
index 9854c681..00000000
--- a/doc/v2/html/boost_test/components/section_pem.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Program Execution Monitor</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../components.html" title="Components">
-<link rel="prev" href="execution_monitor/section_em_users_guide/memory_leaks_detection.html" title="Memory leaks detection">
-<link rel="next" href="section_pem/usage.html" title="Usage">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="execution_monitor/section_em_users_guide/memory_leaks_detection.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../components.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem/usage.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.components.section_pem"></a><a class="link" href="section_pem.html" title="Program Execution Monitor">Program Execution
-      Monitor</a>
-</h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="section_pem/usage.html">Usage</a></span></dt>
-<dt><span class="section"><a href="section_pem/runtime_configuration.html">Runtime
-        configuration</a></span></dt>
-<dt><span class="section"><a href="section_pem/implementation.html">Implementation</a></span></dt>
-<dt><span class="section"><a href="section_pem/section_pem_compilation.html">Compilation</a></span></dt>
-</dl></div>
-<p>
-        The components of a C++ program may report user-detected errors in several
-        ways, such as via a return value or throwing an exception. System-detected
-        errors such as dereferencing an invalid pointer are reported in other ways,
-        totally operating system and compiler dependent.
-      </p>
-<p>
-        Yet many C++ programs, both production and test, must run in an environment
-        where uniform reporting of errors is necessary. For example, converting otherwise
-        uncaught exceptions to non-zero program return codes allows many command
-        line, script, or batch environments to continue processing in a controlled
-        manner. Even some <span class="emphasis"><em>GUI</em></span> environments benefit from the
-        unification of errors into program return codes.
-      </p>
-<p>
-        The Boost.Test Library's <span class="bold"><strong>Program Execution Monitor</strong></span>
-        (<span class="emphasis"><em>PEM</em></span> for short) relieves users from messy error detection
-        and reporting duties by providing a replacement function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> which calls a user-supplied <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code>
-        function within a monitored environment. The supplied <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> then uniformly detects and reports the
-        occurrence of several types of errors, reducing them to a uniform return
-        code which is returned to the host environment.
-      </p>
-<p>
-        Uniform error reporting is particularly useful for programs running unattended
-        under control of scripts or batch files. Some operating systems pop up message
-        boxes if an uncaught exception occurs, and this requires manual intervention.
-        By converting such exceptions into non-zero program return codes, the library
-        makes the program a better citizen. More uniform reporting of errors isn't
-        a benefit to some programs, particularly programs always run by hand of a
-        knowledgeable person. So the <span class="emphasis"><em>PEM</em></span> wouldn't be worth using
-        in that environment.
-      </p>
-<p>
-        Uniform error reporting can be also useful in test environments such as the
-        Boost regression tests. Be aware though in such case it might be preferable
-        to use the <span class="emphasis"><em>UTF</em></span>, because it allows one to use the <a class="link" href="../testing_tools.html" title="The UTF testing tools">testing tools</a> and generate more
-        detailed error information.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="execution_monitor/section_em_users_guide/memory_leaks_detection.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../components.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem/usage.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/implementation.html b/doc/v2/html/boost_test/components/section_pem/implementation.html
deleted file mode 100644
index 9f2e0f40..00000000
--- a/doc/v2/html/boost_test/components/section_pem/implementation.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Implementation</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem.html" title="Program Execution Monitor">
-<link rel="prev" href="runtime_configuration.html" title="Runtime configuration">
-<link rel="next" href="section_pem_compilation.html" title="Compilation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="runtime_configuration.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_compilation.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.section_pem.implementation"></a><a name="ref_pem_implementation"></a><a class="link" href="implementation.html" title="Implementation">Implementation</a>
-</h4></div></div></div>
-<p>
-          To monitor execution of user supplied function <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code> the <span class="emphasis"><em>PEM</em></span> relies on
-          the Boost.Test's <a class="link" href="../execution_monitor.html" title="The Execution Monitor">Execution
-          Monitor</a>. Also the <span class="emphasis"><em>PEM</em></span> supplies the function
-          <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code>
-          to facilitate uniform error reporting. Following files constitute the
-          <span class="emphasis"><em>PEM</em></span> implementation:
-        </p>
-<div class="table">
-<a name="boost_test.components.section_pem.implementation.pem_implementation_file"></a><p class="title"><b>Table&#160;41.&#160;<span class="emphasis"><em>PEM</em></span> implementation files</b></p>
-<div class="table-contents"><table class="table" summary="PEM implementation files">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    File name
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Content
-                  </p>
-                </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                  <p>
-                    <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">impl</span><span class="special">/</span><span class="identifier">execution_monitor</span><span class="special">.</span><span class="identifier">ipp</span></code>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    provides <a class="link" href="../execution_monitor.html" title="The Execution Monitor"><span class="emphasis"><em>EM</em></span></a>
-                    implementation for all supported configurations
-                  </p>
-                </td>
-</tr>
-<tr>
-<td>
-                  <p>
-                    <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">impl</span><span class="special">/</span><span class="identifier">cpp_main</span><span class="special">.</span><span class="identifier">ipp</span></code>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    supplies function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> for static library build
-                  </p>
-                </td>
-</tr>
-<tr>
-<td>
-                  <p>
-                    <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span></code>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    combines all implementation files into single header to be use
-                    as inlined version of component
-                  </p>
-                </td>
-</tr>
-<tr>
-<td>
-                  <p>
-                    <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span></code>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    contains definitions for <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> function for dynamic library
-                    build and pragmas for auto-linking feature support
-                  </p>
-                </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          The <span class="emphasis"><em>PEM</em></span> implementation wraps several system headers
-          and is intended to be used as standalone library. While there exist an
-          alternative variant to <a class="link" href="section_pem_compilation/section_pem_full_include.html#ref_pem_direct_include">include the
-          whole implementation directly</a> into your program, for the long term
-          usage the preferable solution is to <a class="link" href="section_pem_compilation/section_pem_standalone.html#ref_pem_stanlone">build
-          library once</a> and reuse it.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="runtime_configuration.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_compilation.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/runtime_configuration.html b/doc/v2/html/boost_test/components/section_pem/runtime_configuration.html
deleted file mode 100644
index 51b52f7d..00000000
--- a/doc/v2/html/boost_test/components/section_pem/runtime_configuration.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Runtime configuration</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem.html" title="Program Execution Monitor">
-<link rel="prev" href="usage.html" title="Usage">
-<link rel="next" href="implementation.html" title="Implementation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="usage.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="implementation.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.section_pem.runtime_configuration"></a><a class="link" href="runtime_configuration.html" title="Runtime configuration">Runtime
-        configuration</a>
-</h4></div></div></div>
-<p>
-          There are two aspects of the <span class="emphasis"><em>PEM</em></span> behavior that you
-          can customize at runtime. Customization is performed using environment
-          variables.
-        </p>
-<div class="table">
-<a name="boost_test.components.section_pem.runtime_configuration.id_pem_env"></a><p class="title"><b>Table&#160;40.&#160;The <span class="emphasis"><em>PEM</em></span> configuration environment variables</b></p>
-<div class="table-contents"><table class="table" summary="The PEM configuration environment variables">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Flag
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Usage
-                  </p>
-                </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                  <p>
-                    <code class="computeroutput"><span class="identifier">BOOST_TEST_CATCH_SYSTEM_ERRORS</span></code>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    allows customizing behavior of the <span class="emphasis"><em>PEM</em></span> in
-                    regards of catching system errors. For more details about the
-                    meaning of this option see the <code class="computeroutput"><a class="link" href="../../../boost/execution_monitor.html" title="Class execution_monitor">execution_monitor</a></code>
-                    class. If you want to prevent the <span class="emphasis"><em>PEM</em></span> from
-                    catching system exception, set the value of this variable to
-                    "no". The default value is "yes".
-                  </p>
-                </td>
-</tr>
-<tr>
-<td>
-                  <p>
-                    <code class="computeroutput"><span class="identifier">BOOST_PRG_MON_CONFIRM</span></code>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    allows avoiding success confirmation message. Some users prefer
-                    to see a confirmation message in case if program successfully
-                    executed. While others don't like the clutter or any output is
-                    prohibited by organization standards. To avoid the message set
-                    the value of this variable to "no". The default value
-                    is "yes".
-                  </p>
-                </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            <code class="computeroutput"><span class="identifier">BOOST_TEST_CATCH_SYSTEM_ERRORS</span></code>
-            is similar to the <span class="emphasis"><em>UTF</em></span>'s <a class="link" href="../../runtime_parameters_reference/catch_system_errors.html#ref_param_catch_system"><code class="computeroutput"><span class="identifier">catch_system_error</span></code></a> command line
-            parameter.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="usage.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="implementation.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation.html b/doc/v2/html/boost_test/components/section_pem/section_pem_compilation.html
deleted file mode 100644
index b64cac43..00000000
--- a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Compilation</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem.html" title="Program Execution Monitor">
-<link rel="prev" href="implementation.html" title="Implementation">
-<link rel="next" href="section_pem_compilation/section_pem_standalone.html" title="Standalone library compilation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="implementation.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_compilation/section_pem_standalone.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.section_pem.section_pem_compilation"></a><a class="link" href="section_pem_compilation.html" title="Compilation">Compilation</a>
-</h4></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="section_pem_compilation/section_pem_standalone.html">Standalone
-          library compilation</a></span></dt>
-<dt><span class="section"><a href="section_pem_compilation/support_of_the_auto_linking_feat.html">Support
-          of the auto-linking feature</a></span></dt>
-<dt><span class="section"><a href="section_pem_compilation/section_pem_full_include.html">Including
-          the <span class="emphasis"><em>PEM</em></span> directly into your program</a></span></dt>
-</dl></div>
-<p>
-          In comparison with many other boost libraries, which are completely implemented
-          in header files, compilation and linking with the <span class="emphasis"><em>PEM</em></span>
-          may require additional steps. The <span class="emphasis"><em>PEM</em></span> presents you
-          with options to either
-        </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-              built and link with a <a class="link" href="section_pem_compilation/section_pem_standalone.html#ref_pem_stanlone">standalone library</a>
-              or
-            </li>
-<li class="listitem">
-              include the implementation <a class="link" href="section_pem_compilation/section_pem_full_include.html#ref_pem_direct_include">directly</a>
-              into your program.
-            </li>
-</ol></div>
-<p>
-          If you opt to use the library the <span class="emphasis"><em>PEM</em></span> header implements
-          the <span class="bold"><strong>auto-linking support</strong></span> and following
-          flags can be used to configure compilation of the <span class="emphasis"><em>PEM</em></span>
-          library and your program:
-        </p>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Variable
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Usage
-                  </p>
-                </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                  <p>
-                    <a class="link" href="../../users_guide/link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    Define this flag to build/use dynamic library
-                  </p>
-                </td>
-</tr>
-<tr>
-<td>
-                  <p>
-                    <a class="link" href="../../users_guide/link_references/link_boost_test_no_lib.html" title="BOOST_TEST_NO_LIB"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a>
-                  </p>
-                </td>
-<td>
-                  <p>
-                    Define this flag to prevent auto-linking
-                  </p>
-                </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="implementation.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_compilation/section_pem_standalone.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_full_include.html b/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_full_include.html
deleted file mode 100644
index 75c3b940..00000000
--- a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_full_include.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Including the PEM directly into your program</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem_compilation.html" title="Compilation">
-<link rel="prev" href="support_of_the_auto_linking_feat.html" title="Support of the auto-linking feature">
-<link rel="next" href="../../../runtime_parameters_reference.html" title="Runtime parameters reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="support_of_the_auto_linking_feat.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../runtime_parameters_reference.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.section_pem.section_pem_compilation.section_pem_full_include"></a><a name="ref_pem_direct_include"></a><a class="link" href="section_pem_full_include.html" title="Including the PEM directly into your program">Including
-          the <span class="emphasis"><em>PEM</em></span> directly into your program</a>
-</h5></div></div></div>
-<p>
-            If you prefer to avoid the standalone library compilation you have two
-            alternative usage variants: you can either include all files that constitute
-            the static library in your program's makefile or include them as a part
-            of your program's source file. To facilitate the later variant the <span class="emphasis"><em>PEM</em></span>
-            implementation presents the header
-          </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<p>
-            In both variants neither <a class="link" href="../../../users_guide/link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> nor <a class="link" href="../../../users_guide/link_references/link_boost_test_no_lib.html" title="BOOST_TEST_NO_LIB"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a> are applicable.
-            This solution may not be the best choice in a long run, since it requires
-            the <span class="emphasis"><em>PEM</em></span> sources recompilation for every program
-            you use it with.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="support_of_the_auto_linking_feat.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../runtime_parameters_reference.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone.html b/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone.html
deleted file mode 100644
index 2518b7ca..00000000
--- a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Standalone library compilation</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem_compilation.html" title="Compilation">
-<link rel="prev" href="../section_pem_compilation.html" title="Compilation">
-<link rel="next" href="section_pem_standalone/section_pem_compilation_static.html" title="Static library compilation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_standalone/section_pem_compilation_static.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.section_pem.section_pem_compilation.section_pem_standalone"></a><a name="ref_pem_stanlone"></a><a class="link" href="section_pem_standalone.html" title="Standalone library compilation">Standalone
-          library compilation</a>
-</h5></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="section_pem_standalone/section_pem_compilation_static.html">Static
-            library compilation</a></span></dt>
-<dt><span class="section"><a href="section_pem_standalone/section_pem_compilation_dynamic.html">Dynamic
-            library compilation</a></span></dt>
-</dl></div>
-<p>
-            If you opted to link your program with the standalone library, you need
-            to build it first. To build a standalone library all C++ files (.cpp),
-            that constitute <span class="emphasis"><em>PEM</em></span> <a class="link" href="../implementation.html#ref_pem_implementation">implementation</a>
-            need to be listed as source files in your makefile <a href="#ftn.boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.f0" class="footnote" name="boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.f0"><sup class="footnote">[8]</sup></a>.
-          </p>
-<p>
-            The makefile for use with Boost.Build system is supplied in
-          </p>
-<pre class="programlisting"><span class="identifier">libs</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">build</span>
-</pre>
-<p>
-            directory. The <span class="emphasis"><em>PEM</em></span> can be built as either <a class="link" href="section_pem_standalone/section_pem_compilation_static.html#ref_pem_static">static</a> or <a class="link" href="section_pem_standalone/section_pem_compilation_dynamic.html#ref_pem_dynamic">dynamic</a>
-            library.
-          </p>
-<div class="footnotes">
-<br><hr style="width:100; text-align:left;margin-left: 0">
-<div id="ftn.boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.f0" class="footnote"><p><a href="#boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.f0" class="para"><sup class="para">[8] </sup></a>
-              There are varieties of make systems that can be used. To name a few:
-              <span class="emphasis"><em>GNU</em></span> make (and other make clones) and build systems
-              integrated into <span class="emphasis"><em>IDE</em></span>s (for example <span class="emphasis"><em>Microsoft
-              Visual Studio</em></span>). The Boost preferred solution is Boost.Build
-              system that is based on top of <code class="computeroutput"><span class="identifier">bjam</span></code>
-              tool. Make systems require some kind of configuration file that lists
-              all files that constitute the library and all build options. For example
-              the makefile that is used by make, or the Microsoft Visual Studio project
-              file, Jamfile is used by Boost.Build. For the sake of simplicity let's
-              call this file the makefile.
-            </p></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_standalone/section_pem_compilation_static.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_dynamic.html b/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_dynamic.html
deleted file mode 100644
index be638cce..00000000
--- a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_dynamic.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Dynamic library compilation</title>
-<link rel="stylesheet" href="../../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem_standalone.html" title="Standalone library compilation">
-<link rel="prev" href="section_pem_compilation_static.html" title="Static library compilation">
-<link rel="next" href="../support_of_the_auto_linking_feat.html" title="Support of the auto-linking feature">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_pem_compilation_static.html"><img src="../../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_standalone.html"><img src="../../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../../index.html"><img src="../../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../support_of_the_auto_linking_feat.html"><img src="../../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h6 class="title">
-<a name="boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.section_pem_compilation_dynamic"></a><a name="ref_pem_dynamic"></a><a class="link" href="section_pem_compilation_dynamic.html" title="Dynamic library compilation">Dynamic
-            library compilation</a>
-</h6></div></div></div>
-<p>
-              To build the dynamic library <a href="#ftn.boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.section_pem_compilation_dynamic.f0" class="footnote" name="boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.section_pem_compilation_dynamic.f0"><sup class="footnote">[9]</sup></a> you need to add <a class="link" href="../../../../users_guide/link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> to the
-              list of macro definitions in the
-            </p>
-<pre class="programlisting"><span class="identifier">libs</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">build</span></pre>
-<p>
-              directory:
-            </p>
-<pre class="programlisting"><span class="identifier">bjam</span> <span class="special">-</span><span class="identifier">sTOOLS</span><span class="special">=&lt;</span><span class="identifier">your</span><span class="special">-</span><span class="identifier">tool</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;</span> <span class="special">-</span><span class="identifier">sBUILD</span><span class="special">=</span><span class="identifier">boost_prg_exec_monitor</span>
-</pre>
-<p>
-              Also on Windows you can use the Microsoft Visual Studio .NET project
-              file provided.
-            </p>
-<div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../../../../doc/src/images/caution.png"></td>
-<th align="left">Caution</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-                For your program to successfully link with the dynamic library the
-                flag <a class="link" href="../../../../users_guide/link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> needs
-                to be defined both during dynamic library build and during your program
-                compilation.
-              </p></td></tr>
-</table></div>
-<div class="footnotes">
-<br><hr style="width:100; text-align:left;margin-left: 0">
-<div id="ftn.boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.section_pem_compilation_dynamic.f0" class="footnote"><p><a href="#boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.section_pem_compilation_dynamic.f0" class="para"><sup class="para">[9] </sup></a>
-                What is meant by the term dynamic library is a <span class="emphasis"><em>dynamically
-                loaded library</em></span>, alternatively called a <span class="emphasis"><em>shared
-                library</em></span>.
-              </p></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_pem_compilation_static.html"><img src="../../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_standalone.html"><img src="../../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../../index.html"><img src="../../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../support_of_the_auto_linking_feat.html"><img src="../../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_static.html b/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_static.html
deleted file mode 100644
index 5867bb57..00000000
--- a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_static.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Static library compilation</title>
-<link rel="stylesheet" href="../../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem_standalone.html" title="Standalone library compilation">
-<link rel="prev" href="../section_pem_standalone.html" title="Standalone library compilation">
-<link rel="next" href="section_pem_compilation_dynamic.html" title="Dynamic library compilation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_pem_standalone.html"><img src="../../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_standalone.html"><img src="../../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../../index.html"><img src="../../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_compilation_dynamic.html"><img src="../../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h6 class="title">
-<a name="boost_test.components.section_pem.section_pem_compilation.section_pem_standalone.section_pem_compilation_static"></a><a name="ref_pem_static"></a><a class="link" href="section_pem_compilation_static.html" title="Static library compilation">Static
-            library compilation</a>
-</h6></div></div></div>
-<p>
-              There are no additional build defines or options required to build
-              static library. Using Boost.Build system you can build the static library
-              with a following command from <code class="computeroutput"><span class="identifier">libs</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">build</span></code>
-              directory:
-            </p>
-<pre class="programlisting"><span class="identifier">bjam</span> <span class="special">-</span><span class="identifier">sTOOLS</span><span class="special">=&lt;</span><span class="identifier">your</span><span class="special">-</span><span class="identifier">tool</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;</span> <span class="special">-</span><span class="identifier">sBUILD</span><span class="special">=</span><span class="identifier">boost_prg_exec_monitor</span>
-</pre>
-<p>
-              Also on Windows you can use the Microsoft Visual Studio .NET project
-              file provided.
-            </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_pem_standalone.html"><img src="../../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_standalone.html"><img src="../../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../../index.html"><img src="../../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_compilation_dynamic.html"><img src="../../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/support_of_the_auto_linking_feat.html b/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/support_of_the_auto_linking_feat.html
deleted file mode 100644
index 3d3ac886..00000000
--- a/doc/v2/html/boost_test/components/section_pem/section_pem_compilation/support_of_the_auto_linking_feat.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Support of the auto-linking feature</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem_compilation.html" title="Compilation">
-<link rel="prev" href="section_pem_standalone/section_pem_compilation_dynamic.html" title="Dynamic library compilation">
-<link rel="next" href="section_pem_full_include.html" title="Including the PEM directly into your program">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_pem_standalone/section_pem_compilation_dynamic.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_full_include.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.components.section_pem.section_pem_compilation.support_of_the_auto_linking_feat"></a><a name="ref_pem_auto_link"></a><a class="link" href="support_of_the_auto_linking_feat.html" title="Support of the auto-linking feature">Support
-          of the auto-linking feature</a>
-</h5></div></div></div>
-<p>
-            For the Microsoft family of compilers the <span class="emphasis"><em>PEM</em></span> provides
-            an ability to automatically select proper library name and add it to
-            the list of objects to be linked with. To employ this feature you required
-            to include either header
-          </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<p>
-            or header
-          </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<p>
-            By default the feature is enabled. To disable it you have to define the
-            flag <a class="link" href="../../../users_guide/link_references/link_boost_test_no_lib.html" title="BOOST_TEST_NO_LIB"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a>.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="section_pem_standalone/section_pem_compilation_dynamic.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem_compilation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_pem_full_include.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/components/section_pem/usage.html b/doc/v2/html/boost_test/components/section_pem/usage.html
deleted file mode 100644
index a00d3739..00000000
--- a/doc/v2/html/boost_test/components/section_pem/usage.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Usage</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../section_pem.html" title="Program Execution Monitor">
-<link rel="prev" href="../section_pem.html" title="Program Execution Monitor">
-<link rel="next" href="runtime_configuration.html" title="Runtime configuration">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_configuration.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.components.section_pem.usage"></a><a class="link" href="usage.html" title="Usage">Usage</a>
-</h4></div></div></div>
-<p>
-          To facilitate uniform error reporting the <span class="emphasis"><em>PEM</em></span> supplies
-          function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code>
-          as part if it's implementation. To use the <span class="emphasis"><em>PEM</em></span> instead
-          of regular function <code class="computeroutput"><span class="identifier">main</span></code>
-          your program is required to supply a function <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code> with same signature.
-        </p>
-<p>
-          Here is the traditional <span class="emphasis"><em>Hello World</em></span> program implemented
-          using the <span class="emphasis"><em>PEM</em></span>:
-        </p>
-<div class="table">
-<a name="boost_test.components.section_pem.usage.id_example24"></a><p class="title"><b>Table&#160;37.&#160;Hello World with the Program Execution Monitor</b></p>
-<div class="table-contents"><table class="table" summary="Hello World with the Program Execution Monitor">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">cpp_main</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">)</span> <span class="comment">// note name cpp_main, not main.</span>
-<span class="special">{</span>
-  <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Hello, world\n"</span><span class="special">;</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="identifier">Hello</span><span class="special">,</span> <span class="identifier">world</span>
-
-<span class="identifier">no</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          It really is that simple - just change the name of your initial function
-          from <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code>
-          to <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code>.
-          Do make sure the <code class="computeroutput"><span class="identifier">argc</span></code> and
-          <code class="computeroutput"><span class="identifier">argv</span></code> parameters are specified
-          (although you don't have to name them if you don't use them).
-        </p>
-<p>
-          The <span class="emphasis"><em>PEM</em></span> treats as errors:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              Exceptions thrown from <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code>
-            </li>
-<li class="listitem">
-              Non-zero return from <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code>
-            </li>
-</ul></div>
-<p>
-          So what if some function had thrown a <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span></code>
-          with the message "big trouble" and it is not trapped by any catch
-          clause? Like in a following example:
-        </p>
-<div class="table">
-<a name="boost_test.components.section_pem.usage.id_example25"></a><p class="title"><b>Table&#160;38.&#160;Standard exception detection within the Program Execution Monitor</b></p>
-<div class="table-contents"><table class="table" summary="Standard exception detection within the Program Execution Monitor">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">stdexcept</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">foo</span><span class="special">()</span> <span class="special">{</span> <span class="keyword">throw</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">(</span> <span class="string">"big trouble"</span> <span class="special">);</span> <span class="special">}</span>
-
-<span class="keyword">int</span> <span class="identifier">cpp_main</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">)</span> <span class="comment">// note the name</span>
-<span class="special">{</span>
-  <span class="identifier">foo</span><span class="special">();</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">****</span> <span class="identifier">exception</span><span class="special">(</span><span class="number">205</span><span class="special">):</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">runtime_error</span><span class="special">:</span> <span class="identifier">big</span> <span class="identifier">trouble</span>
-<span class="special">********</span> <span class="identifier">errors</span> <span class="identifier">detected</span><span class="special">;</span> <span class="identifier">see</span> <span class="identifier">standard</span> <span class="identifier">output</span> <span class="keyword">for</span> <span class="identifier">details</span> <span class="special">********</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            Note that in both examples above we used <a class="link" href="section_pem_compilation/section_pem_full_include.html" title="Including the PEM directly into your program">single-header
-            variant</a> of the <span class="emphasis"><em>PEM</em></span>. Alternatively the binaries
-            may be built and linked with a <a class="link" href="section_pem_compilation/section_pem_standalone.html" title="Standalone library compilation">standalone
-            library</a> (in case of static library we are not required to include
-            any <span class="emphasis"><em>PEM</em></span> related headers).
-          </p></td></tr>
-</table></div>
-<p>
-          Let's consider an example where function <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code> had bubbled up a return code of 5:
-        </p>
-<div class="table">
-<a name="boost_test.components.section_pem.usage.id_example26"></a><p class="title"><b>Table&#160;39.&#160;Error return code detection of the <span class="emphasis"><em>PEM</em></span></b></p>
-<div class="table-contents"><table class="table" summary="Error return code detection of the PEM">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">prg_exec_monitor</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span> <span class="comment">// this header is optional</span>
-
-<span class="keyword">int</span> <span class="identifier">cpp_main</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">)</span> <span class="comment">// note the name</span>
-<span class="special">{</span>
-    <span class="keyword">return</span> <span class="number">5</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">****</span> <span class="identifier">error</span> <span class="keyword">return</span> <span class="identifier">code</span><span class="special">:</span> <span class="number">5</span>
-<span class="special">********</span> <span class="identifier">errors</span> <span class="identifier">detected</span><span class="special">;</span> <span class="identifier">see</span> <span class="identifier">standard</span> <span class="identifier">output</span> <span class="keyword">for</span> <span class="identifier">details</span> <span class="special">********</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          The <span class="emphasis"><em>PEM</em></span> reports errors to both <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span></code>
-          (details) and <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cerr</span></code> (summary). Primary detailed error
-          messages appear on standard output stream so that it is properly interlaced
-          with other output, thus aiding error analysis. While the final error notification
-          message appears on standard error stream. This increases the visibility
-          of error notification if standard output and error streams are directed
-          to different devices or files.
-        </p>
-<p>
-          The <span class="emphasis"><em>PEM</em></span>'s supplied <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> will return following result codes:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">exit_success</span></code> - no errors
-            </li>
-<li class="listitem">
-              <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">exit_failure</span></code> - non-zero and <code class="computeroutput"><span class="identifier">non</span><span class="special">-</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">exit_success</span></code> return code from <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code>
-            </li>
-<li class="listitem">
-              <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">exit_exception_failure</span></code> - <code class="computeroutput"><span class="identifier">cpp_main</span><span class="special">()</span></code>
-              throw an exception
-            </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../section_pem.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_configuration.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/how_to_read_this_documentation.html b/doc/v2/html/boost_test/how_to_read_this_documentation.html
deleted file mode 100644
index 39fec19f..00000000
--- a/doc/v2/html/boost_test/how_to_read_this_documentation.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>How to read this documentation?</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="intro/portability_concerns.html" title="Portability concerns">
-<link rel="next" href="tutorial.html" title="Tutorials">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="intro/portability_concerns.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.how_to_read_this_documentation"></a><a class="link" href="how_to_read_this_documentation.html" title="How to read this documentation?">How to read
-    this documentation?</a>
-</h2></div></div></div>
-<p>
-      Without further ado, I'd like to start ... but where? It's not obvious what
-      is the best order to describe the framework. One can use bottom up approach,
-      starting with with basics and going up to cover real interfaces based on them.
-      The downside is that you'll have to dig through the multiple pages of information
-      you may not never need in real life. One can follow the order of test program
-      execution. From test initialization to test tree construction to the report
-      and log generation. This also unfortunately may not be most clear way. The
-      Boost.Test <span class="emphasis"><em>UTF</em></span> is very flexible and a lot of details of
-      various test initialization options may not necessarily be important for average
-      user, while understanding test output is.
-    </p>
-<p>
-      Well ... This is a User's Guide after all. Let's go by what <span class="bold"><strong>you</strong></span>
-      need to know to successfully use the <span class="emphasis"><em>UTF</em></span>. Thus I follow
-      the order of decisions you, as a user, have to make and order of complexity
-      of the problems you have to solve. If you find yourself faced with some unclear
-      term feel free to jump directly to the <a class="link" href="section_glossary.html" title="Glossary">Glossary</a>
-      section, where short definitions for all used terms were collected. And again
-      if you want to jump right into coding the <a class="link" href="tutorial.html" title="Tutorials">tutorials</a>
-      section would be a better place to start.
-    </p>
-<p>
-      The <span class="emphasis"><em>UTF</em></span> has several usage variants. And the first decision
-      you have to make is which one to use. These variants are covered in section
-      dedicated to <span class="bold"><strong>Usage variants</strong></span>. The next step,
-      probably the most important for you, is to start writing test cases, bind them
-      in test suites and implement your checks. First two topics are covered in
-      <a class="link" href="tests_organization.html" title="Registering, generating and organizing the unit tests">tests organization</a> section,
-      while <a class="link" href="testing_tools.html" title="The UTF testing tools">testing tools</a> section
-      arms you with rich set of tools enough to implement almost arbitrary check
-      you need.
-    </p>
-<p>
-      Next you'll learn how to understand and manipulate the <span class="emphasis"><em>UTF</em></span>
-      output in a <a class="link" href="test_output.html" title="Controlling the outputs">test outputs</a> section.
-      At that point you should be able to build and run most simple test modules
-      and almost inevitable find a need to configure how the test module is executed.
-      Whether you want to change output format, select which test case to run or
-      run test cases in random order these and may other runtime configuration parameters
-      are described in <span class="bold"><strong>Runtime configuration</strong></span> section.
-    </p>
-<p>
-      One of the first non trivial things you might want to add to your test module
-      is test fixture. Fixture support is covered in <a class="link" href="tests_organization/fixtures.html" title="Fixtures">fixture</a>
-      section. Usually the default test module initialization will work just fine,
-      but if you want to implement some custom initialization or change how default
-      initialization behaves you need to first look in <span class="bold"><strong>Test
-      module initialization</strong></span> section. Here you'll learn about various options
-      the <span class="emphasis"><em>UTF</em></span> provides for you to customize this behaviour.
-    </p>
-<p>
-      Finally you might want to learn about how the <span class="emphasis"><em>UTF</em></span> implements
-      entry points into the test modules. This is especially important if you intend
-      to implement the <code class="computeroutput"><span class="identifier">main</span></code> function
-      yourself and not use the one provided by the <span class="emphasis"><em>UTF</em></span>. The
-      <span class="bold"><strong>Test runners</strong></span> section covers this subject.
-      Different usage variants employ slightly different approached to implementing
-      test module entry points and presents slightly different interfaces. This section
-      intended for advanced user some of the details of the implementation are described
-      there.
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="intro/portability_concerns.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/intro.html b/doc/v2/html/boost_test/intro.html
old mode 100644
new mode 100755
index 48bb0239..f4e739fb
--- a/doc/v2/html/boost_test/intro.html
+++ b/doc/v2/html/boost_test/intro.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>What is Boost.Test?</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>Introduction</title>
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
 <link rel="prev" href="../index.html" title="Boost.Test">
-<link rel="next" href="intro/objective_and_content.html" title="Objective and content">
+<link rel="next" href="intro/how_to_read_this_documentation.html" title="How to read this documentation?">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,39 +20,101 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="intro/objective_and_content.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="intro/how_to_read_this_documentation.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.intro"></a><a class="link" href="intro.html" title="What is Boost.Test?">What is Boost.Test?</a>
+<a name="boost_test.intro"></a><a class="link" href="intro.html" title="Introduction">Introduction</a>
 </h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="intro/objective_and_content.html">Objective and
-      content</a></span></dt>
-<dt><span class="section"><a href="intro/features_implemented.html">Features implemented</a></span></dt>
-<dt><span class="section"><a href="intro/portability_concerns.html">Portability concerns</a></span></dt>
-</dl></div>
-<div class="blockquote"><blockquote class="blockquote"><p>
-        The acceptance test makes the customer satisfied that the software provides
-        the business value that makes them willing to pay for it. The unit test makes
-        the programmer satisfied that the software does what the programmer thinks
-        it does
-      </p></blockquote></div>
 <p>
-      --Xp Maxim
+      <span class="epigraph">Test everything that could possibly break</span>
+      <span class="epigraph">--XP maxim</span>
+    </p>
+<p>
+      <span class="epigraph">The acceptance test makes the customer satisfied that
+      the software provides the business value that makes them willing to pay for
+      it. The unit test makes the programmer satisfied that the software does what
+      the programmer thinks it does </span> <span class="epigraph">--XP maxim</span>
     </p>
 <p>
       What is the first thing you need to do when you start working on new library/class/program?
       That's right - you need to start with the unit test module (I hope you all
-      gave this answer!). Occasional, simple test may be implemented using <code class="computeroutput"><span class="identifier">assert</span></code>s. But any professional developer soon
-      finds this approach lacking. It becomes clear that it's too time-consuming
-      and tedious for simple, but repetitive unit testing tasks and it's too inflexible
-      for most non-trivial ones.
+      gave this answer!). Occasionally, you may get away with simple test implemented
+      using <code class="computeroutput"><span class="identifier">assert</span></code>s, but any professional
+      developer soon finds this approach lacking. It becomes clear that it's too
+      time-consuming and tedious for simple, but repetitive unit testing tasks and
+      it's too inflexible for most non-trivial ones.
     </p>
 <p>
-      The Boost Test Library Unit Test Framework (further in the documentation referred
-      by the acronym <span class="emphasis"><em>UTF</em></span>) provides both an easy to use and flexible
-      solution to this problem domain: C++ unit test implementation and organization.
+      The Boost.Test library provides both an easy to use and flexible set of interfaces
+      for writing test programs, organizing tests into simple test cases and test
+      suites, and controlling their runtime execution. Some of Boost.Test's interfaces
+      are also useful in production (non-test) environments.
+    </p>
+<h4>
+<a name="boost_test.intro.h0"></a>
+      <span><a name="boost_test.intro.rationale"></a></span><a class="link" href="intro.html#boost_test.intro.rationale">Rationale</a>
+    </h4>
+<p>
+      Unit testing tasks arise during many different stages of software development:
+      from initial project implementation to its maintenance and later revisions.
+      These tasks differ in their complexity and purpose and accordingly are approached
+      differently by different developers. The wide spectrum of tasks in a problem
+      domain cause many requirements (sometimes conflicting) to be placed on a unit
+      testing framework. These include:
+    </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+          Writing a unit test module should be simple and obvious for new users.
+        </li>
+<li class="listitem">
+          The framework should allow advanced users to perform non-trivial tests.
+        </li>
+<li class="listitem">
+          Test module should be able to have many small test cases and developer
+          should be able to group them into test suites.
+        </li>
+<li class="listitem">
+          At the beginning of the development users want to see verbose and descriptive
+          error message, whereas during the regression testing they just want to
+          know if any tests failed.
+        </li>
+<li class="listitem">
+          For a small test modules run time should prevail over compilation time:
+          user don't want to wait a minute to compile a test that takes a second
+          to run.
+        </li>
+<li class="listitem">
+          For long and complex tests users want to be able to see the test progress.
+        </li>
+<li class="listitem">
+          Simplest tests shouldn't require an external library.
+        </li>
+<li class="listitem">
+          For long term usage users of a unit test framework should be able to build
+          it as a standalone library.
+        </li>
+</ul></div>
+<p>
+      The <span class="emphasis"><em>Unit Test Framework</em></span> design is based on above rationale
+      and provides versatile facilities to:
+    </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+          Simplify writing test cases by using various testing tools
+        </li>
+<li class="listitem">
+          Organize test cases into a test tree.
+        </li>
+<li class="listitem">
+          Relieve you from messy error detection, reporting duties and framework
+          runtime parameters processing.
+        </li>
+</ul></div>
+<p>
+      The <span class="emphasis"><em>Unit Test Framework</em></span> is intended to be used both for
+      a simple and non trivial testing. It is not intended to be used with production
+      code, but some of the Boost.Test interfaces can be, incuding ... .
     </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
@@ -66,7 +128,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="intro/objective_and_content.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="intro/how_to_read_this_documentation.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/intro/features_implemented.html b/doc/v2/html/boost_test/intro/features_implemented.html
deleted file mode 100644
index 7bac5f65..00000000
--- a/doc/v2/html/boost_test/intro/features_implemented.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Features implemented</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../intro.html" title="What is Boost.Test?">
-<link rel="prev" href="objective_and_content.html" title="Objective and content">
-<link rel="next" href="portability_concerns.html" title="Portability concerns">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="objective_and_content.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intro.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="portability_concerns.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.intro.features_implemented"></a><a class="link" href="features_implemented.html" title="Features implemented">Features implemented</a>
-</h3></div></div></div>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          the elements in bold below should be linked to the appropriate places once
-          the doc ported
-        </p></td></tr>
-</table></div>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> keeps track of all passed/failed testing tools
-        <span class="bold"><strong>assertions</strong></span>, provides an ability to check
-        the <span class="bold"><strong>test progress</strong></span> and generates a <span class="bold"><strong>result report</strong></span> in several different formats. The <span class="emphasis"><em>UTF</em></span>
-        supplies command line test runners that initialize the framework and run
-        the requested tests.
-      </p>
-<p>
-        Depending on the selected <span class="bold"><strong>compilation flags</strong></span>
-        the function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code>
-        default implementation, that invoke the supplied test runner, can be generated
-        automatically as well.
-      </p>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> is intended to be used both for a simple and
-        non trivial testing. It is not intended to be used with production code.
-        In this case the <span class="bold"><strong>Program Execution Monitor</strong></span>
-        is more suitable.
-      </p>
-<p>
-        Given the largely differing requirements of new and advanced users, it is
-        clear that the <span class="emphasis"><em>UTF</em></span> must provide both simple, easy-to-use
-        interfaces with limited customization options and advanced interfaces, which
-        allow unit testing to be fully customized. Accordingly the material provided
-        in this documentation is split into two sections:
-      </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-            <span class="bold"><strong>The User's Guide</strong></span> covers all functionality
-            that doesn't require knowledge of the <span class="emphasis"><em>UTF</em></span> internals
-          </li>
-<li class="listitem">
-            <span class="bold"><strong>The Advanced User's Guide</strong></span> covers all
-            implementation details required for a user to understand the advanced
-            customization options available in the <span class="emphasis"><em>UTF</em></span>, and
-            for a user interested in extending the testing framework.
-          </li>
-</ol></div>
-<p>
-        For those interested in getting started quickly please visit <span class="bold"><strong>collection
-        of examples</strong></span> presented in this documentation.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="objective_and_content.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intro.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="portability_concerns.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/intro/objective_and_content.html b/doc/v2/html/boost_test/intro/objective_and_content.html
deleted file mode 100644
index fbeeae6c..00000000
--- a/doc/v2/html/boost_test/intro/objective_and_content.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Objective and content</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../intro.html" title="What is Boost.Test?">
-<link rel="prev" href="../intro.html" title="What is Boost.Test?">
-<link rel="next" href="features_implemented.html" title="Features implemented">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../intro.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intro.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="features_implemented.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.intro.objective_and_content"></a><a class="link" href="objective_and_content.html" title="Objective and content">Objective and
-      content</a>
-</h3></div></div></div>
-<p>
-        Unit testing tasks arise during many different stages of software development:
-        from initial project implementation to its maintenance and later revisions.
-        These tasks differ in their complexity and purpose and accordingly are approached
-        differently by different developers. The wide spectrum of tasks in a problem
-        domain cause many requirements (sometimes conflicting) to be placed on a
-        unit testing framework. These include:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            Writing a unit test module should be simple and obvious for new users.
-          </li>
-<li class="listitem">
-            The framework should allow advanced users to perform non-trivial tests.
-          </li>
-<li class="listitem">
-            Test module should be able to have many small test cases and developer
-            should be able to group them into test suites.
-          </li>
-<li class="listitem">
-            At the beginning of the development users want to see verbose and descriptive
-            error message, whereas during the regression testing they just want to
-            know if any tests failed.
-          </li>
-<li class="listitem">
-            For a small test modules run time should prevail over compilation time:
-            user don't want to wait a minute to compile a test that takes a second
-            to run.
-          </li>
-<li class="listitem">
-            For long and complex tests users want to be able to see the test progress.
-          </li>
-<li class="listitem">
-            Simplest tests shouldn't require an external library.
-          </li>
-<li class="listitem">
-            For long term usage users of a unit test framework should be able to
-            build it as a standalone library.
-          </li>
-</ul></div>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> design is based on above rationale and provides
-        versatile facilities to:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            Simplify writing test cases by using various testing tools
-          </li>
-<li class="listitem">
-            Organize test cases into a test tree.
-          </li>
-<li class="listitem">
-            Relieve you from messy error detection, reporting duties and framework
-            runtime parameters processing.
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../intro.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intro.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="features_implemented.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/intro/portability_concerns.html b/doc/v2/html/boost_test/intro/portability_concerns.html
deleted file mode 100644
index 43e8614f..00000000
--- a/doc/v2/html/boost_test/intro/portability_concerns.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Portability concerns</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../intro.html" title="What is Boost.Test?">
-<link rel="prev" href="features_implemented.html" title="Features implemented">
-<link rel="next" href="../how_to_read_this_documentation.html" title="How to read this documentation?">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="features_implemented.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intro.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../how_to_read_this_documentation.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.intro.portability_concerns"></a><a class="link" href="portability_concerns.html" title="Portability concerns">Portability concerns</a>
-</h3></div></div></div>
-<p>
-        Because the Boost Test Library is critical for porting and testing Boost
-        libraries, it has been written to be conservative in its use of C++ features,
-        and to keep dependencies to a bare minimum.
-      </p>
-<p>
-        Boost.Test supports all main Boost compilers and platforms. Confirmation
-        of its status on core and additional platforms/compilers can be seen by viewing
-        Boost.Test's own internal regression test results on <a href="http://www.boost.org/development/tests/master/developer/test.html" target="_top">master
-        branch status page</a> or <a href="http://www.boost.org/development/tests/develop/developer/test.html" target="_top">development
-        branch status page</a>
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="features_implemented.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intro.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../how_to_read_this_documentation.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/open_issues.html b/doc/v2/html/boost_test/open_issues.html
old mode 100644
new mode 100755
index fdbe13e5..acf51a96
--- a/doc/v2/html/boost_test/open_issues.html
+++ b/doc/v2/html/boost_test/open_issues.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Open issues</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
 <link rel="prev" href="change_log.html" title="Change log">
@@ -26,7 +26,7 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="boost_test.open_issues"></a><a class="link" href="open_issues.html" title="Open issues">Open issues</a>
 </h2></div></div></div>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
           Finish update for the command line arguments support
         </li>
@@ -45,7 +45,7 @@
 <li class="listitem">
           Projects that could be very interesting, but I may not be able to do it
           by myself:
-          <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; ">
+          <div class="itemizedlist"><ul class="itemizedlist" type="circle">
 <li class="listitem">
                 An add-on for Visual Studio to automate test case/test modules generation
               </li>
diff --git a/doc/v2/html/boost_test/post_build_event.jpg b/doc/v2/html/boost_test/post_build_event.jpg
deleted file mode 100644
index ac9cdf9a..00000000
Binary files a/doc/v2/html/boost_test/post_build_event.jpg and /dev/null differ
diff --git a/doc/v2/html/boost_test/post_build_out.jpg b/doc/v2/html/boost_test/post_build_out.jpg
deleted file mode 100644
index beedf9f6..00000000
Binary files a/doc/v2/html/boost_test/post_build_out.jpg and /dev/null differ
diff --git a/doc/v2/html/boost_test/reference.html b/doc/v2/html/boost_test/reference.html
old mode 100644
new mode 100755
index 95775c1b..a2024f78
--- a/doc/v2/html/boost_test/reference.html
+++ b/doc/v2/html/boost_test/reference.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Reference</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="testing_tool_ref/assertion_boost_is_defined.html" title="BOOST_IS_DEFINED">
-<link rel="next" href="../header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html" title="Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;">
+<link rel="prev" href="the_utf_usage_recommendations/command_line_usage_recommendatio.html" title="Command line usage recommendations">
+<link rel="next" href="../header/boost/test/data/monomorphic/array_hpp.html" title="Header &lt;boost/test/data/monomorphic/array.hpp&gt;">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,47 +20,10 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="testing_tool_ref/assertion_boost_is_defined.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.reference"></a>Reference</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="../header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html">Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/debug_hpp.html">Header &lt;boost/test/debug.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/debug_config_hpp.html">Header &lt;boost/test/debug_config.hpp&gt;</a></span></dt>
-<dt><span class="section"><a href="../header/boost/test/execution_monitor_hpp.html">Header &lt;boost/test/execution_monitor.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/framework_hpp.html">Header &lt;boost/test/framework.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/output/compiler_log_formatter_hpp.html">Header &lt;boost/test/output/compiler_log_formatter.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/output/plain_report_formatter_hpp.html">Header &lt;boost/test/output/plain_report_formatter.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/output/xml_log_formatter_hpp.html">Header &lt;boost/test/output/xml_log_formatter.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/output/xml_report_formatter_hpp.html">Header &lt;boost/test/output/xml_report_formatter.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/parameterized_test_hpp.html">Header &lt;boost/test/parameterized_test.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/progress_monitor_hpp.html">Header &lt;boost/test/progress_monitor.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/results_collector_hpp.html">Header &lt;boost/test/results_collector.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/results_reporter_hpp.html">Header &lt;boost/test/results_reporter.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/tools/assertion_result_hpp.html">Header &lt;boost/test/tools/assertion_result.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/tree/test_unit_hpp.html">Header &lt;boost/test/tree/test_unit.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/unit_test_hpp.html">Header &lt;boost/test/unit_test.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-<dt><span class="section"><a href="../header/boost/test/unit_test_log_formatter_hpp.html">Header &lt;boost/test/unit_test_log_formatter.hpp&gt;</a></span></dt>
-<dd><dl></dl></dd>
-</dl></div>
+<a accesskey="p" href="the_utf_usage_recommendations/command_line_usage_recommendatio.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../header/boost/test/data/monomorphic/array_hpp.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
+<div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="boost_test.reference"></a>Reference</h2></div></div></div></div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
 <td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
@@ -72,7 +35,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="testing_tool_ref/assertion_boost_is_defined.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="the_utf_usage_recommendations/command_line_usage_recommendatio.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../header/boost/test/data/monomorphic/array_hpp.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/run_args.jpg b/doc/v2/html/boost_test/run_args.jpg
deleted file mode 100644
index be0ab288..00000000
Binary files a/doc/v2/html/boost_test/run_args.jpg and /dev/null differ
diff --git a/doc/v2/html/boost_test/runtime_configuration.html b/doc/v2/html/boost_test/runtime_configuration.html
deleted file mode 100644
index 3c37a6ae..00000000
--- a/doc/v2/html/boost_test/runtime_configuration.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Runtime configuration</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="test_output/reference.html" title="Reference">
-<link rel="next" href="runtime_configuration/running_specific_test_units_sele.html" title="Running specific test units selected by their name">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_output/reference.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_configuration/running_specific_test_units_sele.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.runtime_configuration"></a><a name="ref_section_runtime_configuration"></a><a class="link" href="runtime_configuration.html" title="Runtime configuration">Runtime
-    configuration</a>
-</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="runtime_configuration/running_specific_test_units_sele.html">Running
-      specific test units selected by their name</a></span></dt>
-<dt><span class="section"><a href="runtime_configuration/runtime_parameters_summary.html">Runtime
-      parameters summary</a></span></dt>
-</dl></div>
-<p>
-      The <span class="emphasis"><em>UTF</em></span> supports multiple parameters that affect test
-      module execution. To set the parameter's value you can either use a runtime
-      configuration subsystem interface from within the test module initialization
-      function or you can specify the value at runtime during test module invocation.
-    </p>
-<p>
-      The <span class="emphasis"><em>UTF</em></span> provides two ways to set a parameter at runtime:
-      by specifying a command line argument and by setting an environment variable.
-      The command line argument always overrides the corresponding environment variable.
-    </p>
-<p>
-      During test module initialization the <span class="emphasis"><em>UTF</em></span> parses the command
-      line and excludes all parameters that belong to it and their values from the
-      argument list. The rest of command line is forwarded to the test module initialization
-      function supplied by you. The command line argument format expected by the
-      <span class="emphasis"><em>UTF</em></span> is:
-    </p>
-<pre class="programlisting">  --&lt;command_line_argument_name&gt;=&lt;argument_value&gt;
-</pre>
-<p>
-      The command line argument name is case sensitive. It is required to match exactly
-      the name in parameter specification. There should not be any spaces between
-      '=' and either command line argument name or argument value.
-    </p>
-<p>
-      The corresponding environment variable name is also case sensitive and is required
-      to exactly match the name in the parameter specification.
-    </p>
-<p>
-      All information about supported parameters is summarized below in the reference
-      section.
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_output/reference.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_configuration/running_specific_test_units_sele.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_configuration/running_specific_test_units_sele.html b/doc/v2/html/boost_test/runtime_configuration/running_specific_test_units_sele.html
deleted file mode 100644
index 93847695..00000000
--- a/doc/v2/html/boost_test/runtime_configuration/running_specific_test_units_sele.html
+++ /dev/null
@@ -1,336 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Running specific test units selected by their name</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_configuration.html" title="Runtime configuration">
-<link rel="prev" href="../runtime_configuration.html" title="Runtime configuration">
-<link rel="next" href="runtime_parameters_summary.html" title="Runtime parameters summary">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_parameters_summary.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_configuration.running_specific_test_units_sele"></a><a name="ref_runtime_specification_test_to_run"></a><a class="link" href="running_specific_test_units_sele.html" title="Running specific test units selected by their name">Running
-      specific test units selected by their name</a>
-</h3></div></div></div>
-<p>
-        In regular circumstances, test module execution initiates testing of all
-        test units manually or automatically registered in master test suite.
-      </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-            The <span class="emphasis"><em>UTF</em></span> provides an ability to run specific set
-            of test unit as well. It can be single test case, single test suite or
-            some combination of test cases and suites. The tests units to run are
-            selected by the runtime parameter <a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>.
-          </li>
-<li class="listitem">
-            Symbol <code class="computeroutput"><span class="special">,</span></code> is used to create
-            list of test units residing on the same level in test tree
-          </li>
-<li class="listitem">
-            Filter expressions are specified in a form <code class="computeroutput"><span class="identifier">a</span><span class="special">/</span><span class="identifier">b</span><span class="special">/</span><span class="identifier">c</span></code>,
-            where <code class="computeroutput"><span class="identifier">a</span></code>, <code class="computeroutput"><span class="identifier">b</span></code> and <code class="computeroutput"><span class="identifier">c</span></code>
-            are filters for corresponding levels of test tree.
-          </li>
-<li class="listitem">
-            Symbol <code class="computeroutput"><span class="special">*</span></code> can be used at
-            the beginning, at the end and as the level filter itself as an asterisk.
-          </li>
-</ol></div>
-<p>
-        In the following examples, I select tests to run using command line arguments,
-        but the same filter expression can be used as an appropriate environment
-        variable value.
-      </p>
-<p>
-        Let's consider following test module consisting from several test suites
-        and test cases:
-      </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <a class="link" href="../users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">testA</span> <span class="special">)</span> <span class="special">{}</span>
-<a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">testB</span> <span class="special">)</span> <span class="special">{}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">s1</span> <span class="special">)</span>
-  <a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test1</span> <span class="special">)</span> <span class="special">{}</span>
-  <a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">lest2</span> <span class="special">)</span> <span class="special">{}</span>
-<span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
-
-<span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">s2</span> <span class="special">)</span>
-  <a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test1</span> <span class="special">)</span> <span class="special">{}</span>
-  <a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test11</span> <span class="special">){}</span>
-
-  <span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">in</span> <span class="special">)</span>
-    <a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test</span> <span class="special">){}</span>
-  <span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
-<span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
-</pre>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Description
-                </p>
-              </th>
-<th>
-                <p>
-                  Command
-                </p>
-              </th>
-<th>
-                <p>
-                  Example
-                </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  Run single test case by specifying it's name
-                </p>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=&lt;test-case-name&gt;</pre>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=testA
-Running 1 test case...
-Entering test suite "example"
-Entering test case "testA"
-Test case testA doesn't include any assertions
-Leaving test case "testA"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  Run multiple test cases residing within the same test suite by
-                  listing their names in coma separated list
-                </p>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=&lt;test-case-name1&gt;,&lt;test-case-name2&gt;,...</pre>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=testA,testB
-Running 2 test case...
-Entering test suite "example"
-Entering test case "testA"
-Test case testA doesn't include any assertions
-Leaving test case "testA"
-Entering test case "testB"
-Test case testA doesn't include any assertions
-Leaving test case "testB"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  Run all test units within the referred test suites
-                </p>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=&lt;test-suite-name1&gt;,&lt;test-suite-name2&gt;,...</pre>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=s1
-Running 2 test cases...
-Entering test suite "example"
-Entering test suite "s1"
-Entering test case "test1"
-Test case test1 doesn't include any assertions
-Leaving test case "test1"
-Entering test case "lest2"
-Test case lest2 doesn't include any assertions
-Leaving test case "lest2"
-Leaving test suite "s1"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  Run a specific test inside a test tree using <code class="computeroutput"><span class="special">/</span></code>
-                </p>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=&lt;hlevel1&gt;<span class="emphasis"><em>&lt;hlevel2&gt;</em></span>.../&lt;test-case&gt;</pre>
-              </td>
-<td>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=s2/in/test
-Running 1 test case...
-Entering test suite "example"
-Entering test suite "s2"
-Entering test suite "in"
-Entering test case "test"
-Test case test doesn't include any assertions
-Leaving test case "test"
-Leaving test suite "in"
-Leaving test suite "s2"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top">
-<p>
-          Incorrect test case name may lead to no test to be run
-        </p>
-<pre class="programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=testC
-Test setup error: no test cases matching filter
-</pre>
-</td></tr>
-</table></div>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> supports simple regular expression-like <code class="computeroutput"><span class="special">*</span></code> wildcard. Single <code class="computeroutput"><span class="special">*</span></code>
-        match any name of test unit. Accordingly expression <code class="computeroutput"><span class="identifier">s1</span><span class="comment">/*</span></code> is equivalent to the expression <code class="computeroutput"><span class="identifier">s1</span></code> and matches all test units inside test
-        suite <code class="computeroutput"><span class="identifier">s1</span></code>. Similarly expression
-        <code class="computeroutput"><span class="special">*/</span><span class="identifier">test1</span></code>
-        refers to all test units named <code class="computeroutput"><span class="identifier">test1</span></code>
-        that reside in master test suite's direct child suites.
-      </p>
-<pre class="programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=*/test1
-Running 2 test cases...
-Entering test suite "example"
-Entering test suite "s1"
-Entering test case "test1"
-Test case test1 doesn't include any assertions
-Leaving test case "test1"
-Leaving test suite "s1"
-Entering test suite "s2"
-Entering test case "test1"
-Test case test1 doesn't include any assertions
-Leaving test case "test1"
-Leaving test suite "s2"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> allows to match specific prefix in test unit
-        names. For example, expression <code class="computeroutput"><span class="identifier">s2</span><span class="special">/</span><span class="identifier">test</span><span class="special">*</span></code>
-        filters out only test units in test suite <code class="computeroutput"><span class="identifier">s2</span></code>
-        with name that starts with <code class="computeroutput"><span class="identifier">test</span></code>.
-        This avoids running the test suite <code class="computeroutput"><span class="identifier">s2</span><span class="special">/</span><span class="identifier">in</span></code>.
-      </p>
-<pre class="programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=s2/test*
-Running 2 test cases...
-Entering test suite "example"
-Entering test suite "s2"
-Entering test case "test1"
-Test case test1 doesn't include any assertions
-Leaving test case "test1"
-Entering test case "test11"
-Test case test11 doesn't include any assertions
-Leaving test case "test11"
-Leaving test suite "s2"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> allows to match specific suffix in test unit
-        names. For example, expression <code class="computeroutput"><span class="special">*/*</span><span class="number">1</span></code> filters out test units with name that ends
-        with <code class="computeroutput"><span class="number">1</span></code> and reside in master test
-        suite's direct child suites.
-      </p>
-<pre class="programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=*/*1
-Running 2 test cases...
-Entering test suite "example"
-Entering test suite "s2"
-Entering test case "test1"
-Test case test1 doesn't include any assertions
-Leaving test case "test1"
-Entering test case "test11"
-Test case test11 doesn't include any assertions
-Leaving test case "test11"
-Leaving test suite "s2"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          quickbook is escaping things there, FIX IT
-        </p></td></tr>
-</table></div>
-<p>
-        Finally, the <span class="emphasis"><em>UTF</em></span> allows to match specific substring
-        in test unit names.
-      </p>
-<pre class="programlisting">$ example --log_level=test_suite --<a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>=s1/<span class="bold"><strong>est</strong></span>
-Running 2 test cases...
-Entering test suite "example"
-Entering test suite "s1"
-Entering test case "test1"
-Test case test1 doesn't include any assertions
-Leaving test case "test1"
-Entering test case "lest2"
-Test case lest2 doesn't include any assertions
-Leaving test case "lest2"
-Leaving test suite "s1"
-Leaving test suite "example"
-
-*** No errors detected
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_parameters_summary.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_configuration/runtime_parameters_summary.html b/doc/v2/html/boost_test/runtime_configuration/runtime_parameters_summary.html
deleted file mode 100644
index 710f28a1..00000000
--- a/doc/v2/html/boost_test/runtime_configuration/runtime_parameters_summary.html
+++ /dev/null
@@ -1,341 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Runtime parameters summary</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_configuration.html" title="Runtime configuration">
-<link rel="prev" href="running_specific_test_units_sele.html" title="Running specific test units selected by their name">
-<link rel="next" href="../the_unit_test_framework_usage_re.html" title="The unit test framework usage recommendations">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="running_specific_test_units_sele.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_configuration.runtime_parameters_summary"></a><a class="link" href="runtime_parameters_summary.html" title="Runtime parameters summary">Runtime
-      parameters summary</a>
-</h3></div></div></div>
-<p>
-        Each parameter specification includes:
-      </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-            the full parameter name
-          </li>
-<li class="listitem">
-            corresponding environment variable name
-          </li>
-<li class="listitem">
-            command line argument name
-          </li>
-<li class="listitem">
-            acceptable values and
-          </li>
-<li class="listitem">
-            a long description
-          </li>
-</ol></div>
-<p>
-        The default value for the parameter is bold in the acceptable values list.
-        All values are case sensitive and are required to exactly match the parameter
-        specification.
-      </p>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Command
-                </p>
-              </th>
-<th>
-                <p>
-                  Short description
-                </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/auto_start_dbg.html#ref_param_auto_dbg"><code class="computeroutput"><span class="identifier">auto_start_dbg</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Automatically attach debugger in case of system failure.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/show_progress.html#ref_param_show_progress"><code class="computeroutput"><span class="identifier">show_progress</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Makes the framework to print progress information. More details
-                  <a class="link" href="../test_output/test_output_progress.html" title="Progression display">here</a>.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/build_info.html#ref_param_build_info"><code class="computeroutput"><span class="identifier">build_info</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Print build information.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/catch_system_errors.html#ref_param_catch_system"><code class="computeroutput"><span class="identifier">catch_system_error</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Catch system errors.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/break_exec_path.html#ref_param_break_exe_path"><code class="computeroutput"><span class="identifier">break_exec_path</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Break execution path
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/color_output.html#ref_param_color_output"><code class="computeroutput"><span class="identifier">color_output</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Produce colour output
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/log_format.html#ref_param_log_format"><code class="computeroutput"><span class="identifier">log_format</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies the log format
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/log_level.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies the logging level of the <span class="emphasis"><em>UTF</em></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/run_test.html#ref_param_run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies which test units to run.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/output_format.html#ref_param_output_format"><code class="computeroutput"><span class="identifier">output_format</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies the log format and the report format.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/report_format.html#ref_param_report_format"><code class="computeroutput"><span class="identifier">report_format</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies the report format.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/result_code.html#ref_param_result_code"><code class="computeroutput"><span class="identifier">result_code</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Make the framework return a result code indicating an error in
-                  the tests.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/report_level.html#ref_param_report_level"><code class="computeroutput"><span class="identifier">report_level</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  The level of details carried by the <span class="emphasis"><em>UTF</em></span> report.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/random.html#ref_param_random"><code class="computeroutput"><span class="identifier">random</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Runs the tests in random order
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/detect_memory_leaks.html#ref_param_detect_memory_leaks"><code class="computeroutput"><span class="identifier">detect_memory_leaks</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Detects memory leaks.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/use_alt_stack.html#ref_param_use_alt_stack"><code class="computeroutput"><span class="identifier">use_alt_stack</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Uses an alternative stack for running tests (on supported platforms).
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/detect_fp_exceptions.html#ref_param_detect_fp_exceptions"><code class="computeroutput"><span class="identifier">detect_fp_exceptions</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Traps floating point exceptions (on supported platforms).
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/log_sink.html#ref_param_log_sink"><code class="computeroutput"><span class="identifier">log_sink</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies the sink stream for logging.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/report_sink.html#ref_param_report_sink"><code class="computeroutput"><span class="identifier">report_sink</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Specifies the sink stream for tests reports.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <a class="link" href="../runtime_parameters_reference/save_patterm.html#ref_param_save_patterm"><code class="computeroutput"><span class="identifier">save_patterm</span></code></a>
-                </p>
-              </td>
-<td>
-                <p>
-                  Provides parameters for testing output streams.
-                </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          There is a link to the Boost.Test debug API, never heard about
-        </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="running_specific_test_units_sele.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference.html b/doc/v2/html/boost_test/runtime_parameters_reference.html
deleted file mode 100644
index 465928db..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Runtime parameters reference</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="components/section_pem/section_pem_compilation/section_pem_full_include.html" title="Including the PEM directly into your program">
-<link rel="next" href="runtime_parameters_reference/show_progress.html" title="show_progress">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="components/section_pem/section_pem_compilation/section_pem_full_include.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_parameters_reference/show_progress.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.runtime_parameters_reference"></a><a class="link" href="runtime_parameters_reference.html" title="Runtime parameters reference">Runtime parameters
-    reference</a>
-</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="runtime_parameters_reference/show_progress.html"><code class="computeroutput"><span class="identifier">show_progress</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/build_info.html"><code class="computeroutput"><span class="identifier">build_info</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/auto_start_dbg.html"><code class="computeroutput"><span class="identifier">auto_start_dbg</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/catch_system_errors.html"><code class="computeroutput"><span class="identifier">catch_system_errors</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/break_exec_path.html"><code class="computeroutput"><span class="identifier">break_exec_path</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/color_output.html"><code class="computeroutput"><span class="identifier">color_output</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/log_format.html"><code class="computeroutput"><span class="identifier">log_format</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/log_level.html"><code class="computeroutput"><span class="identifier">log_level</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/run_test.html"><code class="computeroutput"><span class="identifier">run_test</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/output_format.html"><code class="computeroutput"><span class="identifier">output_format</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/report_format.html"><code class="computeroutput"><span class="identifier">report_format</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/result_code.html"><code class="computeroutput"><span class="identifier">result_code</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/report_level.html"><code class="computeroutput"><span class="identifier">report_level</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/random.html"><code class="computeroutput"><span class="identifier">random</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/detect_memory_leaks.html"><code class="computeroutput"><span class="identifier">detect_memory_leaks</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/use_alt_stack.html"><code class="computeroutput"><span class="identifier">use_alt_stack</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/detect_fp_exceptions.html"><code class="computeroutput"><span class="identifier">detect_fp_exceptions</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/log_sink.html"><code class="computeroutput"><span class="identifier">log_sink</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/report_sink.html"><code class="computeroutput"><span class="identifier">report_sink</span></code></a></span></dt>
-<dt><span class="section"><a href="runtime_parameters_reference/save_patterm.html"><code class="computeroutput"><span class="identifier">save_patterm</span></code></a></span></dt>
-</dl></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="components/section_pem/section_pem_compilation/section_pem_full_include.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="runtime_parameters_reference/show_progress.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/auto_start_dbg.html b/doc/v2/html/boost_test/runtime_parameters_reference/auto_start_dbg.html
deleted file mode 100644
index 537f23d4..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/auto_start_dbg.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>auto_start_dbg</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="build_info.html" title="build_info">
-<link rel="next" href="catch_system_errors.html" title="catch_system_errors">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="build_info.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="catch_system_errors.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.auto_start_dbg"></a><a name="ref_param_auto_dbg"></a><a class="link" href="auto_start_dbg.html" title="auto_start_dbg"><code class="computeroutput"><span class="identifier">auto_start_dbg</span></code></a>
-</h3></div></div></div>
-<p>
-        Automatically attach debugger in case of system failure.
-      </p>
-<p>
-        Specifies whether Boost.Test should try to attach a debugger in case if fatal
-        system error occurs. If value is <span class="emphasis"><em>yes</em></span> the default debugger
-        configured for the platform is going to be attempted. Alternatively the debugger
-        identified by the argument value of the parameter is used. For more details
-        on advanced debugger support in Boost.Test check the <code class="computeroutput"><a class="link" href="../../header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">section
-        dedicated to Boost.Test debug API</a></code>, in particular the function
-        <code class="computeroutput"><a class="link" href="../../boost/debug/set_debugger.html" title="Function set_debugger">boost::debug::set_debugger</a></code>.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.auto_start_dbg.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.auto_start_dbg.acceptable_values"></a></span><a class="link" href="auto_start_dbg.html#boost_test.runtime_parameters_reference.auto_start_dbg.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>no</strong></span>
-          </li>
-<li class="listitem">
-            yes
-          </li>
-<li class="listitem">
-            <span class="emphasis"><em>debugger identifier</em></span>
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.auto_start_dbg.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.auto_start_dbg.environment_variable"></a></span><a class="link" href="auto_start_dbg.html#boost_test.runtime_parameters_reference.auto_start_dbg.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_AUTO_START_DBG</span>
-</pre>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          There is a link to the Boost.Test debug API, never heard about
-        </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="build_info.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="catch_system_errors.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/break_exec_path.html b/doc/v2/html/boost_test/runtime_parameters_reference/break_exec_path.html
deleted file mode 100644
index c0dd0fec..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/break_exec_path.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>break_exec_path</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="catch_system_errors.html" title="catch_system_errors">
-<link rel="next" href="color_output.html" title="color_output">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="catch_system_errors.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="color_output.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.break_exec_path"></a><a name="ref_param_break_exe_path"></a><a class="link" href="break_exec_path.html" title="break_exec_path"><code class="computeroutput"><span class="identifier">break_exec_path</span></code></a>
-</h3></div></div></div>
-<p>
-        this runtime parameter is used by exception safety tester. By default exception
-        safety tester only reports index of execution path and test case name where
-        failure occurred. Using this parameter you can make the tester to break the
-        execution right before entering this path.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.break_exec_path.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.break_exec_path.acceptable_values"></a></span><a class="link" href="break_exec_path.html#boost_test.runtime_parameters_reference.break_exec_path.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            string consisting of space separate test_name:execution_path_number pairs
-          </li></ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.break_exec_path.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.break_exec_path.environment_variable"></a></span><a class="link" href="break_exec_path.html#boost_test.runtime_parameters_reference.break_exec_path.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_BREAK_EXEC_PATH</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="catch_system_errors.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="color_output.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/build_info.html b/doc/v2/html/boost_test/runtime_parameters_reference/build_info.html
deleted file mode 100644
index be8313fd..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/build_info.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>build_info</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="show_progress.html" title="show_progress">
-<link rel="next" href="auto_start_dbg.html" title="auto_start_dbg">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="show_progress.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="auto_start_dbg.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.build_info"></a><a name="ref_param_build_info"></a><a class="link" href="build_info.html" title="build_info"><code class="computeroutput"><span class="identifier">build_info</span></code></a>
-</h3></div></div></div>
-<p>
-        Print build information that include:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            platform
-          </li>
-<li class="listitem">
-            compiler
-          </li>
-<li class="listitem">
-            STL implementation in use and
-          </li>
-<li class="listitem">
-            boost version
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.build_info.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.build_info.acceptable_values"></a></span><a class="link" href="build_info.html#boost_test.runtime_parameters_reference.build_info.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>no</strong></span> (default)
-          </li>
-<li class="listitem">
-            yes
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.build_info.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.build_info.environment_variable"></a></span><a class="link" href="build_info.html#boost_test.runtime_parameters_reference.build_info.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_BUILD_INFO</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="show_progress.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="auto_start_dbg.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/catch_system_errors.html b/doc/v2/html/boost_test/runtime_parameters_reference/catch_system_errors.html
deleted file mode 100644
index 3bee93fa..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/catch_system_errors.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>catch_system_errors</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="auto_start_dbg.html" title="auto_start_dbg">
-<link rel="next" href="break_exec_path.html" title="break_exec_path">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="auto_start_dbg.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="break_exec_path.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.catch_system_errors"></a><a name="ref_param_catch_system"></a><a class="link" href="catch_system_errors.html" title="catch_system_errors"><code class="computeroutput"><span class="identifier">catch_system_errors</span></code></a>
-</h3></div></div></div>
-<p>
-        Value "no" prohibits the framework from catching asynchronous system
-        events. This could be used for test programs executed within GUI or to get
-        a coredump for stack analysis. See <a class="link" href="../the_unit_test_framework_usage_re.html#ref_usage_recommendations">usage
-        recommendations</a> pages for more details.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.catch_system_errors.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.catch_system_errors.acceptable_values"></a></span><a class="link" href="catch_system_errors.html#boost_test.runtime_parameters_reference.catch_system_errors.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>yes</strong></span> (default)
-          </li>
-<li class="listitem">
-            no
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.catch_system_errors.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.catch_system_errors.environment_variable"></a></span><a class="link" href="catch_system_errors.html#boost_test.runtime_parameters_reference.catch_system_errors.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_CATCH_SYSTEM_ERRORS</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="auto_start_dbg.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="break_exec_path.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/color_output.html b/doc/v2/html/boost_test/runtime_parameters_reference/color_output.html
deleted file mode 100644
index d366503e..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/color_output.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>color_output</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="break_exec_path.html" title="break_exec_path">
-<link rel="next" href="log_format.html" title="log_format">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="break_exec_path.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_format.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.color_output"></a><a name="ref_param_color_output"></a><a class="link" href="color_output.html" title="color_output"><code class="computeroutput"><span class="identifier">color_output</span></code></a>
-</h3></div></div></div>
-<p>
-        The <span class="emphasis"><em>UTF</em></span> is able to produce colour output on systems
-        which supports it. To enable this behaviour set the parameter to <code class="computeroutput"><span class="identifier">yes</span></code>. By default the output produces in
-        not coloured.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.color_output.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.color_output.acceptable_values"></a></span><a class="link" href="color_output.html#boost_test.runtime_parameters_reference.color_output.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>no</strong></span> (default)
-          </li>
-<li class="listitem">
-            yes
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.color_output.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.color_output.environment_variable"></a></span><a class="link" href="color_output.html#boost_test.runtime_parameters_reference.color_output.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_COLOR_OUTPUT</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="break_exec_path.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_format.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/detect_fp_exceptions.html b/doc/v2/html/boost_test/runtime_parameters_reference/detect_fp_exceptions.html
deleted file mode 100644
index c0bd1627..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/detect_fp_exceptions.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>detect_fp_exceptions</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="use_alt_stack.html" title="use_alt_stack">
-<link rel="next" href="log_sink.html" title="log_sink">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="use_alt_stack.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_sink.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.detect_fp_exceptions"></a><a name="ref_param_detect_fp_exceptions"></a><a class="link" href="detect_fp_exceptions.html" title="detect_fp_exceptions"><code class="computeroutput"><span class="identifier">detect_fp_exceptions</span></code></a>
-</h3></div></div></div>
-<p>
-        Traps or not floating point exceptions.
-      </p>
-<p>
-        Dnables/disable hardware traps for the floating point exception (if supported).
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.detect_fp_exceptions.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.detect_fp_exceptions.acceptable_values"></a></span><a class="link" href="detect_fp_exceptions.html#boost_test.runtime_parameters_reference.detect_fp_exceptions.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>no</strong></span> (default)
-          </li>
-<li class="listitem">
-            yes
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.detect_fp_exceptions.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.detect_fp_exceptions.environment_variable"></a></span><a class="link" href="detect_fp_exceptions.html#boost_test.runtime_parameters_reference.detect_fp_exceptions.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_DETECT_FP_EXCEPTIONS</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="use_alt_stack.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_sink.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/detect_memory_leaks.html b/doc/v2/html/boost_test/runtime_parameters_reference/detect_memory_leaks.html
deleted file mode 100644
index 74d9bb91..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/detect_memory_leaks.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>detect_memory_leaks</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="random.html" title="random">
-<link rel="next" href="use_alt_stack.html" title="use_alt_stack">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="random.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="use_alt_stack.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.detect_memory_leaks"></a><a name="ref_param_detect_memory_leaks"></a><a class="link" href="detect_memory_leaks.html" title="detect_memory_leaks"><code class="computeroutput"><span class="identifier">detect_memory_leaks</span></code></a>
-</h3></div></div></div>
-<p>
-        Detect memory leaks.
-      </p>
-<p>
-        Positive value tells the framework to detect the memory leaks (if any). In
-        addition any value greater than 1 is treated as leak allocation number and
-        setups runtime breakpoint. In other words setting this parameter to the positive
-        value N greater than 1 causes the framework to set a breakpoint at Nth memory
-        allocation (don't do that from the command line - only when you are under
-        debugger).
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          If your test program produces memory leaks notifications, they are combined
-          with allocation number values you could use to set a breakpoint.
-        </p></td></tr>
-</table></div>
-<div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../doc/src/images/caution.png"></td>
-<th align="left">Caution</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Currently only applies to MS family of compilers in debug builds.
-        </p></td></tr>
-</table></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.detect_memory_leaks.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.detect_memory_leaks.acceptable_values"></a></span><a class="link" href="detect_memory_leaks.html#boost_test.runtime_parameters_reference.detect_memory_leaks.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            0
-          </li>
-<li class="listitem">
-            <span class="bold"><strong>1</strong></span> (default)
-          </li>
-<li class="listitem">
-            integer value &gt; 1
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.detect_memory_leaks.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.detect_memory_leaks.environment_variable"></a></span><a class="link" href="detect_memory_leaks.html#boost_test.runtime_parameters_reference.detect_memory_leaks.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_DETECT_MEMORY_LEAK</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="random.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="use_alt_stack.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/log_format.html b/doc/v2/html/boost_test/runtime_parameters_reference/log_format.html
deleted file mode 100644
index d61005a4..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/log_format.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>log_format</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="color_output.html" title="color_output">
-<link rel="next" href="log_level.html" title="log_level">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="color_output.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_level.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.log_format"></a><a name="ref_param_log_format"></a><a class="link" href="log_format.html" title="log_format"><code class="computeroutput"><span class="identifier">log_format</span></code></a>
-</h3></div></div></div>
-<p>
-        Allows selecting the <span class="emphasis"><em>UTF</em></span> log format from the list of
-        formats supplied by the framework. To specify custom log format use the
-        <a class="link" href="../test_output/log_compil_time_configuration/custom_log_formatter.html#ref_log_formatter_api">custom log formatting API</a>.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.log_format.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.log_format.acceptable_values"></a></span><a class="link" href="log_format.html#boost_test.runtime_parameters_reference.log_format.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>HRF</strong></span> (default)
-          </li>
-<li class="listitem">
-            XML
-          </li>
-</ul></div>
-<p>
-        <span class="emphasis"><em>HRF</em></span> stands for human readable format, while <span class="emphasis"><em>XML</em></span>
-        is dedicated to automated output processing
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.log_format.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.log_format.environment_variable"></a></span><a class="link" href="log_format.html#boost_test.runtime_parameters_reference.log_format.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_LOG_FORMAT</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="color_output.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_level.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/log_level.html b/doc/v2/html/boost_test/runtime_parameters_reference/log_level.html
deleted file mode 100644
index f92cfb49..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/log_level.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>log_level</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="log_format.html" title="log_format">
-<link rel="next" href="run_test.html" title="run_test">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="run_test.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.log_level"></a><a name="ref_param_log_level"></a><a class="link" href="log_level.html" title="log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a>
-</h3></div></div></div>
-<p>
-        Allows setting the <span class="emphasis"><em>UTF</em></span> <a class="link" href="../test_output/log_compil_time_configuration/log_ct_log_level.html#ref_log_level_explanations">log
-        level</a> in a range from a complete log, when all successful tests are
-        confirmed and all test suite messages are included, to an empty log when
-        nothing is logged a test output stream.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Log levels are accumulating, in other words each log level includes also
-          all the information reported by less restrictive ones.
-        </p></td></tr>
-</table></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.log_level.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.log_level.acceptable_values"></a></span><a class="link" href="log_level.html#boost_test.runtime_parameters_reference.log_level.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="table">
-<a name="boost_test.runtime_parameters_reference.log_level.log_levels"></a><p class="title"><b>Table&#160;42.&#160;Log levels</b></p>
-<div class="table-contents"><table class="table" summary="Log levels">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  value
-                </p>
-              </th>
-<th>
-                <p>
-                  feature
-                </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  all
-                </p>
-              </td>
-<td>
-                <p>
-                  report all log messages including the passed test notification
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  success
-                </p>
-              </td>
-<td>
-                <p>
-                  the same as all
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  test_suite
-                </p>
-              </td>
-<td>
-                <p>
-                  Shows test suite messages
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  message
-                </p>
-              </td>
-<td>
-                <p>
-                  Shows user messages
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  warning
-                </p>
-              </td>
-<td>
-                <p>
-                  Reports warnings issued by user
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <span class="bold"><strong>error</strong></span> (default)
-                </p>
-              </td>
-<td>
-                <p>
-                  Reports all error conditions
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  cpp_exception
-                </p>
-              </td>
-<td>
-                <p>
-                  Reports uncaught C++ exception
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  system_error
-                </p>
-              </td>
-<td>
-                <p>
-                  Reports system originated non-fatal errors. For example, timeout
-                  or floating point exception.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  fatal_error
-                </p>
-              </td>
-<td>
-                <p>
-                  Reports only user or system originated fatal errors. For example,
-                  memory access violation.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  nothing
-                </p>
-              </td>
-<td>
-                <p>
-                  Does not report any information.
-                </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><h5>
-<a name="boost_test.runtime_parameters_reference.log_level.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.log_level.environment_variable"></a></span><a class="link" href="log_level.html#boost_test.runtime_parameters_reference.log_level.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_LOG_LEVEL</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="run_test.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/log_sink.html b/doc/v2/html/boost_test/runtime_parameters_reference/log_sink.html
deleted file mode 100644
index 86b28246..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/log_sink.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>log_sink</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="detect_fp_exceptions.html" title="detect_fp_exceptions">
-<link rel="next" href="report_sink.html" title="report_sink">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="detect_fp_exceptions.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="report_sink.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.log_sink"></a><a name="ref_param_log_sink"></a><a class="link" href="log_sink.html" title="log_sink"><code class="computeroutput"><span class="identifier">log_sink</span></code></a>
-</h3></div></div></div>
-<p>
-        Sets the logging sink to the one specified.
-      </p>
-<p>
-        This parameter allows to easily redirect the test logs. The parameter value
-        is
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            either the string containing either a file name, in which case the <span class="emphasis"><em>UTF</em></span>
-            will redirect log into this file
-          </li>
-<li class="listitem">
-            or <code class="computeroutput"><span class="identifier">stdout</span></code> (the default),
-            in which case log is redirected into standard output stream
-          </li>
-<li class="listitem">
-            or <code class="computeroutput"><span class="identifier">stderr</span></code> , in which
-            case log is redirected into standard error stream.
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.log_sink.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.log_sink.acceptable_values"></a></span><a class="link" href="log_sink.html#boost_test.runtime_parameters_reference.log_sink.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong><code class="computeroutput"><span class="identifier">stdout</span></code></strong></span>
-            (default)
-          </li>
-<li class="listitem">
-            <code class="computeroutput"><span class="identifier">stderr</span></code>
-          </li>
-<li class="listitem">
-            arbitrary file name
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.log_sink.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.log_sink.environment_variable"></a></span><a class="link" href="log_sink.html#boost_test.runtime_parameters_reference.log_sink.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_LOG_SINK</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="detect_fp_exceptions.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="report_sink.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/output_format.html b/doc/v2/html/boost_test/runtime_parameters_reference/output_format.html
deleted file mode 100644
index 40eda5aa..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/output_format.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>output_format</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="run_test.html" title="run_test">
-<link rel="next" href="report_format.html" title="report_format">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="run_test.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="report_format.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.output_format"></a><a name="ref_param_output_format"></a><a class="link" href="output_format.html" title="output_format"><code class="computeroutput"><span class="identifier">output_format</span></code></a>
-</h3></div></div></div>
-<p>
-        Combines an effect of <a class="link" href="report_format.html#ref_param_report_format"><code class="computeroutput"><span class="identifier">report_format</span></code></a> and <a class="link" href="log_format.html#ref_param_log_format"><code class="computeroutput"><span class="identifier">log_format</span></code></a> parameters. Has higher
-        priority than either one of them if specified.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.output_format.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.output_format.acceptable_values"></a></span><a class="link" href="output_format.html#boost_test.runtime_parameters_reference.output_format.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>HRF</strong></span> (default)
-          </li>
-<li class="listitem">
-            XML
-          </li>
-</ul></div>
-<p>
-        <span class="emphasis"><em>HRF</em></span> stands for human readable format, while <span class="emphasis"><em>XML</em></span>
-        is dedicated to automated output processing
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.output_format.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.output_format.environment_variable"></a></span><a class="link" href="output_format.html#boost_test.runtime_parameters_reference.output_format.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_OUTPUT_FORMAT</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="run_test.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="report_format.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/random.html b/doc/v2/html/boost_test/runtime_parameters_reference/random.html
deleted file mode 100644
index 49eb13e0..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/random.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>random</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="report_level.html" title="report_level">
-<link rel="next" href="detect_memory_leaks.html" title="detect_memory_leaks">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="report_level.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="detect_memory_leaks.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.random"></a><a name="ref_param_random"></a><a class="link" href="random.html" title="random"><code class="computeroutput"><span class="identifier">random</span></code></a>
-</h3></div></div></div>
-<p>
-        Runs the tests in random order.
-      </p>
-<p>
-        Positive value makes the framework to run the test cases in random order.
-        Also if this value is greater than 1, it is used as a random seed. In other
-        case random seed is generated based on current time.
-      </p>
-<div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../doc/src/images/caution.png"></td>
-<th align="left">Caution</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          If computed from time, the seed is not outputted to the report
-        </p></td></tr>
-</table></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.random.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.random.acceptable_values"></a></span><a class="link" href="random.html#boost_test.runtime_parameters_reference.random.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>0</strong></span> (default)
-          </li>
-<li class="listitem">
-            1
-          </li>
-<li class="listitem">
-            integer value &gt; 1
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.random.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.random.environment_variable"></a></span><a class="link" href="random.html#boost_test.runtime_parameters_reference.random.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_RANDOM</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="report_level.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="detect_memory_leaks.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/report_format.html b/doc/v2/html/boost_test/runtime_parameters_reference/report_format.html
deleted file mode 100644
index d04e07c7..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/report_format.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>report_format</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="output_format.html" title="output_format">
-<link rel="next" href="result_code.html" title="result_code">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="output_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="result_code.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.report_format"></a><a name="ref_param_report_format"></a><a class="link" href="report_format.html" title="report_format"><code class="computeroutput"><span class="identifier">report_format</span></code></a>
-</h3></div></div></div>
-<p>
-        Allows selecting the <span class="emphasis"><em>UTF</em></span> report format from the list
-        of formats supplied by the framework. To specify a custom report format use
-        unit_test_report API.
-      </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Provide something concrete to the user
-        </p></td></tr>
-</table></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.report_format.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.report_format.acceptable_values"></a></span><a class="link" href="report_format.html#boost_test.runtime_parameters_reference.report_format.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>HRF</strong></span> (default)
-          </li>
-<li class="listitem">
-            XML
-          </li>
-</ul></div>
-<p>
-        <span class="emphasis"><em>HRF</em></span> stands for human readable format, while <span class="emphasis"><em>XML</em></span>
-        is dedicated to automated output processing
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.report_format.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.report_format.environment_variable"></a></span><a class="link" href="report_format.html#boost_test.runtime_parameters_reference.report_format.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_REPORT_FORMAT</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="output_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="result_code.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/report_level.html b/doc/v2/html/boost_test/runtime_parameters_reference/report_level.html
deleted file mode 100644
index 962c53eb..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/report_level.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>report_level</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="result_code.html" title="result_code">
-<link rel="next" href="random.html" title="random">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="result_code.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="random.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.report_level"></a><a name="ref_param_report_level"></a><a class="link" href="report_level.html" title="report_level"><code class="computeroutput"><span class="identifier">report_level</span></code></a>
-</h3></div></div></div>
-<p>
-        Allows setting the level of details carried by the testing results report
-        generated by the framework. Use value "no" to eliminate the results
-        report completely. See the <a class="link" href="../test_output/test_reports.html#ref_tests_report">test report</a>
-        section for description of different report formats.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.report_level.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.report_level.acceptable_values"></a></span><a class="link" href="report_level.html#boost_test.runtime_parameters_reference.report_level.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>confirm</strong></span> (default)
-          </li>
-<li class="listitem">
-            no
-          </li>
-<li class="listitem">
-            short
-          </li>
-<li class="listitem">
-            detailed
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.report_level.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.report_level.environment_variable"></a></span><a class="link" href="report_level.html#boost_test.runtime_parameters_reference.report_level.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_REPORT_LEVEL</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="result_code.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="random.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/report_sink.html b/doc/v2/html/boost_test/runtime_parameters_reference/report_sink.html
deleted file mode 100644
index b753fd61..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/report_sink.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>report_sink</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="log_sink.html" title="log_sink">
-<link rel="next" href="save_patterm.html" title="save_patterm">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_sink.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="save_patterm.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.report_sink"></a><a name="ref_param_report_sink"></a><a class="link" href="report_sink.html" title="report_sink"><code class="computeroutput"><span class="identifier">report_sink</span></code></a>
-</h3></div></div></div>
-<p>
-        Sets the report sink to the one specified.
-      </p>
-<p>
-        This parameter allows to easily redirect the test result report. See <a class="link" href="log_sink.html#ref_param_log_sink"><code class="computeroutput"><span class="identifier">log_sink</span></code></a>
-        for more details.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.report_sink.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.report_sink.acceptable_values"></a></span><a class="link" href="report_sink.html#boost_test.runtime_parameters_reference.report_sink.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong><code class="computeroutput"><span class="identifier">stderr</span></code></strong></span>
-            (default)
-          </li>
-<li class="listitem">
-            <code class="computeroutput"><span class="identifier">stdout</span></code>
-          </li>
-<li class="listitem">
-            arbitrary file name
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.report_sink.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.report_sink.environment_variable"></a></span><a class="link" href="report_sink.html#boost_test.runtime_parameters_reference.report_sink.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_REPORT_SINK</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_sink.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="save_patterm.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/result_code.html b/doc/v2/html/boost_test/runtime_parameters_reference/result_code.html
deleted file mode 100644
index 88db903f..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/result_code.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>result_code</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="report_format.html" title="report_format">
-<link rel="next" href="report_level.html" title="report_level">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="report_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="report_level.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.result_code"></a><a name="ref_param_result_code"></a><a class="link" href="result_code.html" title="result_code"><code class="computeroutput"><span class="identifier">result_code</span></code></a>
-</h3></div></div></div>
-<p>
-        Value "no" enforces the framework to always return zero result
-        code. This could be used for test programs executed within GUI. See the
-        <a class="link" href="../the_unit_test_framework_usage_re.html#ref_usage_recommendations">usage recommendations</a> section
-        for more details.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.result_code.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.result_code.acceptable_values"></a></span><a class="link" href="result_code.html#boost_test.runtime_parameters_reference.result_code.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>yes</strong></span> (default)
-          </li>
-<li class="listitem">
-            no
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.result_code.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.result_code.environment_variable"></a></span><a class="link" href="result_code.html#boost_test.runtime_parameters_reference.result_code.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_RESULT_CODE</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="report_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="report_level.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/run_test.html b/doc/v2/html/boost_test/runtime_parameters_reference/run_test.html
deleted file mode 100644
index ad78b9c6..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/run_test.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>run_test</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="log_level.html" title="log_level">
-<link rel="next" href="output_format.html" title="output_format">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_level.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="output_format.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.run_test"></a><a name="ref_param_run_test"></a><a class="link" href="run_test.html" title="run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a>
-</h3></div></div></div>
-<p>
-        Specifies the tests to run.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.run_test.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.run_test.acceptable_values"></a></span><a class="link" href="run_test.html#boost_test.runtime_parameters_reference.run_test.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<p>
-        See the related <a class="link" href="../runtime_configuration/running_specific_test_units_sele.html#ref_runtime_specification_test_to_run">documentation</a>
-        for the format of the acceptable values.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.run_test.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.run_test.environment_variable"></a></span><a class="link" href="run_test.html#boost_test.runtime_parameters_reference.run_test.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TESTS_TO_RUN</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_level.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="output_format.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/save_patterm.html b/doc/v2/html/boost_test/runtime_parameters_reference/save_patterm.html
deleted file mode 100644
index 4553f7c6..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/save_patterm.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>save_patterm</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="report_sink.html" title="report_sink">
-<link rel="next" href="../testing_tool_ref.html" title="UTF testing tools reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="report_sink.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.save_patterm"></a><a name="ref_param_save_patterm"></a><a class="link" href="save_patterm.html" title="save_patterm"><code class="computeroutput"><span class="identifier">save_patterm</span></code></a>
-</h3></div></div></div>
-<p>
-        Provides parameters for testing output streams. See this <a class="link" href="../testing_tools/output_stream_testing.html" title="Output streams testing tool">section</a>
-        for details on these tests.
-      </p>
-<p>
-        This parameter serves no particular purpose within the framework itself.
-        It can be used by test modules relying on <code class="computeroutput"><span class="identifier">output_test_stream</span></code>
-        to implement testing logic. <code class="computeroutput"><span class="identifier">output_test_stream</span></code>
-        has two modes of operation:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            save the pattern file
-          </li>
-<li class="listitem">
-            and match against stored pattern.
-          </li>
-</ul></div>
-<p>
-        You can use this parameter to switch between these modes, by passing the
-        parameter value to the <code class="computeroutput"><span class="identifier">output_test_stream</span></code>
-        constructor.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.save_patterm.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.save_patterm.acceptable_values"></a></span><a class="link" href="save_patterm.html#boost_test.runtime_parameters_reference.save_patterm.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>no</strong></span> (default)
-          </li>
-<li class="listitem">
-            yes
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.save_patterm.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.save_patterm.environment_variable"></a></span><a class="link" href="save_patterm.html#boost_test.runtime_parameters_reference.save_patterm.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_SAVE_PATTERN</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="report_sink.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/show_progress.html b/doc/v2/html/boost_test/runtime_parameters_reference/show_progress.html
deleted file mode 100644
index c47a252c..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/show_progress.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>show_progress</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="next" href="build_info.html" title="build_info">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="build_info.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.show_progress"></a><a name="ref_param_show_progress"></a><a class="link" href="show_progress.html" title="show_progress"><code class="computeroutput"><span class="identifier">show_progress</span></code></a>
-</h3></div></div></div>
-<p>
-        Makes the framework to print progress information. More details <a class="link" href="../test_output/test_output_progress.html" title="Progression display">here</a>.
-      </p>
-<h5>
-<a name="boost_test.runtime_parameters_reference.show_progress.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.show_progress.acceptable_values"></a></span><a class="link" href="show_progress.html#boost_test.runtime_parameters_reference.show_progress.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>no</strong></span> (default)
-          </li>
-<li class="listitem">
-            yes
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.show_progress.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.show_progress.environment_variable"></a></span><a class="link" href="show_progress.html#boost_test.runtime_parameters_reference.show_progress.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_SHOW_PROGRESS</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="build_info.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/runtime_parameters_reference/use_alt_stack.html b/doc/v2/html/boost_test/runtime_parameters_reference/use_alt_stack.html
deleted file mode 100644
index ac20e425..00000000
--- a/doc/v2/html/boost_test/runtime_parameters_reference/use_alt_stack.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>use_alt_stack</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../runtime_parameters_reference.html" title="Runtime parameters reference">
-<link rel="prev" href="detect_memory_leaks.html" title="detect_memory_leaks">
-<link rel="next" href="detect_fp_exceptions.html" title="detect_fp_exceptions">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="detect_memory_leaks.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="detect_fp_exceptions.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.runtime_parameters_reference.use_alt_stack"></a><a name="ref_param_use_alt_stack"></a><a class="link" href="use_alt_stack.html" title="use_alt_stack"><code class="computeroutput"><span class="identifier">use_alt_stack</span></code></a>
-</h3></div></div></div>
-<p>
-        Uses an alternative stack.
-      </p>
-<p>
-        Specifies whether or not the execution monitor should employ an alternative
-        stack for signals processing, on platforms where they are supported.
-      </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          indicate which platforms are supported
-        </p></td></tr>
-</table></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          add a link to the execution monitor
-        </p></td></tr>
-</table></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.use_alt_stack.h0"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.use_alt_stack.acceptable_values"></a></span><a class="link" href="use_alt_stack.html#boost_test.runtime_parameters_reference.use_alt_stack.acceptable_values">Acceptable
-        values</a>
-      </h5>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <span class="bold"><strong>yes</strong></span> (default)
-          </li>
-<li class="listitem">
-            no
-          </li>
-</ul></div>
-<h5>
-<a name="boost_test.runtime_parameters_reference.use_alt_stack.h1"></a>
-        <span class="phrase"><a name="boost_test.runtime_parameters_reference.use_alt_stack.environment_variable"></a></span><a class="link" href="use_alt_stack.html#boost_test.runtime_parameters_reference.use_alt_stack.environment_variable">Environment
-        variable</a>
-      </h5>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_USE_ALT_STACK</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="detect_memory_leaks.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../runtime_parameters_reference.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="detect_fp_exceptions.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/section_faq.html b/doc/v2/html/boost_test/section_faq.html
old mode 100644
new mode 100755
index 22cf373f..ce47c8e3
--- a/doc/v2/html/boost_test/section_faq.html
+++ b/doc/v2/html/boost_test/section_faq.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Frequently Asked Questions</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="the_unit_test_framework_usage_re/command_line_usage_recommendatio.html" title="Command line usage recommendations">
+<link rel="prev" href="tutorials/bt_and_tdd.html" title="Boost.Test driven development">
 <link rel="next" href="section_glossary.html" title="Glossary">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="the_unit_test_framework_usage_re/command_line_usage_recommendatio.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_glossary.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="tutorials/bt_and_tdd.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_glossary.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -28,7 +28,7 @@
 </h2></div></div></div>
 <h4>
 <a name="boost_test.section_faq.h0"></a>
-      <span class="phrase"><a name="boost_test.section_faq.where_the_latest_version_of_the_"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.where_the_latest_version_of_the_">Where the
+      <span><a name="boost_test.section_faq.where_the_latest_version_of_the_"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.where_the_latest_version_of_the_">Where the
       latest version of the Boost Test Library is located?</a>
     </h4>
 <p>
@@ -36,7 +36,7 @@
     </p>
 <h4>
 <a name="boost_test.section_faq.h1"></a>
-      <span class="phrase"><a name="boost_test.section_faq.i_found_a_bug_where_can_i_report"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.i_found_a_bug_where_can_i_report">I found a
+      <span><a name="boost_test.section_faq.i_found_a_bug_where_can_i_report"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.i_found_a_bug_where_can_i_report">I found a
       bug. Where can I report it?</a>
     </h4>
 <p>
@@ -45,7 +45,7 @@
     </p>
 <h4>
 <a name="boost_test.section_faq.h2"></a>
-      <span class="phrase"><a name="boost_test.section_faq.i_have_a_request_for_a_new_featu"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.i_have_a_request_for_a_new_featu">I have a
+      <span><a name="boost_test.section_faq.i_have_a_request_for_a_new_featu"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.i_have_a_request_for_a_new_featu">I have a
       request for a new feature. Where can I ask for it?</a>
     </h4>
 <p>
@@ -54,20 +54,20 @@
     </p>
 <h4>
 <a name="boost_test.section_faq.h3"></a>
-      <span class="phrase"><a name="boost_test.section_faq.how_to_create_test_case_using_th"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.how_to_create_test_case_using_th">How to create
+      <span><a name="boost_test.section_faq.how_to_create_test_case_using_th"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.how_to_create_test_case_using_th">How to create
       test case using the Unit Test Framework?</a>
     </h4>
 <p>
       To create a test case, use the macro
     </p>
-<pre class="programlisting"><a class="link" href="tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_function</span> <span class="special">);</span>
+<pre class="programlisting"><a class="link" href="tests_organization/test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_function</span> <span class="special">);</span>
 </pre>
 <p>
-      For more details see the Unit Test Framework <a class="link" href="tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a> documentation.
+      For more details see the Unit Test Framework <a class="link" href="tests_organization/test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a> documentation.
     </p>
 <h4>
 <a name="boost_test.section_faq.h4"></a>
-      <span class="phrase"><a name="boost_test.section_faq.how_to_create_test_suite_using_t"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.how_to_create_test_suite_using_t">How to create
+      <span><a name="boost_test.section_faq.how_to_create_test_suite_using_t"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.how_to_create_test_suite_using_t">How to create
       test suite using the Unit Test Framework?</a>
     </h4>
 <p>
@@ -80,7 +80,7 @@
     </p>
 <h4>
 <a name="boost_test.section_faq.h5"></a>
-      <span class="phrase"><a name="boost_test.section_faq.why_did_i_get_a_linker_error_whe"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.why_did_i_get_a_linker_error_whe">Why did I
+      <span><a name="boost_test.section_faq.why_did_i_get_a_linker_error_whe"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.why_did_i_get_a_linker_error_whe">Why did I
       get a linker error when compiling my test program?</a>
     </h4>
 <p>
@@ -114,7 +114,7 @@
     </p>
 <h4>
 <a name="boost_test.section_faq.h6"></a>
-      <span class="phrase"><a name="boost_test.section_faq.how_can_i_redirect_testing_outpu"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.how_can_i_redirect_testing_outpu">How can I
+      <span><a name="boost_test.section_faq.how_can_i_redirect_testing_outpu"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.how_can_i_redirect_testing_outpu">How can I
       redirect testing output?</a>
     </h4>
 <p>
@@ -122,22 +122,24 @@
     </p>
 <pre class="programlisting"><span class="identifier">unit_test_log</span><span class="special">::</span><span class="identifier">instance</span><span class="special">().</span><span class="identifier">set_log_output</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> <span class="special">)</span></pre>
 <p>
-      For more details see the <span class="emphasis"><em>UTF</em></span> <a class="link" href="testing_tools/output_stream_testing.html" title="Output streams testing tool">output
+      For more details see the <span class="emphasis"><em>Unit Test Framework</em></span> <a class="link" href="testing_tools/output_stream_testing.html" title="Output streams testing tool">output
       streams</a> testing tools documentation.
     </p>
 <h4>
 <a name="boost_test.section_faq.h7"></a>
-      <span class="phrase"><a name="boost_test.section_faq.i_want_different_default_log_tra"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.i_want_different_default_log_tra">I want different
+      <span><a name="boost_test.section_faq.i_want_different_default_log_tra"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.i_want_different_default_log_tra">I want different
       default log trace level</a>
     </h4>
 <p>
-      Use environment variable <a class="link" href="runtime_parameters_reference/log_level.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">BOOST_TEST_LOG_LEVEL</span></code></a> to define desired
+      Use environment variable <a class="link" href="the_utf_runtime_parameters/reference.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">BOOST_TEST_LOG_LEVEL</span></code></a> to define desired
       log trace level. You still will be able to reset this value from the command
-      line. For the list of acceptable values see the <span class="emphasis"><em>UTF</em></span> <a class="link" href="runtime_configuration.html#ref_section_runtime_configuration">runtime configuration</a> documentation.
+      line. For the list of acceptable values see the <span class="emphasis"><em>Unit Test Framework</em></span>
+      <a class="link" href="the_utf_runtime_parameters.html#ref_section_runtime_configuration">runtime configuration</a>
+      documentation.
     </p>
 <h4>
 <a name="boost_test.section_faq.h8"></a>
-      <span class="phrase"><a name="boost_test.section_faq.is_there_dll_version_of_boost_te"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.is_there_dll_version_of_boost_te">Is there
+      <span><a name="boost_test.section_faq.is_there_dll_version_of_boost_te"></a></span><a class="link" href="section_faq.html#boost_test.section_faq.is_there_dll_version_of_boost_te">Is there
       DLL version of Boost.Test components available on Win32 platform?</a>
     </h4>
 <p>
@@ -155,7 +157,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="the_unit_test_framework_usage_re/command_line_usage_recommendatio.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_glossary.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="tutorials/bt_and_tdd.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="section_glossary.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/section_glossary.html b/doc/v2/html/boost_test/section_glossary.html
old mode 100644
new mode 100755
index 0a9188a1..847767cc
--- a/doc/v2/html/boost_test/section_glossary.html
+++ b/doc/v2/html/boost_test/section_glossary.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Glossary</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
 <link rel="prev" href="section_faq.html" title="Frequently Asked Questions">
@@ -31,7 +31,7 @@
     </p>
 <a name="ref_test_module"></a><h4>
 <a name="boost_test.section_glossary.h0"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_module"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_module">Test
+      <span><a name="boost_test.section_glossary.test_module"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_module">Test
       module</a>
     </h4>
 <p>
@@ -63,7 +63,7 @@
     </p>
 <a name="test_body"></a><h4>
 <a name="boost_test.section_glossary.h1"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_body"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_body">Test
+      <span><a name="boost_test.section_glossary.test_body"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_body">Test
       body</a>
     </h4>
 <p>
@@ -74,7 +74,7 @@
     </p>
 <a name="test_tree"></a><h4>
 <a name="boost_test.section_glossary.h2"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_tree"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_tree">Test
+      <span><a name="boost_test.section_glossary.test_tree"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_tree">Test
       tree</a>
     </h4>
 <p>
@@ -83,7 +83,7 @@
     </p>
 <a name="test_unit"></a><h4>
 <a name="boost_test.section_glossary.h3"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_unit"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_unit">Test
+      <span><a name="boost_test.section_glossary.test_unit"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_unit">Test
       unit</a>
     </h4>
 <p>
@@ -92,7 +92,7 @@
     </p>
 <a name="test_assertion"></a><h4>
 <a name="boost_test.section_glossary.h4"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_assertion"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_assertion">Test
+      <span><a name="boost_test.section_glossary.test_assertion"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_assertion">Test
       assertion</a>
     </h4>
 <p>
@@ -104,11 +104,11 @@
       should consist of. Two polar positions are the one advocated by TDD followers
       - one assertion per test case; and opposite of this - all test assertions within
       single test case - advocated by those only interested in the first error in
-      a test module. The <span class="emphasis"><em>UTF</em></span> supports both approaches.
+      a test module. The <span class="emphasis"><em>Unit Test Framework</em></span> supports both approaches.
     </p>
 <a name="test_case"></a><h4>
 <a name="boost_test.section_glossary.h5"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_case"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_case">Test
+      <span><a name="boost_test.section_glossary.test_case"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_case">Test
       case</a>
     </h4>
 <p>
@@ -117,14 +117,14 @@
       in the definition above is used to emphasize the fact, that all test cases
       are monitored independently. An uncaught exception or other normal test case
       execution termination doesn't cause the testing to cease. Instead the error
-      is caught by the test case execution monitor, reported by the <span class="emphasis"><em>UTF</em></span>
-      and testing proceeds to the next test case. Later on you are going to see that
-      this is on of the primary reasons to prefer multiple small test cases to a
-      single big test function.
+      is caught by the test case execution monitor, reported by the <span class="emphasis"><em>Unit
+      Test Framework</em></span> and testing proceeds to the next test case. Later
+      on you are going to see that this is on of the primary reasons to prefer multiple
+      small test cases to a single big test function.
     </p>
 <a name="test_suite"></a><h4>
 <a name="boost_test.section_glossary.h6"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_suite"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_suite">Test
+      <span><a name="boost_test.section_glossary.test_suite"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_suite">Test
       suite</a>
     </h4>
 <p>
@@ -132,7 +132,7 @@
       ability to group test cases into a single referable entity. There are various
       reasons why you may opt to do so, including:
     </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
           To group test cases per subsystems of the unit being tested.
         </li>
@@ -152,14 +152,14 @@
 </ul></div>
 <p>
       A test suite can also contain other test suites, thus allowing a hierarchical
-      test tree structure to be formed. The <span class="emphasis"><em>UTF</em></span> requires the
-      test tree to contain at least one test suite with at least one test case. The
-      top level test suite - root node of the test tree - is called the master test
-      suite.
+      test tree structure to be formed. The <span class="emphasis"><em>Unit Test Framework</em></span>
+      requires the test tree to contain at least one test suite with at least one
+      test case. The top level test suite - root node of the test tree - is called
+      the master test suite.
     </p>
 <a name="test_setup"></a><h4>
 <a name="boost_test.section_glossary.h7"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_setup"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_setup">Test
+      <span><a name="boost_test.section_glossary.test_setup"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_setup">Test
       setup</a>
     </h4>
 <p>
@@ -167,9 +167,9 @@
       It includes the following operations that take place prior to a start of the
       test:
     </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
-          The <span class="emphasis"><em>UTF</em></span> initialization
+          The <span class="emphasis"><em>Unit Test Framework</em></span> initialization
         </li>
 <li class="listitem">
           Test tree construction
@@ -185,7 +185,7 @@
 </ul></div>
 <a name="test_cleanup"></a><h4>
 <a name="boost_test.section_glossary.h8"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_cleanup"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_cleanup">Test
+      <span><a name="boost_test.section_glossary.test_cleanup"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_cleanup">Test
       cleanup</a>
     </h4>
 <p>
@@ -193,7 +193,7 @@
     </p>
 <a name="test_fixture"></a><h4>
 <a name="boost_test.section_glossary.h9"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_fixture"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_fixture">Test
+      <span><a name="boost_test.section_glossary.test_fixture"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_fixture">Test
       fixture</a>
     </h4>
 <p>
@@ -202,20 +202,21 @@
     </p>
 <a name="test_runner"></a><h4>
 <a name="boost_test.section_glossary.h10"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_runner"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_runner">Test
+      <span><a name="boost_test.section_glossary.test_runner"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_runner">Test
       runner</a>
     </h4>
 <p>
       This is an <span class="emphasis"><em>executive manager</em></span> that runs the show. The test
       runner's functionality should include the following interfaces and operations:
     </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
           Entry point to a test module. This is usually either the function <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code>
           itself or single function that can be invoked from it to start testing.
         </li>
 <li class="listitem">
-          Initialize the <span class="emphasis"><em>UTF</em></span> based on runtime parameters
+          Initialize the <span class="emphasis"><em>Unit Test Framework</em></span> based on runtime
+          parameters
         </li>
 <li class="listitem">
           Select an output media for the test log and the test results report
@@ -239,7 +240,7 @@
     </p>
 <a name="test_log"></a><h4>
 <a name="boost_test.section_glossary.h11"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_log"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_log">Test
+      <span><a name="boost_test.section_glossary.test_log"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_log">Test
       log</a>
     </h4>
 <p>
@@ -247,13 +248,13 @@
     </p>
 <a name="test_report"></a><h4>
 <a name="boost_test.section_glossary.h12"></a>
-      <span class="phrase"><a name="boost_test.section_glossary.test_report"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_report">Test
+      <span><a name="boost_test.section_glossary.test_report"></a></span><a class="link" href="section_glossary.html#boost_test.section_glossary.test_report">Test
       report</a>
     </h4>
 <p>
-      This is the report produced by the <span class="emphasis"><em>UTF</em></span> after the testing
-      is completed, that indicates which test cases/test suites passed and which
-      failed.
+      This is the report produced by the <span class="emphasis"><em>Unit Test Framework</em></span>
+      after the testing is completed, that indicates which test cases/test suites
+      passed and which failed.
     </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
diff --git a/doc/v2/html/boost_test/test_output.html b/doc/v2/html/boost_test/test_output.html
old mode 100644
new mode 100755
index 93864721..265bb2f1
--- a/doc/v2/html/boost_test/test_output.html
+++ b/doc/v2/html/boost_test/test_output.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Controlling the outputs</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>Controlling the Unit Test Framework outputs</title>
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="testing_tools/testing_floating_points.html" title="Floating-point testing">
+<link rel="prev" href="testing_tools/testing_tool_ref.html" title="Reference">
 <link rel="next" href="test_output/test_log_output.html" title="Test log output">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,63 +20,31 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="testing_tools/testing_floating_points.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output/test_log_output.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="testing_tools/testing_tool_ref.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output/test_log_output.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.test_output"></a><a name="ref_test_outputs"></a><a class="link" href="test_output.html" title="Controlling the outputs">Controlling
-    the outputs</a>
+<a name="boost_test.test_output"></a><a name="ref_test_outputs"></a><a class="link" href="test_output.html" title="Controlling the Unit Test Framework outputs">Controlling
+    the <span class="emphasis"><em>Unit Test Framework</em></span> outputs</a>
 </h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="test_output/test_log_output.html">Test log output</a></span></dt>
-<dt><span class="section"><a href="test_output/log_runtime_config.html">Configuring
-      the verbosity of the logs</a></span></dt>
-<dt><span class="section"><a href="test_output/testing_tool_output_disable.html">Disabling
-      automatic printing for specific types</a></span></dt>
-<dt><span class="section"><a href="test_output/test_output_macro_message.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a></span></dt>
-<dt><span class="section"><a href="test_output/test_output_macro_checkpoint.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_CHECKPOINT</span></code></a></span></dt>
-<dt><span class="section"><a href="test_output/test_output_macro_passpoint.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_PASSPOINT</span></code></a></span></dt>
-<dt><span class="section"><a href="test_output/log_floating_points.html">Logging floating
-      point type numbers</a></span></dt>
-<dt><span class="section"><a href="test_output/log_human_readable_format.html">Human
-      readable log format</a></span></dt>
-<dt><span class="section"><a href="test_output/log_xml_format.html">XML based log
-      output format</a></span></dt>
-<dt><span class="section"><a href="test_output/log_compil_time_configuration.html">Compile
-      time configuration</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="test_output/log_compil_time_configuration/log_ct_output_stream_redirection.html">Log
-        output stream redirection</a></span></dt>
-<dt><span class="section"><a href="test_output/log_compil_time_configuration/log_ct_log_level.html">Log
-        level configuration</a></span></dt>
-<dt><span class="section"><a href="test_output/log_compil_time_configuration/log_ct_log_format.html">Predefined
-        log format selection</a></span></dt>
-<dt><span class="section"><a href="test_output/log_compil_time_configuration/custom_log_formatter.html">Custom
-        log format support</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="test_output/test_reports.html">Test
-      reports</a></span></dt>
-<dt><span class="section"><a href="test_output/test_output_progress.html">Progression
-      display</a></span></dt>
-<dt><span class="section"><a href="test_output/reference.html">Reference</a></span></dt>
-</dl></div>
 <p>
-      The output produced by a test module is one of the major assets the <span class="emphasis"><em>UTF</em></span>
-      brings to users. In comparison with any kind of manual/assert based solution
-      the <span class="emphasis"><em>UTF</em></span> provide following services:
+      The output produced by a test module is one of the major assets the <span class="emphasis"><em>Unit
+      Test Framework</em></span> brings to users. In comparison with any kind of manual/assert
+      based solution the <span class="emphasis"><em>Unit Test Framework</em></span> provide following
+      services:
     </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
           All test errors are reported uniformly<br> The test execution monitor
-          along with standardized output from all included <a class="link" href="testing_tools.html" title="The UTF testing tools">testing
+          along with standardized output from all included <a class="link" href="testing_tools.html" title="The Unit Test Framework testing tools">testing
           tools</a> provides uniform reporting for all errors including fatal
           errors, like memory assess violation and uncaught exceptions.
         </li>
 <li class="listitem">
-          Detailed information on the source of an error<br> The <span class="emphasis"><em>UTF</em></span>
-          test tool's based assertion provides as much information as possible about
-          cause of error, usually allowing you to deduce what is wrong without entering
-          the debugger or core analysis.
+          Detailed information on the source of an error<br> The <span class="emphasis"><em>Unit
+          Test Framework</em></span> test tool's based assertion provides as much
+          information as possible about cause of error, usually allowing you to deduce
+          what is wrong without entering the debugger or core analysis.
         </li>
 <li class="listitem">
           Separation of the test errors description (test log) from the results report
@@ -84,20 +52,21 @@
           execution, including all error, warning and info messages from the test
           tools, executed test units notification constitute the test log. By default
           all entries in the test log are directed to the standard output. Once testing
-          is completed the <span class="emphasis"><em>UTF</em></span> may produce a summary test report
-          with different levels of detail. The test report is by default directed
-          to the standard error output.
+          is completed the <span class="emphasis"><em>Unit Test Framework</em></span> may produce a
+          summary test report with different levels of detail. The test report is
+          by default directed to the standard error output.
         </li>
 <li class="listitem">
-          Flexibility in what is shown in the output<br> The <span class="emphasis"><em>UTF</em></span>
-          provides the ability to configure what if shown in both the test log and
-          the test report. The configuration is supported both at runtime, during
-          test module invocation and at compile time from within a test module.
+          Flexibility in what is shown in the output<br> The <span class="emphasis"><em>Unit Test
+          Framework</em></span> provides the ability to configure what if shown in
+          both the test log and the test report. The configuration is supported both
+          at runtime, during test module invocation and at compile time from within
+          a test module.
         </li>
 <li class="listitem">
-          Flexibility in how output is formatted<br> The <span class="emphasis"><em>UTF</em></span>
+          Flexibility in how output is formatted<br> The <span class="emphasis"><em>Unit Test Framework</em></span>
           provides the ability to configure the format of the test module output.
-          At the moment only 2 formats are supported by the <span class="emphasis"><em>UTF</em></span>
+          At the moment only 2 formats are supported by the <span class="emphasis"><em>Unit Test Framework</em></span>
           itself, the well defined public interface allows you to customize an output
           for your purposes almost any way you want.
         </li>
@@ -127,7 +96,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="testing_tools/testing_floating_points.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output/test_log_output.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="testing_tools/testing_tool_ref.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output/test_log_output.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/test_output/log_compil_time_configuration.html b/doc/v2/html/boost_test/test_output/log_compil_time_configuration.html
old mode 100644
new mode 100755
index bd6e5461..ef17edaf
--- a/doc/v2/html/boost_test/test_output/log_compil_time_configuration.html
+++ b/doc/v2/html/boost_test/test_output/log_compil_time_configuration.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Compile time configuration</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="log_xml_format.html" title="XML based log output format">
-<link rel="next" href="log_compil_time_configuration/log_ct_output_stream_redirection.html" title="Log output stream redirection">
+<link rel="next" href="test_reports.html" title="Test reports">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,28 +20,18 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_xml_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_compil_time_configuration/log_ct_output_stream_redirection.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="log_xml_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_reports.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_test.test_output.log_compil_time_configuration"></a><a class="link" href="log_compil_time_configuration.html" title="Compile time configuration">Compile
       time configuration</a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="log_compil_time_configuration/log_ct_output_stream_redirection.html">Log
-        output stream redirection</a></span></dt>
-<dt><span class="section"><a href="log_compil_time_configuration/log_ct_log_level.html">Log
-        level configuration</a></span></dt>
-<dt><span class="section"><a href="log_compil_time_configuration/log_ct_log_format.html">Predefined
-        log format selection</a></span></dt>
-<dt><span class="section"><a href="log_compil_time_configuration/custom_log_formatter.html">Custom
-        log format support</a></span></dt>
-</dl></div>
 <p>
         While many test log configuration tasks can be performed at runtime using
-        predefined framework parameters, the <span class="emphasis"><em>UTF</em></span> provides a
-        compile time interface as well. The interface gives you full power over what,
-        where and how to log. The interface is provided by singleton class
+        predefined framework parameters, the <span class="emphasis"><em>Unit Test Framework</em></span>
+        provides a compile time interface as well. The interface gives you full power
+        over what, where and how to log. The interface is provided by singleton class
       </p>
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log_t</span></pre>
 <p>
@@ -49,6 +39,244 @@
         this class
       </p>
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span></pre>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection"></a><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection" title="Log output stream redirection">Log
+        output stream redirection</a>
+</h4></div></div></div>
+<p>
+          If you want to redirect the test log output stream into something different
+          from <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span></code> use the following interface:
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span><span class="special">&amp;</span> <span class="identifier">str</span> <span class="special">);</span>
+</pre>
+<p>
+          You can reset the output stream at any time both during the test module
+          initialization and from within test cases. There are no limitations on
+          number of output stream resets either.
+        </p>
+<h6>
+<a name="boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection.h0"></a>
+          <span><a name="boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection.example_descr"></a></span><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection.example_descr">Example:
+          Compile-time log output redirection</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="keyword">struct</span> <span class="identifier">MyConfig</span> <span class="special">{</span>
+    <span class="identifier">MyConfig</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">test_log</span><span class="special">(</span> <span class="string">"example.log"</span> <span class="special">)</span>  <span class="special">{</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">test_log</span> <span class="special">);</span> <span class="special">}</span>
+    <span class="special">~</span><span class="identifier">MyConfig</span><span class="special">()</span>                             <span class="special">{</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">);</span> <span class="special">}</span>
+
+    <span class="identifier">std</span><span class="special">::</span><span class="identifier">ofstream</span> <span class="identifier">test_log</span><span class="special">;</span>
+<span class="special">};</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span> <span class="identifier">MyConfig</span> <span class="special">);</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case</span> <span class="special">)</span>
+<span class="special">{</span>
+    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">false</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+
+<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
+<span class="special">&gt;</span> <span class="identifier">cat</span> <span class="identifier">example</span><span class="special">.</span><span class="identifier">log</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">20</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            If you redirect test log output stream from global fixture setup, you
+            are <span class="bold"><strong>required</strong></span> to reset it back to <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span></code> during teardown to prevent dangling
+            references access
+          </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_level"></a><a name="ref_log_level_explanations"></a><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_log_level" title="Log level configuration">Log
+        level configuration</a>
+</h4></div></div></div>
+<p>
+          If you need to enforce specific log level from within your test module
+          use the following interface:
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_threshold_level</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">log_level</span> <span class="special">);</span>
+</pre>
+<p>
+          In regular circumstances you shouldn't use this interface, since you not
+          only override default log level, but also the one supplied at test execution
+          time. Prefer to use runtime parameters <a class="link" href="../the_utf_runtime_parameters/reference.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a> for log level selection.
+        </p>
+<h6>
+<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_level.h0"></a>
+          <span><a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_level.example_descr"></a></span><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_log_level.example_descr">Example:
+          Compile-time log level configuration</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">unit_test_parameters</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case0</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">runtime_config</span><span class="special">::</span><span class="identifier">log_level</span><span class="special">()</span> <span class="special">&lt;</span> <span class="identifier">log_warnings</span> <span class="special">)</span>
+    <span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_threshold_level</span><span class="special">(</span> <span class="identifier">log_warnings</span> <span class="special">);</span>
+
+  <span class="identifier">BOOST_WARN</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;</span> <span class="number">4</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">13</span><span class="special">):</span> <span class="identifier">warning</span> <span class="identifier">in</span> <span class="string">"test_case0"</span><span class="special">:</span> <span class="identifier">condition</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;</span> <span class="number">4</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">satisfied</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_format"></a><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_log_format" title="Predefined log format selection">Predefined
+        log format selection</a>
+</h4></div></div></div>
+<p>
+          The select at compile time the log format from the list of the formats
+          supplied by the <span class="emphasis"><em>Unit Test Framework</em></span>
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_format</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">output_format</span> <span class="special">);</span>
+</pre>
+<p>
+          In regular circumstances you shouldn't use this interface. Prefer to use
+          runtime parameters for predefined log format selection.
+        </p>
+<h6>
+<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_format.h0"></a>
+          <span><a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_format.example_descr"></a></span><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_log_format.example_descr">Example:
+          Compile-time log format selection</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="keyword">struct</span> <span class="identifier">MyConfig</span> <span class="special">{</span>
+    <span class="identifier">MyConfig</span><span class="special">()</span>  <span class="special">{</span> <span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_format</span><span class="special">(</span> <span class="identifier">XML</span> <span class="special">);</span> <span class="special">}</span>
+    <span class="special">~</span><span class="identifier">MyConfig</span><span class="special">()</span> <span class="special">{}</span>
+<span class="special">};</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span> <span class="identifier">MyConfig</span> <span class="special">);</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case0</span> <span class="special">)</span>
+<span class="special">{</span>
+    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">false</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">report_level</span><span class="special">=</span><span class="identifier">no</span>
+<span class="special">&lt;</span><span class="identifier">TestLog</span><span class="special">&gt;&lt;</span><span class="identifier">Error</span> <span class="identifier">file</span><span class="special">=</span><span class="string">"test.cpp"</span> <span class="identifier">line</span><span class="special">=</span><span class="string">"18"</span><span class="special">&gt;</span><span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span><span class="special">&lt;/</span><span class="identifier">Error</span><span class="special">&gt;&lt;/</span><span class="identifier">TestLog</span><span class="special">&gt;</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.test_output.log_compil_time_configuration.custom_log_formatter"></a><a name="ref_log_formatter_api"></a><a class="link" href="log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.custom_log_formatter" title="Custom log format support">Custom
+        log format support</a>
+</h4></div></div></div>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            Check what to do on this one
+          </p></td></tr>
+</table></div>
+</div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -61,7 +289,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_xml_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_compil_time_configuration/log_ct_output_stream_redirection.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="log_xml_format.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_reports.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/custom_log_formatter.html b/doc/v2/html/boost_test/test_output/log_compil_time_configuration/custom_log_formatter.html
deleted file mode 100644
index c7a8b551..00000000
--- a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/custom_log_formatter.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Custom log format support</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../log_compil_time_configuration.html" title="Compile time configuration">
-<link rel="prev" href="log_ct_log_format.html" title="Predefined log format selection">
-<link rel="next" href="../test_reports.html" title="Test reports">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_ct_log_format.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../test_reports.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.test_output.log_compil_time_configuration.custom_log_formatter"></a><a name="ref_log_formatter_api"></a><a class="link" href="custom_log_formatter.html" title="Custom log format support">Custom
-        log format support</a>
-</h4></div></div></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            Check what to do on this one
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_ct_log_format.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../test_reports.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_log_format.html b/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_log_format.html
deleted file mode 100644
index 8dd817fa..00000000
--- a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_log_format.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Predefined log format selection</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../log_compil_time_configuration.html" title="Compile time configuration">
-<link rel="prev" href="log_ct_log_level.html" title="Log level configuration">
-<link rel="next" href="custom_log_formatter.html" title="Custom log format support">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_ct_log_level.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="custom_log_formatter.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_format"></a><a class="link" href="log_ct_log_format.html" title="Predefined log format selection">Predefined
-        log format selection</a>
-</h4></div></div></div>
-<p>
-          The select at compile time the log format from the list of the formats
-          supplied by the <span class="emphasis"><em>UTF</em></span>
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_format</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">output_format</span> <span class="special">);</span>
-</pre>
-<p>
-          In regular circumstances you shouldn't use this interface. Prefer to use
-          runtime parameters for predefined log format selection.
-        </p>
-<div class="table">
-<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_format.id_example52"></a><p class="title"><b>Table&#160;34.&#160;Compile-time log format selection</b></p>
-<div class="table-contents"><table class="table" summary="Compile-time log format selection">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="keyword">struct</span> <span class="identifier">MyConfig</span> <span class="special">{</span>
-    <span class="identifier">MyConfig</span><span class="special">()</span>  <span class="special">{</span> <span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_format</span><span class="special">(</span> <span class="identifier">XML</span> <span class="special">);</span> <span class="special">}</span>
-    <span class="special">~</span><span class="identifier">MyConfig</span><span class="special">()</span> <span class="special">{}</span>
-<span class="special">};</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span> <span class="identifier">MyConfig</span> <span class="special">);</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case0</span> <span class="special">)</span>
-<span class="special">{</span>
-    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">false</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">report_level</span><span class="special">=</span><span class="identifier">no</span>
-<span class="special">&lt;</span><span class="identifier">TestLog</span><span class="special">&gt;&lt;</span><span class="identifier">Error</span> <span class="identifier">file</span><span class="special">=</span><span class="string">"test.cpp"</span> <span class="identifier">line</span><span class="special">=</span><span class="string">"18"</span><span class="special">&gt;</span><span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span><span class="special">&lt;/</span><span class="identifier">Error</span><span class="special">&gt;&lt;/</span><span class="identifier">TestLog</span><span class="special">&gt;</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_ct_log_level.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="custom_log_formatter.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_log_level.html b/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_log_level.html
deleted file mode 100644
index 449b8cb1..00000000
--- a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_log_level.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Log level configuration</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../log_compil_time_configuration.html" title="Compile time configuration">
-<link rel="prev" href="log_ct_output_stream_redirection.html" title="Log output stream redirection">
-<link rel="next" href="log_ct_log_format.html" title="Predefined log format selection">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_ct_output_stream_redirection.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_ct_log_format.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_level"></a><a name="ref_log_level_explanations"></a><a class="link" href="log_ct_log_level.html" title="Log level configuration">Log
-        level configuration</a>
-</h4></div></div></div>
-<p>
-          If you need to enforce specific log level from within your test module
-          use the following interface:
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_threshold_level</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">log_level</span> <span class="special">);</span>
-</pre>
-<p>
-          In regular circumstances you shouldn't use this interface, since you not
-          only override default log level, but also the one supplied at test execution
-          time. Prefer to use runtime parameters <a class="link" href="../../runtime_parameters_reference/log_level.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a> for log level selection.
-        </p>
-<div class="table">
-<a name="boost_test.test_output.log_compil_time_configuration.log_ct_log_level.id_example51"></a><p class="title"><b>Table&#160;33.&#160;Compile-time log level configuration</b></p>
-<div class="table-contents"><table class="table" summary="Compile-time log level configuration">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">unit_test_parameters</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case0</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">runtime_config</span><span class="special">::</span><span class="identifier">log_level</span><span class="special">()</span> <span class="special">&lt;</span> <span class="identifier">log_warnings</span> <span class="special">)</span>
-    <span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_threshold_level</span><span class="special">(</span> <span class="identifier">log_warnings</span> <span class="special">);</span>
-
-  <span class="identifier">BOOST_WARN</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;</span> <span class="number">4</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">13</span><span class="special">):</span> <span class="identifier">warning</span> <span class="identifier">in</span> <span class="string">"test_case0"</span><span class="special">:</span> <span class="identifier">condition</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;</span> <span class="number">4</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">satisfied</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="log_ct_output_stream_redirection.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_ct_log_format.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_output_stream_redirection.html b/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_output_stream_redirection.html
deleted file mode 100644
index 25f437a3..00000000
--- a/doc/v2/html/boost_test/test_output/log_compil_time_configuration/log_ct_output_stream_redirection.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Log output stream redirection</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../log_compil_time_configuration.html" title="Compile time configuration">
-<link rel="prev" href="../log_compil_time_configuration.html" title="Compile time configuration">
-<link rel="next" href="log_ct_log_level.html" title="Log level configuration">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_ct_log_level.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection"></a><a class="link" href="log_ct_output_stream_redirection.html" title="Log output stream redirection">Log
-        output stream redirection</a>
-</h4></div></div></div>
-<p>
-          If you want to redirect the test log output stream into something different
-          from <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span></code> use the following interface:
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span><span class="special">&amp;</span> <span class="identifier">str</span> <span class="special">);</span>
-</pre>
-<p>
-          You can reset the output stream at any time both during the test module
-          initialization and from within test cases. There are no limitations on
-          number of output stream resets either.
-        </p>
-<div class="table">
-<a name="boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection.id_example50"></a><p class="title"><b>Table&#160;32.&#160;Compile-time log output redirection</b></p>
-<div class="table-contents"><table class="table" summary="Compile-time log output redirection">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">fstream</span><span class="special">&gt;</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="keyword">struct</span> <span class="identifier">MyConfig</span> <span class="special">{</span>
-    <span class="identifier">MyConfig</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">test_log</span><span class="special">(</span> <span class="string">"example.log"</span> <span class="special">)</span>  <span class="special">{</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">test_log</span> <span class="special">);</span> <span class="special">}</span>
-    <span class="special">~</span><span class="identifier">MyConfig</span><span class="special">()</span>                             <span class="special">{</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">);</span> <span class="special">}</span>
-
-    <span class="identifier">std</span><span class="special">::</span><span class="identifier">ofstream</span> <span class="identifier">test_log</span><span class="special">;</span>
-<span class="special">};</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span> <span class="identifier">MyConfig</span> <span class="special">);</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case</span> <span class="special">)</span>
-<span class="special">{</span>
-    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">false</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-<span class="special">&gt;</span> <span class="identifier">cat</span> <span class="identifier">example</span><span class="special">.</span><span class="identifier">log</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">20</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            If you redirect test log output stream from global fixture setup, you
-            are <span class="bold"><strong>required</strong></span> to reset it back to <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span></code> during teardown to prevent dangling
-            references access
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../log_compil_time_configuration.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="log_ct_log_level.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/test_output/log_floating_points.html b/doc/v2/html/boost_test/test_output/log_floating_points.html
old mode 100644
new mode 100755
index 0f4c99c2..477985a9
--- a/doc/v2/html/boost_test/test_output/log_floating_points.html
+++ b/doc/v2/html/boost_test/test_output/log_floating_points.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Logging floating point type numbers</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="test_output_macro_passpoint.html" title="BOOST_TEST_PASSPOINT">
 <link rel="next" href="log_human_readable_format.html" title="Human readable log format">
 </head>
@@ -28,13 +28,13 @@
       point type numbers</a>
 </h3></div></div></div>
 <p>
-        It may appear that floating-point numbers are displayed by the <span class="emphasis"><em>UTF</em></span>
-        with an excessive number of decimal digits. However the number of digits
-        shown is chosen to avoid apparently nonsensical displays like <code class="computeroutput"><span class="special">[</span><span class="number">1.00000</span> <span class="special">!=</span>
-        <span class="number">1.00000</span><span class="special">]</span></code>
-        when comparing exactly unity against a value which is increased by just one
-        least significant binary digit using the default precision for float of just
-        6 decimal digits, given by <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">numeric_limits</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;::</span><span class="identifier">digits10</span></code>.
+        It may appear that floating-point numbers are displayed by the <span class="emphasis"><em>Unit
+        Test Framework</em></span> with an excessive number of decimal digits. However
+        the number of digits shown is chosen to avoid apparently nonsensical displays
+        like <code class="computeroutput"><span class="special">[</span><span class="number">1.00000</span>
+        <span class="special">!=</span> <span class="number">1.00000</span><span class="special">]</span></code> when comparing exactly unity against a value
+        which is increased by just one least significant binary digit using the default
+        precision for float of just 6 decimal digits, given by <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">numeric_limits</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;::</span><span class="identifier">digits10</span></code>.
         The function used for the number of decimal digits displayed is that proposed
         for a future C++ Standard, <a href="http://www2.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1822.pdf" target="_top">A
         Proposal to add a max significant decimal digits value</a>, to be called
diff --git a/doc/v2/html/boost_test/test_output/log_human_readable_format.html b/doc/v2/html/boost_test/test_output/log_human_readable_format.html
old mode 100644
new mode 100755
index 421d3b2a..ef733a00
--- a/doc/v2/html/boost_test/test_output/log_human_readable_format.html
+++ b/doc/v2/html/boost_test/test_output/log_human_readable_format.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Human readable log format</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="log_floating_points.html" title="Logging floating point type numbers">
 <link rel="next" href="log_xml_format.html" title="XML based log output format">
 </head>
@@ -378,7 +378,7 @@ Boost   : $BOOST_VERSION</pre>
 </table>
 </div>
 <p>
-        Advanced <a class="link" href="../testing_tools.html" title="The UTF testing tools">testing tools</a> may
+        Advanced <a class="link" href="../testing_tools.html" title="The Unit Test Framework testing tools">testing tools</a> may
         produce more complicated error messages.
       </p>
 </div>
diff --git a/doc/v2/html/boost_test/test_output/log_runtime_config.html b/doc/v2/html/boost_test/test_output/log_runtime_config.html
old mode 100644
new mode 100755
index 3742d248..d8b4b8a9
--- a/doc/v2/html/boost_test/test_output/log_runtime_config.html
+++ b/doc/v2/html/boost_test/test_output/log_runtime_config.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Configuring the verbosity of the logs</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="test_log_output.html" title="Test log output">
 <link rel="next" href="testing_tool_output_disable.html" title="Disabling automatic printing for specific types">
 </head>
@@ -29,8 +29,8 @@
 </h3></div></div></div>
 <p>
         The active log level threshold can be configured at runtime using the parameter
-        <a class="link" href="../runtime_parameters_reference/log_level.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a>.
-        The test log output format can be selected using either parameter <a class="link" href="../runtime_parameters_reference/log_format.html#ref_param_log_format"><code class="computeroutput"><span class="identifier">log_format</span></code></a> or the parameter <a class="link" href="../runtime_parameters_reference/output_format.html#ref_param_output_format"><code class="computeroutput"><span class="identifier">output_format</span></code></a>.
+        <a class="link" href="../the_utf_runtime_parameters/reference.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a>.
+        The test log output format can be selected using either parameter <a class="link" href="../the_utf_runtime_parameters/reference.html#ref_param_log_format"><code class="computeroutput"><span class="identifier">log_format</span></code></a> or the parameter <a class="link" href="../the_utf_runtime_parameters/reference.html#ref_param_output_format"><code class="computeroutput"><span class="identifier">output_format</span></code></a>.
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
diff --git a/doc/v2/html/boost_test/test_output/log_xml_format.html b/doc/v2/html/boost_test/test_output/log_xml_format.html
old mode 100644
new mode 100755
index 8a3a2553..9cd94879
--- a/doc/v2/html/boost_test/test_output/log_xml_format.html
+++ b/doc/v2/html/boost_test/test_output/log_xml_format.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>XML based log output format</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="log_human_readable_format.html" title="Human readable log format">
 <link rel="next" href="log_compil_time_configuration.html" title="Compile time configuration">
 </head>
diff --git a/doc/v2/html/boost_test/test_output/reference.html b/doc/v2/html/boost_test/test_output/reference.html
deleted file mode 100644
index f4fd2a36..00000000
--- a/doc/v2/html/boost_test/test_output/reference.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Reference</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
-<link rel="prev" href="test_output_progress.html" title="Progression display">
-<link rel="next" href="../runtime_configuration.html" title="Runtime configuration">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_output_progress.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.test_output.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
-</h3></div></div></div>
-<div class="blockquote"><blockquote class="blockquote"><p>
-          <code class="computeroutput"><a class="link" href="../../header/boost/test/output/compiler_log_formatter_hpp.html" title="Header &lt;boost/test/output/compiler_log_formatter.hpp&gt;">boost/test/output/compiler_log_formatter.hpp</a></code>
-        </p></blockquote></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_output_progress.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../runtime_configuration.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/test_output/test_log_output.html b/doc/v2/html/boost_test/test_output/test_log_output.html
old mode 100644
new mode 100755
index a65cd814..e03e17bc
--- a/doc/v2/html/boost_test/test_output/test_log_output.html
+++ b/doc/v2/html/boost_test/test_output/test_log_output.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Test log output</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
-<link rel="prev" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
+<link rel="prev" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="next" href="log_runtime_config.html" title="Configuring the verbosity of the logs">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -34,7 +34,7 @@
         log entries. Here is the list of all levels in order of increasing 'importance':
       </p>
 <div class="table">
-<a name="boost_test.test_output.test_log_output.id_messages"></a><p class="title"><b>Table&#160;27.&#160;Messages</b></p>
+<a name="boost_test.test_output.test_log_output.id_messages"></a><p class="title"><b>Table&#160;5.&#160;Messages</b></p>
 <div class="table-contents"><table class="table" summary="Messages">
 <colgroup>
 <col>
@@ -74,9 +74,9 @@
               </td>
 <td>
                 <p>
-                  This category includes messages that are produced by the <span class="emphasis"><em>UTF</em></span>
-                  core and indicate which test suites/cases are currently being executed
-                  or skipped
+                  This category includes messages that are produced by the <span class="emphasis"><em>Unit
+                  Test Framework</em></span> core and indicate which test suites/cases
+                  are currently being executed or skipped
                 </p>
               </td>
 </tr>
@@ -127,9 +127,9 @@
               </td>
 <td>
                 <p>
-                  This category includes messages that are produced by the <span class="emphasis"><em>UTF</em></span>
-                  and provide detailed information on the C++ exceptions uncaught
-                  by the test case body.
+                  This category includes messages that are produced by the <span class="emphasis"><em>Unit
+                  Test Framework</em></span> and provide detailed information on the
+                  C++ exceptions uncaught by the test case body.
                 </p>
               </td>
 </tr>
@@ -141,10 +141,11 @@
               </td>
 <td>
                 <p>
-                  This category includes messages that are produced by the <span class="emphasis"><em>UTF</em></span>
-                  itself and provides information about caught non-fatal system error.
-                  For example it includes messages produced in the case of test case
-                  timeout or if floating point values calculation errors are caught.
+                  This category includes messages that are produced by the <span class="emphasis"><em>Unit
+                  Test Framework</em></span> itself and provides information about
+                  caught non-fatal system error. For example it includes messages
+                  produced in the case of test case timeout or if floating point
+                  values calculation errors are caught.
                 </p>
               </td>
 </tr>
@@ -157,8 +158,8 @@
 <td>
                 <p>
                   This category includes messages produced by failed require level
-                  assertions and by the <span class="emphasis"><em>UTF</em></span> itself in case of
-                  abnormal test case termination.
+                  assertions and by the <span class="emphasis"><em>Unit Test Framework</em></span>
+                  itself in case of abnormal test case termination.
                 </p>
               </td>
 </tr>
@@ -181,7 +182,7 @@
         In addition to the levels described above the test log defines two special
         log levels. The current log level can be set to:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             All messages<br> If active log level threshold is set to this value,
             all test log entries appear in the output. In practice this is equivalent
@@ -206,15 +207,16 @@
         based format.
       </p>
 <p>
-        In most cases, the <span class="emphasis"><em>UTF</em></span> can't provide an exact location,
-        where system error occurs or uncaught C++ exception is thrown from. To be
-        able to pinpoint it as close as possible the <span class="emphasis"><em>UTF</em></span> keeps
-        track of checkpoints - the location a test module passed through. A test
-        case entrance and exit points, a test tool invocation point the <span class="emphasis"><em>UTF</em></span>
-        tracks automatically. Any other checkpoints should be entered by you manually.
-        The test log provides two macros for this purpose:
+        In most cases, the <span class="emphasis"><em>Unit Test Framework</em></span> can't provide
+        an exact location, where system error occurs or uncaught C++ exception is
+        thrown from. To be able to pinpoint it as close as possible the <span class="emphasis"><em>Unit
+        Test Framework</em></span> keeps track of checkpoints - the location a test
+        module passed through. A test case entrance and exit points, a test tool
+        invocation point the <span class="emphasis"><em>Unit Test Framework</em></span> tracks automatically.
+        Any other checkpoints should be entered by you manually. The test log provides
+        two macros for this purpose:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             <a class="link" href="test_output_macro_checkpoint.html" title="BOOST_TEST_CHECKPOINT"><code class="computeroutput"><span class="identifier">BOOST_TEST_CHECKPOINT</span></code></a> to specify
             a <span class="emphasis"><em>named</em></span> checkpoint and
diff --git a/doc/v2/html/boost_test/test_output/test_output_macro_checkpoint.html b/doc/v2/html/boost_test/test_output/test_output_macro_checkpoint.html
old mode 100644
new mode 100755
index b7c6bbf7..e8ecaef1
--- a/doc/v2/html/boost_test/test_output/test_output_macro_checkpoint.html
+++ b/doc/v2/html/boost_test/test_output/test_output_macro_checkpoint.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>BOOST_TEST_CHECKPOINT</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE">
 <link rel="next" href="test_output_macro_passpoint.html" title="BOOST_TEST_PASSPOINT">
 </head>
@@ -38,9 +38,12 @@
         the exception logging functions (if any occurs). Similarly to the <a class="link" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a> the message can
         be formatted from any standard output stream compliant components.
       </p>
-<div class="table">
-<a name="boost_test.test_output.test_output_macro_checkpoint.id_example22"></a><p class="title"><b>Table&#160;30.&#160;<a class="link" href="test_output_macro_checkpoint.html" title="BOOST_TEST_CHECKPOINT"><code class="computeroutput"><span class="identifier">BOOST_TEST_CHECKPOINT</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_TEST_CHECKPOINT usage">
+<h6>
+<a name="boost_test.test_output.test_output_macro_checkpoint.h0"></a>
+        <span><a name="boost_test.test_output.test_output_macro_checkpoint.example_descr"></a></span><a class="link" href="test_output_macro_checkpoint.html#boost_test.test_output.test_output_macro_checkpoint.example_descr">Example:
+        <a class="link" href="test_output_macro_checkpoint.html" title="BOOST_TEST_CHECKPOINT"><code class="computeroutput"><span class="identifier">BOOST_TEST_CHECKPOINT</span></code></a> usage</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -59,7 +62,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="keyword">extern</span> <span class="keyword">void</span> <span class="identifier">foo</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">);</span>
@@ -79,7 +82,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
 <span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
 <span class="identifier">unknown</span> <span class="identifier">location</span><span class="special">(</span><span class="number">0</span><span class="special">):</span> <span class="identifier">fatal</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_external_interface"</span><span class="special">:</span> <span class="identifier">signal</span><span class="special">:</span> <span class="identifier">integer</span> <span class="identifier">divide</span> <span class="identifier">by</span> <span class="identifier">zero</span><span class="special">;</span> <span class="identifier">address</span> <span class="identifier">of</span> <span class="identifier">failing</span> <span class="identifier">instruction</span><span class="special">:</span> <span class="number">0x00048090</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">13</span><span class="special">):</span> <span class="identifier">last</span> <span class="identifier">checkpoint</span><span class="special">:</span> <span class="identifier">Calling</span> <span class="identifier">foo</span> <span class="identifier">with</span> <span class="identifier">i</span><span class="special">=</span><span class="number">1</span>
@@ -90,8 +93,6 @@
 </tr></tbody>
 </table></div>
 </div>
-<br class="table-break">
-</div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
 <td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
diff --git a/doc/v2/html/boost_test/test_output/test_output_macro_message.html b/doc/v2/html/boost_test/test_output/test_output_macro_message.html
old mode 100644
new mode 100755
index 4efb5fde..05019e5d
--- a/doc/v2/html/boost_test/test_output/test_output_macro_message.html
+++ b/doc/v2/html/boost_test/test_output/test_output_macro_message.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>BOOST_TEST_MESSAGE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="testing_tool_output_disable.html" title="Disabling automatic printing for specific types">
 <link rel="next" href="test_output_macro_checkpoint.html" title="BOOST_TEST_CHECKPOINT">
 </head>
@@ -28,10 +28,10 @@
 </h3></div></div></div>
 <p>
         The macro <a class="link" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a> is intended to
-        be used for the purpose of injecting an additional message into the <span class="emphasis"><em>UTF</em></span>
-        test log. These messages are not intended to indicate any error or warning
-        conditions, but rather as information/status notifications. The macro signature
-        is as follows:
+        be used for the purpose of injecting an additional message into the <span class="emphasis"><em>Unit
+        Test Framework</em></span> test log. These messages are not intended to indicate
+        any error or warning conditions, but rather as information/status notifications.
+        The macro signature is as follows:
       </p>
 <pre class="programlisting"><a class="link" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a><span class="special">(</span><span class="identifier">test_message</span><span class="special">);</span>
 </pre>
@@ -51,9 +51,12 @@
           active log level threshold has to be set to a value below or equal to "message".
         </p></td></tr>
 </table></div>
-<div class="table">
-<a name="boost_test.test_output.test_output_macro_message.id_example21"></a><p class="title"><b>Table&#160;29.&#160;<a class="link" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_TEST_MESSAGE usage">
+<h6>
+<a name="boost_test.test_output.test_output_macro_message.h0"></a>
+        <span><a name="boost_test.test_output.test_output_macro_message.example_descr"></a></span><a class="link" href="test_output_macro_message.html#boost_test.test_output.test_output_macro_message.example_descr">Example:
+        <a class="link" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a> usage</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -72,7 +75,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_init</span> <span class="special">)</span>
@@ -94,7 +97,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">message</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">message</span>
 <span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
 <span class="identifier">Testing</span> <span class="identifier">initialization</span> <span class="special">:</span>
 <span class="identifier">Current</span> <span class="identifier">time</span><span class="special">:</span><span class="number">0</span>
@@ -107,8 +110,6 @@
 </tr></tbody>
 </table></div>
 </div>
-<br class="table-break">
-</div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
 <td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
diff --git a/doc/v2/html/boost_test/test_output/test_output_macro_passpoint.html b/doc/v2/html/boost_test/test_output/test_output_macro_passpoint.html
old mode 100644
new mode 100755
index b330472f..c16dfec5
--- a/doc/v2/html/boost_test/test_output/test_output_macro_passpoint.html
+++ b/doc/v2/html/boost_test/test_output/test_output_macro_passpoint.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>BOOST_TEST_PASSPOINT</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="test_output_macro_checkpoint.html" title="BOOST_TEST_CHECKPOINT">
 <link rel="next" href="log_floating_points.html" title="Logging floating point type numbers">
 </head>
@@ -38,9 +38,12 @@
         doesn't require any message to be supplied with it. It's just a simple "been
         there" marker that records file name and line number code passes through.
       </p>
-<div class="table">
-<a name="boost_test.test_output.test_output_macro_passpoint.id_example23"></a><p class="title"><b>Table&#160;31.&#160;<a class="link" href="test_output_macro_passpoint.html" title="BOOST_TEST_PASSPOINT"><code class="computeroutput"><span class="identifier">BOOST_TEST_PASSPOINT</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_TEST_PASSPOINT usage">
+<h6>
+<a name="boost_test.test_output.test_output_macro_passpoint.h0"></a>
+        <span><a name="boost_test.test_output.test_output_macro_passpoint.example_descr"></a></span><a class="link" href="test_output_macro_passpoint.html#boost_test.test_output.test_output_macro_passpoint.example_descr">Example:
+        <a class="link" href="test_output_macro_passpoint.html" title="BOOST_TEST_PASSPOINT"><code class="computeroutput"><span class="identifier">BOOST_TEST_PASSPOINT</span></code></a> usage</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -59,7 +62,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case</span> <span class="special">)</span>
@@ -78,7 +81,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
 <span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
 <span class="identifier">unknown</span> <span class="identifier">location</span><span class="special">(</span><span class="number">0</span><span class="special">):</span> <span class="identifier">fatal</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case"</span><span class="special">:</span> <span class="identifier">memory</span> <span class="identifier">access</span> <span class="identifier">violation</span> <span class="identifier">at</span> <span class="identifier">address</span><span class="special">:</span> <span class="number">0x00000008</span><span class="special">:</span> <span class="identifier">no</span> <span class="identifier">mapping</span> <span class="identifier">at</span> <span class="identifier">fault</span> <span class="identifier">address</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">16</span><span class="special">):</span> <span class="identifier">last</span> <span class="identifier">checkpoint</span>
@@ -89,8 +92,6 @@
 </tr></tbody>
 </table></div>
 </div>
-<br class="table-break">
-</div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
 <td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
diff --git a/doc/v2/html/boost_test/test_output/test_output_progress.html b/doc/v2/html/boost_test/test_output/test_output_progress.html
old mode 100644
new mode 100755
index 96da1f42..61eb46af
--- a/doc/v2/html/boost_test/test_output/test_output_progress.html
+++ b/doc/v2/html/boost_test/test_output/test_output_progress.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Progression display</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>Progress display</title>
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="test_reports.html" title="Test reports">
-<link rel="next" href="reference.html" title="Reference">
+<link rel="next" href="../the_utf_runtime_parameters.html" title="The Unit Test Framework runtime parameters">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,34 +20,34 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_reports.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_reports.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../the_utf_runtime_parameters.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.test_output.test_output_progress"></a><a class="link" href="test_output_progress.html" title="Progression display">Progression
+<a name="boost_test.test_output.test_output_progress"></a><a class="link" href="test_output_progress.html" title="Progress display">Progress
       display</a>
 </h3></div></div></div>
 <p>
         In case if the test module involves lengthy computation split among multiple
         test cases you may be interested in progress monitor. The test runners supplied
-        with the <span class="emphasis"><em>UTF</em></span> support simple text progress display, implemented
-        based on
+        with the <span class="emphasis"><em>Unit Test Framework</em></span> support simple text progress
+        display, implemented based on
       </p>
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">progress_display</span>
 </pre>
 <p>
-        <a href="#ftn.boost_test.test_output.test_output_progress.f0" class="footnote" name="boost_test.test_output.test_output_progress.f0"><sup class="footnote">[7]</sup></a>.
+        <sup>[<a name="boost_test.test_output.test_output_progress.f0" href="#ftn.boost_test.test_output.test_output_progress.f0" class="footnote">7</a>]</sup>.
       </p>
 <p>
-        The progress display output is enabled using the <span class="emphasis"><em>UTF</em></span>
-        parameter <a class="link" href="../runtime_parameters_reference/show_progress.html#ref_param_show_progress"><code class="computeroutput"><span class="identifier">show_progress</span></code></a>.
+        The progress display output is enabled using the <span class="emphasis"><em>Unit Test Framework</em></span>
+        parameter <a class="link" href="../the_utf_runtime_parameters/reference.html#ref_param_show_progress"><code class="computeroutput"><span class="identifier">show_progress</span></code></a>.
       </p>
 <p>
-        The <span class="emphasis"><em>UTF</em></span> has no ability to estimate how long the test
-        case execution is going to take and the manual test progress update is not
-        supported at this point. The <span class="emphasis"><em>UTF</em></span> tracks the progress
-        on test case level. If you want to see more frequent progress update, you
-        need to split the test into multiple test cases.
+        The <span class="emphasis"><em>Unit Test Framework</em></span> has no ability to estimate how
+        long the test case execution is going to take and the manual test progress
+        update is not supported at this point. The <span class="emphasis"><em>Unit Test Framework</em></span>
+        tracks the progress on test case level. If you want to see more frequent
+        progress update, you need to split the test into multiple test cases.
       </p>
 <p>
         In default configuration both test log and test progress outputs are directed
@@ -59,9 +59,12 @@
       </p>
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">progress_monitor</span><span class="special">.</span><span class="identifier">set_stream</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span><span class="special">&amp;</span> <span class="special">)</span>
 </pre>
-<div class="table">
-<a name="boost_test.test_output.test_output_progress.id_example49"></a><p class="title"><b>Table&#160;35.&#160;Progress report for the test module with large amount of test cases</b></p>
-<div class="table-contents"><table class="table" summary="Progress report for the test module with large amount of test cases">
+<h6>
+<a name="boost_test.test_output.test_output_progress.h0"></a>
+        <span><a name="boost_test.test_output.test_output_progress.example_descr"></a></span><a class="link" href="test_output_progress.html#boost_test.test_output.test_output_progress.example_descr">Example:
+        Progress report for the test module with large amount of test cases</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -80,7 +83,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
 
 <span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
@@ -99,7 +102,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">show_progress</span><span class="special">=</span><span class="identifier">yes</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">nothing</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">show_progress</span><span class="special">=</span><span class="identifier">yes</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">nothing</span>
 
 <span class="number">0</span><span class="special">%</span>   <span class="number">10</span>   <span class="number">20</span>   <span class="number">30</span>   <span class="number">40</span>   <span class="number">50</span>   <span class="number">60</span>   <span class="number">70</span>   <span class="number">80</span>   <span class="number">90</span>   <span class="number">100</span><span class="special">%</span>
 <span class="special">|----|----|----|----|----|----|----|----|----|----|</span>
@@ -110,12 +113,11 @@
               </td>
 </tr></tbody>
 </table></div>
-</div>
-<br class="table-break"><div class="footnotes">
-<br><hr style="width:100; text-align:left;margin-left: 0">
-<div id="ftn.boost_test.test_output.test_output_progress.f0" class="footnote"><p><a href="#boost_test.test_output.test_output_progress.f0" class="para"><sup class="para">[7] </sup></a>
-          The <span class="emphasis"><em>UTF</em></span> interfaces allow implementing an advanced
-          GUI based test runner with arbitrary progress display controls
+<div class="footnotes">
+<br><hr width="100" align="left">
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.test_output.test_output_progress.f0" href="#boost_test.test_output.test_output_progress.f0" class="para">7</a>] </sup>
+          The <span class="emphasis"><em>Unit Test Framework</em></span> interfaces allow implementing
+          an advanced GUI based test runner with arbitrary progress display controls
         </p></div>
 </div>
 </div>
@@ -130,7 +132,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_reports.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_reports.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../the_utf_runtime_parameters.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/test_output/test_reports.html b/doc/v2/html/boost_test/test_output/test_reports.html
old mode 100644
new mode 100755
index 9d554423..d51102bb
--- a/doc/v2/html/boost_test/test_output/test_reports.html
+++ b/doc/v2/html/boost_test/test_output/test_reports.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Test reports</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
-<link rel="prev" href="log_compil_time_configuration/custom_log_formatter.html" title="Custom log format support">
-<link rel="next" href="test_output_progress.html" title="Progression display">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
+<link rel="prev" href="log_compil_time_configuration.html" title="Compile time configuration">
+<link rel="next" href="test_output_progress.html" title="Progress display">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_compil_time_configuration/custom_log_formatter.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output_progress.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="log_compil_time_configuration.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output_progress.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -48,7 +48,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="log_compil_time_configuration/custom_log_formatter.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output_progress.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="log_compil_time_configuration.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_output.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_output_progress.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/test_output/testing_tool_output_disable.html b/doc/v2/html/boost_test/test_output/testing_tool_output_disable.html
old mode 100644
new mode 100755
index ed8f87ce..7a78edd6
--- a/doc/v2/html/boost_test/test_output/testing_tool_output_disable.html
+++ b/doc/v2/html/boost_test/test_output/testing_tool_output_disable.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Disabling automatic printing for specific types</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../test_output.html" title="Controlling the outputs">
+<link rel="up" href="../test_output.html" title="Controlling the Unit Test Framework outputs">
 <link rel="prev" href="log_runtime_config.html" title="Configuring the verbosity of the logs">
 <link rel="next" href="test_output_macro_message.html" title="BOOST_TEST_MESSAGE">
 </head>
@@ -28,7 +28,7 @@
       automatic printing for specific types</a>
 </h3></div></div></div>
 <p>
-        Most of the <a class="link" href="../testing_tools.html" title="The UTF testing tools">testing tools</a>
+        Most of the <a class="link" href="../testing_tools.html" title="The Unit Test Framework testing tools">testing tools</a>
         print values of their arguments to the output stream in some form of log
         statement. If arguments type does not support
       </p>
@@ -36,16 +36,19 @@
 </pre>
 <p>
         interface you will get a compilation error. You can either implement above
-        interface or prohibit the <a class="link" href="../testing_tools.html" title="The UTF testing tools">testing
+        interface or prohibit the <a class="link" href="../testing_tools.html" title="The Unit Test Framework testing tools">testing
         tools</a> from logging argument values for specified type. To do so, use
         following statement on file level before first test case that includes statement
         failing to compile:
       </p>
 <pre class="programlisting"><span class="identifier">BOOST_TEST_DONT_PRINT_LOG_VALUE</span><span class="special">(</span><span class="identifier">ArgumentType</span><span class="special">)</span>
 </pre>
-<div class="table">
-<a name="boost_test.test_output.testing_tool_output_disable.id_example32"></a><p class="title"><b>Table&#160;28.&#160;BOOST_TEST_DONT_PRINT_LOG_VALUE usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_TEST_DONT_PRINT_LOG_VALUE usage">
+<h6>
+<a name="boost_test.test_output.testing_tool_output_disable.h0"></a>
+        <span><a name="boost_test.test_output.testing_tool_output_disable.example_descr"></a></span><a class="link" href="testing_tool_output_disable.html#boost_test.test_output.testing_tool_output_disable.example_descr">Example:
+        BOOST_TEST_DONT_PRINT_LOG_VALUE usage</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -64,7 +67,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">utility</span><span class="special">&gt;</span>
 
@@ -83,7 +86,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">16</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_list"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">p1</span> <span class="special">==</span> <span class="identifier">p2</span> <span class="identifier">failed</span> <span class="special">[</span> <span class="special">!=</span> <span class="special">]</span>
 
 <span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
@@ -92,8 +95,6 @@
 </tr></tbody>
 </table></div>
 </div>
-<br class="table-break">
-</div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
 <td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
diff --git a/doc/v2/html/boost_test/testing_tool_ref.html b/doc/v2/html/boost_test/testing_tool_ref.html
deleted file mode 100644
index 338d9e54..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref.html
+++ /dev/null
@@ -1,329 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>UTF testing tools reference</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="runtime_parameters_reference/save_patterm.html" title="save_patterm">
-<link rel="next" href="testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="runtime_parameters_reference/save_patterm.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tool_ref/assertion_boost_level.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.testing_tool_ref"></a><a class="link" href="testing_tool_ref.html" title="UTF testing tools reference"><span class="emphasis"><em>UTF</em></span> testing
-    tools reference</a>
-</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_bitwise_eq.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_BITWISE_EQUAL</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_eq.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_eq_collections.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL_COLLECTIONS</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_close.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_close_fraction.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_exception.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EXCEPTION</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_ge.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_gt.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_le.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_lt.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_message.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_ne.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NE</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_no_throw.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NO_THROW</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_predicate.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_small.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_level_throw.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_error.html"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_fail.html"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a></span></dt>
-<dt><span class="section"><a href="testing_tool_ref/assertion_boost_is_defined.html"><code class="computeroutput"><span class="identifier">BOOST_IS_DEFINED</span></code></a></span></dt>
-</dl></div>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Assertions
-              </p>
-            </th>
-<th>
-              <p>
-                Short description
-              </p>
-            </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Simple validation of a boolean predicate value.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_bitwise_eq.html" title="BOOST_&lt;level&gt;_BITWISE_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_BITWISE_EQUAL</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Bitwise equality test of two elements.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Equality test of two elements.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_eq_collections.html" title="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL_COLLECTIONS</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Element-wise equality test of two collections.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Floating point comparison using a percentage of deviation.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Floating point comparison using the fraction of the compared operands.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_exception.html" title="BOOST_&lt;level&gt;_EXCEPTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EXCEPTION</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Exception detection and validation check.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Comparison of two values (with convenient reporting).
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Comparison of two values (with convenient reporting).
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Comparison of two values (with convenient reporting).
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Comparison of two values (with convenient reporting).
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Same as <a class="link" href="testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-                with a custom message in case of failure.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_ne.html" title="BOOST_&lt;level&gt;_NE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NE</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Comparison of two values (with convenient reporting).
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_no_throw.html" title="BOOST_&lt;level&gt;_NO_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NO_THROW</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Checks an expression does not throw any exception.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Checks a list of arguments against a predicate functor.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Checks a value is small according to a tolerance.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Checks an expression throws a specific type of expression.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_error.html" title="BOOST_ERROR"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Logs an error message, fails but does not abort the current test.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_fail.html" title="BOOST_FAIL"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Logs an error message, fails and aborts the current test.
-              </p>
-            </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <a class="link" href="testing_tool_ref/assertion_boost_is_defined.html" title="BOOST_IS_DEFINED"><code class="computeroutput"><span class="identifier">BOOST_IS_DEFINED</span></code></a>
-              </p>
-            </td>
-<td>
-              <p>
-                Checks at runtime whether or not the supplied preprocessor symbol
-                is defined.
-              </p>
-            </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="runtime_parameters_reference/save_patterm.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tool_ref/assertion_boost_level.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_error.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_error.html
deleted file mode 100644
index 6873cd08..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_error.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_ERROR</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW">
-<link rel="next" href="assertion_boost_fail.html" title="BOOST_FAIL">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_throw.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_fail.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_error"></a><a class="link" href="assertion_boost_error.html" title="BOOST_ERROR"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_ERROR</span><span class="special">(</span><span class="identifier">message</span><span class="special">);</span>
-</pre>
-<p>
-        <a class="link" href="assertion_boost_error.html" title="BOOST_ERROR"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a> tool behave the same
-        way as <code class="computeroutput"><a class="link" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_CHECK_MESSAGE</span></code></a><span class="special">(</span><span class="keyword">false</span><span class="special">,</span> <span class="identifier">message</span><span class="special">)</span></code>. This tool is used for an unconditional
-        error counter increasing and message logging.
-      </p>
-<p>
-        The only tool's parameter is an error message to log.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_error.id_example46"></a><p class="title"><b>Table&#160;61.&#160;<a class="link" href="assertion_boost_error.html" title="BOOST_ERROR"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_ERROR usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_ERROR</span><span class="special">(</span> <span class="string">"Nothing to test"</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">Nothing</span> <span class="identifier">to</span> <span class="identifier">test</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_throw.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_fail.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_fail.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_fail.html
deleted file mode 100644
index cf03a813..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_fail.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_FAIL</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_error.html" title="BOOST_ERROR">
-<link rel="next" href="assertion_boost_is_defined.html" title="BOOST_IS_DEFINED">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_error.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_is_defined.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_fail"></a><a class="link" href="assertion_boost_fail.html" title="BOOST_FAIL"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_FAIL</span><span class="special">(</span><span class="identifier">message</span><span class="special">);</span>
-</pre>
-<p>
-        <code class="computeroutput"><a class="link" href="assertion_boost_fail.html" title="BOOST_FAIL"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a><span class="special">(</span><span class="identifier">message</span><span class="special">)</span></code>
-        behave the same way as <code class="computeroutput"><a class="link" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_REQUIRE_MESSAGE</span></code></a><span class="special">(</span><span class="keyword">false</span><span class="special">,</span> <span class="identifier">message</span><span class="special">)</span></code>. This tool is used for an unconditional
-        error counter increasing, message logging and the current test case aborting.
-      </p>
-<p>
-        The only tool's parameter is an error message to log.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_fail.id_example47"></a><p class="title"><b>Table&#160;62.&#160;<a class="link" href="assertion_boost_fail.html" title="BOOST_FAIL"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_FAIL usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_FAIL</span><span class="special">(</span> <span class="string">"Test is not ready yet"</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">fatal</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">Test</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">ready</span> <span class="identifier">yet</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_error.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_is_defined.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_is_defined.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_is_defined.html
deleted file mode 100644
index 767a14c1..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_is_defined.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_IS_DEFINED</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_fail.html" title="BOOST_FAIL">
-<link rel="next" href="../reference.html" title="Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_fail.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_is_defined"></a><a class="link" href="assertion_boost_is_defined.html" title="BOOST_IS_DEFINED"><code class="computeroutput"><span class="identifier">BOOST_IS_DEFINED</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_IS_DEFINED</span><span class="special">(</span><span class="identifier">symbol</span><span class="special">);</span>
-</pre>
-<p>
-        Unlike the rest of the tools in the toolbox this tool does not perform the
-        logging itself. Its only purpose is to check at runtime whether or not the
-        supplied preprocessor symbol is defined. Use it in combination with <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-        to perform and log validation. Macros of any arity could be checked. To check
-        the macro definition with non-zero arity specify dummy arguments for it.
-        See below for example.
-      </p>
-<p>
-        The only tool's parameter is a preprocessor symbol that gets validated.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_is_defined.id_example48"></a><p class="title"><b>Table&#160;63.&#160;<a class="link" href="assertion_boost_is_defined.html" title="BOOST_IS_DEFINED"><code class="computeroutput"><span class="identifier">BOOST_IS_DEFINED</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_IS_DEFINED usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">BOOST_IS_DEFINED</span><span class="special">(</span><span class="identifier">SYMBOL1</span><span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">BOOST_IS_DEFINED</span><span class="special">(</span><span class="identifier">SYMBOL2</span><span class="special">(</span><span class="identifier">arg</span><span class="special">))</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">test_tools</span><span class="special">::</span><span class="identifier">tt_detail</span><span class="special">::</span><span class="identifier">is_defined_impl</span><span class="special">(</span> <span class="string">"SYMBOL1"</span><span class="special">,</span> <span class="string">"= SYMBOL1"</span> <span class="special">)</span> <span class="identifier">failed</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">9</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">test_tools</span><span class="special">::</span><span class="identifier">tt_detail</span><span class="special">::</span><span class="identifier">is_defined_impl</span><span class="special">(</span> <span class="string">"SYMBOL2(arg)"</span><span class="special">,</span> <span class="string">"= SYMBOL2(arg)"</span> <span class="special">)</span> <span class="identifier">failed</span>
-
-<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_fail.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level.html
deleted file mode 100644
index 1fd64fa8..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="next" href="assertion_boost_level_bitwise_eq.html" title="BOOST_&lt;level&gt;_BITWISE_EQUAL">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_bitwise_eq.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level"></a><a name="ref_BOOST_level"></a><a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to validate the predicate value. The only parameter
-        for these tools is a boolean predicate value that gets validated. It could
-        be any expression that could be evaluated and converted to boolean value.
-        The expression gets evaluated only once, so it's safe to pass complex expression
-        for validation.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level.id_example34"></a><p class="title"><b>Table&#160;43.&#160;<code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code>
-        usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;
-        usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span><span class="special">=</span><span class="number">2</span><span class="special">;</span>
-  <span class="identifier">BOOST_WARN</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">short</span><span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
-  <span class="identifier">BOOST_REQUIRE</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">&gt;</span> <span class="number">5</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">6</span> <span class="special">);</span>  <span class="comment">// will never reach this check</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">warning</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">9</span><span class="special">):</span> <span class="identifier">warning</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">condition</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">short</span><span class="special">)</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">satisfied</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">11</span><span class="special">):</span> <span class="identifier">fatal</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">critical</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&gt;</span> <span class="number">5</span> <span class="identifier">failed</span>
-
-<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_bitwise_eq.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_bitwise_eq.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_bitwise_eq.html
deleted file mode 100644
index 95763049..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_bitwise_eq.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_BITWISE_EQUAL</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;">
-<link rel="next" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_eq.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_bitwise_eq"></a><a class="link" href="assertion_boost_level_bitwise_eq.html" title="BOOST_&lt;level&gt;_BITWISE_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_BITWISE_EQUAL</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_BITWISE_EQUAL</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_BITWISE_EQUAL</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_BITWISE_EQUAL</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to perform bitwise comparison of two values. The check
-        shows all positions where left and right value's bits mismatch.
-      </p>
-<p>
-        The first parameter is the left compared value. The second parameter is the
-        right compared value. Parameters are not required to be of the same type,
-        but warning is issued if their type's size does not coincide.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_bitwise_eq.id_example33"></a><p class="title"><b>Table&#160;44.&#160;<a class="link" href="assertion_boost_level_bitwise_eq.html" title="BOOST_&lt;level&gt;_BITWISE_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_BITWISE_EQUAL</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_BITWISE_EQUAL usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_BITWISE_EQUAL</span><span class="special">(</span> <span class="special">(</span><span class="keyword">char</span><span class="special">)</span><span class="number">0x26</span><span class="special">,</span> <span class="number">0x04</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="special">(</span><span class="keyword">char</span><span class="special">)</span><span class="number">0x26</span> <span class="special">=.=</span> <span class="number">0x04</span> <span class="identifier">failed</span><span class="special">.</span>
-<span class="identifier">Mismatch</span> <span class="identifier">in</span> <span class="identifier">a</span> <span class="identifier">position</span> <span class="number">1</span>
-<span class="identifier">Mismatch</span> <span class="identifier">in</span> <span class="identifier">a</span> <span class="identifier">position</span> <span class="number">5</span>
-<span class="identifier">Operands</span> <span class="identifier">bit</span> <span class="identifier">sizes</span> <span class="identifier">mismatch</span><span class="special">:</span> <span class="number">8</span> <span class="special">!=</span> <span class="number">32</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_eq.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_close.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_close.html
deleted file mode 100644
index 3b78ae31..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_close.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_CLOSE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_eq_collections.html" title="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS">
-<link rel="next" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_eq_collections.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_close_fraction.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_close"></a><a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_CLOSE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_CLOSE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_CLOSE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to check on closeness using strong relationship defined
-        by the predicate
-      </p>
-<pre class="programlisting"><span class="identifier">check_is_close</span><span class="special">(</span> <span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span> <span class="special">)</span></pre>
-<p>
-        To check for the weak relationship use <a class="link" href="assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a> family of tools with
-        explicit <code class="computeroutput"><span class="identifier">check_is_close</span></code> invocation.
-      </p>
-<p>
-        The first parameter is the <span class="emphasis"><em>left</em></span> compared value. The
-        second parameter is the <span class="emphasis"><em>right</em></span> compared value. Last third
-        parameter defines the tolerance for the comparison in <a class="link" href="../testing_tools/testing_floating_points.html" title="Floating-point testing"><span class="bold"><strong>percentage units</strong></span></a>.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          It is required for left and right parameters to be of the same floating
-          point type. You will need to explicitly resolve any type mismatch to select
-          which type to use for comparison.
-        </p></td></tr>
-</table></div>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Note that to use these tools you need to include additional header <code class="computeroutput"><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span></code>.
-        </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_close.id_example42"></a><p class="title"><b>Table&#160;47.&#160;<a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a> usage with small values</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_CLOSE usage with small values">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">double</span> <span class="identifier">v1</span> <span class="special">=</span> <span class="number">1.23456e-10</span><span class="special">;</span>
-  <span class="keyword">double</span> <span class="identifier">v2</span> <span class="special">=</span> <span class="number">1.23457e-10</span><span class="special">;</span>
-
-  <span class="identifier">BOOST_CHECK_CLOSE</span><span class="special">(</span> <span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">,</span> <span class="number">0.0001</span> <span class="special">);</span>
-  <span class="comment">// Absolute value of difference between these two values is 1e-15. They seems </span>
-  <span class="comment">// to be very close. But we want to checks that these values differ no more then 0.0001%</span>
-  <span class="comment">// of their value. And this test will fail at tolerance supplied.</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">12</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">difference</span> <span class="identifier">between</span> <span class="identifier">v1</span><span class="special">{</span><span class="number">1.23456e-010</span><span class="special">}</span> <span class="keyword">and</span> <span class="identifier">v2</span><span class="special">{</span><span class="number">1.23457e-010</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">0.0001</span><span class="special">%</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_close.id_example43"></a><p class="title"><b>Table&#160;48.&#160;<a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a> usage with big values</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_CLOSE usage with big values">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">double</span> <span class="identifier">v1</span> <span class="special">=</span> <span class="number">1.23456e28</span><span class="special">;</span>
-  <span class="keyword">double</span> <span class="identifier">v2</span> <span class="special">=</span> <span class="number">1.23457e28</span><span class="special">;</span>
-
-  <span class="identifier">BOOST_REQUIRE_CLOSE</span><span class="special">(</span> <span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">,</span> <span class="number">0.001</span> <span class="special">);</span>
-  <span class="comment">// Absolute value of difference between these two values is 1e+23.</span>
-  <span class="comment">// But we are interested only that it does not exeed 0.001% of a values compared</span>
-  <span class="comment">// And this test will pass.</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="../testing_tools/testing_floating_points.html" title="Floating-point testing">Floating
-            point comparison algorithms</a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_eq_collections.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_close_fraction.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_close_fraction.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_close_fraction.html
deleted file mode 100644
index a479877d..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_close_fraction.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_CLOSE_FRACTION</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE">
-<link rel="next" href="assertion_boost_level_exception.html" title="BOOST_&lt;level&gt;_EXCEPTION">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_close.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_exception.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_close_fraction"></a><a class="link" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_CLOSE_FRACTION</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_CLOSE_FRACTION</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_CLOSE_FRACTION</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to check on closeness using strong relationship defined
-        by the predicate
-      </p>
-<pre class="programlisting"><span class="identifier">check_is_close</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">)</span></pre>
-<p>
-        To check for the weak relationship use <a class="link" href="assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a> family of tools with
-        explicit <code class="computeroutput"><span class="identifier">check_is_close</span></code> invocation.
-      </p>
-<p>
-        The first parameter is the <span class="emphasis"><em>left</em></span> compared value. The
-        second parameter is the <span class="emphasis"><em>right</em></span> compared value. Last third
-        parameter defines the tolerance for the comparison as <a class="link" href="../testing_tools/testing_floating_points.html" title="Floating-point testing"><span class="bold"><strong>fraction of absolute values being compared</strong></span></a>.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          It is required for left and right parameters to be of the same floating
-          point type. You will need to explicitly resolve any type mismatch to select
-          which type to use for comparison.
-        </p></td></tr>
-</table></div>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Note that to use these tools you need to include additional header <code class="computeroutput"><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span></code>.
-        </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_close_fraction.id_example44"></a><p class="title"><b>Table&#160;49.&#160;<a class="link" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_CLOSE_FRACTION usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">double</span> <span class="identifier">v1</span> <span class="special">=</span> <span class="number">1.111e-10</span><span class="special">;</span>
-  <span class="keyword">double</span> <span class="identifier">v2</span> <span class="special">=</span> <span class="number">1.112e-10</span><span class="special">;</span>
-
-  <span class="identifier">BOOST_CHECK_CLOSE_FRACTION</span><span class="special">(</span> <span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">,</span> <span class="number">0.0008999</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">12</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">difference</span> <span class="identifier">between</span> <span class="identifier">v1</span><span class="special">{</span><span class="number">1.111e-010</span><span class="special">}</span> <span class="keyword">and</span> <span class="identifier">v2</span><span class="special">{</span><span class="number">1.112e-010</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">0.0008999</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="../testing_tools/testing_floating_points.html" title="Floating-point testing">Floating
-            point comparison algorithms</a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_close.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_exception.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_eq.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_eq.html
deleted file mode 100644
index 3e80646b..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_eq.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_EQUAL</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_bitwise_eq.html" title="BOOST_&lt;level&gt;_BITWISE_EQUAL">
-<link rel="next" href="assertion_boost_level_eq_collections.html" title="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_bitwise_eq.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_eq_collections.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_eq"></a><a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_EQUAL</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_EQUAL</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        Check performed by these tools is the same as the one performed by <code class="computeroutput"><a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a><span class="special">(</span><span class="identifier">left</span> <span class="special">==</span> <span class="identifier">right</span><span class="special">)</span></code>. The difference is that the mismatched values
-        are reported as well.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          It is bad idea to use these tools to compare floating point values. Use
-          <a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a> or <a class="link" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a> tools instead.
-        </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_eq.id_example35"></a><p class="title"><b>Table&#160;45.&#160;<a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_EQUAL usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">2</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span>
-  <span class="identifier">BOOST_REQUIRE_EQUAL</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">fatal</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">critical</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="identifier">j</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">2</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_ne.html" title="BOOST_&lt;level&gt;_NE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_eq_collections.html" title="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL_COLLECTIONS</span></code></a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_bitwise_eq.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_eq_collections.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_eq_collections.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_eq_collections.html
deleted file mode 100644
index 1e17cf79..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_eq_collections.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_EQUAL_COLLECTIONS</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL">
-<link rel="next" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_eq.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_close.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_eq_collections"></a><a class="link" href="assertion_boost_level_eq_collections.html" title="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL_COLLECTIONS</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_EQUAL_COLLECTIONS</span><span class="special">(</span><span class="identifier">left_begin</span><span class="special">,</span> <span class="identifier">left_end</span><span class="special">,</span> <span class="identifier">right_begin</span><span class="special">,</span> <span class="identifier">right_end</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_EQUAL_COLLECTIONS</span><span class="special">(</span><span class="identifier">left_begin</span><span class="special">,</span> <span class="identifier">left_end</span><span class="special">,</span> <span class="identifier">right_begin</span><span class="special">,</span> <span class="identifier">right_end</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_EQUAL_COLLECTIONS</span><span class="special">(</span><span class="identifier">left_begin</span><span class="special">,</span> <span class="identifier">left_end</span><span class="special">,</span> <span class="identifier">right_begin</span><span class="special">,</span> <span class="identifier">right_end</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to perform an element by element comparison of two collections.
-        They print all mismatched positions, collection elements at these positions
-        and check that the collections have the same size. The first two parameters
-        designate begin and end of the first collection. The two last parameters
-        designate begin and end of the second collection.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_eq_collections.id_example36"></a><p class="title"><b>Table&#160;46.&#160;<a class="link" href="assertion_boost_level_eq_collections.html" title="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL_COLLECTIONS</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_EQUAL_COLLECTIONS usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">col1</span> <span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">5</span><span class="special">,</span> <span class="number">6</span><span class="special">,</span> <span class="number">7</span> <span class="special">};</span>
-  <span class="keyword">int</span> <span class="identifier">col2</span> <span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">5</span><span class="special">,</span> <span class="number">7</span><span class="special">,</span> <span class="number">7</span> <span class="special">};</span>
-
-  <span class="identifier">BOOST_CHECK_EQUAL_COLLECTIONS</span><span class="special">(</span> <span class="identifier">col1</span><span class="special">,</span> <span class="identifier">col1</span><span class="special">+</span><span class="number">7</span><span class="special">,</span> <span class="identifier">col2</span><span class="special">,</span> <span class="identifier">col2</span><span class="special">+</span><span class="number">7</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">11</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="special">{</span> <span class="identifier">col1</span><span class="special">,</span> <span class="identifier">col1</span><span class="special">+</span><span class="number">7</span> <span class="special">}</span> <span class="special">==</span> <span class="special">{</span> <span class="identifier">col2</span><span class="special">,</span> <span class="identifier">col2</span><span class="special">+</span><span class="number">7</span> <span class="special">}</span> <span class="identifier">failed</span><span class="special">.</span>
-<span class="identifier">Mismatch</span> <span class="identifier">in</span> <span class="identifier">a</span> <span class="identifier">position</span> <span class="number">2</span><span class="special">:</span> <span class="number">3</span> <span class="special">!=</span> <span class="number">4</span>
-<span class="identifier">Mismatch</span> <span class="identifier">in</span> <span class="identifier">a</span> <span class="identifier">position</span> <span class="number">5</span><span class="special">:</span> <span class="number">6</span> <span class="special">!=</span> <span class="number">7</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_eq.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_close.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_exception.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_exception.html
deleted file mode 100644
index c414f888..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_exception.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_EXCEPTION</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION">
-<link rel="next" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_close_fraction.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_ge.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_exception"></a><a class="link" href="assertion_boost_level_exception.html" title="BOOST_&lt;level&gt;_EXCEPTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EXCEPTION</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_EXCEPTION</span><span class="special">(</span><span class="identifier">expression</span><span class="special">,</span> <span class="identifier">exception</span><span class="special">,</span> <span class="identifier">predicate</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_EXCEPTION</span><span class="special">(</span><span class="identifier">expression</span><span class="special">,</span> <span class="identifier">exception</span><span class="special">,</span> <span class="identifier">predicate</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_EXCEPTION</span><span class="special">(</span><span class="identifier">expression</span><span class="special">,</span> <span class="identifier">exception</span><span class="special">,</span> <span class="identifier">predicate</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to perform an exception detection and validation check.
-        Tools execute the supplied expression and validate that it throws an exception
-        of supplied class (or the one derived from it) that complies with the supplied
-        predicate. If the expression throws any other unrelated exception, doesn't
-        throw at all or predicate evaluates to false, check fails. In comparison
-        with <a class="link" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a> tools these allow performing
-        more fine-grained checks. For example: make sure that an expected exception
-        has specific error message.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_exception.id_example37"></a><p class="title"><b>Table&#160;50.&#160;<a class="link" href="assertion_boost_level_exception.html" title="BOOST_&lt;level&gt;_EXCEPTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EXCEPTION</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_EXCEPTION usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">struct</span> <span class="identifier">my_exception</span>
-<span class="special">{</span>
-  <span class="keyword">explicit</span> <span class="identifier">my_exception</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">ec</span> <span class="special">=</span> <span class="number">0</span> <span class="special">)</span> <span class="special">:</span> <span class="identifier">m_error_code</span><span class="special">(</span> <span class="identifier">ec</span> <span class="special">)</span>
-  <span class="special">{}</span>
-
-  <span class="keyword">int</span> <span class="identifier">m_error_code</span><span class="special">;</span>
-<span class="special">};</span>
-
-<span class="keyword">bool</span> <span class="identifier">is_critical</span><span class="special">(</span> <span class="identifier">my_exception</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">ex</span> <span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="identifier">ex</span><span class="special">.</span><span class="identifier">m_error_code</span> <span class="special">&lt;</span> <span class="number">0</span><span class="special">;</span> <span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_EXCEPTION</span><span class="special">(</span> <span class="keyword">throw</span> <span class="identifier">my_exception</span><span class="special">(</span> <span class="number">1</span> <span class="special">),</span> <span class="identifier">my_exception</span><span class="special">,</span> <span class="identifier">is_critical</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">16</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">incorrect</span> <span class="identifier">exception</span> <span class="identifier">my_exception</span> <span class="identifier">is</span> <span class="identifier">caught</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_close_fraction.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_ge.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_ge.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_ge.html
deleted file mode 100644
index 30b33835..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_ge.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_GE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_exception.html" title="BOOST_&lt;level&gt;_EXCEPTION">
-<link rel="next" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_exception.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_gt.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_ge"></a><a class="link" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_GE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_GE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_GE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        Check performed by these tools is the same as the one performed by <code class="computeroutput"><a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a><span class="special">(</span> <span class="identifier">left</span> <span class="special">&gt;=</span> <span class="identifier">right</span> <span class="special">)</span></code>. The difference is that the argument values
-        are reported as well.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_ge.id_example57"></a><p class="title"><b>Table&#160;51.&#160;<a class="link" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_GE usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">1</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">4</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_GE</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span><span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&gt;=</span> <span class="identifier">j</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">1</span> <span class="special">&lt;</span> <span class="number">4</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_exception.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_gt.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_gt.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_gt.html
deleted file mode 100644
index d2d8c6eb..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_gt.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_GT</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE">
-<link rel="next" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_ge.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_le.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_gt"></a><a class="link" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_GT</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_GT</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_GT</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        Check performed by these tools is the same as the one performed by <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a><code class="computeroutput"><span class="special">(</span> <span class="identifier">left</span> <span class="special">&gt;</span> <span class="identifier">right</span> <span class="special">)</span></code>. The difference is that the argument values
-        are reported as well.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_gt.id_example58"></a><p class="title"><b>Table&#160;52.&#160;<a class="link" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_GT usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">2</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">14</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_GT</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span><span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&gt;</span> <span class="identifier">j</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">2</span> <span class="special">&lt;</span> <span class="number">14</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_ge.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_le.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_le.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_le.html
deleted file mode 100644
index 08f57ab6..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_le.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_LE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT">
-<link rel="next" href="assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_gt.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_lt.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_le"></a><a class="link" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_LE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_LE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_LE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        Check performed by these tools is the same as the one performed by <code class="computeroutput"><a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a><span class="special">(</span> <span class="identifier">left</span> <span class="special">&lt;=</span> <span class="identifier">right</span> <span class="special">)</span></code>. The difference is that the argument values
-        are reported as well.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_le.id_example55"></a><p class="title"><b>Table&#160;53.&#160;<a class="link" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_LE usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">9</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">6</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_LE</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span><span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&lt;=</span> <span class="identifier">j</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">9</span> <span class="special">&gt;</span> <span class="number">6</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_gt.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_lt.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_lt.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_lt.html
deleted file mode 100644
index b1419afd..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_lt.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_LT</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE">
-<link rel="next" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_le.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_message.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_lt"></a><a class="link" href="assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_LT</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_LT</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_LT</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        Check performed by these tools is the same as the one performed by <code class="computeroutput"><a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a><span class="special">(</span> <span class="identifier">left</span> <span class="special">&lt;</span> <span class="identifier">right</span> <span class="special">)</span></code>. The difference is that the argument values
-        are reported as well.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_lt.id_example56"></a><p class="title"><b>Table&#160;54.&#160;<a class="link" href="assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_LT usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">7</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">7</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_LT</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span><span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="identifier">j</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">7</span> <span class="special">&gt;=</span> <span class="number">7</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_le.html" title="BOOST_&lt;level&gt;_LE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_ge.html" title="BOOST_&lt;level&gt;_GE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_gt.html" title="BOOST_&lt;level&gt;_GT"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_le.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_message.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_message.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_message.html
deleted file mode 100644
index 2a769817..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_message.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_MESSAGE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_lt.html" title="BOOST_&lt;level&gt;_LT">
-<link rel="next" href="assertion_boost_level_ne.html" title="BOOST_&lt;level&gt;_NE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_lt.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_ne.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_message"></a><a class="link" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_MESSAGE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">,</span> <span class="identifier">message</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_MESSAGE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">,</span> <span class="identifier">message</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_MESSAGE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">,</span> <span class="identifier">message</span><span class="special">);</span>
-</pre>
-<p>
-        These tools perform exactly the same check as <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-        tools. The only difference is that instead of generating an error/confirm
-        message these use the supplied one.
-      </p>
-<p>
-        The first parameter is the boolean expression. The second parameter is the
-        message reported in case of check failure. The message argument can be constructed
-        of components of any type supporting the <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span><span class="special">&amp;</span> <span class="keyword">operator</span><span class="special">&lt;&lt;(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span><span class="special">&amp;)</span></code>.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_message.id_example38"></a><p class="title"><b>Table&#160;55.&#160;<a class="link" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_MESSAGE usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">cmath</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">double</span> <span class="identifier">res</span> <span class="special">=</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">sin</span><span class="special">(</span> <span class="number">45.</span> <span class="special">);</span> <span class="comment">// sin 45 radians is actually ~ 0.85, sin 45 degrees is ~0.707</span>
-
-  <span class="identifier">BOOST_WARN_MESSAGE</span><span class="special">(</span> <span class="identifier">res</span> <span class="special">&lt;</span> <span class="number">0.71</span><span class="special">,</span> <span class="string">"sin(45){"</span> <span class="special">&lt;&lt;</span> <span class="identifier">res</span> <span class="special">&lt;&lt;</span> <span class="string">"} is &gt; 0.71. Arg is not in radian?"</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">warning</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">12</span><span class="special">):</span> <span class="identifier">warning</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">sin</span><span class="special">(</span><span class="number">45</span><span class="special">){</span><span class="number">0.850904</span><span class="special">}</span> <span class="identifier">is</span> <span class="special">&gt;</span> <span class="number">0.71</span><span class="special">.</span> <span class="identifier">Arg</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">in</span> <span class="identifier">radian</span><span class="special">?</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_lt.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_ne.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_ne.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_ne.html
deleted file mode 100644
index cf19c889..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_ne.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_NE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE">
-<link rel="next" href="assertion_boost_level_no_throw.html" title="BOOST_&lt;level&gt;_NO_THROW">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_message.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_no_throw.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_ne"></a><a class="link" href="assertion_boost_level_ne.html" title="BOOST_&lt;level&gt;_NE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NE</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_NE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_NE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_NE</span><span class="special">(</span><span class="identifier">left</span><span class="special">,</span> <span class="identifier">right</span><span class="special">);</span>
-</pre>
-<p>
-        Check performed by these tools is the same as the one performed by <code class="computeroutput"><a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a><span class="special">(</span> <span class="identifier">left</span> <span class="special">!=</span> <span class="identifier">right</span> <span class="special">)</span></code>. The difference is that the matched values
-        are reported as well.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_ne.id_example54"></a><p class="title"><b>Table&#160;56.&#160;<a class="link" href="assertion_boost_level_ne.html" title="BOOST_&lt;level&gt;_NE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NE</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_NE usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">3</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">3</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_NE</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span><span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">3</span> <span class="special">==</span> <span class="number">3</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_message.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_no_throw.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_no_throw.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_no_throw.html
deleted file mode 100644
index e8c014d0..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_no_throw.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_NO_THROW</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_ne.html" title="BOOST_&lt;level&gt;_NE">
-<link rel="next" href="assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_ne.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_predicate.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_no_throw"></a><a class="link" href="assertion_boost_level_no_throw.html" title="BOOST_&lt;level&gt;_NO_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NO_THROW</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_NO_THROW</span><span class="special">(</span><span class="identifier">expression</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_NO_THROW</span><span class="special">(</span><span class="identifier">expression</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_NO_THROW</span><span class="special">(</span><span class="identifier">expression</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to perform a "no throw" check. Tools execute
-        the supplied expression and validate that it does not throw any exceptions.
-        Error would be reported by the framework even if the statement appear directly
-        in test case body and throw any exception. But these tools allow proceeding
-        further with test case in case of failure.
-      </p>
-<p>
-        If check is successful, tools may produce a confirmation message, in other
-        case they produce an error message in a form
-      </p>
-<pre class="programlisting"><span class="identifier">error</span> <span class="identifier">in</span> <span class="special">&lt;</span><span class="identifier">test</span><span class="special">-</span><span class="keyword">case</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;;</span><span class="identifier">exception</span> <span class="identifier">was</span> <span class="identifier">thrown</span> <span class="identifier">by</span> <span class="special">&lt;</span><span class="identifier">expression</span><span class="special">&gt;</span></pre>
-<p>
-        The only parameter is an expression to execute. You can use <code class="computeroutput"><span class="keyword">do</span> <span class="special">{}</span> <span class="keyword">while</span><span class="special">(</span><span class="number">0</span><span class="special">)</span></code>
-        block if you want to execute more than one statement.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_no_throw.id_example39"></a><p class="title"><b>Table&#160;57.&#160;<a class="link" href="assertion_boost_level_no_throw.html" title="BOOST_&lt;level&gt;_NO_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NO_THROW</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_NO_THROW usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">class</span> <span class="identifier">my_exception</span><span class="special">{};</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_NO_THROW</span><span class="special">(</span> <span class="keyword">throw</span> <span class="identifier">my_exception</span><span class="special">()</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">exception</span> <span class="identifier">thrown</span> <span class="identifier">by</span> <span class="keyword">throw</span> <span class="identifier">my_exception</span><span class="special">()</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_ne.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_predicate.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_predicate.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_predicate.html
deleted file mode 100644
index b845d235..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_predicate.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_PREDICATE</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_no_throw.html" title="BOOST_&lt;level&gt;_NO_THROW">
-<link rel="next" href="assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_no_throw.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_small.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_predicate"></a><a class="link" href="assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_PREDICATE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">,</span> <span class="identifier">arguments_list</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_PREDICATE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">,</span> <span class="identifier">arguments_list</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_PREDICATE</span><span class="special">(</span><span class="identifier">predicate</span><span class="special">,</span> <span class="identifier">arguments_list</span><span class="special">);</span>
-</pre>
-<p>
-        These are generic tools used to validate an arbitrary supplied predicate
-        functor (there is a compile time limit on predicate arity defined by the
-        configurable macro <code class="computeroutput"><span class="identifier">BOOST_TEST_MAX_PREDICATE_ARITY</span></code>).
-        To validate zero arity predicate use <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-        tools. In other cases prefer theses tools. The advantage of these tools is
-        that they show arguments values in case of predicate failure.
-      </p>
-<p>
-        The first parameter is the predicate itself. The second parameter is the
-        list of predicate arguments each wrapped in round brackets (<code class="computeroutput"><span class="identifier">BOOST_PP</span></code> sequence format).
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_predicate.id_example40"></a><p class="title"><b>Table&#160;58.&#160;<a class="link" href="assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_PREDICATE usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">bool</span> <span class="identifier">moo</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">arg1</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">arg2</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">mod</span> <span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="special">((</span><span class="identifier">arg1</span><span class="special">+</span><span class="identifier">arg2</span><span class="special">)</span> <span class="special">%</span> <span class="identifier">mod</span><span class="special">)</span> <span class="special">==</span> <span class="number">0</span><span class="special">;</span> <span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">17</span><span class="special">;</span>
-  <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">=</span> <span class="number">15</span><span class="special">;</span>
-  <span class="identifier">unit_test_log</span><span class="special">.</span><span class="identifier">set_threshold_level</span><span class="special">(</span> <span class="identifier">log_warnings</span> <span class="special">);</span>
-  <span class="identifier">BOOST_WARN</span><span class="special">(</span> <span class="identifier">moo</span><span class="special">(</span> <span class="number">12</span><span class="special">,</span><span class="identifier">i</span><span class="special">,</span><span class="identifier">j</span> <span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">BOOST_WARN_PREDICATE</span><span class="special">(</span> <span class="identifier">moo</span><span class="special">,</span> <span class="special">(</span><span class="number">12</span><span class="special">)(</span><span class="identifier">i</span><span class="special">)(</span><span class="identifier">j</span><span class="special">)</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">14</span><span class="special">):</span> <span class="identifier">warning</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">condition</span> <span class="identifier">moo</span><span class="special">(</span> <span class="number">12</span><span class="special">,</span><span class="identifier">i</span><span class="special">,</span><span class="identifier">j</span> <span class="special">)</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">satisfied</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">15</span><span class="special">):</span> <span class="identifier">warning</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">condition</span> <span class="identifier">moo</span><span class="special">(</span> <span class="number">12</span><span class="special">,</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">j</span> <span class="special">)</span> <span class="identifier">is</span> <span class="keyword">not</span> <span class="identifier">satisfied</span> <span class="keyword">for</span> <span class="special">(</span> <span class="number">12</span><span class="special">,</span> <span class="number">17</span><span class="special">,</span> <span class="number">15</span> <span class="special">)</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Note difference in error log from <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-        </p></td></tr>
-</table></div>
-<p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_no_throw.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_small.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_small.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_small.html
deleted file mode 100644
index 207c28ed..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_small.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_SMALL</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE">
-<link rel="next" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_predicate.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_throw.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_small"></a><a class="link" href="assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_SMALL</span><span class="special">(</span><span class="identifier">value</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_SMALL</span><span class="special">(</span><span class="identifier">value</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_SMALL</span><span class="special">(</span><span class="identifier">value</span><span class="special">,</span> <span class="identifier">tolerance</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to check that supplied value is small enough. The "smallness"
-        is defined by absolute value of the tolerance supplied as a second argument.
-        Use these tools with caution. To compare to values on closeness it's preferable
-        to use <a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a> tools instead.
-      </p>
-<p>
-        The first parameter is the value to check. The second parameter is the tolerance.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          Note that to use these tools you need to include additional header <code class="computeroutput"><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span></code>.
-        </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_small.id_example41"></a><p class="title"><b>Table&#160;59.&#160;<a class="link" href="assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_SMALL usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">double</span> <span class="identifier">v</span> <span class="special">=</span> <span class="special">-</span><span class="number">1.23456e-3</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_SMALL</span><span class="special">(</span> <span class="identifier">v</span><span class="special">,</span> <span class="number">0.000001</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">11</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">absolute</span> <span class="identifier">value</span> <span class="identifier">of</span> <span class="identifier">v</span><span class="special">{-</span><span class="number">0.00123456</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">1e-006</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="assertion_boost_level_close_fraction.html" title="BOOST_&lt;level&gt;_CLOSE_FRACTION"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a>
-          </li>
-<li class="listitem">
-            <a class="link" href="../testing_tools/testing_floating_points.html" title="Floating-point testing">Floating
-            point comparison algorithms</a>
-          </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_predicate.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_level_throw.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_throw.html b/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_throw.html
deleted file mode 100644
index 6c3a9198..00000000
--- a/doc/v2/html/boost_test/testing_tool_ref/assertion_boost_level_throw.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_&lt;level&gt;_THROW</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tool_ref.html" title="UTF testing tools reference">
-<link rel="prev" href="assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL">
-<link rel="next" href="assertion_boost_error.html" title="BOOST_ERROR">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_small.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_error.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_throw"></a><a class="link" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a>
-</h3></div></div></div>
-<pre class="programlisting"><span class="identifier">BOOST_WARN_THROW</span><span class="special">(</span><span class="identifier">expression</span><span class="special">,</span> <span class="identifier">exception</span><span class="special">);</span>
-<span class="identifier">BOOST_CHECK_THROW</span><span class="special">(</span><span class="identifier">expression</span><span class="special">,</span> <span class="identifier">exception</span><span class="special">);</span>
-<span class="identifier">BOOST_REQUIRE_THROW</span><span class="special">(</span><span class="identifier">expression</span><span class="special">,</span> <span class="identifier">exception</span><span class="special">);</span>
-</pre>
-<p>
-        These tools are used to perform an exception detection check. Tools execute
-        the supplied expression and validate that it throws an exception of supplied
-        class (or the one derived from it) or it's child. If the statement throws
-        any other unrelated exception or doesn't throw at all, check fails.
-      </p>
-<p>
-        If check is successful, the tool produces a confirmation message, in other
-        case it produces an error message in a form
-      </p>
-<pre class="programlisting"><span class="identifier">error</span> <span class="identifier">in</span> <span class="special">&lt;</span><span class="identifier">test</span><span class="special">-</span><span class="keyword">case</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;:</span> <span class="identifier">exception</span> <span class="special">&lt;</span><span class="identifier">exception</span><span class="special">&gt;</span> <span class="identifier">expected</span>
-</pre>
-<p>
-        The first parameter is the expression to execute. Use <code class="computeroutput"><span class="keyword">do</span><span class="special">{}</span> <span class="keyword">while</span><span class="special">(</span><span class="number">0</span><span class="special">)</span></code> block if
-        you want to execute more than one statement. The second parameter is an expected
-        exception.
-      </p>
-<div class="table">
-<a name="boost_test.testing_tool_ref.assertion_boost_level_throw.id_example45"></a><p class="title"><b>Table&#160;60.&#160;<a class="link" href="assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a> usage</b></p>
-<div class="table-contents"><table class="table" summary="BOOST_&lt;level&gt;_THROW usage">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Code
-                </p>
-              </th>
-<th>
-                <p>
-                  Output
-                </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">class</span> <span class="identifier">my_exception</span><span class="special">{};</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span>  <span class="number">0</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK_THROW</span><span class="special">(</span> <span class="identifier">i</span><span class="special">++,</span> <span class="identifier">my_exception</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-              </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">11</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">exception</span> <span class="identifier">my_exception</span> <span class="identifier">is</span> <span class="identifier">expected</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-        See also:
-      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            <a class="link" href="assertion_boost_level_no_throw.html" title="BOOST_&lt;level&gt;_NO_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NO_THROW</span></code></a>
-          </li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="assertion_boost_level_small.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tool_ref.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="assertion_boost_error.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/testing_tools.html b/doc/v2/html/boost_test/testing_tools.html
old mode 100644
new mode 100755
index 1279951b..fe19ea23
--- a/doc/v2/html/boost_test/testing_tools.html
+++ b/doc/v2/html/boost_test/testing_tools.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The UTF testing tools</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>The Unit Test Framework testing tools</title>
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="tests_organization/fixtures/global_fixture.html" title="Global fixture">
+<link rel="prev" href="tests_organization/fixtures.html" title="Fixtures">
 <link rel="next" href="testing_tools/tools_assertion_severity_level.html" title="Assertion severity level">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,33 +20,23 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="tests_organization/fixtures/global_fixture.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tools/tools_assertion_severity_level.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="tests_organization/fixtures.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tools/tools_assertion_severity_level.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.testing_tools"></a><a class="link" href="testing_tools.html" title="The UTF testing tools">The <span class="emphasis"><em>UTF</em></span>
+<a name="boost_test.testing_tools"></a><a class="link" href="testing_tools.html" title="The Unit Test Framework testing tools">The <span class="emphasis"><em>Unit Test Framework</em></span>
     testing tools</a>
 </h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="testing_tools/tools_assertion_severity_level.html">Assertion
-      severity level</a></span></dt>
-<dt><span class="section"><a href="testing_tools/custom_predicates.html">Custom predicate
-      support</a></span></dt>
-<dt><span class="section"><a href="testing_tools/output_stream_testing.html">Output
-      streams testing tool</a></span></dt>
-<dt><span class="section"><a href="testing_tools/testing_floating_points.html">Floating-point
-      testing</a></span></dt>
-</dl></div>
 <p>
-      The <span class="emphasis"><em>UTF</em></span>'s supplies a toolbox of testing tools to ease
-      creation and maintenance of test programs and provide a uniform error reporting
-      mechanism. The toolbox supplied in most part in a form of macro and function
-      declarations. While the functions can be called directly, the usual way to
-      use testing tools is via convenience macros. All macros arguments are calculated
-      once, so it's safe to pass complex expressions in their place. All tools automatically
-      supply an error location: a file name and a line number. The testing tools
-      are intended for unit test code rather than library or production code, where
-      throwing exceptions, using <code class="computeroutput"><span class="identifier">assert</span><span class="special">()</span></code>, <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">concept_check</span></code>
+      The <span class="emphasis"><em>Unit Test Framework</em></span>'s supplies a toolbox of testing
+      tools to ease creation and maintenance of test programs and provide a uniform
+      error reporting mechanism. The toolbox supplied in most part in a form of macro
+      and function declarations. While the functions can be called directly, the
+      usual way to use testing tools is via convenience macros. All macros arguments
+      are calculated once, so it's safe to pass complex expressions in their place.
+      All tools automatically supply an error location: a file name and a line number.
+      The testing tools are intended for unit test code rather than library or production
+      code, where throwing exceptions, using <code class="computeroutput"><span class="identifier">assert</span><span class="special">()</span></code>, <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">concept_check</span></code>
       or <code class="computeroutput"><span class="identifier">BOOST_STATIC_ASSERT</span><span class="special">()</span></code>
       may be more suitable ways to detect and report errors. For list of all supplied
       testing tools and usage examples see the reference.
@@ -63,7 +53,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="tests_organization/fixtures/global_fixture.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tools/tools_assertion_severity_level.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="tests_organization/fixtures.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tools/tools_assertion_severity_level.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/testing_tools/custom_predicates.html b/doc/v2/html/boost_test/testing_tools/custom_predicates.html
old mode 100644
new mode 100755
index 20b68355..6b9dd446
--- a/doc/v2/html/boost_test/testing_tools/custom_predicates.html
+++ b/doc/v2/html/boost_test/testing_tools/custom_predicates.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Custom predicate support</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tools.html" title="The UTF testing tools">
+<link rel="up" href="../testing_tools.html" title="The Unit Test Framework testing tools">
 <link rel="prev" href="tools_assertion_severity_level.html" title="Assertion severity level">
 <link rel="next" href="output_stream_testing.html" title="Output streams testing tool">
 </head>
@@ -36,14 +36,17 @@
         tools toolbox: with and without custom error message generation.
       </p>
 <p>
-        The first layer is supported by <a class="link" href="../testing_tool_ref/assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a> family of testing tools.
+        The first layer is supported by <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_predicate" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a> family of testing tools.
         You can use it to check any custom predicate that reports the result as boolean
         value. The values of the predicate arguments are reported by the tool automatically
         in case of failure.
       </p>
-<div class="table">
-<a name="boost_test.testing_tools.custom_predicates.id_example30"></a><p class="title"><b>Table&#160;23.&#160;Custom predicate support using <a class="link" href="../testing_tool_ref/assertion_boost_level_predicate.html" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a></b></p>
-<div class="table-contents"><table class="table" summary="Custom predicate support using BOOST_&lt;level&gt;_PREDICATE">
+<h6>
+<a name="boost_test.testing_tools.custom_predicates.h0"></a>
+        <span><a name="boost_test.testing_tools.custom_predicates.example_descr"></a></span><a class="link" href="custom_predicates.html#boost_test.testing_tools.custom_predicates.example_descr">Example:
+        Custom predicate support using <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_predicate" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a></a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -62,7 +65,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="keyword">bool</span> <span class="identifier">is_even</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">)</span>
@@ -80,7 +83,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
 <span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">13</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_is_even"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">is_even</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">)</span> <span class="identifier">failed</span> <span class="keyword">for</span> <span class="special">(</span> <span class="number">17</span> <span class="special">)</span>
 
@@ -89,8 +92,7 @@
               </td>
 </tr></tbody>
 </table></div>
-</div>
-<br class="table-break"><p>
+<p>
         To use second layer your predicate has to return <code class="computeroutput"><a class="link" href="../../header/boost/test/tools/assertion_result_hpp.html#boost.test_tools.predicate_result">boost::test_tools::predicate_result</a></code>.
       </p>
 <p>
@@ -108,9 +110,12 @@
         <code class="computeroutput"><span class="identifier">p_predicate_value</span></code>. The error
         message is stored in public read-write property <code class="computeroutput"><span class="identifier">p_message</span></code>.
       </p>
-<div class="table">
-<a name="boost_test.testing_tools.custom_predicates.id_example31"></a><p class="title"><b>Table&#160;24.&#160;Custom predicate support using class <code class="computeroutput"><a class="link" href="../../header/boost/test/tools/assertion_result_hpp.html#boost.test_tools.predicate_result">boost::test_tools::predicate_result</a></code></b></p>
-<div class="table-contents"><table class="table" summary="Custom predicate support using class boost::test_tools::predicate_result">
+<h6>
+<a name="boost_test.testing_tools.custom_predicates.h1"></a>
+        <span><a name="boost_test.testing_tools.custom_predicates.example_descr0"></a></span><a class="link" href="custom_predicates.html#boost_test.testing_tools.custom_predicates.example_descr0">Example:
+        Custom predicate support using class <code class="computeroutput"><a class="link" href="../../header/boost/test/tools/assertion_result_hpp.html#boost.test_tools.predicate_result">boost::test_tools::predicate_result</a></code></a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -129,7 +134,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="identifier">boost</span><span class="special">::</span><span class="identifier">test_tools</span><span class="special">::</span><span class="identifier">predicate_result</span>
@@ -157,7 +162,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">28</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_list_comparizon"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">compare_lists</span><span class="special">(</span> <span class="identifier">l1</span><span class="special">,</span> <span class="identifier">l2</span> <span class="special">)</span> <span class="identifier">failed</span><span class="special">.</span> <span class="identifier">Different</span> <span class="identifier">sizes</span> <span class="special">[</span><span class="number">2</span><span class="special">!=</span><span class="number">0</span><span class="special">]</span>
 
 <span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
@@ -166,8 +171,6 @@
 </tr></tbody>
 </table></div>
 </div>
-<br class="table-break">
-</div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
 <td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
diff --git a/doc/v2/html/boost_test/testing_tools/output_stream_testing.html b/doc/v2/html/boost_test/testing_tools/output_stream_testing.html
old mode 100644
new mode 100755
index 23a9e217..4aa375ba
--- a/doc/v2/html/boost_test/testing_tools/output_stream_testing.html
+++ b/doc/v2/html/boost_test/testing_tools/output_stream_testing.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Output streams testing tool</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tools.html" title="The UTF testing tools">
+<link rel="up" href="../testing_tools.html" title="The Unit Test Framework testing tools">
 <link rel="prev" href="custom_predicates.html" title="Custom predicate support">
 <link rel="next" href="testing_floating_points.html" title="Floating-point testing">
 </head>
@@ -97,7 +97,7 @@
 </table></div>
 <h4>
 <a name="boost_test.testing_tools.output_stream_testing.h0"></a>
-        <span class="phrase"><a name="boost_test.testing_tools.output_stream_testing.usages"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.usages">Usage</a>
+        <span><a name="boost_test.testing_tools.output_stream_testing.usages"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.usages">Usage</a>
       </h4>
 <p>
         There are two ways to employ the class <code class="computeroutput"><span class="identifier">output_test_stream</span></code>:
@@ -112,16 +112,19 @@
 </ol></div>
 <h5>
 <a name="boost_test.testing_tools.output_stream_testing.h1"></a>
-        <span class="phrase"><a name="boost_test.testing_tools.output_stream_testing.explicit_output_checks"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.explicit_output_checks">Explicit
+        <span><a name="boost_test.testing_tools.output_stream_testing.explicit_output_checks"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.explicit_output_checks">Explicit
         output checks</a>
       </h5>
 <p>
         Use the instance of class <code class="computeroutput"><span class="identifier">output_test_stream</span></code>
         as an output stream and check output content using tool's methods.
       </p>
-<div class="table">
-<a name="boost_test.testing_tools.output_stream_testing.id_example28"></a><p class="title"><b>Table&#160;25.&#160;Explicit output checks with <code class="computeroutput"><span class="identifier">output_test_stream</span></code></b></p>
-<div class="table-contents"><table class="table" summary="Explicit output checks with output_test_stream">
+<h6>
+<a name="boost_test.testing_tools.output_stream_testing.h2"></a>
+        <span><a name="boost_test.testing_tools.output_stream_testing.example_descr"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.example_descr">Example:
+        Explicit output checks with <code class="computeroutput"><span class="identifier">output_test_stream</span></code></a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -140,7 +143,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">output_test_stream</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">test_tools</span><span class="special">::</span><span class="identifier">output_test_stream</span><span class="special">;</span>
@@ -157,7 +160,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
 <span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">15</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">is_equal</span><span class="special">(</span> <span class="string">"i=3"</span> <span class="special">)</span> <span class="identifier">failed</span><span class="special">.</span> <span class="identifier">Output</span> <span class="identifier">content</span><span class="special">:</span> <span class="string">"i=2"</span>
 
@@ -166,8 +169,7 @@
               </td>
 </tr></tbody>
 </table></div>
-</div>
-<br class="table-break"><div class="note"><table border="0" summary="Note">
+<div class="note"><table border="0" summary="Note">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
 <th align="left">Note</th>
@@ -192,8 +194,8 @@
         </p></td></tr>
 </table></div>
 <h5>
-<a name="boost_test.testing_tools.output_stream_testing.h2"></a>
-        <span class="phrase"><a name="boost_test.testing_tools.output_stream_testing.pattern_file_matching"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.pattern_file_matching">Pattern
+<a name="boost_test.testing_tools.output_stream_testing.h3"></a>
+        <span><a name="boost_test.testing_tools.output_stream_testing.pattern_file_matching"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.pattern_file_matching">Pattern
         file matching</a>
       </h5>
 <p>
@@ -208,9 +210,12 @@
 <pre class="programlisting">i=2
 File: test.cpp Line:XXX
 </pre>
-<div class="table">
-<a name="boost_test.testing_tools.output_stream_testing.id_example29"></a><p class="title"><b>Table&#160;26.&#160;Pattern file matching with <code class="computeroutput"><span class="identifier">output_test_stream</span></code></b></p>
-<div class="table-contents"><table class="table" summary="Pattern file matching with output_test_stream">
+<h6>
+<a name="boost_test.testing_tools.output_stream_testing.h4"></a>
+        <span><a name="boost_test.testing_tools.output_stream_testing.example_descr0"></a></span><a class="link" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.example_descr0">Example:
+        Pattern file matching with <code class="computeroutput"><span class="identifier">output_test_stream</span></code></a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -229,43 +234,33 @@ File: test.cpp Line:XXX
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">output_test_stream</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">test_tools</span><span class="special">::</span><span class="identifier">output_test_stream</span><span class="special">;</span>
 
 <span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test</span> <span class="special">)</span>
 <span class="special">{</span>
-  <span class="identifier">output_test_stream</span> <span class="identifier">output</span><span class="special">(</span> <span class="string">"pattern_file"</span><span class="special">,</span> <span class="keyword">true</span> <span class="special">);</span>
+  <span class="identifier">output_test_stream</span> <span class="identifier">output</span><span class="special">;</span>
   <span class="keyword">int</span> <span class="identifier">i</span><span class="special">=</span><span class="number">2</span><span class="special">;</span>
   <span class="identifier">output</span> <span class="special">&lt;&lt;</span> <span class="string">"i="</span> <span class="special">&lt;&lt;</span> <span class="identifier">i</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">match_pattern</span><span class="special">()</span> <span class="special">);</span>
-
-  <span class="identifier">output</span> <span class="special">&lt;&lt;</span> <span class="string">"\nFile: "</span> <span class="special">&lt;&lt;</span> <span class="identifier">__FILE__</span> <span class="special">&lt;&lt;</span> <span class="string">" Line:YYY"</span><span class="special">;</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">match_pattern</span><span class="special">()</span> <span class="special">);</span> <a class="co" name="boost_test.testing_tools.output_stream_testing.c0" href="output_stream_testing.html#boost_test.testing_tools.output_stream_testing.c1"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="special">!</span><span class="identifier">output</span><span class="special">.</span><span class="identifier">is_empty</span><span class="special">(</span> <span class="keyword">false</span> <span class="special">)</span> <span class="special">);</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">check_length</span><span class="special">(</span> <span class="number">3</span><span class="special">,</span> <span class="keyword">false</span> <span class="special">)</span> <span class="special">);</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">is_equal</span><span class="special">(</span> <span class="string">"i=3"</span> <span class="special">)</span> <span class="special">);</span>
 <span class="special">}</span>
 </pre>
-                <div class="calloutlist"><table border="0" summary="Callout list"><tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.testing_tools.output_stream_testing.c1"></a><a href="#boost_test.testing_tools.output_stream_testing.c0"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-                      This line generates the error Line:YYY != Line:XXX
-                    </p></td>
-</tr></table></div>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
 <span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">16</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">match_pattern</span><span class="special">()</span> <span class="identifier">failed</span><span class="special">.</span> <span class="identifier">Mismatch</span> <span class="identifier">at</span> <span class="identifier">position</span> <span class="number">23</span>
-<span class="special">...</span><span class="number">5.</span><span class="special">..</span>
-<span class="special">...</span><span class="number">4.</span><span class="special">..</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">15</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">output</span><span class="special">.</span><span class="identifier">is_equal</span><span class="special">(</span> <span class="string">"i=3"</span> <span class="special">)</span> <span class="identifier">failed</span><span class="special">.</span> <span class="identifier">Output</span> <span class="identifier">content</span><span class="special">:</span> <span class="string">"i=2"</span>
 
 <span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
 </pre>
               </td>
 </tr></tbody>
 </table></div>
-</div>
-<br class="table-break"><div class="tip"><table border="0" summary="Tip">
+<div class="tip"><table border="0" summary="Tip">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../doc/src/images/tip.png"></td>
 <th align="left">Tip</th>
diff --git a/doc/v2/html/boost_test/testing_tools/testing_floating_points.html b/doc/v2/html/boost_test/testing_tools/testing_floating_points.html
old mode 100644
new mode 100755
index 2fea2fba..146a84f5
--- a/doc/v2/html/boost_test/testing_tools/testing_floating_points.html
+++ b/doc/v2/html/boost_test/testing_tools/testing_floating_points.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Floating-point testing</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tools.html" title="The UTF testing tools">
+<link rel="up" href="../testing_tools.html" title="The Unit Test Framework testing tools">
 <link rel="prev" href="output_stream_testing.html" title="Output streams testing tool">
-<link rel="next" href="../test_output.html" title="Controlling the outputs">
+<link rel="next" href="testing_tool_ref.html" title="Reference">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="output_stream_testing.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tools.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../test_output.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="output_stream_testing.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tools.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tool_ref.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -47,9 +47,9 @@
 <p>
         does not produce expected results in many circumstances - specifically for
         very small or very big values (see <a class="link" href="testing_floating_points.html#Squassabia">Squassabia</a>
-        for examples). The <span class="emphasis"><em>UTF</em></span> implements floating-point comparison
-        algorithm that is based on the more confident solution first presented in
-        <a class="link" href="testing_floating_points.html#KnuthII">Knuth</a>:
+        for examples). The <span class="emphasis"><em>Unit Test Framework</em></span> implements floating-point
+        comparison algorithm that is based on the more confident solution first presented
+        in <a class="link" href="testing_floating_points.html#KnuthII">Knuth</a>:
       </p>
 <a name="equ2"></a><pre class="programlisting">   <span class="identifier">abs</span><span class="special">(</span><span class="identifier">u</span> <span class="special">-</span> <span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;=</span> <span class="identifier">epsilon</span> <span class="special">*</span> <span class="identifier">abs</span><span class="special">(</span><span class="identifier">u</span><span class="special">)</span>
 <span class="special">&amp;&amp;</span> <span class="identifier">abs</span><span class="special">(</span><span class="identifier">u</span> <span class="special">-</span> <span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;=</span> <span class="identifier">epsilon</span> <span class="special">*</span> <span class="identifier">abs</span><span class="special">(</span><span class="identifier">v</span><span class="special">));</span> <span class="comment">// (2)</span>
@@ -92,11 +92,11 @@
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
             binary predicate <code class="computeroutput"><span class="identifier">close_at_tolerance</span></code>
-            <a href="#ftn.boost_test.testing_tools.testing_floating_points.f0" class="footnote" name="boost_test.testing_tools.testing_floating_points.f0"><sup class="footnote">[3]</sup></a>
+            <sup>[<a name="boost_test.testing_tools.testing_floating_points.f0" href="#ftn.boost_test.testing_tools.testing_floating_points.f0" class="footnote">3</a>]</sup>
           </li>
 <li class="listitem">
             and predicate with four arguments <code class="computeroutput"><span class="identifier">check_is_close</span></code>
-            <a href="#ftn.boost_test.testing_tools.testing_floating_points.f1" class="footnote" name="boost_test.testing_tools.testing_floating_points.f1"><sup class="footnote">[4]</sup></a>.
+            <sup>[<a name="boost_test.testing_tools.testing_floating_points.f1" href="#ftn.boost_test.testing_tools.testing_floating_points.f1" class="footnote">4</a>]</sup>.
           </li>
 </ol></div>
 <p>
@@ -104,19 +104,18 @@
         in general are preferred for the general floating point comparison check
         over equation <a class="link" href="testing_floating_points.html#equ1">(1)</a>, they are unusable for the
         test on closeness to zero. The later check is still might be useful in some
-        cases and the <span class="emphasis"><em>UTF</em></span> implements an algorithm based on equation
-        <a class="link" href="testing_floating_points.html#equ1">(1)</a> in binary predicate <code class="computeroutput"><span class="identifier">check_is_small</span></code>
-        <a href="#ftn.boost_test.testing_tools.testing_floating_points.f2" class="footnote" name="boost_test.testing_tools.testing_floating_points.f2"><sup class="footnote">[5]</sup></a>.
+        cases and the <span class="emphasis"><em>Unit Test Framework</em></span> implements an algorithm
+        based on equation <a class="link" href="testing_floating_points.html#equ1">(1)</a> in binary predicate <code class="computeroutput"><span class="identifier">check_is_small</span></code> <sup>[<a name="boost_test.testing_tools.testing_floating_points.f2" href="#ftn.boost_test.testing_tools.testing_floating_points.f2" class="footnote">5</a>]</sup>.
       </p>
 <p>
-        On top of the generic, flexible predicates the <span class="emphasis"><em>UTF</em></span> implements
-        macro based family of tools <a class="link" href="../testing_tool_ref/assertion_boost_level_close.html" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_CHECK_CLOSE</span></code></a> and <a class="link" href="../testing_tool_ref/assertion_boost_level_small.html" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_SMALL</span></code></a>. These tools limit
+        On top of the generic, flexible predicates the <span class="emphasis"><em>Unit Test Framework</em></span>
+        implements macro based family of tools <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_close" title="BOOST_&lt;level&gt;_CLOSE"><code class="computeroutput"><span class="identifier">BOOST_CHECK_CLOSE</span></code></a> and <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_small" title="BOOST_&lt;level&gt;_SMALL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_SMALL</span></code></a>. These tools limit
         the check flexibility to strong-only checks, but automate failed check arguments
         reporting.
       </p>
 <h4>
 <a name="boost_test.testing_tools.testing_floating_points.h0"></a>
-        <span class="phrase"><a name="boost_test.testing_tools.testing_floating_points.tolerance_selection_consideratio"></a></span><a class="link" href="testing_floating_points.html#boost_test.testing_tools.testing_floating_points.tolerance_selection_consideratio">Tolerance
+        <span><a name="boost_test.testing_tools.testing_floating_points.tolerance_selection_consideratio"></a></span><a class="link" href="testing_floating_points.html#boost_test.testing_tools.testing_floating_points.tolerance_selection_consideratio">Tolerance
         selection considerations</a>
       </h4>
 <p>
@@ -130,7 +129,7 @@
         The discrepancy between real and floating point value may be caused by several
         reasons:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             Type promotion
           </li>
@@ -152,7 +151,7 @@
 </pre>
 <p>
         for the appropriate floating point type <code class="computeroutput"><span class="identifier">FPT</span></code>
-        <a href="#ftn.boost_test.testing_tools.testing_floating_points.f3" class="footnote" name="boost_test.testing_tools.testing_floating_points.f3"><sup class="footnote">[6]</sup></a>. Conversion to binary presentation, sadly, does not have such
+        <sup>[<a name="boost_test.testing_tools.testing_floating_points.f3" href="#ftn.boost_test.testing_tools.testing_floating_points.f3" class="footnote">6</a>]</sup>. Conversion to binary presentation, sadly, does not have such
         requirement. So we can't assume that <code class="computeroutput"><span class="keyword">float</span><span class="special">(</span><span class="number">1.1</span><span class="special">)</span></code>
         is close to the real number <code class="computeroutput"><span class="number">1.1</span></code>
         with tolerance <code class="computeroutput"><span class="identifier">half_epsilon</span></code>
@@ -204,12 +203,12 @@
       </p>
 <h5>
 <a name="boost_test.testing_tools.testing_floating_points.h1"></a>
-        <span class="phrase"><a name="boost_test.testing_tools.testing_floating_points.bibliographic_references"></a></span><a class="link" href="testing_floating_points.html#boost_test.testing_tools.testing_floating_points.bibliographic_references">Bibliographic
+        <span><a name="boost_test.testing_tools.testing_floating_points.bibliographic_references"></a></span><a class="link" href="testing_floating_points.html#boost_test.testing_tools.testing_floating_points.bibliographic_references">Bibliographic
         references</a>
       </h5>
 <div class="variablelist">
 <p class="title"><b>Books</b></p>
-<dl class="variablelist">
+<dl>
 <dt><span class="term"><a name="KnuthII"></a>The art of computer programming (vol II)</span></dt>
 <dd><p>
               Donald. E. Knuth, 1998, Addison-Wesley Longman, Inc., ISBN 0-201-89684-2,
@@ -225,7 +224,7 @@
 </div>
 <div class="variablelist">
 <p class="title"><b>Periodicals</b></p>
-<dl class="variablelist">
+<dl>
 <dt><span class="term"><a name="Squassabia"></a><a href="http://www.adtmag.com/joop/carticle.aspx?ID=396" target="_top">Comparing
           Floats: How To Determine if Floating Quantities Are Close Enough Once a
           Tolerance Has Been Reached</a></span></dt>
@@ -241,7 +240,7 @@
 </div>
 <div class="variablelist">
 <p class="title"><b>Publications</b></p>
-<dl class="variablelist">
+<dl>
 <dt><span class="term"><a href="http://dl.acm.org/citation.cfm?id=103163" target="_top">What Every
           Computer Scientist Should Know About Floating-Point Arithmetic</a></span></dt>
 <dd><p>
@@ -261,18 +260,18 @@
 </dl>
 </div>
 <div class="footnotes">
-<br><hr style="width:100; text-align:left;margin-left: 0">
-<div id="ftn.boost_test.testing_tools.testing_floating_points.f0" class="footnote"><p><a href="#boost_test.testing_tools.testing_floating_points.f0" class="para"><sup class="para">[3] </sup></a>
+<br><hr width="100" align="left">
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.testing_tools.testing_floating_points.f0" href="#boost_test.testing_tools.testing_floating_points.f0" class="para">3</a>] </sup>
               check type and tolerance value are fixed at predicate construction
               time
             </p></div>
-<div id="ftn.boost_test.testing_tools.testing_floating_points.f1" class="footnote"><p><a href="#boost_test.testing_tools.testing_floating_points.f1" class="para"><sup class="para">[4] </sup></a>
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.testing_tools.testing_floating_points.f1" href="#boost_test.testing_tools.testing_floating_points.f1" class="para">4</a>] </sup>
               check type and tolerance value are the arguments of the predicate
             </p></div>
-<div id="ftn.boost_test.testing_tools.testing_floating_points.f2" class="footnote"><p><a href="#boost_test.testing_tools.testing_floating_points.f2" class="para"><sup class="para">[5] </sup></a>
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.testing_tools.testing_floating_points.f2" href="#boost_test.testing_tools.testing_floating_points.f2" class="para">5</a>] </sup>
           <code class="computeroutput"><span class="identifier">v</span></code> is zero
         </p></div>
-<div id="ftn.boost_test.testing_tools.testing_floating_points.f3" class="footnote"><p><a href="#boost_test.testing_tools.testing_floating_points.f3" class="para"><sup class="para">[6] </sup></a>
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.testing_tools.testing_floating_points.f3" href="#boost_test.testing_tools.testing_floating_points.f3" class="para">6</a>] </sup>
           <span class="bold"><strong>machine epsilon value</strong></span> is represented by
           <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">numeric_limits</span><span class="special">&lt;</span><span class="identifier">FPT</span><span class="special">&gt;::</span><span class="identifier">epsilon</span><span class="special">()</span></code>
         </p></div>
@@ -289,7 +288,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="output_stream_testing.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tools.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../test_output.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="output_stream_testing.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../testing_tools.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="testing_tool_ref.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/testing_tools/tools_assertion_severity_level.html b/doc/v2/html/boost_test/testing_tools/tools_assertion_severity_level.html
old mode 100644
new mode 100755
index d2dc018b..dac482e6
--- a/doc/v2/html/boost_test/testing_tools/tools_assertion_severity_level.html
+++ b/doc/v2/html/boost_test/testing_tools/tools_assertion_severity_level.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Assertion severity level</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../testing_tools.html" title="The UTF testing tools">
-<link rel="prev" href="../testing_tools.html" title="The UTF testing tools">
+<link rel="up" href="../testing_tools.html" title="The Unit Test Framework testing tools">
+<link rel="prev" href="../testing_tools.html" title="The Unit Test Framework testing tools">
 <link rel="next" href="custom_predicates.html" title="Custom predicate support">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -44,24 +44,24 @@
 <p>
         For example:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
-            <a class="link" href="../testing_tool_ref/assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_WARN_EQUAL</span></code></a>
+            <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_WARN_EQUAL</span></code></a>
           </li>
 <li class="listitem">
-            <a class="link" href="../testing_tool_ref/assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_EQUAL</span></code></a>
+            <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_EQUAL</span></code></a>
           </li>
 <li class="listitem">
-            <a class="link" href="../testing_tool_ref/assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_REQUIRE_EQUAL</span></code></a>
+            <a class="link" href="testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_REQUIRE_EQUAL</span></code></a>
           </li>
 </ul></div>
 <p>
         If an assertion designated by the tool passes, confirmation message can be
-        printed in log output <a href="#ftn.boost_test.testing_tools.tools_assertion_severity_level.f0" class="footnote" name="boost_test.testing_tools.tools_assertion_severity_level.f0"><sup class="footnote">[1]</sup></a>. If an assertion designated by the tool failed, depending on
-        the level following will happened <a href="#ftn.boost_test.testing_tools.tools_assertion_severity_level.f1" class="footnote" name="boost_test.testing_tools.tools_assertion_severity_level.f1"><sup class="footnote">[2]</sup></a>:
+        printed in log output <sup>[<a name="boost_test.testing_tools.tools_assertion_severity_level.f0" href="#ftn.boost_test.testing_tools.tools_assertion_severity_level.f0" class="footnote">1</a>]</sup>. If an assertion designated by the tool failed, depending on
+        the level following will happened <sup>[<a name="boost_test.testing_tools.tools_assertion_severity_level.f1" href="#ftn.boost_test.testing_tools.tools_assertion_severity_level.f1" class="footnote">2</a>]</sup>:
       </p>
 <div class="table">
-<a name="boost_test.testing_tools.tools_assertion_severity_level.assertions_severity_levels"></a><p class="title"><b>Table&#160;22.&#160;Assertions severity levels</b></p>
+<a name="boost_test.testing_tools.tools_assertion_severity_level.assertions_severity_levels"></a><p class="title"><b>Table&#160;4.&#160;Assertions severity levels</b></p>
 <div class="table-contents"><table class="table" summary="Assertions severity levels">
 <colgroup>
 <col>
@@ -183,12 +183,12 @@
         assertions fails.
       </p>
 <div class="footnotes">
-<br><hr style="width:100; text-align:left;margin-left: 0">
-<div id="ftn.boost_test.testing_tools.tools_assertion_severity_level.f0" class="footnote"><p><a href="#boost_test.testing_tools.tools_assertion_severity_level.f0" class="para"><sup class="para">[1] </sup></a>
+<br><hr width="100" align="left">
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.testing_tools.tools_assertion_severity_level.f0" href="#boost_test.testing_tools.tools_assertion_severity_level.f0" class="para">1</a>] </sup>
           to manage what messages appear in the test log stream, set the proper
           <a class="link" href="../test_output/log_runtime_config.html" title="Configuring the verbosity of the logs">log level</a>
         </p></div>
-<div id="ftn.boost_test.testing_tools.tools_assertion_severity_level.f1" class="footnote"><p><a href="#boost_test.testing_tools.tools_assertion_severity_level.f1" class="para"><sup class="para">[2] </sup></a>
+<div class="footnote"><p><sup>[<a id="ftn.boost_test.testing_tools.tools_assertion_severity_level.f1" href="#boost_test.testing_tools.tools_assertion_severity_level.f1" class="para">2</a>] </sup>
           in some cases log message can be slightly different to reflect failed tool
           specifics
         </p></div>
diff --git a/doc/v2/html/boost_test/tests_organization.html b/doc/v2/html/boost_test/tests_organization.html
old mode 100644
new mode 100755
index e731310f..8c4cdd2c
--- a/doc/v2/html/boost_test/tests_organization.html
+++ b/doc/v2/html/boost_test/tests_organization.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Registering, generating and organizing the unit tests</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>Test organization using the Unit Test Framework</title>
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE">
+<link rel="prev" href="users_guide/link_references.html" title="Macros that control the build behaviours">
 <link rel="next" href="tests_organization/test_cases.html" title="Test cases">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,50 +20,20 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="users_guide/link_references/link_boost_test_module_macro.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tests_organization/test_cases.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="users_guide/link_references.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tests_organization/test_cases.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.tests_organization"></a><a class="link" href="tests_organization.html" title="Registering, generating and organizing the unit tests">Registering, generating
-    and organizing the unit tests</a>
+<a name="boost_test.tests_organization"></a><a class="link" href="tests_organization.html" title="Test organization using the Unit Test Framework">Test organization using
+    the <span class="emphasis"><em>Unit Test Framework</em></span></a>
 </h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="tests_organization/test_cases.html">Test cases</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="tests_organization/test_cases/test_organization_nullary.html">Nullary
-        function based test case</a></span></dt>
-<dt><span class="section"><a href="tests_organization/test_cases/unary_function_based_test_case.html">Unary
-        function based test case</a></span></dt>
-<dt><span class="section"><a href="tests_organization/test_cases/test_organization_templates.html">Template
-        test cases</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="tests_organization/test_organization_test_suite.html">Test
-      suite</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="tests_organization/test_organization_test_suite/master_test_suite.html">Master
-        Test Suite</a></span></dt>
-<dt><span class="section"><a href="tests_organization/test_organization_test_suite/test_suite_expected_failure.html">Expected
-        failures specification</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="tests_organization/fixtures.html">Fixtures</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="tests_organization/fixtures/generic_fixture_model.html">Generic
-        fixture model</a></span></dt>
-<dt><span class="section"><a href="tests_organization/fixtures/per_test_case_fixture.html">Per
-        test case fixture</a></span></dt>
-<dt><span class="section"><a href="tests_organization/fixtures/test_suite_level_fixture.html">Test
-        suite level fixture</a></span></dt>
-<dt><span class="section"><a href="tests_organization/fixtures/global_fixture.html">Global
-        fixture</a></span></dt>
-</dl></dd>
-</dl></div>
 <p>
       If you look at many legacy test modules, big chance is that it's implemented
       as one big test function that consists of a mixture of check and output statements.
       Is there anything wrong with it? Yes. There are various disadvantages in single
       test function approach:
     </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
           One big function tends to become really difficult to manage if the number
           of checks exceeds a reasonable limit (true for any large function). What
@@ -92,18 +62,19 @@
       cases</a>.
     </p>
 <p>
-      To solve test tree creation problem the <span class="emphasis"><em>UTF</em></span> provides facilities
-      for <a class="link" href="tests_organization/test_organization_test_suite.html" title="Test suite">test
+      To solve test tree creation problem the <span class="emphasis"><em>Unit Test Framework</em></span>
+      provides facilities for <a class="link" href="tests_organization/test_organization_test_suite.html" title="Test suite">test
       suite</a> creation. In some cases it's desirable to allow some <span class="emphasis"><em>expected</em></span>
       failures in test case without failing a test module. To support this request
-      The <span class="emphasis"><em>UTF</em></span> allows specifying the number of <a class="link" href="tests_organization/test_organization_test_suite/test_suite_expected_failure.html" title="Expected failures specification">expected
+      The <span class="emphasis"><em>Unit Test Framework</em></span> allows specifying the number of
+      <a class="link" href="tests_organization/test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure" title="Expected failures specification">expected
       failures</a> in a test case.
     </p>
 <p>
       When several tests shares the same set-up (environment, test data preparation,
       etc.), the <a class="link" href="tests_organization/fixtures.html" title="Fixtures">fixture</a>
-      comes into play. In the <span class="emphasis"><em>UTF</em></span>, fixtures can be defined at
-      the test case or the test suite level.
+      comes into play. In the <span class="emphasis"><em>Unit Test Framework</em></span>, fixtures
+      can be defined at the test case or the test suite level.
     </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
@@ -117,7 +88,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="users_guide/link_references/link_boost_test_module_macro.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tests_organization/test_cases.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="users_guide/link_references.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tests_organization/test_cases.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/tests_organization/fixtures.html b/doc/v2/html/boost_test/tests_organization/fixtures.html
old mode 100644
new mode 100755
index d652587d..6331d1ce
--- a/doc/v2/html/boost_test/tests_organization/fixtures.html
+++ b/doc/v2/html/boost_test/tests_organization/fixtures.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Fixtures</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../tests_organization.html" title="Registering, generating and organizing the unit tests">
-<link rel="prev" href="test_organization_test_suite/test_suite_expected_failure.html" title="Expected failures specification">
-<link rel="next" href="fixtures/generic_fixture_model.html" title="Generic fixture model">
+<link rel="up" href="../tests_organization.html" title="Test organization using the Unit Test Framework">
+<link rel="prev" href="test_organization_test_suite.html" title="Test suite">
+<link rel="next" href="../testing_tools.html" title="The Unit Test Framework testing tools">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,27 +20,17 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_organization_test_suite/test_suite_expected_failure.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="fixtures/generic_fixture_model.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_organization_test_suite.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../testing_tools.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_test.tests_organization.fixtures"></a><a class="link" href="fixtures.html" title="Fixtures">Fixtures</a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="fixtures/generic_fixture_model.html">Generic
-        fixture model</a></span></dt>
-<dt><span class="section"><a href="fixtures/per_test_case_fixture.html">Per
-        test case fixture</a></span></dt>
-<dt><span class="section"><a href="fixtures/test_suite_level_fixture.html">Test
-        suite level fixture</a></span></dt>
-<dt><span class="section"><a href="fixtures/global_fixture.html">Global
-        fixture</a></span></dt>
-</dl></div>
 <p>
         In general terms a test fixture or test context is the collection of one
         or more of the following items, required to perform the test:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             preconditions
           </li>
@@ -75,8 +65,9 @@
         It's important to understand that C++ provides a way to implement a straightforward
         test fixture solution that almost satisfies our requirements without any
         extra support from the test framework. This may explain why test fixtures
-        support was introduced in the <span class="emphasis"><em>UTF</em></span> somewhat late in its
-        life cycle. Here is how simple test module with such a fixture may look like:
+        support was introduced in the <span class="emphasis"><em>Unit Test Framework</em></span> somewhat
+        late in its life cycle. Here is how simple test module with such a fixture
+        may look like:
       </p>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">MyFixture</span> <span class="special">{</span>
   <span class="identifier">MyFixture</span><span class="special">()</span>   <span class="special">{</span> <span class="identifier">i</span> <span class="special">=</span> <span class="keyword">new</span> <span class="keyword">int</span><span class="special">;</span> <span class="special">*</span><span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span> <span class="special">}</span>
@@ -85,13 +76,13 @@
   <span class="keyword">int</span><span class="special">*</span> <span class="identifier">i</span><span class="special">;</span>
 <span class="special">};</span>
 
-<a class="link" href="test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_case1</span> <span class="special">)</span>
+<a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_case1</span> <span class="special">)</span>
 <span class="special">{</span>
   <span class="identifier">MyFixture</span> <span class="identifier">f</span><span class="special">;</span>
   <span class="comment">// do something involving f.i</span>
 <span class="special">}</span>
 
-<a class="link" href="test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_case2</span> <span class="special">)</span>
+<a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_case2</span> <span class="special">)</span>
 <span class="special">{</span>
   <span class="identifier">MyFixture</span> <span class="identifier">f</span><span class="special">;</span>
   <span class="comment">// do something involving f.i</span>
@@ -102,7 +93,7 @@
         setup or cleanup procedure. Still there are several more or less minor practical
         issues with this pure C++ based fixtures solution:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             We need to add a fixture declaration statement into each test case manually.
           </li>
@@ -117,15 +108,15 @@
           </li>
 </ul></div>
 <p>
-        While there is little the <span class="emphasis"><em>UTF</em></span> can do to address these
-        issues for manually registered test units, it's possible to resolve them
-        for test units that are automatically registered. To do this the <span class="emphasis"><em>UTF</em></span>
-        defines a <a class="link" href="fixtures/generic_fixture_model.html#fixtures_generic">generic fixture model</a> -
-        fixed interfaces that both setup and teardown fixture functions should comply
-        to. Based on the generic fixture model, the <span class="emphasis"><em>UTF</em></span> presents
-        solution for the following tasks:
+        While there is little the <span class="emphasis"><em>Unit Test Framework</em></span> can do
+        to address these issues for manually registered test units, it's possible
+        to resolve them for test units that are automatically registered. To do this
+        the <span class="emphasis"><em>Unit Test Framework</em></span> defines a <a class="link" href="fixtures.html#fixtures_generic">generic
+        fixture model</a> - fixed interfaces that both setup and teardown fixture
+        functions should comply to. Based on the generic fixture model, the <span class="emphasis"><em>Unit
+        Test Framework</em></span> presents solution for the following tasks:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             per test case fixture automation
           </li>
@@ -136,6 +127,384 @@
             <span class="emphasis"><em>global</em></span> fixture support
           </li>
 </ul></div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.fixtures.generic_fixture_model"></a><a name="fixtures_generic"></a><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.generic_fixture_model" title="Generic fixture model">Generic
+        fixture model</a>
+</h4></div></div></div>
+<p>
+          The <span class="emphasis"><em>Unit Test Framework</em></span> defines the generic fixture
+          model as follows:
+        </p>
+<pre class="programlisting"><span class="keyword">struct</span> <span class="special">&lt;</span><span class="identifier">fixture</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;{</span>
+  <span class="special">&lt;</span><span class="identifier">fixture</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;();</span>      <span class="comment">// setup function</span>
+  <span class="special">~&lt;</span><span class="identifier">fixture</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;();</span>     <span class="comment">// teardown function</span>
+<span class="special">};</span>
+</pre>
+<p>
+          In other words a fixture is expected to be implemented as a class where
+          the class constructor serves as a setup method and class destructor serves
+          as teardown method. The <span class="emphasis"><em>Unit Test Framework</em></span> opted
+          to avoid explicit names in fixture interface for setup and teardown methods,
+          since is considered most natural in C++ for tasks similar to RAII and coincides
+          with the pure C++ solution discusses earlier.
+        </p>
+<div class="caution"><table border="0" summary="Caution">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../doc/src/images/caution.png"></td>
+<th align="left">Caution</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The above interface prevents you to report errors in the teardown procedure
+            using an exception. It does make sense though: if somehow more than one
+            fixture is assigned to a test unit, you want all teardown procedures
+            to run, even if some may experience problems.
+          </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.fixtures.per_test_case_fixture"></a><a name="ref_fixture_test_case"></a><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.per_test_case_fixture" title="Per test case fixture">Per
+        test case fixture</a>
+</h4></div></div></div>
+<p>
+          To automate the task of assigning a fixture for the test case, for test
+          case creation use the macro <a class="link" href="fixtures.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a> in place
+          of the macro <a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a>:
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">fixture_name</span><span class="special">);</span>
+</pre>
+<p>
+          The only difference from the macro <a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a> is the presence
+          of an extra argument - fixture name. Unlike the pure C++ solution you have
+          direct access to the public and protected members of the fixture, though
+          you still need to refer to the fixture name in every test case.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            You can't access private members of fixture, but then why would you make
+            anything private?
+          </p></td></tr>
+</table></div>
+<h6>
+<a name="boost_test.tests_organization.fixtures.per_test_case_fixture.h0"></a>
+          <span><a name="boost_test.tests_organization.fixtures.per_test_case_fixture.example_descr"></a></span><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.per_test_case_fixture.example_descr">Example:
+          Per test case fixture</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="keyword">struct</span> <span class="identifier">F</span> <span class="special">{</span>
+  <span class="identifier">F</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">i</span><span class="special">(</span> <span class="number">0</span> <span class="special">)</span> <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"setup fixture"</span> <span class="special">);</span> <span class="special">}</span>
+  <span class="special">~</span><span class="identifier">F</span><span class="special">()</span>         <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"teardown fixture"</span> <span class="special">);</span> <span class="special">}</span>
+
+  <span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span>
+<span class="special">};</span>
+
+<span class="identifier">BOOST_FIXTURE_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case1</span><span class="special">,</span> <span class="identifier">F</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
+  <span class="special">++</span><span class="identifier">i</span><span class="special">;</span>
+<span class="special">}</span>
+
+<span class="identifier">BOOST_FIXTURE_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case2</span><span class="special">,</span> <span class="identifier">F</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="number">1</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case3</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">message</span>
+<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">setup</span> <span class="identifier">fixture</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">13</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
+<span class="identifier">teardown</span> <span class="identifier">fixture</span>
+<span class="identifier">setup</span> <span class="identifier">fixture</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">19</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case2"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">0</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
+<span class="identifier">teardown</span> <span class="identifier">fixture</span>
+
+<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          In this example only <code class="computeroutput"><span class="identifier">test_case1</span></code>
+          and <code class="computeroutput"><span class="identifier">test_case2</span></code> have fixture
+          <code class="computeroutput"><span class="identifier">F</span></code> assigned. In the next
+          section you going to see what can be done if all test cases in a test suite
+          require the same fixture.
+        </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.fixtures.test_suite_level_fixture"></a><a name="ref_fixture_test_suite"></a><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.test_suite_level_fixture" title="Test suite level fixture">Test
+        suite level fixture</a>
+</h4></div></div></div>
+<p>
+          If all test cases in a test require the same fixture (you can group test
+          cases in the test suite based on a fixture required) you can make another
+          step toward an automation of a test fixture assignment. To assign the same
+          shared fixture for all test cases in a test suite, use the macro <a class="link" href="fixtures.html#ref_fixture_test_suite"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_SUITE</span></code></a>
+          in place of the macro <a class="link" href="test_organization_test_suite.html#ref_BOOST_AUTO_TEST_SUITE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_SUITE</span></code></a> for automated
+          test suite creation and registration.
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_FIXTURE_TEST_SUITE</span><span class="special">(</span><span class="identifier">suite_name</span><span class="special">,</span> <span class="identifier">fixure_name</span><span class="special">);</span>
+</pre>
+<p>
+          Once again the only difference from the macro <a class="link" href="test_organization_test_suite.html#ref_BOOST_AUTO_TEST_SUITE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_SUITE</span></code></a> usage is
+          the presence of an extra argument - the fixture name. And now, you not
+          only have direct access to the public and protected members of the fixture,
+          but also do not need to refer to the fixture name in test case definition.
+          All test cases assigned the same fixture automatically.
+        </p>
+<div class="tip"><table border="0" summary="Tip">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../doc/src/images/tip.png"></td>
+<th align="left">Tip</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            If necessary you can reset the fixture for a particular test case with
+            the use of the macro <a class="link" href="fixtures.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a>.
+          </p></td></tr>
+</table></div>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The fixture assignment is <span class="emphasis"><em>deep</em></span>. In other words unless
+            reset by another <a class="link" href="fixtures.html#ref_fixture_test_suite"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_SUITE</span></code></a> or
+            <a class="link" href="fixtures.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a>
+            definition the same fixture is assigned to all test cases, including
+            ones that belong to the sub test suites.
+          </p></td></tr>
+</table></div>
+<h6>
+<a name="boost_test.tests_organization.fixtures.test_suite_level_fixture.h0"></a>
+          <span><a name="boost_test.tests_organization.fixtures.test_suite_level_fixture.example_descr"></a></span><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.test_suite_level_fixture.example_descr">Example:
+          Test suite level fixture</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="keyword">struct</span> <span class="identifier">F</span> <span class="special">{</span>
+  <span class="identifier">F</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">i</span><span class="special">(</span> <span class="number">0</span> <span class="special">)</span> <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"setup fixture"</span> <span class="special">);</span> <span class="special">}</span>
+  <span class="special">~</span><span class="identifier">F</span><span class="special">()</span>         <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"teardown fixture"</span> <span class="special">);</span> <span class="special">}</span>
+
+  <span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span>
+<span class="special">};</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="identifier">BOOST_FIXTURE_TEST_SUITE</span><span class="special">(</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">F</span> <span class="special">)</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case1</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case2</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="number">0</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">17</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
+
+<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<div class="caution"><table border="0" summary="Caution">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../doc/src/images/caution.png"></td>
+<th align="left">Caution</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The fixture constructor and destructor is called for each test cases
+            (the state of the fixture is not shared among the test cases).
+          </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.fixtures.global_fixture"></a><a name="ref_fixture_test_global"></a><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.global_fixture" title="Global fixture">Global
+        fixture</a>
+</h4></div></div></div>
+<p>
+          Any global initialization that needs to be performed every time testing
+          begins or a global cleanup that is to be performed once testing is finished
+          is called a global fixture. The <span class="emphasis"><em>Unit Test Framework</em></span>
+          global fixture design is based on a generic test fixture model and is supported
+          by the utility class <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">global_fixture</span></code>.
+          The global fixture design allows any number of global fixtures to be defined
+          in any test file that constitutes a test module. Though some initialization
+          can be implemented in the test module initialization function, there are
+          several reasons to prefer the global fixture approach:
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              There is no place for cleanup/teardown operations in the initialization
+              function.
+            </li>
+<li class="listitem">
+              Unlike the initialization function, the global fixture setup method
+              invocation is guarded by the execution monitor. That means that all
+              uncaught errors that occur during initialization are properly reported.
+            </li>
+<li class="listitem">
+              Any number of different global fixtures can be defined, which allows
+              you to split initialization code by category.
+            </li>
+<li class="listitem">
+              The fixture allows you to place matching setup/teardown code in close
+              vicinity in your test module code.
+            </li>
+<li class="listitem">
+              If the whole test tree is constructed automatically the initialization
+              function is empty and auto-generated by the <span class="emphasis"><em>Unit Test Framework</em></span>.
+              To introduce the initialization function can be more work than the
+              use of a global fixture facility, while global fixture is more to the
+              point.
+            </li>
+<li class="listitem">
+              Since all fixtures follow the same generic model you can easily switch
+              from local per test case fixtures to the global one.
+            </li>
+<li class="listitem">
+              If you are using the interactive test runner (non-supplied yet) global
+              test fixtures are applied to every run, while an initialization function
+              is executed only once during a test module startup (just make sure
+              that it's what you really want).
+            </li>
+</ul></div>
+<p>
+          To define a global test module fixture you need to implement a class that
+          matched generic fixture model and passed it as an argument to the macro
+          <a class="link" href="fixtures.html#ref_fixture_test_global"><code class="computeroutput"><span class="identifier">BOOST_GLOBAL_FIXTURE</span></code></a>.
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span><span class="identifier">fixure_name</span><span class="special">);</span>
+</pre>
+<p>
+          The statement, that performs global fixture definition, has to reside at
+          a test file scope.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.fixtures.global_fixture.h0"></a>
+          <span><a name="boost_test.tests_organization.fixtures.global_fixture.example_descr"></a></span><a class="link" href="fixtures.html#boost_test.tests_organization.fixtures.global_fixture.example_descr">Example:
+          Global fixture</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="keyword">struct</span> <span class="identifier">MyConfig</span> <span class="special">{</span>
+  <span class="identifier">MyConfig</span><span class="special">()</span>   <span class="special">{</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"global setup\n"</span><span class="special">;</span> <span class="special">}</span>
+  <span class="special">~</span><span class="identifier">MyConfig</span><span class="special">()</span>  <span class="special">{</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"global teardown\n"</span><span class="special">;</span> <span class="special">}</span>
+<span class="special">};</span>
+
+<span class="comment">//____________________________________________________________________________//</span>
+
+<span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span> <span class="identifier">MyConfig</span> <span class="special">);</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">global</span> <span class="identifier">setup</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">global</span> <span class="identifier">teardown</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+</div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -148,7 +517,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_organization_test_suite/test_suite_expected_failure.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="fixtures/generic_fixture_model.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_organization_test_suite.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../testing_tools.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/tests_organization/fixtures/generic_fixture_model.html b/doc/v2/html/boost_test/tests_organization/fixtures/generic_fixture_model.html
deleted file mode 100644
index ab1b665e..00000000
--- a/doc/v2/html/boost_test/tests_organization/fixtures/generic_fixture_model.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Generic fixture model</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../fixtures.html" title="Fixtures">
-<link rel="prev" href="../fixtures.html" title="Fixtures">
-<link rel="next" href="per_test_case_fixture.html" title="Per test case fixture">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="per_test_case_fixture.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.fixtures.generic_fixture_model"></a><a name="fixtures_generic"></a><a class="link" href="generic_fixture_model.html" title="Generic fixture model">Generic
-        fixture model</a>
-</h4></div></div></div>
-<p>
-          The <span class="emphasis"><em>UTF</em></span> defines the generic fixture model as follows:
-        </p>
-<pre class="programlisting"><span class="keyword">struct</span> <span class="special">&lt;</span><span class="identifier">fixture</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;{</span>
-  <span class="special">&lt;</span><span class="identifier">fixture</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;();</span>      <span class="comment">// setup function</span>
-  <span class="special">~&lt;</span><span class="identifier">fixture</span><span class="special">-</span><span class="identifier">name</span><span class="special">&gt;();</span>     <span class="comment">// teardown function</span>
-<span class="special">};</span>
-</pre>
-<p>
-          In other words a fixture is expected to be implemented as a class where
-          the class constructor serves as a setup method and class destructor serves
-          as teardown method. The <span class="emphasis"><em>UTF</em></span> opted to avoid explicit
-          names in fixture interface for setup and teardown methods, since is considered
-          most natural in C++ for tasks similar to RAII and coincides with the pure
-          C++ solution discusses earlier.
-        </p>
-<div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../../doc/src/images/caution.png"></td>
-<th align="left">Caution</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The above interface prevents you to report errors in the teardown procedure
-            using an exception. It does make sense though: if somehow more than one
-            fixture is assigned to a test unit, you want all teardown procedures
-            to run, even if some may experience problems.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="per_test_case_fixture.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/fixtures/global_fixture.html b/doc/v2/html/boost_test/tests_organization/fixtures/global_fixture.html
deleted file mode 100644
index 093addb5..00000000
--- a/doc/v2/html/boost_test/tests_organization/fixtures/global_fixture.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Global fixture</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../fixtures.html" title="Fixtures">
-<link rel="prev" href="test_suite_level_fixture.html" title="Test suite level fixture">
-<link rel="next" href="../../testing_tools.html" title="The UTF testing tools">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_suite_level_fixture.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../testing_tools.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.fixtures.global_fixture"></a><a name="ref_fixture_test_global"></a><a class="link" href="global_fixture.html" title="Global fixture">Global
-        fixture</a>
-</h4></div></div></div>
-<p>
-          Any global initialization that needs to be performed every time testing
-          begins or a global cleanup that is to be performed once testing is finished
-          is called a global fixture. The <span class="emphasis"><em>UTF</em></span> global fixture
-          design is based on a generic test fixture model and is supported by the
-          utility class <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">global_fixture</span></code>. The global fixture design
-          allows any number of global fixtures to be defined in any test file that
-          constitutes a test module. Though some initialization can be implemented
-          in the test module initialization function, there are several reasons to
-          prefer the global fixture approach:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              There is no place for cleanup/teardown operations in the initialization
-              function.
-            </li>
-<li class="listitem">
-              Unlike the initialization function, the global fixture setup method
-              invocation is guarded by the execution monitor. That means that all
-              uncaught errors that occur during initialization are properly reported.
-            </li>
-<li class="listitem">
-              Any number of different global fixtures can be defined, which allows
-              you to split initialization code by category.
-            </li>
-<li class="listitem">
-              The fixture allows you to place matching setup/teardown code in close
-              vicinity in your test module code.
-            </li>
-<li class="listitem">
-              If the whole test tree is constructed automatically the initialization
-              function is empty and auto-generated by the <span class="emphasis"><em>UTF</em></span>.
-              To introduce the initialization function can be more work than the
-              use of a global fixture facility, while global fixture is more to the
-              point.
-            </li>
-<li class="listitem">
-              Since all fixtures follow the same generic model you can easily switch
-              from local per test case fixtures to the global one.
-            </li>
-<li class="listitem">
-              If you are using the interactive test runner (non-supplied yet) global
-              test fixtures are applied to every run, while an initialization function
-              is executed only once during a test module startup (just make sure
-              that it's what you really want).
-            </li>
-</ul></div>
-<p>
-          To define a global test module fixture you need to implement a class that
-          matched generic fixture model and passed it as an argument to the macro
-          <a class="link" href="global_fixture.html#ref_fixture_test_global"><code class="computeroutput"><span class="identifier">BOOST_GLOBAL_FIXTURE</span></code></a>.
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span><span class="identifier">fixure_name</span><span class="special">);</span>
-</pre>
-<p>
-          The statement, that performs global fixture definition, has to reside at
-          a test file scope.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.fixtures.global_fixture.id_example20"></a><p class="title"><b>Table&#160;21.&#160;Global fixture</b></p>
-<div class="table-contents"><table class="table" summary="Global fixture">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="keyword">struct</span> <span class="identifier">MyConfig</span> <span class="special">{</span>
-  <span class="identifier">MyConfig</span><span class="special">()</span>   <span class="special">{</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"global setup\n"</span><span class="special">;</span> <span class="special">}</span>
-  <span class="special">~</span><span class="identifier">MyConfig</span><span class="special">()</span>  <span class="special">{</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"global teardown\n"</span><span class="special">;</span> <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="identifier">BOOST_GLOBAL_FIXTURE</span><span class="special">(</span> <span class="identifier">MyConfig</span> <span class="special">);</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">global</span> <span class="identifier">setup</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">global</span> <span class="identifier">teardown</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_suite_level_fixture.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../testing_tools.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/fixtures/per_test_case_fixture.html b/doc/v2/html/boost_test/tests_organization/fixtures/per_test_case_fixture.html
deleted file mode 100644
index a231c0ff..00000000
--- a/doc/v2/html/boost_test/tests_organization/fixtures/per_test_case_fixture.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Per test case fixture</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../fixtures.html" title="Fixtures">
-<link rel="prev" href="generic_fixture_model.html" title="Generic fixture model">
-<link rel="next" href="test_suite_level_fixture.html" title="Test suite level fixture">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="generic_fixture_model.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite_level_fixture.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.fixtures.per_test_case_fixture"></a><a name="ref_fixture_test_case"></a><a class="link" href="per_test_case_fixture.html" title="Per test case fixture">Per
-        test case fixture</a>
-</h4></div></div></div>
-<p>
-          To automate the task of assigning a fixture for the test case, for test
-          case creation use the macro <a class="link" href="per_test_case_fixture.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a> in place
-          of the macro <a class="link" href="../test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a>:
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">fixture_name</span><span class="special">);</span>
-</pre>
-<p>
-          The only difference from the macro <a class="link" href="../test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a> is the presence
-          of an extra argument - fixture name. Unlike the pure C++ solution you have
-          direct access to the public and protected members of the fixture, though
-          you still need to refer to the fixture name in every test case.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            You can't access private members of fixture, but then why would you make
-            anything private?
-          </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.tests_organization.fixtures.per_test_case_fixture.id_example18"></a><p class="title"><b>Table&#160;19.&#160;Per test case fixture</b></p>
-<div class="table-contents"><table class="table" summary="Per test case fixture">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">struct</span> <span class="identifier">F</span> <span class="special">{</span>
-  <span class="identifier">F</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">i</span><span class="special">(</span> <span class="number">0</span> <span class="special">)</span> <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"setup fixture"</span> <span class="special">);</span> <span class="special">}</span>
-  <span class="special">~</span><span class="identifier">F</span><span class="special">()</span>         <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"teardown fixture"</span> <span class="special">);</span> <span class="special">}</span>
-
-  <span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span>
-<span class="special">};</span>
-
-<span class="identifier">BOOST_FIXTURE_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case1</span><span class="special">,</span> <span class="identifier">F</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
-  <span class="special">++</span><span class="identifier">i</span><span class="special">;</span>
-<span class="special">}</span>
-
-<span class="identifier">BOOST_FIXTURE_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case2</span><span class="special">,</span> <span class="identifier">F</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="number">1</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case3</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">message</span>
-<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">setup</span> <span class="identifier">fixture</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">13</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
-<span class="identifier">teardown</span> <span class="identifier">fixture</span>
-<span class="identifier">setup</span> <span class="identifier">fixture</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">19</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case2"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">0</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
-<span class="identifier">teardown</span> <span class="identifier">fixture</span>
-
-<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          In this example only <code class="computeroutput"><span class="identifier">test_case1</span></code>
-          and <code class="computeroutput"><span class="identifier">test_case2</span></code> have fixture
-          <code class="computeroutput"><span class="identifier">F</span></code> assigned. In the next
-          section you going to see what can be done if all test cases in a test suite
-          require the same fixture.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="generic_fixture_model.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite_level_fixture.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/fixtures/test_suite_level_fixture.html b/doc/v2/html/boost_test/tests_organization/fixtures/test_suite_level_fixture.html
deleted file mode 100644
index 31da9796..00000000
--- a/doc/v2/html/boost_test/tests_organization/fixtures/test_suite_level_fixture.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Test suite level fixture</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../fixtures.html" title="Fixtures">
-<link rel="prev" href="per_test_case_fixture.html" title="Per test case fixture">
-<link rel="next" href="global_fixture.html" title="Global fixture">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="per_test_case_fixture.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="global_fixture.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.fixtures.test_suite_level_fixture"></a><a name="ref_fixture_test_suite"></a><a class="link" href="test_suite_level_fixture.html" title="Test suite level fixture">Test
-        suite level fixture</a>
-</h4></div></div></div>
-<p>
-          If all test cases in a test require the same fixture (you can group test
-          cases in the test suite based on a fixture required) you can make another
-          step toward an automation of a test fixture assignment. To assign the same
-          shared fixture for all test cases in a test suite, use the macro <a class="link" href="test_suite_level_fixture.html#ref_fixture_test_suite"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_SUITE</span></code></a>
-          in place of the macro <a class="link" href="../test_organization_test_suite.html#ref_BOOST_AUTO_TEST_SUITE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_SUITE</span></code></a> for automated
-          test suite creation and registration.
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_FIXTURE_TEST_SUITE</span><span class="special">(</span><span class="identifier">suite_name</span><span class="special">,</span> <span class="identifier">fixure_name</span><span class="special">);</span>
-</pre>
-<p>
-          Once again the only difference from the macro <a class="link" href="../test_organization_test_suite.html#ref_BOOST_AUTO_TEST_SUITE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_SUITE</span></code></a> usage is
-          the presence of an extra argument - the fixture name. And now, you not
-          only have direct access to the public and protected members of the fixture,
-          but also do not need to refer to the fixture name in test case definition.
-          All test cases assigned the same fixture automatically.
-        </p>
-<div class="tip"><table border="0" summary="Tip">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../../doc/src/images/tip.png"></td>
-<th align="left">Tip</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            If necessary you can reset the fixture for a particular test case with
-            the use of the macro <a class="link" href="per_test_case_fixture.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a>.
-          </p></td></tr>
-</table></div>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The fixture assignment is <span class="emphasis"><em>deep</em></span>. In other words unless
-            reset by another <a class="link" href="test_suite_level_fixture.html#ref_fixture_test_suite"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_SUITE</span></code></a> or
-            <a class="link" href="per_test_case_fixture.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a>
-            definition the same fixture is assigned to all test cases, including
-            ones that belong to the sub test suites.
-          </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.tests_organization.fixtures.test_suite_level_fixture.id_example19"></a><p class="title"><b>Table&#160;20.&#160;Test suite level fixture</b></p>
-<div class="table-contents"><table class="table" summary="Test suite level fixture">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">struct</span> <span class="identifier">F</span> <span class="special">{</span>
-  <span class="identifier">F</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">i</span><span class="special">(</span> <span class="number">0</span> <span class="special">)</span> <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"setup fixture"</span> <span class="special">);</span> <span class="special">}</span>
-  <span class="special">~</span><span class="identifier">F</span><span class="special">()</span>         <span class="special">{</span> <span class="identifier">BOOST_TEST_MESSAGE</span><span class="special">(</span> <span class="string">"teardown fixture"</span> <span class="special">);</span> <span class="special">}</span>
-
-  <span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span>
-<span class="special">};</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="identifier">BOOST_FIXTURE_TEST_SUITE</span><span class="special">(</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">F</span> <span class="special">)</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case1</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">test_case2</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">i</span><span class="special">,</span> <span class="number">0</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="comment">//____________________________________________________________________________//</span>
-
-<span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">17</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../../../doc/src/images/caution.png"></td>
-<th align="left">Caution</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The fixture constructor and destructor is called for each test cases
-            (the state of the fixture is not shared among the test cases).
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="per_test_case_fixture.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="global_fixture.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_cases.html b/doc/v2/html/boost_test/tests_organization/test_cases.html
old mode 100644
new mode 100755
index a5d3864f..fa4b0491
--- a/doc/v2/html/boost_test/tests_organization/test_cases.html
+++ b/doc/v2/html/boost_test/tests_organization/test_cases.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Test cases</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../tests_organization.html" title="Registering, generating and organizing the unit tests">
-<link rel="prev" href="../tests_organization.html" title="Registering, generating and organizing the unit tests">
-<link rel="next" href="test_cases/test_organization_nullary.html" title="Nullary function based test case">
+<link rel="up" href="../tests_organization.html" title="Test organization using the Unit Test Framework">
+<link rel="prev" href="../tests_organization.html" title="Test organization using the Unit Test Framework">
+<link rel="next" href="test_organization_test_suite.html" title="Test suite">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,33 +20,25 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_cases/test_organization_nullary.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_organization_test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_test.tests_organization.test_cases"></a><a class="link" href="test_cases.html" title="Test cases">Test cases</a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="test_cases/test_organization_nullary.html">Nullary
-        function based test case</a></span></dt>
-<dt><span class="section"><a href="test_cases/unary_function_based_test_case.html">Unary
-        function based test case</a></span></dt>
-<dt><span class="section"><a href="test_cases/test_organization_templates.html">Template
-        test cases</a></span></dt>
-</dl></div>
 <p>
         A test case has to be constructed based on some kind of function and registered
         in a test tree, so that the test runner knows how to invoke it. There are
         different possible designs for the test case construction problem: inheritance
         from the predefined base class, specifically named member function and so
-        on. The <span class="emphasis"><em>UTF</em></span> opted to avoid classed altogether and to
-        use the least intrusive <span class="emphasis"><em>generic callback</em></span> approach. The
-        facility the <span class="emphasis"><em>UTF</em></span> provides, requires specific function
-        signature and allows adopting any function or function object that matches
-        the signature as a test case. The signatures the <span class="emphasis"><em>UTF</em></span>
-        supports are:
+        on. The <span class="emphasis"><em>Unit Test Framework</em></span> opted to avoid classed altogether
+        and to use the least intrusive <span class="emphasis"><em>generic callback</em></span> approach.
+        The facility the <span class="emphasis"><em>Unit Test Framework</em></span> provides, requires
+        specific function signature and allows adopting any function or function
+        object that matches the signature as a test case. The signatures the <span class="emphasis"><em>Unit
+        Test Framework</em></span> supports are:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             Nullary function
           </li>
@@ -58,14 +50,14 @@
           </li>
 </ul></div>
 <p>
-        Generic test case construction design used by the <span class="emphasis"><em>UTF</em></span>
+        Generic test case construction design used by the <span class="emphasis"><em>Unit Test Framework</em></span>
         causes the test case implementation (test function body) and test case creation/registration
         points to be remote. As a result you may forget to register the test case
         and it's never going to be executed, even though it's present in test file.
-        To alleviate this issue the <span class="emphasis"><em>UTF</em></span> presents facilities
-        for automated (in place) test case creation and registration in the test
-        tree. These facilities sacrifice some generality and work for selected test
-        function signatures only. But the result is that library users are relieved
+        To alleviate this issue the <span class="emphasis"><em>Unit Test Framework</em></span> presents
+        facilities for automated (in place) test case creation and registration in
+        the test tree. These facilities sacrifice some generality and work for selected
+        test function signatures only. But the result is that library users are relieved
         from the necessity to manually register test cases. These facilities are
         the most user-friendly and are recommended to be used whenever possible.
         In addition they support automated registration of test suites, thus allowing
@@ -78,6 +70,1429 @@
         function and test cases that are registered automatically at implementation
         point.
       </p>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary" title="Non-parameterized test cases">Non-parameterized
+        test cases</a>
+</h4></div></div></div>
+<p>
+          The most widely used are test cases based on a nullary function. These
+          include nullary free functions, nullary function objects created with
+          <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code> and nullary <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span></code>
+          instances. The simplest is a free function and the <span class="emphasis"><em>Unit Test
+          Framework</em></span> provides facilities to create a free function based
+          test case that is automatically registered. Here are the two construction
+          interfaces:
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              Test case with automated registration
+            </li>
+<li class="listitem">
+              Manually registered test case
+            </li>
+</ul></div>
+<a name="ref_BOOST_AUTO_TEST_CASE"></a><h5>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h0"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.automated_registration"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.automated_registration">Automated
+          registration</a>
+        </h5>
+<p>
+          To create a nullary free function cased test case, which is registered
+          in place of implementation, employ the macro <a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a>.
+        </p>
+<pre class="programlisting"><a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">);</span>
+</pre>
+<p>
+          The macro is designed to closely mimic nullary free function syntax. Changes
+          that are required to make an existing test case, implemented as a free
+          function, registered in place are illustrated in the following example
+          (compare with <a class="link" href="test_cases.html#ref_bt_example01">manual registration</a>):
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h1"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.example_descr"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.example_descr">Example:
+          Nullary function based test case with automated registration</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">free_test_function</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
+<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span>
+<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span><span class="special">;</span> <span class="identifier">testing</span> <span class="identifier">time</span><span class="special">:</span> <span class="number">16</span><span class="identifier">ms</span>
+<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          With this macro you don't need to implement the initialization function
+          at all. The macro creates and registers the test case with the name <code class="computeroutput"><span class="identifier">free_test_function</span></code> automatically.
+        </p>
+<a name="ref_BOOST_TEST_CASE"></a><h5>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h2"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.manual_registration"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.manual_registration">Manual
+          registration</a>
+        </h5>
+<p>
+          To create a test case manually, employ the macro <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE</span></code></a>:
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span><span class="identifier">test_function</span><span class="special">);</span>
+</pre>
+<p>
+          <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE</span></code></a>
+          creates an instance of the class <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">test_case</span></code>
+          and returns a pointer to the constructed instance. The test case name is
+          deduced from the macro argument test_function. If you prefer to assign
+          a different test case name, you have to use the underlying make_test_case
+          interface instead. To register a new test case, employ the method <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code>. Both test case creation and registration
+          are performed in the test module initialization function.
+        </p>
+<p>
+          Here is the simplest possible manually registered test case. This example
+          employs the original test module initialization function specification.
+          A single test case is created and registered in the master test suite.
+          Note that the free function name is passed by address to the macro <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE</span></code></a>`.
+        </p>
+<a name="ref_bt_example01"></a><h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h3"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.example_descr0"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.example_descr0">Example:
+          Nullary free function manually registered</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">)</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          A test case can be implemented as a method of a class. In this case a pointer
+          to the class instance has to be bound to the test method to create a test
+          case. You can use the same instance of the class for multiple test cases.
+          The <span class="emphasis"><em>Unit Test Framework</em></span> doesn't take an ownership
+          of the class instance and you are required to manage the class instance
+          lifetime yourself.
+        </p>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The class instance can't be defined in the initialization function scope,
+            since it becomes invalid as soon as the test execution exits it. It needs
+            to be either defined statically/globally or managed using a shared pointer.
+          </p></td></tr>
+</table></div>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h4"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.example_descr1"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.example_descr1">Example:
+          Nullary method of a class bound to global class instance and manually registered</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">class</span> <span class="identifier">test_class</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+  <span class="keyword">void</span> <span class="identifier">test_method</span><span class="special">()</span>
+  <span class="special">{</span>
+    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+  <span class="special">}</span>
+<span class="special">}</span> <span class="identifier">tester</span><span class="special">;</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">tester</span> <span class="special">)));</span>
+
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">11</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"boost::bind( &amp;test_class::test_method, &amp;tester )"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
+
+<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h5"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.example_descr2"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.example_descr2">Example:
+          Nullary method of a class bound to shared class instance and manually registered</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">class</span> <span class="identifier">test_class</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+  <span class="keyword">void</span> <span class="identifier">test_method1</span><span class="special">()</span>
+  <span class="special">{</span>
+    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+  <span class="special">}</span>
+  <span class="keyword">void</span> <span class="identifier">test_method2</span><span class="special">()</span>
+  <span class="special">{</span>
+    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">false</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+  <span class="special">}</span>
+<span class="special">};</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">shared_ptr</span><span class="special">&lt;</span><span class="identifier">test_class</span><span class="special">&gt;</span> <span class="identifier">tester</span><span class="special">(</span> <span class="keyword">new</span> <span class="identifier">test_class</span> <span class="special">);</span>
+
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method1</span><span class="special">,</span> <span class="identifier">tester</span> <span class="special">)));</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method2</span><span class="special">,</span> <span class="identifier">tester</span> <span class="special">)));</span>
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">15</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"boost::bind( &amp;test_class::test_method2, tester )"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
+
+<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          If you do not need to reuse the test class instance and can't or do not
+          wish to create test class instance globally it may be easier and safer
+          to create an instance on the stack of free function:
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h6"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.example_descr3"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.example_descr3">Example:
+          Nullary method of a class bound to local class instance inside free function</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">class</span> <span class="identifier">test_class</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+  <span class="keyword">void</span> <span class="identifier">test_method</span><span class="special">()</span>
+  <span class="special">{</span>
+    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+  <span class="special">}</span>
+<span class="special">};</span>
+
+<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">test_class</span> <span class="identifier">inst</span><span class="special">;</span>
+  <span class="identifier">inst</span><span class="special">.</span><span class="identifier">test_method</span><span class="special">();</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">)</span> <span class="special">);</span>
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          If you have to perform the same set of tests with different sets of parameters
+          you may want to base your test case on a function with arguments and bind
+          particular parameters during test case creation.
+        </p>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            If you bind parameters by reference or pointer, the referenced value
+            can't have local storage in the test module initialization function.
+          </p></td></tr>
+</table></div>
+<p>
+          The example below employs the alternative test module initialization function
+          specification:
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h7"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_nullary.example_descr4"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary.example_descr4">Example:
+          Binary free function bound to set of different parameter pairs</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_DYN_LINK</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="keyword">bool</span> <span class="identifier">init_function</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">1</span> <span class="special">)</span> <span class="special">)</span> <span class="special">);</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span> <span class="special">)</span> <span class="special">)</span> <span class="special">);</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">1</span> <span class="special">)</span> <span class="special">)</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
+<span class="special">}</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="keyword">return</span> <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_main</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">init_function</span><span class="special">,</span> <span class="identifier">argc</span><span class="special">,</span> <span class="identifier">argv</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          The <span class="emphasis"><em>Unit Test Framework</em></span> also presents an alternative
+          method for parameterized test case creation, which is covered in <a class="link" href="test_cases.html#ref_BOOST_PARAM_TEST_CASE">next section</a>.
+        </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.test_cases.test_organization_unary"></a><a name="ref_BOOST_PARAM_TEST_CASE"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_unary" title="Parameterized test cases">Parameterized
+        test cases</a>
+</h4></div></div></div>
+<p>
+          Some tests are required to be repeated for a series of different input
+          parameters. One way to achieve this is manually register a test case for
+          each parameter as in the previous examples. You can also invoke a test
+          function with all parameters manually from within your test case, like
+          this:
+        </p>
+<pre class="programlisting"><span class="keyword">void</span> <span class="identifier">single_test</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="keyword">void</span> <span class="identifier">combined_test</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="keyword">int</span> <span class="identifier">params</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">5</span> <span class="special">};</span>
+  <span class="identifier">std</span><span class="special">::</span><span class="identifier">for_each</span><span class="special">(</span> <span class="identifier">params</span><span class="special">,</span> <span class="identifier">params</span><span class="special">+</span><span class="number">5</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">single_test</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+<p>
+          The <span class="emphasis"><em>Unit Test Framework</em></span> presents a better solution
+          for this problem: the unary function based test case, also referred as
+          <span class="emphasis"><em>parameterized test case</em></span>. The unary test function can
+          be a free function, unary functor (for example created with <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code>) or unary method of a class with
+          bound test class instance). The test function is converted into test case
+          using the macro <a class="link" href="test_cases.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a>. The macro
+          expects a collection of parameters (passed as two input iterators) and
+          an unary test function:
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_PARAM_TEST_CASE</span><span class="special">(</span><span class="identifier">test_function</span><span class="special">,</span> <span class="identifier">params_begin</span><span class="special">,</span> <span class="identifier">params_end</span><span class="special">);</span>
+</pre>
+<p>
+          <a class="link" href="test_cases.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a>
+          creates an instance of the test case generator. When passed to the method
+          <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code>, the generator produces a separate
+          sub test case for each parameter in the parameters collection and registers
+          it immediately in a test suite. Each test case is based on a test function
+          with the parameter bound by value, even if the test function expects a
+          parameter by reference. The fact that parameter value is stored along with
+          bound test function releases you from necessity to manage parameters lifetime.
+          For example, they can be defined in the test module initialization function
+          scope.
+        </p>
+<p>
+          All sub test case names are deduced from the macro argument <code class="computeroutput"><span class="identifier">test_function</span></code>. If you prefer to assign
+          different names, you have to use the underlying <code class="computeroutput"><a class="link" href="../../header/boost/test/parameterized_test_hpp.html" title="Header &lt;boost/test/parameterized_test.hpp&gt;">make_test_case</a></code> interface
+          instead. Both test cases creation and registration are performed in the
+          test module initialization function.
+        </p>
+<p>
+          The parameterized test case facility is preferable to the approach in the
+          example above, since execution of each sub test case is guarded and counted
+          independently. It produces a better test log/results report (in example
+          above in case of failure you can't say which parameter is at fault) and
+          allows you to test against all parameters even if one of them causes termination
+          a particular sub test case.
+        </p>
+<p>
+          In comparison with a manual test case registration for each parameter approach
+          the parameterized test case facility is more concise and easily extendible.
+        </p>
+<p>
+          In following simple example the same test, implemented in <code class="computeroutput"><span class="identifier">free_test_function</span></code>, is performed for
+          5 different parameters. The parameters are defined in the test module initialization
+          function scope. The master test suite contains 5 independent test cases.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_unary.h0"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_unary.example_descr"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_unary.example_descr">Example:
+          Unary free function based test case</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">parameterized_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">4</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="keyword">int</span> <span class="identifier">params</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">5</span> <span class="special">};</span>
+
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_PARAM_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="identifier">params</span><span class="special">,</span> <span class="identifier">params</span><span class="special">+</span><span class="number">5</span> <span class="special">)</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">5</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">9</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"free_test_function"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">4</span> <span class="identifier">failed</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">9</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"free_test_function"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">4</span> <span class="identifier">failed</span>
+
+<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          Next example is similar, but instead of a free function it uses a method
+          of a class. Even though parameters are passed into test method by reference
+          you can still define them in the test module initialization function scope.
+          This example employs the alternative test module initialization function
+          specification.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_unary.h1"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_unary.example_descr0"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_unary.example_descr0">Example:
+          Unary class method based test case</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">parameterized_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">;</span>
+
+<span class="keyword">class</span> <span class="identifier">test_class</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+  <span class="keyword">void</span> <span class="identifier">test_method</span><span class="special">(</span> <span class="keyword">double</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">d</span> <span class="special">)</span>
+  <span class="special">{</span>
+    <span class="identifier">BOOST_CHECK_CLOSE</span><span class="special">(</span> <span class="identifier">d</span> <span class="special">*</span> <span class="number">100</span><span class="special">,</span> <span class="special">(</span><span class="keyword">double</span><span class="special">)(</span><span class="keyword">int</span><span class="special">)(</span><span class="identifier">d</span><span class="special">*</span><span class="number">100</span><span class="special">),</span> <span class="number">0.01</span> <span class="special">);</span>
+  <span class="special">}</span>
+<span class="special">}</span> <span class="identifier">tester</span><span class="special">;</span>
+
+<span class="keyword">bool</span> <span class="identifier">init_unit_test</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="keyword">double</span> <span class="identifier">params</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1.</span><span class="special">,</span> <span class="number">1.1</span><span class="special">,</span> <span class="number">1.01</span><span class="special">,</span> <span class="number">1.001</span><span class="special">,</span> <span class="number">1.0001</span> <span class="special">};</span>
+
+  <span class="identifier">callback1</span><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">tm</span> <span class="special">=</span> <span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">tester</span><span class="special">,</span> <span class="identifier">_1</span><span class="special">);</span>
+
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_PARAM_TEST_CASE</span><span class="special">(</span> <span class="identifier">tm</span><span class="special">,</span> <span class="identifier">params</span><span class="special">,</span> <span class="identifier">params</span><span class="special">+</span><span class="number">5</span> <span class="special">)</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">5</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">14</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"tm"</span><span class="special">:</span> <span class="identifier">difference</span> <span class="identifier">between</span> <span class="identifier">d</span> <span class="special">*</span> <span class="number">100</span><span class="special">{</span><span class="number">100.1</span><span class="special">}</span> <span class="keyword">and</span> <span class="special">(</span><span class="keyword">double</span><span class="special">)(</span><span class="keyword">int</span><span class="special">)(</span><span class="identifier">d</span><span class="special">*</span><span class="number">100</span><span class="special">){</span><span class="number">100</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">0.01</span><span class="special">%</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">14</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"tm"</span><span class="special">:</span> <span class="identifier">difference</span> <span class="identifier">between</span> <span class="identifier">d</span> <span class="special">*</span> <span class="number">100</span><span class="special">{</span><span class="number">100.01</span><span class="special">}</span> <span class="keyword">and</span> <span class="special">(</span><span class="keyword">double</span><span class="special">)(</span><span class="keyword">int</span><span class="special">)(</span><span class="identifier">d</span><span class="special">*</span><span class="number">100</span><span class="special">){</span><span class="number">100</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">0.01</span><span class="special">%</span>
+
+<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.test_cases.test_organization_templates"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_templates" title="Template test cases">Template
+        test cases</a>
+</h4></div></div></div>
+<p>
+          To test a template based component it's frequently necessary to perform
+          the same set of checks for a component instantiated with different template
+          parameters. The <span class="emphasis"><em>Unit Test Framework</em></span> provides the ability
+          to create a series of test cases based on a list of desired types and function
+          similar to nullary function template. This facility is called test case
+          template. Here are the two construction interfaces:
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              Test case template with automated registration
+            </li>
+<li class="listitem">
+              Manually registered test case template
+            </li>
+</ul></div>
+<a name="ref_BOOST_AUTO_TEST_CASE_TEMPLATE"></a><h5>
+<a name="boost_test.tests_organization.test_cases.test_organization_templates.h0"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_automate"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_automate">Test
+          case template with automated registration</a>
+        </h5>
+<p>
+          To create a test case template registered in place of implementation, employ
+          the macro <a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span></code></a>.
+          This facility is also called <span class="emphasis"><em>auto test case template</em></span>.
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">formal_type_parameter_name</span><span class="special">,</span> <span class="identifier">collection_of_types</span><span class="special">);</span>
+</pre>
+<p>
+          The macro <a class="link" href="test_cases.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span></code></a>
+          requires three arguments:
+        </p>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+              <code class="computeroutput"><span class="identifier">test_case_name</span></code> The
+              test case template name: unique test cases template identifier
+            </li>
+<li class="listitem">
+              <code class="computeroutput"><span class="identifier">formal_type_parameter_name</span></code>
+              The name of a formal template parameter: name of the type the test
+              case template is instantiated with
+            </li>
+<li class="listitem">
+              The collection of types to instantiate test case template with: arbitrary
+              MPL sequence
+            </li>
+</ol></div>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_templates.h1"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_templates.example_descr"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_templates.example_descr">Example:
+          Test case template with automated registration</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">test_types</span><span class="special">;</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span><span class="special">(</span> <span class="identifier">my_test</span><span class="special">,</span> <span class="identifier">T</span><span class="special">,</span> <span class="identifier">test_types</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">),</span> <span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="number">4</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">12</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test&lt;unsigned char&gt;"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">1</span> <span class="special">!=</span> <span class="number">4</span><span class="special">]</span>
+
+<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<a name="ref_BOOST_TEST_CASE_TEMPLATE"></a><h5>
+<a name="boost_test.tests_organization.test_cases.test_organization_templates.h2"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_manual_r"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_manual_r">Test
+          case template with manual registration</a>
+        </h5>
+<p>
+          One way to perform the same set of checks for a component instantiated
+          with different template parameters is illustrated in the following example:
+        </p>
+<pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
+<span class="keyword">void</span> <span class="identifier">single_test</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="keyword">void</span> <span class="identifier">combined_test</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">single_test</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;();</span>
+  <span class="identifier">single_test</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;();</span>
+  <span class="identifier">single_test</span><span class="special">&lt;</span><span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">&gt;();</span>
+<span class="special">}</span>
+</pre>
+<p>
+          There several problems/inconveniences with above approach, including:
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              Fatal error in one of the invocation will stop whole test case and
+              will skip invocations with different types
+            </li>
+<li class="listitem">
+              You need to repeat function invocation manually for all the parameters
+              you are interested in
+            </li>
+<li class="listitem">
+              You need two functions to implement the test
+            </li>
+</ul></div>
+<p>
+          Ideally the test case template would be based on nullary function template
+          (like single_test above). Unfortunately function templates are neither
+          addressable nor can be used as template parameters. To alleviate the issue
+          the manually registered test case template facility consists of two co-working
+          macros: <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
+          and <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span></code></a>.
+          Former is used to define the test case template body, later - to create
+          and register test cases based on it.
+        </p>
+<p>
+          The macro <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
+          requires two arguments:
+        </p>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+              the name of the test case template and
+            </li>
+<li class="listitem">
+              the name of the format type parameter
+            </li>
+</ol></div>
+<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">type_name</span><span class="special">);</span>
+</pre>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            Is this snippet really useful??
+          </p></td></tr>
+</table></div>
+<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span><span class="special">(</span> <span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">type_name</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="comment">// test case template body</span>
+<span class="special">}</span>
+</pre>
+<p>
+          The macro <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
+          is intended to be used in place of nullary function template signature:
+        </p>
+<pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">type_name</span><span class="special">&gt;</span>
+<span class="keyword">void</span> <span class="identifier">test_case_name</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="comment">// test case template body</span>
+<span class="special">}</span>
+</pre>
+<p>
+          The only difference is that the <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
+          makes the test case template name usable in the template argument list.
+        </p>
+<p>
+          <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span></code></a>
+          requires two arguments:
+        </p>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+              the name of the test case template and
+            </li>
+<li class="listitem">
+              Boost.MPL compatible collection of types to instantiate it with.
+            </li>
+</ol></div>
+<p>
+          The names passed to both macros should be the same.
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">collection_of_types</span><span class="special">);</span>
+</pre>
+<p>
+          <a class="link" href="test_cases.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span></code></a>
+          creates an instance of the test case generator. When passed to the method
+          <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code>, the generator produces a separate
+          sub test case for each type in the supplied collection of types and registers
+          it immediately in the test suite. Each test case is based on the test case
+          template body instantiated with a particular test type.
+        </p>
+<p>
+          The names for the <span class="emphasis"><em>sub test cases</em></span> are deduced from
+          the macro argument <code class="computeroutput"><span class="identifier">test_case_name</span></code>.
+          If you prefer to assign different test case names, you need to use the
+          underlying <code class="computeroutput"><span class="identifier">make_test_case</span></code>
+          interface instead. Both test cases creation and registration is performed
+          in the test module initialization function.
+        </p>
+<div class="tip"><table border="0" summary="Tip">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../doc/src/images/tip.png"></td>
+<th align="left">Tip</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The test case template facility is preferable to the approach in example
+            above, since execution of each sub test case is guarded and counted separately.
+            It produces a better test log/results report (in example above in case
+            of failure you can't say which type is at fault) and allows you to test
+            all types even if one of them causes termination of the sub test case.
+          </p></td></tr>
+</table></div>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_organization_templates.h3"></a>
+          <span><a name="boost_test.tests_organization.test_cases.test_organization_templates.example_descr0"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_templates.example_descr0">Example:
+          Manually registered test case template</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span><span class="special">(</span> <span class="identifier">my_test</span><span class="special">,</span> <span class="identifier">T</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">),</span> <span class="number">4</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">test_types</span><span class="special">;</span>
+
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE_TEMPLATE</span><span class="special">(</span> <span class="identifier">my_test</span><span class="special">,</span> <span class="identifier">test_types</span> <span class="special">)</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test&lt;unsigned char&gt;"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">1</span> <span class="special">!=</span> <span class="number">4</span><span class="special">]</span>
+
+<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation" title="Generation of test case parameters">Generation
+        of test case parameters</a>
+</h4></div></div></div>
+<p>
+          In some circumstance, one would like to test a <a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_organization_unary" title="Parameterized test cases">parametrized</a>
+          test over a large set of parameters. <a class="link" href="test_cases.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a> provides
+          an easy solution when these parameters can be described in some collection.
+          However, this solution has also limitations
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              Suppose we already have parametrized tests for two functions <code class="computeroutput"><span class="identifier">func1</span></code> and <code class="computeroutput"><span class="identifier">func2</span></code>.
+            </li>
+<li class="listitem">
+</ul></div>
+<p>
+          The <span class="emphasis"><em>Unit Test Framework</em></span> provides a facility in order
+          to ease the automated generations of these parameters.
+        </p>
+<p>
+          The unit test toolbox is augmented with one new registration macro: <a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets_auto_registration" title="Declaring test case with datasets"><code class="computeroutput"><span class="identifier">BOOST_DATA_TEST_CASE</span></code></a>.
+        </p>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets" title="Datasets">Datasets</a>
+</h5></div></div></div>
+<p>
+            The power of the dataset object comes from
+          </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+                the operations they provide for combination
+              </li>
+<li class="listitem">
+                the generators provided
+              </li>
+<li class="listitem">
+                their interface with other type of collections
+              </li>
+</ul></div>
+<p>
+            A dataset is a collection of elements, that
+          </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+                is forward iterable
+              </li>
+<li class="listitem">
+                can be queried for their <code class="computeroutput"><span class="identifier">size</span></code>
+              </li>
+</ul></div>
+<div class="tip"><table border="0" summary="Tip">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../doc/src/images/tip.png"></td>
+<th align="left">Tip</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+              datasets are implemented in <code class="computeroutput"><a class="link" href="../../boost/unit_test/data/monomorphic/dataset.html" title="Class template dataset">boost::unit_test::data::monomorphic::dataset</a></code>
+            </p></td></tr>
+</table></div>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+              Only "monomorphic" datasets are supported, which means that
+              all elements of the collection have the same type.
+            </p></td></tr>
+</table></div>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset" title="Operations on dataset">Operations
+            on dataset</a>
+</h6></div></div></div>
+<p>
+              As mentionned earlier, one of the major aspects of using the <span class="emphasis"><em>Unit
+              Test Framework</em></span> datasets lies in the number of operations
+              provided for their combination.
+            </p>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.cartesian_products"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.cartesian_products" title="Cartesian products">Cartesian
+              products</a>
+</h6></div></div></div>
+<p>
+                The cartesian product, or <span class="emphasis"><em>grid</em></span>, combines two
+                datasets to form a new dataset of higher dimension. The iteration
+                over the resulting datasets creates pairs of values with types respectives
+                to the initial datasets.
+              </p>
+<p>
+                Cartesian products are accessible through the <code class="computeroutput"><span class="keyword">operator</span><span class="special">*</span></code> on datasets:
+              </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.joins"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.joins" title="Joins">Joins</a>
+</h6></div></div></div>
+<p>
+                A <span class="emphasis"><em>join</em></span> is the concatenation of two datasets.
+                These datasets are required to have compatible types. Joins are accessible
+                through the <code class="computeroutput"><span class="keyword">operator</span><span class="special">+</span></code> on datasets:
+              </p>
+<pre class="programlisting"><span class="keyword">int</span> <span class="identifier">arr1</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">};</span>
+<span class="keyword">int</span> <span class="identifier">arr2</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span><span class="number">7</span><span class="special">,</span> <span class="number">19</span><span class="special">};</span>
+<a class="link" href="../testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_EQUAL</span></code></a><span class="special">(</span> <span class="special">(</span><span class="identifier">data</span><span class="special">::</span><span class="identifier">make</span><span class="special">(</span> <span class="identifier">arr1</span> <span class="special">)</span> <span class="special">+</span> <span class="identifier">data</span><span class="special">::</span><span class="identifier">make</span><span class="special">(</span> <span class="identifier">arr2</span> <span class="special">)).</span><span class="identifier">size</span><span class="special">(),</span> <span class="number">4</span><span class="special">);</span>
+</pre>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+                  The <code class="computeroutput"><span class="identifier">join</span></code> functionality
+                  is implemented in the class <code class="computeroutput"><a class="link" href="../../boost/unit_test/data/monomorphic/join.html" title="Class template join">boost::unit_test::data::monomorphic::join</a></code>.
+                </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.zips"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.zips" title="Zips">Zips</a>
+</h6></div></div></div>
+<p>
+                The <span class="emphasis"><em>zip</em></span> function returns a dataset of tuples,
+                where the i-th tuple contains the i-th element from each of the argument
+                datasets. The size of the zipped dataset is as follow:
+              </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+                    if one of the dataset is of size 1 (singleton) or of infinite
+                    size, the final zip size is governed by the other dataset.
+                  </li>
+<li class="listitem">
+                    otherwise the datasets are required to have the same size
+                  </li>
+</ul></div>
+<p>
+                Zips are accessible through the <code class="computeroutput"><span class="keyword">operator</span><span class="special">^</span></code> on datasets:
+              </p>
+<div class="table">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.operations_on_dataset.zips.id_example_dataset_zipop"></a><p class="title"><b>Table&#160;1.&#160;Custom predicate support using <a class="link" href="../testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_predicate" title="BOOST_&lt;level&gt;_PREDICATE"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a></b></p>
+<div class="table-contents"><table class="table" summary="Custom predicate support using BOOST_&lt;level&gt;_PREDICATE">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                        <p>
+                          Code
+                        </p>
+                      </th>
+<th>
+                        <p>
+                          Output
+                        </p>
+                      </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="preprocessor">#if</span> <span class="identifier">BOOST_PP_VARIADICS</span>
+
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">data</span><span class="special">/</span><span class="identifier">test_case</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">data</span><span class="special">/</span><span class="identifier">monomorphic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">namespace</span> <span class="identifier">data</span><span class="special">=</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">data</span><span class="special">;</span>
+
+<span class="keyword">int</span> <span class="identifier">samples1</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">};</span>
+<span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">samples2</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span><span class="string">"qwerty"</span><span class="special">,</span><span class="string">"asdfg"</span><span class="special">};</span>
+
+<a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets_auto_registration" title="Declaring test case with datasets"><code class="computeroutput"><span class="identifier">BOOST_DATA_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">test_name</span><span class="special">,</span> <span class="identifier">data</span><span class="special">::</span><span class="identifier">make</span><span class="special">(</span><span class="identifier">samples1</span><span class="special">)^</span><span class="identifier">samples2</span><span class="special">,</span> <span class="identifier">integer_values</span><span class="special">,</span> <span class="identifier">string_value</span><span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">integer_values</span> <span class="special">&lt;&lt;</span> <span class="string">", "</span> <span class="special">&lt;&lt;</span> <span class="identifier">string_value</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="special">}</span>
+<span class="preprocessor">#endif</span>
+</pre>
+                      </td>
+<td>
+<pre class="programlisting"><span class="number">1</span><span class="special">,</span> <span class="identifier">qwerty</span>
+<span class="number">2</span><span class="special">,</span> <span class="identifier">asdfg</span>
+</pre>
+                      </td>
+</tr></tbody>
+</table></div>
+</div>
+<br class="table-break">
+</div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators" title="Datasets generators">Datasets
+            generators</a>
+</h6></div></div></div>
+<p>
+              Several <span class="emphasis"><em>generators</em></span> are implemented in <span class="emphasis"><em>Unit
+              Test Framework</em></span>. The purpose are:
+            </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+                  to ease the generation of data, even in large scale
+                </li>
+<li class="listitem">
+                  to improve the readability and expressivity of the test cases
+                </li>
+</ul></div>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.ranges"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.ranges" title="Ranges">Ranges</a>
+</h6></div></div></div>
+<p>
+                A range is a sequence of equally spaced values. An optional <code class="computeroutput"><span class="identifier">begin</span></code> and <code class="computeroutput"><span class="identifier">step</span></code>
+                can be given. The range initialisation supports named values.
+              </p>
+<pre class="programlisting"><span class="keyword">void</span> <span class="identifier">generate_ranges</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+  <span class="identifier">generated_by</span><span class="special">&lt;</span> <span class="identifier">data</span><span class="special">::</span><span class="identifier">xrange_t</span><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">r_double</span> <span class="special">=</span> <span class="identifier">data</span><span class="special">::</span><span class="identifier">xrange</span><span class="special">(</span> <span class="identifier">data</span><span class="special">::</span><span class="identifier">step</span> <span class="special">=</span> <span class="number">0.5</span><span class="special">,</span> <span class="identifier">data</span><span class="special">::</span><span class="identifier">end</span> <span class="special">=</span> <span class="number">3</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.ranges.h0"></a>
+                <span><a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.ranges.parameters"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.ranges.parameters">Parameters</a>
+              </h6>
+<p>
+                The details of the named value parameters is given in the table below.
+              </p>
+<div class="table">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.ranges.id_range_parameter_table"></a><p class="title"><b>Table&#160;2.&#160;Range parameters</b></p>
+<div class="table-contents"><table class="table" summary="Range parameters">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                        <p>
+                          Name
+                        </p>
+                      </th>
+<th>
+                        <p>
+                          Default
+                        </p>
+                      </th>
+<th>
+                        <p>
+                          Description
+                        </p>
+                      </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                        <p>
+                          <code class="computeroutput"><span class="identifier">begin</span></code>
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          0
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Number indicating the beginning of the generated range.
+                          The <code class="computeroutput"><span class="identifier">begin</span></code>
+                          value is included in set of values returned by the generator.
+                        </p>
+                      </td>
+</tr>
+<tr>
+<td>
+                        <p>
+                          <code class="computeroutput"><span class="identifier">end</span></code>
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          + infinity
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Number indicating the end of the generated range. The
+                          <code class="computeroutput"><span class="identifier">end</span></code> value
+                          is not included in set of values returned by the generator.
+                          If omitted, the generator has infinite size.
+                        </p>
+                      </td>
+</tr>
+<tr>
+<td>
+                        <p>
+                          <code class="computeroutput"><span class="identifier">step</span></code>
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          1
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Strictly positive number indicating the step between two
+                          consecutive elements of the generated range. The default
+                          type is the same as the input type.
+                        </p>
+                      </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<br class="table-break"><div class="tip"><table border="0" summary="Tip">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../doc/src/images/tip.png"></td>
+<th align="left">Tip</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+                  ranges are implemented in <code class="computeroutput"><a class="link" href="../../boost/unit_test/data/monomorphic/xrange_t.html" title="Class template xrange_t">boost::unit_test::data::monomorphic::xrange_t</a></code>,
+                </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h6 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators" title="Random value generators">Random
+              value generators</a>
+</h6></div></div></div>
+<p>
+                <code class="computeroutput"><a class="link" href="../../boost/unit_test/data/monomorphic/random_t.html" title="Class template random_t">boost::unit_test::data::monomorphic::random_t</a></code>
+              </p>
+<p>
+                A factory for creating datasets with this random generator is given
+                by <code class="computeroutput">boost::unit_test::data::monomorphic::random</code>
+              </p>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+                  the random value generators are available only for C++11 capable
+                  compilers.
+                </p></td></tr>
+</table></div>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.h0"></a>
+                <span><a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.choosing_the_distribution"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.choosing_the_distribution">Choosing
+                the distribution</a>
+              </h6>
+<p>
+                The selection of the distibution may be given by the parameter <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">data</span><span class="special">::</span><span class="identifier">distribution</span></code>
+              </p>
+<p>
+                The following defines a random value generator with Gaussian distribution
+                (mean 5, sigma 2).
+              </p>
+<pre class="programlisting"><span class="keyword">auto</span> <span class="identifier">rdgen</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">data</span><span class="special">::</span><span class="identifier">random</span><span class="special">(</span><span class="identifier">data</span><span class="special">::</span><span class="identifier">distribution</span> <span class="special">=</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">normal_distribution</span><span class="special">&lt;&gt;(</span><span class="number">5.</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+</pre>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.h1"></a>
+                <span><a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.setting_the_seed"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.setting_the_seed">Setting
+                the seed</a>
+              </h6>
+<p>
+                In order to be able to reproduce a failure within a randomized parameter
+                test case, the seed that generated the failure may be set in order
+                to generate the same sequence of random values.
+              </p>
+<pre class="programlisting"><span class="keyword">auto</span> <span class="identifier">rdgen</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">data</span><span class="special">::</span><span class="identifier">random</span><span class="special">(</span><span class="identifier">data</span><span class="special">::</span><span class="identifier">seed</span> <span class="special">=</span> <span class="number">100UL</span><span class="special">);</span>
+</pre>
+<h6>
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.h2"></a>
+                <span><a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.parameters"></a></span><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.parameters">Parameters</a>
+              </h6>
+<p>
+                The details of the named value parameters is given in the table below.
+              </p>
+<div class="table">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets.datasets_generators.random_value_generators.id_range_parameter_table"></a><p class="title"><b>Table&#160;3.&#160;Range parameters</b></p>
+<div class="table-contents"><table class="table" summary="Range parameters">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                        <p>
+                          Name
+                        </p>
+                      </th>
+<th>
+                        <p>
+                          Default
+                        </p>
+                      </th>
+<th>
+                        <p>
+                          Description
+                        </p>
+                      </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                        <p>
+                          <code class="computeroutput"><span class="identifier">seed</span></code>
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          0
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Number indicating the beginning of the generated range.
+                          The <code class="computeroutput"><span class="identifier">begin</span></code>
+                          value is included in set of values returned by the generator.
+                        </p>
+                      </td>
+</tr>
+<tr>
+<td>
+                        <p>
+                          <code class="computeroutput"><span class="identifier">distribution</span></code>
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Uniform
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Number indicating the end of the generated range. The
+                          <code class="computeroutput"><span class="identifier">end</span></code> value
+                          is not included in set of values returned by the generator.
+                          If omitted, the generator has infinite size.
+                        </p>
+                      </td>
+</tr>
+<tr>
+<td>
+                        <p>
+                          <code class="computeroutput"><span class="identifier">engine</span></code>
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          1
+                        </p>
+                      </td>
+<td>
+                        <p>
+                          Strictly positive number indicating the step between two
+                          consecutive elements of the generated range. The default
+                          type is the same as the input type.
+                        </p>
+                      </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<br class="table-break">
+</div>
+</div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.tests_organization.test_cases.test_case_generation.datasets_auto_registration"></a><a class="link" href="test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets_auto_registration" title="Declaring test case with datasets">Declaring
+          test case with datasets</a>
+</h5></div></div></div>
+<p>
+            The dataset framework comes with a new test-case declaration macro:
+          </p>
+<pre class="programlisting"><span class="identifier">BOOST_DATA_TEST_CASE</span>
+</pre>
+</div>
+</div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -90,7 +1505,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_cases/test_organization_nullary.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_organization_test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_cases/test_organization_nullary.html b/doc/v2/html/boost_test/tests_organization/test_cases/test_organization_nullary.html
deleted file mode 100644
index b326d485..00000000
--- a/doc/v2/html/boost_test/tests_organization/test_cases/test_organization_nullary.html
+++ /dev/null
@@ -1,484 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Nullary function based test case</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../test_cases.html" title="Test cases">
-<link rel="prev" href="../test_cases.html" title="Test cases">
-<link rel="next" href="unary_function_based_test_case.html" title="Unary function based test case">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="unary_function_based_test_case.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary"></a><a class="link" href="test_organization_nullary.html" title="Nullary function based test case">Nullary
-        function based test case</a>
-</h4></div></div></div>
-<p>
-          The most widely used are test cases based on a nullary function. These
-          include nullary free functions, nullary function objects created with
-          <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code> and nullary <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span></code>
-          instances. The simplest is a free function and the <span class="emphasis"><em>UTF</em></span>
-          provides facilities to create a free function based test case that is automatically
-          registered. Here are the two construction interfaces:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              Test case with automated registration
-            </li>
-<li class="listitem">
-              Manually registered test case
-            </li>
-</ul></div>
-<a name="ref_BOOST_AUTO_TEST_CASE"></a><h5>
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h0"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_cases.test_organization_nullary.automated_registration"></a></span><a class="link" href="test_organization_nullary.html#boost_test.tests_organization.test_cases.test_organization_nullary.automated_registration">Automated
-          registration</a>
-        </h5>
-<p>
-          To create a nullary free function cased test case, which is registered
-          in place of implementation, employ the macro <a class="link" href="test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a>.
-        </p>
-<pre class="programlisting"><a class="link" href="test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">);</span>
-</pre>
-<p>
-          The macro is designed to closely mimic nullary free function syntax. Changes
-          that are required to make an existing test case, implemented as a free
-          function, registered in place are illustrated in the following example
-          (compare with &lt;xref linkend="utf.user-guide.test-organization.manual-nullary-test-case.example01"/&gt;):
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.id_example06"></a><p class="title"><b>Table&#160;1.&#160;Nullary function based test case with automated registration</b></p>
-<div class="table-contents"><table class="table" summary="Nullary function based test case with automated registration">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">free_test_function</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span>
-<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span><span class="special">;</span> <span class="identifier">testing</span> <span class="identifier">time</span><span class="special">:</span> <span class="number">16</span><span class="identifier">ms</span>
-<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          With this macro you don't need to implement the initialization function
-          at all. The macro creates and registers the test case with the name free_test_function
-          automatically.
-        </p>
-<a name="ref_BOOST_TEST_CASE"></a><h5>
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.h1"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_cases.test_organization_nullary.manual_registration"></a></span><a class="link" href="test_organization_nullary.html#boost_test.tests_organization.test_cases.test_organization_nullary.manual_registration">Manual
-          registration</a>
-        </h5>
-<p>
-          To create a test case manually, employ the macro <a class="link" href="test_organization_nullary.html#ref_BOOST_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE</span></code></a>:
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span><span class="identifier">test_function</span><span class="special">);</span>
-</pre>
-<p>
-          <a class="link" href="test_organization_nullary.html#ref_BOOST_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE</span></code></a>
-          creates an instance of the class <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">test_case</span></code>
-          and returns a pointer to the constructed instance. The test case name is
-          deduced from the macro argument test_function. If you prefer to assign
-          a different test case name, you have to use the underlying make_test_case
-          interface instead. To register a new test case, employ the method <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code>. Both test case creation and registration
-          are performed in the test module initialization function.
-        </p>
-<p>
-          Here is the simplest possible manually registered test case. This example
-          employs the original test module initialization function specification.
-          A single test case is created and registered in the master test suite.
-          Note that the free function name is passed by address to the macro <a class="link" href="test_organization_nullary.html#ref_BOOST_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE</span></code></a>`.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.id_example01"></a><p class="title"><b>Table&#160;2.&#160;Nullary free function manually registered</b></p>
-<div class="table-contents"><table class="table" summary="Nullary free function manually registered">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">)</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          A test case can be implemented as a method of a class. In this case a pointer
-          to the class instance has to be bound to the test method to create a test
-          case. You can use the same instance of the class for multiple test cases.
-          The <span class="emphasis"><em>UTF</em></span> doesn't take an ownership of the class instance
-          and you are required to manage the class instance lifetime yourself.
-        </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The class instance can't be defined in the initialization function scope,
-            since it becomes invalid as soon as the test execution exits it. It needs
-            to be either defined statically/globally or managed using a shared pointer.
-          </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.id_example02"></a><p class="title"><b>Table&#160;3.&#160;Nullary method of a class bound to global class instance and manually
-          registered</b></p>
-<div class="table-contents"><table class="table" summary="Nullary method of a class bound to global class instance and manually
-          registered">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">class</span> <span class="identifier">test_class</span>
-<span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="keyword">void</span> <span class="identifier">test_method</span><span class="special">()</span>
-  <span class="special">{</span>
-    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-  <span class="special">}</span>
-<span class="special">}</span> <span class="identifier">tester</span><span class="special">;</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">tester</span> <span class="special">)));</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">11</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"boost::bind( &amp;test_class::test_method, &amp;tester )"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.id_example03"></a><p class="title"><b>Table&#160;4.&#160;Nullary method of a class bound to shared class instance and manually
-          registered</b></p>
-<div class="table-contents"><table class="table" summary="Nullary method of a class bound to shared class instance and manually
-          registered">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">class</span> <span class="identifier">test_class</span>
-<span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="keyword">void</span> <span class="identifier">test_method1</span><span class="special">()</span>
-  <span class="special">{</span>
-    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-  <span class="special">}</span>
-  <span class="keyword">void</span> <span class="identifier">test_method2</span><span class="special">()</span>
-  <span class="special">{</span>
-    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">false</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-  <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">shared_ptr</span><span class="special">&lt;</span><span class="identifier">test_class</span><span class="special">&gt;</span> <span class="identifier">tester</span><span class="special">(</span> <span class="keyword">new</span> <span class="identifier">test_class</span> <span class="special">);</span>
-
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method1</span><span class="special">,</span> <span class="identifier">tester</span> <span class="special">)));</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method2</span><span class="special">,</span> <span class="identifier">tester</span> <span class="special">)));</span>
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">15</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"boost::bind( &amp;test_class::test_method2, tester )"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          If you do not need to reuse the test class instance and can't or do not
-          wish to create test class instance globally it may be easier and safer
-          to create an instance on the stack of free function:
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.id_example04"></a><p class="title"><b>Table&#160;5.&#160;Nullary method of a class bound to local class instance inside free
-          function</b></p>
-<div class="table-contents"><table class="table" summary="Nullary method of a class bound to local class instance inside free
-          function">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">class</span> <span class="identifier">test_class</span>
-<span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="keyword">void</span> <span class="identifier">test_method</span><span class="special">()</span>
-  <span class="special">{</span>
-    <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-  <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">test_class</span> <span class="identifier">inst</span><span class="special">;</span>
-  <span class="identifier">inst</span><span class="special">.</span><span class="identifier">test_method</span><span class="special">();</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">)</span> <span class="special">);</span>
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          If you have to perform the same set of tests with different sets of parameters
-          you may want to base your test case on a function with arguments and bind
-          particular parameters during test case creation.
-        </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            If you bind parameters by reference or pointer, the referenced value
-            can't have local storage in the test module initialization function.
-          </p></td></tr>
-</table></div>
-<p>
-          The example below employs the alternative test module initialization function
-          specification:
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_nullary.id_example05"></a><p class="title"><b>Table&#160;6.&#160;Binary free function bound to set of different parameter pairs</b></p>
-<div class="table-contents"><table class="table" summary="Binary free function bound to set of different parameter pairs">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_DYN_LINK</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="keyword">bool</span> <span class="identifier">init_function</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">1</span> <span class="special">)</span> <span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span> <span class="special">)</span> <span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">1</span> <span class="special">)</span> <span class="special">)</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
-<span class="special">}</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">return</span> <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_main</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">init_function</span><span class="special">,</span> <span class="identifier">argc</span><span class="special">,</span> <span class="identifier">argv</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          The <span class="emphasis"><em>UTF</em></span> also presents an alternative method for parameterized
-          test case creation, which is covered in <a class="link" href="unary_function_based_test_case.html#ref_BOOST_PARAM_TEST_CASE">next
-          section</a>.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="unary_function_based_test_case.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_cases/test_organization_templates.html b/doc/v2/html/boost_test/tests_organization/test_cases/test_organization_templates.html
deleted file mode 100644
index a44ae529..00000000
--- a/doc/v2/html/boost_test/tests_organization/test_cases/test_organization_templates.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Template test cases</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../test_cases.html" title="Test cases">
-<link rel="prev" href="unary_function_based_test_case.html" title="Unary function based test case">
-<link rel="next" href="../test_organization_test_suite.html" title="Test suite">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="unary_function_based_test_case.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.test_cases.test_organization_templates"></a><a class="link" href="test_organization_templates.html" title="Template test cases">Template
-        test cases</a>
-</h4></div></div></div>
-<p>
-          To test a template based component it's frequently necessary to perform
-          the same set of checks for a component instantiated with different template
-          parameters. The <span class="emphasis"><em>UTF</em></span> provides the ability to create
-          a series of test cases based on a list of desired types and function similar
-          to nullary function template. This facility is called test case template.
-          Here are the two construction interfaces:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              Test case template with automated registration
-            </li>
-<li class="listitem">
-              Manually registered test case template
-            </li>
-</ul></div>
-<a name="ref_BOOST_AUTO_TEST_CASE_TEMPLATE"></a><h5>
-<a name="boost_test.tests_organization.test_cases.test_organization_templates.h0"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_automate"></a></span><a class="link" href="test_organization_templates.html#boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_automate">Test
-          case template with automated registration</a>
-        </h5>
-<p>
-          To create a test case template registered in place of implementation, employ
-          the macro <a class="link" href="test_organization_templates.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span></code></a>.
-          This facility is also called <span class="emphasis"><em>auto test case template</em></span>.
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">formal_type_parameter_name</span><span class="special">,</span> <span class="identifier">collection_of_types</span><span class="special">);</span>
-</pre>
-<p>
-          The macro <a class="link" href="test_organization_templates.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span></code></a>
-          requires three arguments:
-        </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-              <code class="computeroutput"><span class="identifier">test_case_name</span></code> The
-              test case template name: unique test cases template identifier
-            </li>
-<li class="listitem">
-              <code class="computeroutput"><span class="identifier">formal_type_parameter_name</span></code>
-              The name of a formal template parameter: name of the type the test
-              case template is instantiated with
-            </li>
-<li class="listitem">
-              The collection of types to instantiate test case template with: arbitrary
-              MPL sequence
-            </li>
-</ol></div>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_templates.id_example10"></a><p class="title"><b>Table&#160;9.&#160;Test case template with automated registration</b></p>
-<div class="table-contents"><table class="table" summary="Test case template with automated registration">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">test_types</span><span class="special">;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span><span class="special">(</span> <span class="identifier">my_test</span><span class="special">,</span> <span class="identifier">T</span><span class="special">,</span> <span class="identifier">test_types</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">),</span> <span class="special">(</span><span class="keyword">unsigned</span><span class="special">)</span><span class="number">4</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">12</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test&lt;unsigned char&gt;"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">1</span> <span class="special">!=</span> <span class="number">4</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"example"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><a name="ref_BOOST_TEST_CASE_TEMPLATE"></a><h5>
-<a name="boost_test.tests_organization.test_cases.test_organization_templates.h1"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_manual_r"></a></span><a class="link" href="test_organization_templates.html#boost_test.tests_organization.test_cases.test_organization_templates.test_case_template_with_manual_r">Test
-          case template with manual registration</a>
-        </h5>
-<p>
-          One way to perform the same set of checks for a component instantiated
-          with different template parameters is illustrated in the following example:
-        </p>
-<pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
-<span class="keyword">void</span> <span class="identifier">single_test</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="keyword">void</span> <span class="identifier">combined_test</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">single_test</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;();</span>
-  <span class="identifier">single_test</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;();</span>
-  <span class="identifier">single_test</span><span class="special">&lt;</span><span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">&gt;();</span>
-<span class="special">}</span>
-</pre>
-<p>
-          There several problems/inconveniences with above approach, including:
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              Fatal error in one of the invocation will stop whole test case and
-              will skip invocations with different types
-            </li>
-<li class="listitem">
-              You need to repeat function invocation manually for all the parameters
-              you are interested in
-            </li>
-<li class="listitem">
-              You need two functions to implement the test
-            </li>
-</ul></div>
-<p>
-          Ideally the test case template would be based on nullary function template
-          (like single_test above). Unfortunately function templates are neither
-          addressable nor can be used as template parameters. To alleviate the issue
-          the manually registered test case template facility consists of two co-working
-          macros: <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
-          and <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span></code></a>.
-          Former is used to define the test case template body, later - to create
-          and register test cases based on it.
-        </p>
-<p>
-          The macro <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
-          requires two arguments:
-        </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-              the name of the test case template and
-            </li>
-<li class="listitem">
-              the name of the format type parameter
-            </li>
-</ol></div>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">type_name</span><span class="special">);</span>
-</pre>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            Is this snippet really useful??
-          </p></td></tr>
-</table></div>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span><span class="special">(</span> <span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">type_name</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="comment">// test case template body</span>
-<span class="special">}</span>
-</pre>
-<p>
-          The macro <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
-          is intended to be used in place of nullary function template signature:
-        </p>
-<pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">type_name</span><span class="special">&gt;</span>
-<span class="keyword">void</span> <span class="identifier">test_case_name</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="comment">// test case template body</span>
-<span class="special">}</span>
-</pre>
-<p>
-          The only difference is that the <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span></code></a>
-          makes the test case template name usable in the template argument list.
-        </p>
-<p>
-          <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span></code></a>
-          requires two arguments:
-        </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-              the name of the test case template and
-            </li>
-<li class="listitem">
-              Boost.MPL compatible collection of types to instantiate it with.
-            </li>
-</ol></div>
-<p>
-          The names passed to both macros should be the same.
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">collection_of_types</span><span class="special">);</span>
-</pre>
-<p>
-          <a class="link" href="test_organization_templates.html#ref_BOOST_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_TEST_CASE_TEMPLATE</span></code></a>
-          creates an instance of the test case generator. When passed to the method
-          <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code>, the generator produces a separate
-          sub test case for each type in the supplied collection of types and registers
-          it immediately in the test suite. Each test case is based on the test case
-          template body instantiated with a particular test type.
-        </p>
-<p>
-          The names for the <span class="emphasis"><em>sub test cases</em></span> are deduced from
-          the macro argument <code class="computeroutput"><span class="identifier">test_case_name</span></code>.
-          If you prefer to assign different test case names, you need to use the
-          underlying <code class="computeroutput"><span class="identifier">make_test_case</span></code>
-          interface instead. Both test cases creation and registration is performed
-          in the test module initialization function.
-        </p>
-<div class="tip"><table border="0" summary="Tip">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../../doc/src/images/tip.png"></td>
-<th align="left">Tip</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The test case template facility is preferable to the approach in example
-            above, since execution of each sub test case is guarded and counted separately.
-            It produces a better test log/results report (in example above in case
-            of failure you can't say which type is at fault) and allows you to test
-            all types even if one of them causes termination of the sub test case.
-          </p></td></tr>
-</table></div>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.test_organization_templates.id_example09"></a><p class="title"><b>Table&#160;10.&#160;Manually registered test case template</b></p>
-<div class="table-contents"><table class="table" summary="Manually registered test case template">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="identifier">BOOST_TEST_CASE_TEMPLATE_FUNCTION</span><span class="special">(</span> <span class="identifier">my_test</span><span class="special">,</span> <span class="identifier">T</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">),</span> <span class="number">4</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">typedef</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">unsigned</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">test_types</span><span class="special">;</span>
-
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE_TEMPLATE</span><span class="special">(</span> <span class="identifier">my_test</span><span class="special">,</span> <span class="identifier">test_types</span> <span class="special">)</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test&lt;unsigned char&gt;"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="identifier">T</span><span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">1</span> <span class="special">!=</span> <span class="number">4</span><span class="special">]</span>
-
-<span class="special">***</span> <span class="number">1</span> <span class="identifier">failure</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="unary_function_based_test_case.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_cases/unary_function_based_test_case.html b/doc/v2/html/boost_test/tests_organization/test_cases/unary_function_based_test_case.html
deleted file mode 100644
index af3e1295..00000000
--- a/doc/v2/html/boost_test/tests_organization/test_cases/unary_function_based_test_case.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Unary function based test case</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../test_cases.html" title="Test cases">
-<link rel="prev" href="test_organization_nullary.html" title="Nullary function based test case">
-<link rel="next" href="test_organization_templates.html" title="Template test cases">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_organization_nullary.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_organization_templates.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.test_cases.unary_function_based_test_case"></a><a name="ref_BOOST_PARAM_TEST_CASE"></a><a class="link" href="unary_function_based_test_case.html" title="Unary function based test case">Unary
-        function based test case</a>
-</h4></div></div></div>
-<p>
-          Some tests are required to be repeated for a series of different input
-          parameters. One way to achieve this is manually register a test case for
-          each parameter as in example above. You can also invoke a test function
-          with all parameters manually from within your test case, like this:
-        </p>
-<pre class="programlisting"><span class="keyword">void</span> <span class="identifier">single_test</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="keyword">void</span> <span class="identifier">combined_test</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">params</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">5</span> <span class="special">};</span>
-  <span class="identifier">std</span><span class="special">::</span><span class="identifier">for_each</span><span class="special">(</span> <span class="identifier">params</span><span class="special">,</span> <span class="identifier">params</span><span class="special">+</span><span class="number">5</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">single_test</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<p>
-          The <span class="emphasis"><em>UTF</em></span> presents a better solution for this problem:
-          the unary function based test case, also referred as <span class="emphasis"><em>parameterized
-          test case</em></span>. The unary test function can be a free function, unary
-          functor (for example created with <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code>)
-          or unary method of a class with bound test class instance). The test function
-          is converted into test case using the macro <a class="link" href="unary_function_based_test_case.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a>. The macro
-          expects a collection of parameters (passed as two input iterators) and
-          an unary test function:
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_PARAM_TEST_CASE</span><span class="special">(</span><span class="identifier">test_function</span><span class="special">,</span> <span class="identifier">params_begin</span><span class="special">,</span> <span class="identifier">params_end</span><span class="special">);</span>
-</pre>
-<p>
-          <a class="link" href="unary_function_based_test_case.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a>
-          creates an instance of the test case generator. When passed to the method
-          <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code>, the generator produces a separate
-          sub test case for each parameter in the parameters collection and registers
-          it immediately in a test suite. Each test case is based on a test function
-          with the parameter bound by value, even if the test function expects a
-          parameter by reference. The fact that parameter value is stored along with
-          bound test function releases you from necessity to manage parameters lifetime.
-          For example, they can be defined in the test module initialization function
-          scope.
-        </p>
-<p>
-          All sub test case names are deduced from the macro argument test_function.
-          If you prefer to assign different names, you have to use the underlying
-          make_test_case interface instead. Both test cases creation and registration
-          are performed in the test module initialization function.
-        </p>
-<p>
-          The parameterized test case facility is preferable to the approach in the
-          example above, since execution of each sub test case is guarded and counted
-          independently. It produces a better test log/results report (in example
-          above in case of failure you can't say which parameter is at fault) and
-          allows you to test against all parameters even if one of them causes termination
-          a particular sub test case.
-        </p>
-<p>
-          In comparison with a manual test case registration for each parameter approach
-          the parameterized test case facility is more concise and easily extendible.
-        </p>
-<p>
-          In following simple example the same test, implemented in <code class="computeroutput"><span class="identifier">free_test_function</span></code>, is performed for
-          5 different parameters. The parameters are defined in the test module initialization
-          function scope. The master test suite contains 5 independent test cases.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.unary_function_based_test_case.id_example07"></a><p class="title"><b>Table&#160;7.&#160;Unary free function based test case</b></p>
-<div class="table-contents"><table class="table" summary="Unary free function based test case">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">parameterized_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">4</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">int</span> <span class="identifier">params</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">,</span> <span class="number">4</span><span class="special">,</span> <span class="number">5</span> <span class="special">};</span>
-
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_PARAM_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span><span class="special">,</span> <span class="identifier">params</span><span class="special">,</span> <span class="identifier">params</span><span class="special">+</span><span class="number">5</span> <span class="special">)</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">5</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">9</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"free_test_function"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">4</span> <span class="identifier">failed</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">9</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"free_test_function"</span><span class="special">:</span> <span class="identifier">check</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">4</span> <span class="identifier">failed</span>
-
-<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          Next example is similar, but instead of a free function it uses a method
-          of a class. Even though parameters are passed into test method by reference
-          you can still define them in the test module initialization function scope.
-          This example employs the alternative test module initialization function
-          specification.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_cases.unary_function_based_test_case.id_example08"></a><p class="title"><b>Table&#160;8.&#160;Unary class method based test case</b></p>
-<div class="table-contents"><table class="table" summary="Unary class method based test case">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">floating_point_comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">parameterized_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">;</span>
-
-<span class="keyword">class</span> <span class="identifier">test_class</span>
-<span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="keyword">void</span> <span class="identifier">test_method</span><span class="special">(</span> <span class="keyword">double</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">d</span> <span class="special">)</span>
-  <span class="special">{</span>
-    <span class="identifier">BOOST_CHECK_CLOSE</span><span class="special">(</span> <span class="identifier">d</span> <span class="special">*</span> <span class="number">100</span><span class="special">,</span> <span class="special">(</span><span class="keyword">double</span><span class="special">)(</span><span class="keyword">int</span><span class="special">)(</span><span class="identifier">d</span><span class="special">*</span><span class="number">100</span><span class="special">),</span> <span class="number">0.01</span> <span class="special">);</span>
-  <span class="special">}</span>
-<span class="special">}</span> <span class="identifier">tester</span><span class="special">;</span>
-
-<span class="keyword">bool</span> <span class="identifier">init_unit_test</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="keyword">double</span> <span class="identifier">params</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="number">1.</span><span class="special">,</span> <span class="number">1.1</span><span class="special">,</span> <span class="number">1.01</span><span class="special">,</span> <span class="number">1.001</span><span class="special">,</span> <span class="number">1.0001</span> <span class="special">};</span>
-
-  <span class="identifier">callback1</span><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">tm</span> <span class="special">=</span> <span class="identifier">bind</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">test_class</span><span class="special">::</span><span class="identifier">test_method</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">tester</span><span class="special">,</span> <span class="identifier">_1</span><span class="special">);</span>
-
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_PARAM_TEST_CASE</span><span class="special">(</span> <span class="identifier">tm</span><span class="special">,</span> <span class="identifier">params</span><span class="special">,</span> <span class="identifier">params</span><span class="special">+</span><span class="number">5</span> <span class="special">)</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
-<span class="identifier">Running</span> <span class="number">5</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">14</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"tm"</span><span class="special">:</span> <span class="identifier">difference</span> <span class="identifier">between</span> <span class="identifier">d</span> <span class="special">*</span> <span class="number">100</span><span class="special">{</span><span class="number">100.1</span><span class="special">}</span> <span class="keyword">and</span> <span class="special">(</span><span class="keyword">double</span><span class="special">)(</span><span class="keyword">int</span><span class="special">)(</span><span class="identifier">d</span><span class="special">*</span><span class="number">100</span><span class="special">){</span><span class="number">100</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">0.01</span><span class="special">%</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">14</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"tm"</span><span class="special">:</span> <span class="identifier">difference</span> <span class="identifier">between</span> <span class="identifier">d</span> <span class="special">*</span> <span class="number">100</span><span class="special">{</span><span class="number">100.01</span><span class="special">}</span> <span class="keyword">and</span> <span class="special">(</span><span class="keyword">double</span><span class="special">)(</span><span class="keyword">int</span><span class="special">)(</span><span class="identifier">d</span><span class="special">*</span><span class="number">100</span><span class="special">){</span><span class="number">100</span><span class="special">}</span> <span class="identifier">exceeds</span> <span class="number">0.01</span><span class="special">%</span>
-
-<span class="special">***</span> <span class="number">2</span> <span class="identifier">failures</span> <span class="identifier">detected</span> <span class="identifier">in</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="test_organization_nullary.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_cases.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_organization_templates.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_organization_test_suite.html b/doc/v2/html/boost_test/tests_organization/test_organization_test_suite.html
old mode 100644
new mode 100755
index 7c371971..5e8913d7
--- a/doc/v2/html/boost_test/tests_organization/test_organization_test_suite.html
+++ b/doc/v2/html/boost_test/tests_organization/test_organization_test_suite.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Test suite</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../tests_organization.html" title="Registering, generating and organizing the unit tests">
-<link rel="prev" href="test_cases/test_organization_templates.html" title="Template test cases">
-<link rel="next" href="test_organization_test_suite/master_test_suite.html" title="Master Test Suite">
+<link rel="up" href="../tests_organization.html" title="Test organization using the Unit Test Framework">
+<link rel="prev" href="test_cases.html" title="Test cases">
+<link rel="next" href="fixtures.html" title="Fixtures">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,27 +20,21 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_cases/test_organization_templates.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_organization_test_suite/master_test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_cases.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="fixtures.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_test.tests_organization.test_organization_test_suite"></a><a class="link" href="test_organization_test_suite.html" title="Test suite">Test
       suite</a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="test_organization_test_suite/master_test_suite.html">Master
-        Test Suite</a></span></dt>
-<dt><span class="section"><a href="test_organization_test_suite/test_suite_expected_failure.html">Expected
-        failures specification</a></span></dt>
-</dl></div>
 <p>
         If you consider test cases as leaves on the test tree, the test suite can
         be considered as branch and the master test suite as a trunk. Unlike real
         trees though, our tree in many cases consists only of leaves attached directly
         to the trunk. This is common for all test cases to reside directly in the
         master test suite. If you do want to construct a hierarchical test suite
-        structure the <span class="emphasis"><em>UTF</em></span> provides both manual and automated
-        test suite creation and registration facilities:
+        structure the <span class="emphasis"><em>Unit Test Framework</em></span> provides both manual
+        and automated test suite creation and registration facilities:
       </p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
@@ -51,22 +45,23 @@
           </li>
 </ol></div>
 <p>
-        In addition the <span class="emphasis"><em>UTF</em></span> presents a notion of <a class="link" href="test_organization_test_suite/master_test_suite.html" title="Master Test Suite">Master
+        In addition the <span class="emphasis"><em>Unit Test Framework</em></span> presents a notion
+        of <a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite" title="Master Test Suite">Master
         Test Suite</a>. The most important reason to learn about this component
         is that it provides an ability to access command line arguments supplied
         to a test module.
       </p>
 <a name="ref_BOOST_AUTO_TEST_SUITE"></a><h4>
 <a name="boost_test.tests_organization.test_organization_test_suite.h0"></a>
-        <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.test_suites_with_automated_regis"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suites_with_automated_regis">Test
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suites_with_automated_regis"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suites_with_automated_regis">Test
         suites with automated registration</a>
       </h4>
 <p>
-        The solution the <span class="emphasis"><em>UTF</em></span> presents for automated test suite
-        creation and registration is designed to facilitate multiple points of definition,
-        arbitrary test suites depth and smooth integration with automated test case
-        creation and registration. This facility should significantly simplify a
-        test tree construction process in comparison with manual explicit registration
+        The solution the <span class="emphasis"><em>Unit Test Framework</em></span> presents for automated
+        test suite creation and registration is designed to facilitate multiple points
+        of definition, arbitrary test suites depth and smooth integration with automated
+        test case creation and registration. This facility should significantly simplify
+        a test tree construction process in comparison with manual explicit registration
         case.
       </p>
 <p>
@@ -92,9 +87,12 @@
         This example creates a test tree that matches exactly the one created in
         the manual test suite registration example.
       </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.id_example12"></a><p class="title"><b>Table&#160;11.&#160;Test suites with automated registration</b></p>
-<div class="table-contents"><table class="table" summary="Test suites with automated registration">
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.h1"></a>
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.example_descr"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.example_descr">Example:
+        Test suites with automated registration</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -113,7 +111,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">test_suite1</span> <span class="special">)</span>
@@ -146,7 +144,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span>
 <span class="identifier">Running</span> <span class="number">4</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">12</span><span class="special">):</span> <span class="identifier">fatal</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case2"</span><span class="special">:</span> <span class="identifier">critical</span> <span class="identifier">check</span> <span class="number">1</span> <span class="special">==</span> <span class="number">2</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">1</span> <span class="special">!=</span> <span class="number">2</span><span class="special">]</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">27</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case4"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">false</span> <span class="identifier">failed</span>
@@ -156,8 +154,7 @@
               </td>
 </tr></tbody>
 </table></div>
-</div>
-<br class="table-break"><p>
+<p>
         As you can see test tree construction in this example is more straightforward
         and automated.
       </p>
@@ -169,9 +166,12 @@
         <code class="computeroutput"><span class="identifier">test_case1</span></code> and <code class="computeroutput"><span class="identifier">test_case2</span></code> reside in the same test suite
         <code class="computeroutput"><span class="identifier">test_suite</span></code>.
       </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.id_example53"></a><p class="title"><b>Table&#160;12.&#160;Example of test suite extension using automated registration facility</b></p>
-<div class="table-contents"><table class="table" summary="Example of test suite extension using automated registration facility">
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.h2"></a>
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.example_descr0"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.example_descr0">Example:
+        Test suite extension using automated registration facility</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -190,7 +190,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
 <span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">test_suite</span> <span class="special">)</span>
@@ -219,7 +219,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span><span class="identifier">example</span> <span class="special">--</span><span class="identifier">report_level</span><span class="special">=</span><span class="identifier">detailed</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span><span class="identifier">example</span> <span class="special">--</span><span class="identifier">report_level</span><span class="special">=</span><span class="identifier">detailed</span>
 <span class="identifier">Running</span> <span class="number">3</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case1"</span><span class="special">:</span> <span class="identifier">some</span> <span class="identifier">error</span> <span class="number">1</span>
 <span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">23</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"test_case2"</span><span class="special">:</span> <span class="identifier">some</span> <span class="identifier">error</span> <span class="number">2</span>
@@ -246,10 +246,9 @@
               </td>
 </tr></tbody>
 </table></div>
-</div>
-<br class="table-break"><h4>
-<a name="boost_test.tests_organization.test_organization_test_suite.h1"></a>
-        <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.test_suites_with_manual_registra"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suites_with_manual_registra">Test
+<h4>
+<a name="boost_test.tests_organization.test_organization_test_suite.h3"></a>
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suites_with_manual_registra"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suites_with_manual_registra">Test
         suites with manual registration</a>
       </h4>
 <p>
@@ -257,13 +256,13 @@
         and populate it with test cases (or lower level test suites).
       </p>
 <a name="ref_test_case_registration"></a><h5>
-<a name="boost_test.tests_organization.test_organization_test_suite.h2"></a>
-        <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.test_unit_registration_interface"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_unit_registration_interface">Test
+<a name="boost_test.tests_organization.test_organization_test_suite.h4"></a>
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.test_unit_registration_interface"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_unit_registration_interface">Test
         unit registration interface</a>
       </h5>
 <p>
-        The <span class="emphasis"><em>UTF</em></span> models the notion of test case container - test
-        suite - using class <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">test_suite</span></code>.
+        The <span class="emphasis"><em>Unit Test Framework</em></span> models the notion of test case
+        container - test suite - using class <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">test_suite</span></code>.
         For complete class interface reference check advanced section of this documentation.
         Here you should only be interested in a single test unit registration interface:
       </p>
@@ -282,18 +281,19 @@
 </tr>
 <tr><td align="left" valign="top"><p>
           Be careful when supplying a number of expected failures for test suites.
-          By default the <span class="emphasis"><em>UTF</em></span> calculates the number of expected
-          failures in test suite as the sum of appropriate values in all test units
-          that constitute it. And it rarely makes sense to change this.
+          By default the <span class="emphasis"><em>Unit Test Framework</em></span> calculates the
+          number of expected failures in test suite as the sum of appropriate values
+          in all test units that constitute it. And it rarely makes sense to change
+          this.
         </p></td></tr>
 </table></div>
 <p>
         The third optional parameter - <code class="computeroutput"><span class="identifier">timeout</span></code>
-        - defines the timeout value for the test unit. As of now the <span class="emphasis"><em>UTF</em></span>
-        isn't able to set a timeout for the test suite execution, so this parameter
-        makes sense only for test case registration. By default no timeout is set.
-        See the method <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">execution_monitor</span><span class="special">::</span><span class="identifier">execute</span></code> for more details about the timeout
-        value. <code class="computeroutput"><a class="link" href="../../boost/unit_test/test_suite.html#idm18025820912-bb">boost::unit_test::test_suite::add</a></code>
+        - defines the timeout value for the test unit. As of now the <span class="emphasis"><em>Unit
+        Test Framework</em></span> isn't able to set a timeout for the test suite
+        execution, so this parameter makes sense only for test case registration.
+        By default no timeout is set. See the method <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">execution_monitor</span><span class="special">::</span><span class="identifier">execute</span></code>
+        for more details about the timeout value. <code class="computeroutput"><a class="link" href="../../boost/unit_test/test_suite.html#id331790-bb">boost::unit_test::test_suite::add</a></code>
         <code class="computeroutput"><a class="link" href="../../boost/unit_test/test_suite.html" title="Class test_suite">test_suite</a></code>.
       </p>
 <p>
@@ -311,8 +311,8 @@
         </p></td></tr>
 </table></div>
 <a name="ref_BOOST_TEST_SUITE"></a><h5>
-<a name="boost_test.tests_organization.test_organization_test_suite.h3"></a>
-        <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_instance_construction"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_instance_construction">Test
+<a name="boost_test.tests_organization.test_organization_test_suite.h5"></a>
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_instance_construction"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_instance_construction">Test
         suite instance construction</a>
       </h5>
 <p>
@@ -350,9 +350,12 @@
 <p>
         <span class="inlinemediaobject"><img src="../../../img/class-hier.jpg"></span>
       </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.id_example11"></a><p class="title"><b>Table&#160;13.&#160;Manually registered test suites</b></p>
-<div class="table-contents"><table class="table" summary="Manually registered test suites">
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.h6"></a>
+        <span><a name="boost_test.tests_organization.test_organization_test_suite.example_descr1"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.example_descr1">Example:
+        Manually registered test suites</a>
+      </h6>
+<div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
@@ -371,7 +374,7 @@
 </tr></thead>
 <tbody><tr>
 <td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
 
 <span class="keyword">void</span> <span class="identifier">test_case1</span><span class="special">()</span> <span class="special">{</span> <span class="comment">/* ... */</span> <span class="special">}</span>
@@ -397,7 +400,7 @@
 </pre>
               </td>
 <td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
 <span class="identifier">Running</span> <span class="number">4</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
 <span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"Master Test Suite"</span>
 <span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"test_suite1"</span>
@@ -419,8 +422,443 @@
               </td>
 </tr></tbody>
 </table></div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite"></a><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite" title="Master Test Suite">Master
+        Test Suite</a>
+</h4></div></div></div>
+<p>
+          As defined in introduction section the master test suite is a root node
+          of a test tree. Each test module built with the <span class="emphasis"><em>Unit Test Framework</em></span>
+          always has the master test suite defined. The <span class="emphasis"><em>Unit Test Framework</em></span>
+          maintain the master test suite instance internally. All other test units
+          are registered as direct or indirect children of the master test suite.
+        </p>
+<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
+<span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
+<span class="keyword">class</span> <span class="identifier">master_test_suite_t</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">test_suite</span>
+<span class="special">{</span>
+<span class="keyword">public</span><span class="special">:</span>
+  <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">;</span>
+  <span class="keyword">char</span><span class="special">**</span> <span class="identifier">argv</span><span class="special">;</span>
+<span class="special">};</span>
+
+<span class="special">}</span> <span class="comment">// namespace unit_test</span>
+<span class="special">}</span> <span class="comment">// namespace boost</span>
+</pre>
+<p>
+          To access single instance of the master test suite use the following interface:
+        </p>
+<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
+<span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
+<span class="keyword">namespace</span> <span class="identifier">framework</span> <span class="special">{</span>
+
+<span class="identifier">master_test_suite_t</span><span class="special">&amp;</span> <span class="identifier">master_test_suite</span><span class="special">();</span>
+
+<span class="special">}</span> <span class="comment">// namespace framework</span>
+<span class="special">}</span> <span class="comment">// namespace unit_test</span>
+<span class="special">}</span> <span class="comment">// namespace boost</span>
+</pre>
+<h5>
+<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h0"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.command_line_arguments_access_in"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.command_line_arguments_access_in">Command
+          line arguments access interface</a>
+        </h5>
+<p>
+          Master test suite implemented as an extension to the regular test suite,
+          since it maintains references to the command line arguments passed to the
+          test module. To access the command line arguments use
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">argc</span>
+<span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">argv</span>
+</pre>
+<p>
+          In below example references to the command line arguments are accessible
+          either as an initialization function parameters or as members of the master
+          test suite. Both references point to the same values. A test module that
+          uses the alternative initialization function specification can only access
+          command line arguments through the master test suite.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            This interface for runtime parameter access is temporary. It's planned
+            to be updated once runtime parameters support is redesigned.
+          </p></td></tr>
+</table></div>
+<p>
+          Returning to the free function example, let's modify initialization function
+          to check for absence of any test module arguments.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h1"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.example_descr"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.example_descr">Example:
+          Command line access in initialization function</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">argc</span> <span class="special">&gt;</span> <span class="number">1</span> <span class="special">)</span>
+    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">)</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="number">1</span>
+<span class="identifier">Test</span> <span class="identifier">setup</span> <span class="identifier">error</span><span class="special">:</span> <span class="identifier">test</span> <span class="identifier">tree</span> <span class="identifier">is</span> <span class="identifier">empty</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<a name="ref_BOOST_TEST_MODULE"></a><h5>
+<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h2"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.naming_the_master_test_suite"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.naming_the_master_test_suite">Naming
+          the <span class="emphasis"><em>Master test suite</em></span></a>
+        </h5>
+<p>
+          The master test suite is created with default name <span class="emphasis"><em>Master Test
+          Suite</em></span>. There are two methods two reset the name to a different
+          value: using the macro <a class="link" href="../users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> and from within
+          the test module initialization function. Former is used for test modules
+          that don't have the manually implemented initialization function. Following
+          examples illustrate these methods.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h3"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.example_descr0"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.example_descr0">Example:
+          Naming master test suite using the macro <a class="link" href="../users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a></a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_DYN_LINK</span>
+<span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">my</span> <span class="identifier">master</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="identifier">name</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">free_test_function</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
+<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span>
+<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span><span class="special">;</span> <span class="identifier">testing</span> <span class="identifier">time</span><span class="special">:</span> <span class="number">1</span><span class="identifier">ms</span>
+<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          If the macro <a class="link" href="../users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> is defined,
+          the test module initialization function is <span class="bold"><strong>automatically
+          generated</strong></span> and the macro value becomes the name of the master
+          test suite. The name may include spaces.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h4"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.example_descr1"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.example_descr1">Example:
+          Naming master test suite explicitly in the test module initialization function</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">free_test_function</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">p_name</span><span class="special">.</span><span class="identifier">value</span> <span class="special">=</span> <span class="string">"my master test suite name"</span><span class="special">;</span>
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
+<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span>
+<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span><span class="special">;</span> <span class="identifier">testing</span> <span class="identifier">time</span><span class="special">:</span> <span class="number">1</span><span class="identifier">ms</span>
+<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<p>
+          Without the <a class="link" href="../users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> and the <a class="link" href="../users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> flags defined,
+          the test module initialization function has to be manually implemented.
+          The master test suite name can be reset at any point within this function.
+        </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure"></a><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure" title="Expected failures specification">Expected
+        failures specification</a>
+</h4></div></div></div>
+<p>
+          While in a perfect world all test assertions should pass in order for a
+          test module to pass, in some situations it is desirable to temporarily
+          allow particular tests to fail. For example, where a particular feature
+          is not implemented yet and one needs to prepare a library for the release
+          or when particular test fails on some platforms. To avoid a nagging red
+          box in regression tests table, you can use the expected failures feature.
+        </p>
+<p>
+          This feature allows specifying an expected number of failed assertions
+          per test unit. The value is specified during test tree construction, and
+          can't be updated during test execution.
+        </p>
+<p>
+          The feature is not intended to be used to check for expected functionality
+          failures. To check that a particular input is causing an exception to be
+          thrown use <a class="link" href="../testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_throw" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a> family of testing tools.
+        </p>
+<p>
+          The usage of this feature should be limited and employed only after careful
+          consideration. In general you should only use this feature when it is necessary
+          to force a test module to pass without actually fixing the problem. Obviously,
+          an excessive usage of expected failures defeats the purpose of the unit
+          test. In most cases it only needs be applied temporarily.
+        </p>
+<p>
+          You also need to remember that the expected failure specification is per
+          test case. This means that any failed assertion within that test case can
+          satisfy the expected failures quota. Meaning it is possible for an unexpected
+          failure to occur to satisfy this quota.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            If an assertion at fault is fixed and passed, while an expected failures
+            specification still present, the test case is going to fail, since the
+            number of failures is smaller than expected.
+          </p></td></tr>
+</table></div>
+<h4>
+<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.h0"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_manually_registered_t"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_manually_registered_t">Usage
+          with manually registered test cases</a>
+        </h4>
+<p>
+          To set the value of expected failures for the manually registered test
+          unit pass it as a second argument for the <a class="link" href="test_organization_test_suite.html#ref_test_case_registration"><code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code></a> call during test unit registration.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.h1"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.example_descr"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.example_descr">Example:
+          Expected failures specification for manually registered test case</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
+
+<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
+    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">),</span> <span class="number">2</span> <span class="special">);</span>
+
+  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+<span class="special">}</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">message</span>
+<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"free_test_function"</span><span class="special">:</span> <span class="identifier">check</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
+<span class="identifier">Test</span> <span class="keyword">case</span> <span class="identifier">has</span> <span class="identifier">less</span> <span class="identifier">failures</span> <span class="identifier">then</span> <span class="identifier">expected</span>
+
+<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
+<a name="ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES"></a><h4>
+<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.h2"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_automatically_registe"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_automatically_registe">Usage
+          with automatically registered test cases</a>
+        </h4>
+<p>
+          To set the number of expected failures for the automatically registered
+          test unit use the macro <a class="link" href="test_organization_test_suite.html#ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span></code></a>
+          before the test case definition.
+        </p>
+<pre class="programlisting"><span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">number_of_expected_failures</span><span class="special">);</span>
+</pre>
+<p>
+          You can use this macro both on a file scope and inside a test suite. Moreover
+          you can use it even if name of test units coincide in different test suites.
+          Expected failures specification applies to the test unit belonging to the
+          same test suite where <a class="link" href="test_organization_test_suite.html#ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span></code></a>
+          resides.
+        </p>
+<h6>
+<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.h3"></a>
+          <span><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.example_descr0"></a></span><a class="link" href="test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.example_descr0">Example:
+          Expected failures specification for automatically registered test case</a>
+        </h6>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                  <p>
+                    Code
+                  </p>
+                </th>
+<th>
+                  <p>
+                    Output
+                  </p>
+                </th>
+</tr></thead>
+<tbody><tr>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span><span class="special">(</span> <span class="identifier">my_test1</span><span class="special">,</span> <span class="number">1</span> <span class="special">)</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">my_test1</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">internal</span> <span class="special">)</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span><span class="special">(</span> <span class="identifier">my_test1</span><span class="special">,</span> <span class="number">2</span> <span class="special">)</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">my_test1</span> <span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">),</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="special">);</span>
+  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">*),</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="special">);</span>
+<span class="special">}</span>
+
+<span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
+</pre>
+                </td>
+<td>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">report_level</span><span class="special">=</span><span class="keyword">short</span>
+<span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">21</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">4</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
+<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">22</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">*)</span> <span class="special">==</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">4</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
+
+<span class="identifier">Test</span> <span class="identifier">suite</span> <span class="string">"example"</span> <span class="identifier">passed</span> <span class="identifier">with</span><span class="special">:</span>
+  <span class="number">3</span> <span class="identifier">assertions</span> <span class="identifier">out</span> <span class="identifier">of</span> <span class="number">3</span> <span class="identifier">failed</span>
+  <span class="number">3</span> <span class="identifier">failures</span> <span class="identifier">expected</span>
+  <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span> <span class="identifier">out</span> <span class="identifier">of</span> <span class="number">2</span> <span class="identifier">passed</span>
+</pre>
+                </td>
+</tr></tbody>
+</table></div>
 </div>
-<br class="table-break">
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -433,7 +871,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="test_cases/test_organization_templates.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_organization_test_suite/master_test_suite.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="test_cases.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="fixtures.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_organization_test_suite/master_test_suite.html b/doc/v2/html/boost_test/tests_organization/test_organization_test_suite/master_test_suite.html
deleted file mode 100644
index 66408594..00000000
--- a/doc/v2/html/boost_test/tests_organization/test_organization_test_suite/master_test_suite.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Master Test Suite</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../test_organization_test_suite.html" title="Test suite">
-<link rel="prev" href="../test_organization_test_suite.html" title="Test suite">
-<link rel="next" href="test_suite_expected_failure.html" title="Expected failures specification">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite_expected_failure.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite"></a><a class="link" href="master_test_suite.html" title="Master Test Suite">Master
-        Test Suite</a>
-</h4></div></div></div>
-<p>
-          As defined in introduction section the master test suite is a root node
-          of a test tree. Each test module built with the <span class="emphasis"><em>UTF</em></span>
-          always has the master test suite defined. The <span class="emphasis"><em>UTF</em></span>
-          maintain the master test suite instance internally. All other test units
-          are registered as direct or indirect children of the master test suite.
-        </p>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
-<span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
-<span class="keyword">class</span> <span class="identifier">master_test_suite_t</span> <span class="special">:</span> <span class="keyword">public</span> <span class="identifier">test_suite</span>
-<span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">;</span>
-  <span class="keyword">char</span><span class="special">**</span> <span class="identifier">argv</span><span class="special">;</span>
-<span class="special">};</span>
-
-<span class="special">}</span> <span class="comment">// namespace unit_test</span>
-<span class="special">}</span> <span class="comment">// namespace boost</span>
-</pre>
-<p>
-          To access single instance of the master test suite use the following interface:
-        </p>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
-<span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
-<span class="keyword">namespace</span> <span class="identifier">framework</span> <span class="special">{</span>
-
-<span class="identifier">master_test_suite_t</span><span class="special">&amp;</span> <span class="identifier">master_test_suite</span><span class="special">();</span>
-
-<span class="special">}</span> <span class="comment">// namespace framework</span>
-<span class="special">}</span> <span class="comment">// namespace unit_test</span>
-<span class="special">}</span> <span class="comment">// namespace boost</span>
-</pre>
-<h5>
-<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h0"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.command_line_arguments_access_in"></a></span><a class="link" href="master_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.command_line_arguments_access_in">Command
-          line arguments access interface</a>
-        </h5>
-<p>
-          Master test suite implemented as an extension to the regular test suite,
-          since it maintains references to the command line arguments passed to the
-          test module. To access the command line arguments use
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">argc</span>
-<span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">argv</span>
-</pre>
-<p>
-          In below example references to the command line arguments are accessible
-          either as an initialization function parameters or as members of the master
-          test suite. Both references point to the same values. A test module that
-          uses the alternative initialization function specification can only access
-          command line arguments through the master test suite.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            This interface for runtime parameter access is temporary. It's planned
-            to be updated once runtime parameters support is redesigned.
-          </p></td></tr>
-</table></div>
-<p>
-          Returning to the free function example, let's modify initialization function
-          to check for absence of any test module arguments.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.id_example13"></a><p class="title"><b>Table&#160;14.&#160;Command line access in initialization function</b></p>
-<div class="table-contents"><table class="table" summary="Command line access in initialization function">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">argc</span> <span class="special">&gt;</span> <span class="number">1</span> <span class="special">)</span>
-    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">)</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="number">1</span>
-<span class="identifier">Test</span> <span class="identifier">setup</span> <span class="identifier">error</span><span class="special">:</span> <span class="identifier">test</span> <span class="identifier">tree</span> <span class="identifier">is</span> <span class="identifier">empty</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><a name="ref_BOOST_TEST_MODULE"></a><h5>
-<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.h1"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.naming_the_master_test_suite"></a></span><a class="link" href="master_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite.naming_the_master_test_suite">Naming
-          the <span class="emphasis"><em>Master test suite</em></span></a>
-        </h5>
-<p>
-          The master test suite is created with default name <span class="emphasis"><em>Master Test
-          Suite</em></span>. There are two methods two reset the name to a different
-          value: using the macro <a class="link" href="../../users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> and from within
-          the test module initialization function. Former is used for test modules
-          that don't have the manually implemented initialization function. Following
-          examples illustrate these methods.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.id_example14"></a><p class="title"><b>Table&#160;15.&#160;Naming master test suite using the macro <a class="link" href="../../users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a></b></p>
-<div class="table-contents"><table class="table" summary="Naming master test suite using the macro BOOST_TEST_MODULE">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_DYN_LINK</span>
-<span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">my</span> <span class="identifier">master</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="identifier">name</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">free_test_function</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
-<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span>
-<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span><span class="special">;</span> <span class="identifier">testing</span> <span class="identifier">time</span><span class="special">:</span> <span class="number">1</span><span class="identifier">ms</span>
-<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          If the macro <a class="link" href="../../users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> is defined,
-          the test module initialization function is <span class="bold"><strong>automatically
-          generated</strong></span> and the macro value becomes the name of the master
-          test suite. The name may include spaces.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.master_test_suite.id_example15"></a><p class="title"><b>Table&#160;16.&#160;Naming master test suite explicitly in the test module initialization
-          function</b></p>
-<div class="table-contents"><table class="table" summary="Naming master test suite explicitly in the test module initialization
-          function">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">free_test_function</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="keyword">true</span> <span class="comment">/* test assertion */</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span><span class="identifier">p_name</span><span class="special">.</span><span class="identifier">value</span> <span class="special">=</span> <span class="string">"my master test suite name"</span><span class="special">;</span>
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">test_suite</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
-<span class="identifier">Entering</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span>
-<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="keyword">case</span> <span class="string">"free_test_function"</span><span class="special">;</span> <span class="identifier">testing</span> <span class="identifier">time</span><span class="special">:</span> <span class="number">1</span><span class="identifier">ms</span>
-<span class="identifier">Leaving</span> <span class="identifier">test</span> <span class="identifier">suite</span> <span class="string">"my master test suite name"</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          Without the <a class="link" href="../../users_guide/link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> and the <a class="link" href="../../users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> flags defined,
-          the test module initialization function has to be manually implemented.
-          The master test suite name can be reset at any point within this function.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="test_suite_expected_failure.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tests_organization/test_organization_test_suite/test_suite_expected_failure.html b/doc/v2/html/boost_test/tests_organization/test_organization_test_suite/test_suite_expected_failure.html
deleted file mode 100644
index 37501446..00000000
--- a/doc/v2/html/boost_test/tests_organization/test_organization_test_suite/test_suite_expected_failure.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Expected failures specification</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../test_organization_test_suite.html" title="Test suite">
-<link rel="prev" href="master_test_suite.html" title="Master Test Suite">
-<link rel="next" href="../fixtures.html" title="Fixtures">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="master_test_suite.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure"></a><a class="link" href="test_suite_expected_failure.html" title="Expected failures specification">Expected
-        failures specification</a>
-</h4></div></div></div>
-<p>
-          While in a perfect world all test assertions should pass in order for a
-          test module to pass, in some situations it is desirable to temporarily
-          allow particular tests to fail. For example, where a particular feature
-          is not implemented yet and one needs to prepare a library for the release
-          or when particular test fails on some platforms. To avoid a nagging red
-          box in regression tests table, you can use the expected failures feature.
-        </p>
-<p>
-          This feature allows specifying an expected number of failed assertions
-          per test unit. The value is specified during test tree construction, and
-          can't be updated during test execution.
-        </p>
-<p>
-          The feature is not intended to be used to check for expected functionality
-          failures. To check that a particular input is causing an exception to be
-          thrown use <a class="link" href="../../testing_tool_ref/assertion_boost_level_throw.html" title="BOOST_&lt;level&gt;_THROW"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a> family of testing tools.
-        </p>
-<p>
-          The usage of this feature should be limited and employed only after careful
-          consideration. In general you should only use this feature when it is necessary
-          to force a test module to pass without actually fixing the problem. Obviously,
-          an excessive usage of expected failures defeats the purpose of the unit
-          test. In most cases it only needs be applied temporarily.
-        </p>
-<p>
-          You also need to remember that the expected failure specification is per
-          test case. This means that any failed assertion within that test case can
-          satisfy the expected failures quota. Meaning it is possible for an unexpected
-          failure to occur to satisfy this quota.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            If an assertion at fault is fixed and passed, while an expected failures
-            specification still present, the test case is going to fail, since the
-            number of failures is smaller than expected.
-          </p></td></tr>
-</table></div>
-<h4>
-<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.h0"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_manually_registered_t"></a></span><a class="link" href="test_suite_expected_failure.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_manually_registered_t">Usage
-          with manually registered test cases</a>
-        </h4>
-<p>
-          To set the value of expected failures for the manually registered test
-          unit pass it as a second argument for the <a class="link" href="../test_organization_test_suite.html#ref_test_case_registration"><code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code></a> call during test unit registration.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.id_example16"></a><p class="title"><b>Table&#160;17.&#160;Expected failures specification for manually registered test case</b></p>
-<div class="table-contents"><table class="table" summary="Expected failures specification for manually registered test case">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">;</span>
-
-<span class="keyword">void</span> <span class="identifier">free_test_function</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">().</span>
-    <span class="identifier">add</span><span class="special">(</span> <span class="identifier">BOOST_TEST_CASE</span><span class="special">(</span> <span class="special">&amp;</span><span class="identifier">free_test_function</span> <span class="special">),</span> <span class="number">2</span> <span class="special">);</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">log_level</span><span class="special">=</span><span class="identifier">message</span>
-<span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">8</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"free_test_function"</span><span class="special">:</span> <span class="identifier">check</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
-<span class="identifier">Test</span> <span class="keyword">case</span> <span class="identifier">has</span> <span class="identifier">less</span> <span class="identifier">failures</span> <span class="identifier">then</span> <span class="identifier">expected</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><a name="ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES"></a><h4>
-<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.h1"></a>
-          <span class="phrase"><a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_automatically_registe"></a></span><a class="link" href="test_suite_expected_failure.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.usage_with_automatically_registe">Usage
-          with automatically registered test cases</a>
-        </h4>
-<p>
-          To set the number of expected failures for the automatically registered
-          test unit use the macro <a class="link" href="test_suite_expected_failure.html#ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span></code></a>
-          before the test case definition.
-        </p>
-<pre class="programlisting"><span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span><span class="special">(</span><span class="identifier">test_case_name</span><span class="special">,</span> <span class="identifier">number_of_expected_failures</span><span class="special">);</span>
-</pre>
-<p>
-          You can use this macro both on a file scope and inside a test suite. Moreover
-          you can use it even if name of test units coincide in different test suites.
-          Expected failures specification applies to the test unit belonging to the
-          same test suite where <a class="link" href="test_suite_expected_failure.html#ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span></code></a>
-          resides.
-        </p>
-<div class="table">
-<a name="boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure.id_example17"></a><p class="title"><b>Table&#160;18.&#160;Expected failures specification for automatically registered test
-          case</b></p>
-<div class="table-contents"><table class="table" summary="Expected failures specification for automatically registered test
-          case">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Code
-                  </p>
-                </th>
-<th>
-                  <p>
-                    Output
-                  </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">example</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span><span class="special">(</span> <span class="identifier">my_test1</span><span class="special">,</span> <span class="number">1</span> <span class="special">)</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">my_test1</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_SUITE</span><span class="special">(</span> <span class="identifier">internal</span> <span class="special">)</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES</span><span class="special">(</span> <span class="identifier">my_test1</span><span class="special">,</span> <span class="number">2</span> <span class="special">)</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">my_test1</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">),</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">*),</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_SUITE_END</span><span class="special">()</span>
-</pre>
-                </td>
-<td>
-<pre class="programlisting"><span class="special">&gt;</span> <span class="identifier">example</span> <span class="special">--</span><span class="identifier">report_level</span><span class="special">=</span><span class="keyword">short</span>
-<span class="identifier">Running</span> <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span><span class="special">...</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">10</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="number">2</span> <span class="special">==</span> <span class="number">1</span> <span class="identifier">failed</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">21</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">4</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
-<span class="identifier">test</span><span class="special">.</span><span class="identifier">cpp</span><span class="special">(</span><span class="number">22</span><span class="special">):</span> <span class="identifier">error</span> <span class="identifier">in</span> <span class="string">"my_test1"</span><span class="special">:</span> <span class="identifier">check</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">int</span><span class="special">*)</span> <span class="special">==</span> <span class="keyword">sizeof</span><span class="special">(</span><span class="keyword">char</span><span class="special">)</span> <span class="identifier">failed</span> <span class="special">[</span><span class="number">4</span> <span class="special">!=</span> <span class="number">1</span><span class="special">]</span>
-
-<span class="identifier">Test</span> <span class="identifier">suite</span> <span class="string">"example"</span> <span class="identifier">passed</span> <span class="identifier">with</span><span class="special">:</span>
-  <span class="number">3</span> <span class="identifier">assertions</span> <span class="identifier">out</span> <span class="identifier">of</span> <span class="number">3</span> <span class="identifier">failed</span>
-  <span class="number">3</span> <span class="identifier">failures</span> <span class="identifier">expected</span>
-  <span class="number">2</span> <span class="identifier">test</span> <span class="identifier">cases</span> <span class="identifier">out</span> <span class="identifier">of</span> <span class="number">2</span> <span class="identifier">passed</span>
-</pre>
-                </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="master_test_suite.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../test_organization_test_suite.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../fixtures.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/the_unit_test_framework_usage_re.html b/doc/v2/html/boost_test/the_unit_test_framework_usage_re.html
deleted file mode 100644
index 3776efac..00000000
--- a/doc/v2/html/boost_test/the_unit_test_framework_usage_re.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The unit test framework usage recommendations</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="runtime_configuration/runtime_parameters_summary.html" title="Runtime parameters summary">
-<link rel="next" href="the_unit_test_framework_usage_re/general.html" title="General">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="runtime_configuration/runtime_parameters_summary.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="the_unit_test_framework_usage_re/general.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.the_unit_test_framework_usage_re"></a><a name="ref_usage_recommendations"></a><a class="link" href="the_unit_test_framework_usage_re.html" title="The unit test framework usage recommendations">The
-    unit test framework usage recommendations</a>
-</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="the_unit_test_framework_usage_re/general.html">General</a></span></dt>
-<dt><span class="section"><a href="the_unit_test_framework_usage_re/microsoft_visual_studio_net_usag.html">Microsoft
-      Visual Studio .NET usage recommendations</a></span></dt>
-<dt><span class="section"><a href="the_unit_test_framework_usage_re/command_line_usage_recommendatio.html">Command
-      line usage recommendations</a></span></dt>
-</dl></div>
-<p>
-      On following pages collected tips and recommendations on how to use and apply
-      the &amp;utf; in your real life practice. You don't necessarily need to follow
-      them, but I found them handy.
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="runtime_configuration/runtime_parameters_summary.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="the_unit_test_framework_usage_re/general.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/the_unit_test_framework_usage_re/command_line_usage_recommendatio.html b/doc/v2/html/boost_test/the_unit_test_framework_usage_re/command_line_usage_recommendatio.html
deleted file mode 100644
index 7a631994..00000000
--- a/doc/v2/html/boost_test/the_unit_test_framework_usage_re/command_line_usage_recommendatio.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Command line usage recommendations</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../the_unit_test_framework_usage_re.html" title="The unit test framework usage recommendations">
-<link rel="prev" href="microsoft_visual_studio_net_usag.html" title="Microsoft Visual Studio .NET usage recommendations">
-<link rel="next" href="../section_faq.html" title="Frequently Asked Questions">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="microsoft_visual_studio_net_usag.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../section_faq.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio"></a><a class="link" href="command_line_usage_recommendatio.html" title="Command line usage recommendations">Command
-      line usage recommendations</a>
-</h3></div></div></div>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio.h0"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio.if_you_got_fatal_exception_somew"></a></span><a class="link" href="command_line_usage_recommendatio.html#boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio.if_you_got_fatal_exception_somew">If
-        you got fatal exception somewhere within test case, make program generate
-        coredump by adding extra command line argument</a>
-      </h5>
-<p>
-        If you got "memory access violation" message (or any other message
-        indication fatal or system error) when you run you test, to get more information
-        about the error location add
-      </p>
-<pre class="programlisting"><span class="special">--</span><a class="link" href="../runtime_parameters_reference/catch_system_errors.html#ref_param_catch_system"><code class="computeroutput"><span class="identifier">catch_system_error</span></code></a><span class="special">=</span><span class="identifier">no</span>
-</pre>
-<p>
-        to the test run command line. Now run the test again and it will create a
-        coredump you could analyse using you preferable debugger. Or run it under
-        debugger in a first place and it will break at the point of failure.
-      </p>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio.h1"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio.how_to_use_test_module_build_wit"></a></span><a class="link" href="command_line_usage_recommendatio.html#boost_test.the_unit_test_framework_usage_re.command_line_usage_recommendatio.how_to_use_test_module_build_wit">How
-        to use test module build with Boost.Test framework under management of automated
-        regression test facilities?</a>
-      </h5>
-<p>
-        My first recommendation is to make sure that the test framework catches all
-        fatal errors by adding argument
-      </p>
-<pre class="programlisting"><span class="special">--</span><a class="link" href="../runtime_parameters_reference/catch_system_errors.html#ref_param_catch_system"><code class="computeroutput"><span class="identifier">catch_system_error</span></code></a><span class="special">=</span><span class="identifier">yes</span>
-</pre>
-<p>
-        to all test modules invocations. Otherwise test program may produce unwanted
-        dialogs (depends on compiler and OS) that will halt you regression tests
-        run. The second recommendation is to suppress result report output by adding
-      </p>
-<pre class="programlisting"><span class="special">--</span><a class="link" href="../runtime_parameters_reference/report_level.html#ref_param_report_level"><code class="computeroutput"><span class="identifier">report_level</span></code></a><span class="special">=</span><span class="identifier">no</span>
-</pre>
-<p>
-        argument and test log output by adding
-      </p>
-<pre class="programlisting"><span class="special">--</span><a class="link" href="../runtime_parameters_reference/log_level.html#ref_param_log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a><span class="special">=</span><span class="identifier">nothing</span>
-</pre>
-<p>
-        argument, so that test module won't produce undesirable output no one is
-        going to look at anyway. I recommend relying only on result code that will
-        be consistent for all test programs. An alternative to my second recommendation
-        is direct both log and report to separate file you could analyse later on.
-        Moreover you can make Boost.Test to produce them in XML format using
-      </p>
-<pre class="programlisting"><span class="special">--</span><a class="link" href="../runtime_parameters_reference/output_format.html#ref_param_output_format"><code class="computeroutput"><span class="identifier">output_format</span></code></a><span class="special">=</span><span class="identifier">XML</span>
-</pre>
-<p>
-        and use some automated tool that will format this information as you like.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="microsoft_visual_studio_net_usag.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../section_faq.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/the_unit_test_framework_usage_re/general.html b/doc/v2/html/boost_test/the_unit_test_framework_usage_re/general.html
deleted file mode 100644
index c2446bff..00000000
--- a/doc/v2/html/boost_test/the_unit_test_framework_usage_re/general.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>General</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../the_unit_test_framework_usage_re.html" title="The unit test framework usage recommendations">
-<link rel="prev" href="../the_unit_test_framework_usage_re.html" title="The unit test framework usage recommendations">
-<link rel="next" href="microsoft_visual_studio_net_usag.html" title="Microsoft Visual Studio .NET usage recommendations">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="microsoft_visual_studio_net_usag.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.the_unit_test_framework_usage_re.general"></a><a class="link" href="general.html" title="General">General</a>
-</h3></div></div></div>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.general.h0"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.general.prefer_offline_compiled_librarie"></a></span><a class="link" href="general.html#boost_test.the_unit_test_framework_usage_re.general.prefer_offline_compiled_librarie">Prefer
-        offline compiled libraries to the inline included components</a>
-      </h5>
-<p>
-        If you are just want to write quick simple test in environment where you
-        never used Boost.Test before - yes, use included components. But if you plan
-        to use Boost.Test on permanent basis, small investment of time needed to
-        build (if not build yet), install and change you makefiles/project settings
-        will soon return to you in a form of shorter compilation time. Why do you
-        need to make your compiler do the same work over and over again?
-      </p>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.general.h1"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.general.if_you_use_only_free_function_ba"></a></span><a class="link" href="general.html#boost_test.the_unit_test_framework_usage_re.general.if_you_use_only_free_function_ba">If
-        you use only free function based test cases advance to the automatic registration
-        facility</a>
-      </h5>
-<p>
-        It's really easy to switch to automatic registration. And you don't need
-        to worry about forgotten test case
-      </p>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.general.h2"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.general.to_find_location_of_first_error_"></a></span><a class="link" href="general.html#boost_test.the_unit_test_framework_usage_re.general.to_find_location_of_first_error_">To
-        find location of first error reported by test tool within reused template
-        function, use special hook within framework headers</a>
-      </h5>
-<p>
-        In some cases you are reusing the same template based code from within one
-        test case (actually I recommend better solution in such case- see below).
-        Now if an error gets reported by the test tool within that reused code you
-        may have difficulty locating were exactly error occurred. To address this
-        issue you could either a add <a class="link" href="../test_output/test_output_macro_message.html" title="BOOST_TEST_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MESSAGE</span></code></a> statements in
-        templated code that log current type id of template parameters or you can
-        use special hook located in <code class="computeroutput"><span class="identifier">unit_test_result</span><span class="special">.</span><span class="identifier">hpp</span></code> called
-        <code class="computeroutput"><span class="identifier">first_failed_assertion</span><span class="special">()</span></code>.
-        If you set a breakpoint right on the line where this function is defined
-        you will be able to unroll the stack and see where error actually occurred.
-      </p>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.general.h3"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.general.to_test_reusable_template_base_c"></a></span><a class="link" href="general.html#boost_test.the_unit_test_framework_usage_re.general.to_test_reusable_template_base_c">To
-        test reusable template base component with different template parameter use
-        test case template facility</a>
-      </h5>
-<p>
-        If you writing unit test for generic reusable component you may have a need
-        to test it against set of different template parameter types . Most probably
-        you will end up with a code like this:
-      </p>
-<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">TestType</span><span class="special">&gt;</span>
-<span class="keyword">void</span> <span class="identifier">specific_type_test</span><span class="special">(</span> <span class="identifier">TestType</span><span class="special">*</span> <span class="special">=</span> <span class="number">0</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">MyComponent</span><span class="special">&lt;</span><span class="identifier">TestType</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">;</span>
-  <span class="comment">// ... here we perform actual testing</span>
-<span class="special">}</span>
-
-<span class="keyword">void</span> <span class="identifier">my_component_test</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">specific_type_test</span><span class="special">(</span> <span class="special">(</span><span class="keyword">int</span><span class="special">*)</span><span class="number">0</span> <span class="special">);</span>
-  <span class="identifier">specific_type_test</span><span class="special">(</span> <span class="special">(</span><span class="keyword">float</span><span class="special">*)</span><span class="number">0</span> <span class="special">);</span>
-  <span class="identifier">specific_type_test</span><span class="special">(</span> <span class="special">(</span><span class="identifier">UDT</span><span class="special">*)</span><span class="number">0</span> <span class="special">);</span>
-  <span class="comment">// ... </span>
-<span class="special">}</span>
-</pre>
-<p>
-        This is namely the situation where you would use test case template facility.
-        It not only simplifies this kind of unit testing by automating some of the
-        work, in addition every argument type gets tested separately under unit test
-        monitor. As a result if one of types produce exception or non-fatal error
-        you may still continue and get results from testing with other types.
-      </p>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.general.h4"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.general.prefer_boost_check_equal_to_boos"></a></span><a class="link" href="general.html#boost_test.the_unit_test_framework_usage_re.general.prefer_boost_check_equal_to_boos">Prefer
-        <code class="computeroutput"><span class="identifier">BOOST_CHECK_EQUAL</span></code> to <code class="computeroutput"><span class="identifier">BOOST_CHECK</span></code></a>
-      </h5>
-<p>
-        Even though <a class="link" href="../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_CHECK</span></code></a> tool is most generic
-        and allows validating any <code class="computeroutput"><span class="keyword">bool</span></code>
-        convertible expression, I would recommend using, if possible, more specific
-        tools dedicated to the task. For example if you need you validate some variable
-        vs. some expected value use <a class="link" href="../testing_tool_ref/assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_EQUAL</span></code></a> instead. The main
-        advantage is that in case of failure you will see the mismatched value -
-        the information most useful for error identification. The same applies to
-        other tools supplied by the framework.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="microsoft_visual_studio_net_usag.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/the_unit_test_framework_usage_re/microsoft_visual_studio_net_usag.html b/doc/v2/html/boost_test/the_unit_test_framework_usage_re/microsoft_visual_studio_net_usag.html
deleted file mode 100644
index 153abcb6..00000000
--- a/doc/v2/html/boost_test/the_unit_test_framework_usage_re/microsoft_visual_studio_net_usag.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Microsoft Visual Studio .NET usage recommendations</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../the_unit_test_framework_usage_re.html" title="The unit test framework usage recommendations">
-<link rel="prev" href="general.html" title="General">
-<link rel="next" href="command_line_usage_recommendatio.html" title="Command line usage recommendations">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="general.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="command_line_usage_recommendatio.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag"></a><a class="link" href="microsoft_visual_studio_net_usag.html" title="Microsoft Visual Studio .NET usage recommendations">Microsoft
-      Visual Studio .NET usage recommendations</a>
-</h3></div></div></div>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag.h0"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag.use_custom_build_step_to_automat"></a></span><a class="link" href="microsoft_visual_studio_net_usag.html#boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag.use_custom_build_step_to_automat">Use
-        custom build step to automatically start test program after compilation</a>
-      </h5>
-<p>
-        I found it most convenient to put test program execution as a post-build
-        step in compilation. To do so use project property page:
-      </p>
-<p>
-        <span class="inlinemediaobject"><img src="../../../img/post_build_event.jpg"></span>
-      </p>
-<p>
-        Full command you need in "Command Line" field is:
-      </p>
-<pre class="programlisting"><span class="string">"$(TargetDir)\$(TargetName).exe"</span> <span class="special">--</span><a class="link" href="../runtime_parameters_reference/result_code.html#ref_param_result_code"><code class="computeroutput"><span class="identifier">result_code</span></code></a><span class="special">=</span><span class="identifier">no</span> <span class="special">--</span><a class="link" href="../runtime_parameters_reference/report_level.html#ref_param_report_level"><code class="computeroutput"><span class="identifier">report_level</span></code></a><span class="special">=</span><span class="identifier">no</span>
-</pre>
-<p>
-        Note that both report level and result code are suppressed. This way the
-        only output you may see from this command are possible runtime errors. But
-        the best part is that you could jump through these errors using usual keyboard
-        shortcuts/mouse clicks you use for compilation error analysis:
-      </p>
-<p>
-        <span class="inlinemediaobject"><img src="../../../img/post_build_out.jpg"></span>
-      </p>
-<h5>
-<a name="boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag.h1"></a>
-        <span class="phrase"><a name="boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag.if_you_got_fatal_exception_somew"></a></span><a class="link" href="microsoft_visual_studio_net_usag.html#boost_test.the_unit_test_framework_usage_re.microsoft_visual_studio_net_usag.if_you_got_fatal_exception_somew">If
-        you got fatal exception somewhere within test case, make debugger break at
-        the point the failure by adding extra command line argument</a>
-      </h5>
-<p>
-        If you got "memory access violation" message (or any other message
-        indication fatal or system error) when you run you test, to get more information
-        of error location add
-      </p>
-<pre class="programlisting"><span class="special">--</span><a class="link" href="../runtime_parameters_reference/catch_system_errors.html#ref_param_catch_system"><code class="computeroutput"><span class="identifier">catch_system_error</span></code></a><span class="special">=</span><span class="identifier">no</span>
-</pre>
-<p>
-        to the test run command line:
-      </p>
-<p>
-        <span class="inlinemediaobject"><img src="../../../img/run_args.jpg"></span>
-      </p>
-<p>
-        Now run the test again under debugger and it will break at the point of failure.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="general.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../the_unit_test_framework_usage_re.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="command_line_usage_recommendatio.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tutorial.html b/doc/v2/html/boost_test/tutorial.html
deleted file mode 100644
index cdf55478..00000000
--- a/doc/v2/html/boost_test/tutorial.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Tutorials</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Boost.Test">
-<link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="how_to_read_this_documentation.html" title="How to read this documentation?">
-<link rel="next" href="tutorial/hello.html" title="Hello the testing world!">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="how_to_read_this_documentation.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial/hello.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.tutorial"></a><a class="link" href="tutorial.html" title="Tutorials">Tutorials</a>
-</h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="tutorial/hello.html">Hello the testing world!</a></span></dt>
-<dt><span class="section"><a href="tutorial/bt_and_tdd.html">Boost.Test driven development</a></span></dt>
-</dl></div>
-<p>
-      You think writing tests is difficult, annoying and fruitless work? I beg to
-      differ. Read through these tutorials and I am sure you will agree. One other
-      thing I do suggest you to take a look is &lt;link linkend="utf.compilation"&gt;compilation
-      instructions&lt;/link&gt;, especially if you plan to build and use standalone
-      library.
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="how_to_read_this_documentation.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial/hello.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tutorial/bt_and_tdd.html b/doc/v2/html/boost_test/tutorial/bt_and_tdd.html
deleted file mode 100644
index 37aba349..00000000
--- a/doc/v2/html/boost_test/tutorial/bt_and_tdd.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Boost.Test driven development</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../tutorial.html" title="Tutorials">
-<link rel="prev" href="hello.html" title="Hello the testing world!">
-<link rel="next" href="../users_guide.html" title="Building a test module with the UTF">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="hello.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorial.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../users_guide.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.tutorial.bt_and_tdd"></a><a class="link" href="bt_and_tdd.html" title="Boost.Test driven development">Boost.Test driven development</a>
-</h3></div></div></div>
-<p>
-        Today is a momentous day - first day of new year. Today I am going to start
-        a new life. I am going to stop eating a greasy food, start attending a fitness
-        club and ... today I am going to test programs I am writing. I can start
-        right after the last line of a program is completed or, even better, I can
-        write tests while I am coding. And maybe next time I will write tests before
-        the coding, during the design stage. I have read a lot of literature on how
-        to write the tests, I have the unit test framework in hand and an idea of
-        new class. So let's get started.
-      </p>
-<p>
-        Let say I want to encapsulate an unchangeable C character buffer with a length
-        into the simple class <code class="computeroutput"><span class="identifier">const_string</span></code>.
-        Rationale: a string class that does not allocate a memory and provide a convenient
-        read-only access to the preallocated character buffer. I will probably want
-        <code class="computeroutput"><span class="identifier">const_string</span></code> to have an interface
-        similar to the class std::string. What will I do first? In my new life I
-        will start with writing a test module for future class <code class="computeroutput"><span class="identifier">const_string</span></code>.
-        It will look like this:
-      </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">const_string</span> <span class="identifier">test</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<p>
-        Now I can compile it and link with the unit test framework. Done! I have
-        a working test program. It is empty, so when I run the program it produces
-        following output:
-      </p>
-<pre class="programlisting"><span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span></pre>
-<p>
-        Well, now it could be a good time to start a work on <code class="computeroutput"><span class="identifier">const_string</span></code>.
-        First thing I imagine would be good to have is a constructors and trivial
-        access methods. So my class initial version looks like this:
-      </p>
-<pre class="programlisting"><span class="keyword">class</span> <span class="identifier">const_string</span> <span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="comment">// Constructors</span>
-  <span class="identifier">const_string</span><span class="special">();</span>
-  <span class="identifier">const_string</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">s</span> <span class="special">)</span>
-  <span class="identifier">const_string</span><span class="special">(</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">s</span> <span class="special">);</span>
-  <span class="identifier">const_string</span><span class="special">(</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">size_t</span> <span class="identifier">length</span> <span class="special">);</span>
-  <span class="identifier">const_string</span><span class="special">(</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">begin</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">end</span> <span class="special">);</span>
-
-  <span class="comment">// Access methods</span>
-  <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">data</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="identifier">size_t</span>      <span class="identifier">length</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">bool</span>        <span class="identifier">is_empty</span><span class="special">()</span> <span class="keyword">const</span><span class="special">;</span>
-
-  <span class="comment">// ...</span>
-<span class="special">};</span>
-</pre>
-<p>
-        Now I am able to write a first test case - constructors testing - and add
-        it to a test suite. My test program became to look like this:
-      </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">const_string</span> <span class="identifier">test</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">constructors_test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">const_string</span> <span class="identifier">cs0</span><span class="special">(</span> <span class="string">""</span> <span class="special">);</span>                                                 <span class="comment">// 1 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs0</span><span class="special">.</span><span class="identifier">length</span><span class="special">(),</span> <span class="special">(</span><span class="identifier">size_t</span><span class="special">)</span><span class="number">0</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">cs0</span><span class="special">.</span><span class="identifier">is_empty</span><span class="special">()</span> <span class="special">);</span>
-
-  <span class="identifier">const_string</span> <span class="identifier">cs01</span><span class="special">(</span> <span class="identifier">NULL</span> <span class="special">);</span>                                              <span class="comment">// 2 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs01</span><span class="special">.</span><span class="identifier">length</span><span class="special">(),</span> <span class="special">(</span><span class="identifier">size_t</span><span class="special">)</span><span class="number">0</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">cs01</span><span class="special">.</span><span class="identifier">is_empty</span><span class="special">()</span> <span class="special">);</span>
-
-  <span class="identifier">const_string</span> <span class="identifier">cs1</span><span class="special">(</span> <span class="string">"test_string"</span> <span class="special">);</span>                                      <span class="comment">// 3 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">strcmp</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">data</span><span class="special">(),</span> <span class="string">"test_string"</span> <span class="special">),</span> <span class="number">0</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">length</span><span class="special">(),</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">strlen</span><span class="special">(</span><span class="string">"test_string"</span><span class="special">)</span> <span class="special">);</span>
-
-  <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span><span class="special">(</span> <span class="string">"test_string"</span> <span class="special">);</span>                                         <span class="comment">// 4 //</span>
-  <span class="identifier">const_string</span> <span class="identifier">cs2</span><span class="special">(</span> <span class="identifier">s</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">strcmp</span><span class="special">(</span> <span class="identifier">cs2</span><span class="special">.</span><span class="identifier">data</span><span class="special">(),</span> <span class="string">"test_string"</span> <span class="special">),</span> <span class="number">0</span> <span class="special">);</span>
-
-  <span class="identifier">const_string</span> <span class="identifier">cs3</span><span class="special">(</span> <span class="identifier">cs1</span> <span class="special">);</span>                                                <span class="comment">// 5 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">strcmp</span><span class="special">(</span> <span class="identifier">cs3</span><span class="special">.</span><span class="identifier">data</span><span class="special">(),</span> <span class="string">"test_string"</span> <span class="special">),</span> <span class="number">0</span> <span class="special">);</span>
-
-  <span class="identifier">const_string</span> <span class="identifier">cs4</span><span class="special">(</span> <span class="string">"test_string"</span><span class="special">,</span> <span class="number">4</span> <span class="special">);</span>                                   <span class="comment">// 6 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">strncmp</span><span class="special">(</span> <span class="identifier">cs4</span><span class="special">.</span><span class="identifier">data</span><span class="special">(),</span> <span class="string">"test"</span><span class="special">,</span> <span class="identifier">cs4</span><span class="special">.</span><span class="identifier">length</span><span class="special">()</span> <span class="special">),</span> <span class="number">0</span> <span class="special">);</span>
-
-  <span class="identifier">const_string</span> <span class="identifier">cs5</span><span class="special">(</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">data</span><span class="special">(),</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">data</span><span class="special">()</span> <span class="special">+</span> <span class="identifier">s</span><span class="special">.</span><span class="identifier">length</span><span class="special">()</span> <span class="special">);</span>                    <span class="comment">// 7 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">strncmp</span><span class="special">(</span> <span class="identifier">cs5</span><span class="special">.</span><span class="identifier">data</span><span class="special">(),</span> <span class="string">"test_string"</span><span class="special">,</span> <span class="identifier">cs5</span><span class="special">.</span><span class="identifier">length</span><span class="special">()</span> <span class="special">),</span> <span class="number">0</span> <span class="special">);</span>
-
-  <span class="identifier">const_string</span> <span class="identifier">cs_array</span><span class="special">[]</span> <span class="special">=</span> <span class="special">{</span> <span class="string">"str1"</span><span class="special">,</span> <span class="string">"str2"</span> <span class="special">};</span>                           <span class="comment">// 8 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs_array</span><span class="special">[</span><span class="number">0</span><span class="special">],</span> <span class="string">"str1"</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs_array</span><span class="special">[</span><span class="number">1</span><span class="special">],</span> <span class="string">"str2"</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<p>
-        The constructors_test test case is intended to check a simple feature of
-        the class <code class="computeroutput"><span class="identifier">const_string</span></code>: an
-        ability to construct itself properly based on different arguments. To test
-        this feature I am using such characteristics of constructed object as a data
-        it contains and a length. The specification of the class <code class="computeroutput"><span class="identifier">const_string</span></code>
-        does not contain any expected failures, so, though the constructor can fail
-        if I would pass a pointer to an invalid memory, error check control is not
-        performed (can't require what was not promised :-)). But for any valid input
-        it should work. So I am trying to check a construction for an empty string
-        (1), a NULL string (2) a regular C string(3), an STL string(4), a copy construction(5)
-        and so on. Well, after fixing all the errors in the implementation (do you
-        write programs without errors from scratch?) I am able to pass this test
-        case and the unit test framework gives me the following report:
-      </p>
-<pre class="programlisting"><span class="identifier">Running</span> <span class="number">1</span> <span class="identifier">test</span> <span class="keyword">case</span><span class="special">...</span>
-
-<span class="special">***</span> <span class="identifier">No</span> <span class="identifier">errors</span> <span class="identifier">detected</span>
-</pre>
-<p>
-        Encouraged I am moving on and adding more access methods:
-      </p>
-<pre class="programlisting"><span class="keyword">class</span> <span class="identifier">const_string</span> <span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-  <span class="comment">//...</span>
-  <span class="keyword">char</span> <span class="keyword">operator</span><span class="special">[](</span> <span class="identifier">size_t</span> <span class="identifier">index</span> <span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="keyword">char</span> <span class="identifier">at</span><span class="special">(</span> <span class="identifier">size_t</span> <span class="identifier">index</span> <span class="special">)</span> <span class="keyword">const</span><span class="special">;</span>
-  <span class="comment">//...</span>
-<span class="special">};</span>
-</pre>
-<p>
-        I added the new feature - I need a new test case to check it. As a result
-        my test suite became to look like this:
-      </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">const_string</span> <span class="identifier">test</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">constructors_test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="comment">//...</span>
-<span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">data_access_test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">const_string</span> <span class="identifier">cs1</span><span class="special">(</span> <span class="string">"test_string"</span> <span class="special">);</span>                                 <span class="comment">// 1 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">[(</span><span class="identifier">size_t</span><span class="special">)</span><span class="number">0</span><span class="special">],</span> <span class="char">'t'</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">[(</span><span class="identifier">size_t</span><span class="special">)</span><span class="number">4</span><span class="special">],</span> <span class="char">'_'</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">[</span><span class="identifier">cs1</span><span class="special">.</span><span class="identifier">length</span><span class="special">()-</span><span class="number">1</span><span class="special">],</span> <span class="char">'g'</span> <span class="special">);</span>
-
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">[(</span><span class="identifier">size_t</span><span class="special">)</span><span class="number">0</span><span class="special">],</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">at</span><span class="special">(</span> <span class="number">0</span> <span class="special">)</span> <span class="special">);</span>                  <span class="comment">// 2 //</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">[(</span><span class="identifier">size_t</span><span class="special">)</span><span class="number">2</span><span class="special">],</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">at</span><span class="special">(</span> <span class="number">5</span> <span class="special">)</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">at</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">length</span><span class="special">()</span> <span class="special">-</span> <span class="number">1</span> <span class="special">),</span> <span class="char">'g'</span> <span class="special">);</span>
-
-  <span class="identifier">BOOST_CHECK_THROW</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">at</span><span class="special">(</span> <span class="identifier">cs1</span><span class="special">.</span><span class="identifier">length</span><span class="special">()</span> <span class="special">),</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">out_of_range</span> <span class="special">);</span>    <span class="comment">// 3 //</span>
-<span class="special">}</span>
-</pre>
-<p>
-        In the data_access_test test case I am trying to check the class <code class="computeroutput"><span class="identifier">const_string</span></code> character access correctness.
-        While tests (1) checks valid access using <code class="computeroutput"><span class="identifier">const_string</span><span class="special">::</span><span class="keyword">operator</span><span class="special">[]</span></code> and test (2) checks valid access using
-        method <code class="computeroutput"><span class="identifier">const_string</span><span class="special">::</span><span class="identifier">at</span><span class="special">()</span></code>, there
-        is one more thing to test. The specification of the method <code class="computeroutput"><span class="identifier">const_string</span><span class="special">::</span><span class="identifier">at</span><span class="special">()</span></code> contains
-        validation for the out of bound access. That was test (3) is intended to
-        do: check that the validation is working. A testing of a validation and error
-        handling code is an important part of a unit testing and should not be left
-        for a production stage. The data_access_test test case passed and I am ready
-        for the next step.
-      </p>
-<p>
-        Continuing my effort I am able to complete class <code class="computeroutput"><span class="identifier">const_string</span></code>
-        (see <a href="../../../snippet/const_string.hpp" target="_top">Listing 1 <code class="literal">const_string.hpp</code></a>)
-        and testing module for it (see <a href="../../../snippet/const_string_test.cpp" target="_top">Listing
-        2 <code class="literal">const_string_test.cpp</code></a>) that is checking all
-        features that are presented in the class <code class="computeroutput"><span class="identifier">const_string</span></code>
-        specification.
-      </p>
-<p>
-        Well, I am step closer to fulfilling my new year resolution (we should see
-        about this fitness club sometime next ...). What about you? Your testing
-        habits could be a little different. You could start with a class/library
-        development and then at some point start writing test cases on feature basis.
-        Or you can, given a detailed specification for the future product, including
-        expected interfaces, immediately start with writing all test cases (or it
-        could be a different person, while you working on implementation at the same
-        time). In any case you should not have any problems to use facilities provided
-        by the Boost.Test unit test framework and, let me hope, be able to write
-        a stable, bulletproof code. And what is even more important is your confidence
-        in an ability to make changes of any complexity without involving a lengthy
-        regression testing of your whole product. Your test module and the unit test
-        framework will stay behind your back to help you with any occasional errors.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="hello.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorial.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../users_guide.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/tutorial/hello.html b/doc/v2/html/boost_test/tutorial/hello.html
deleted file mode 100644
index 95f66a36..00000000
--- a/doc/v2/html/boost_test/tutorial/hello.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Hello the testing world!</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../tutorial.html" title="Tutorials">
-<link rel="prev" href="../tutorial.html" title="Tutorials">
-<link rel="next" href="bt_and_tdd.html" title="Boost.Test driven development">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../tutorial.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorial.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="bt_and_tdd.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.tutorial.hello"></a><a class="link" href="hello.html" title="Hello the testing world!">Hello the testing world!</a>
-</h3></div></div></div>
-<p>
-        How should a test program report errors? Displaying an error message is an
-        obvious possibility:
-      </p>
-<pre class="programlisting"><span class="keyword">if</span><span class="special">(</span> <span class="identifier">something_bad_detected</span> <span class="special">)</span>
-  <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"something bad has been detected"</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-</pre>
-<p>
-        But that requires inspection of the program's output after each run to determine
-        if an error occurred. Since test programs are often run as part of a regression
-        test suite, human inspection of output to detect error messages is time consuming
-        and unreliable. Test frameworks like GNU/expect can do the inspections automatically,
-        but are overly complex for simple testing.
-      </p>
-<p>
-        A better simple way to report errors is for the test program to return <code class="computeroutput"><span class="identifier">EXIT_SUCCESS</span></code> (normally 0) if the test program
-        completes satisfactorily, and <code class="computeroutput"><span class="identifier">EXIT_FAILURE</span></code>
-        if an error is detected. This allows a simple regression test script to automatically
-        and unambiguous detect success or failure. Further appropriate actions such
-        as creating an HTML table or emailing an alert can be taken by the script,
-        and can be modified as desired without having to change the actual C++ test
-        programs.
-      </p>
-<p>
-        A testing protocol based on a policy of test programs returning <code class="computeroutput"><span class="identifier">EXIT_SUCCESS</span></code> or <code class="computeroutput"><span class="identifier">EXIT_FAILURE</span></code>
-        does not require any supporting tools; the C++ language and standard library
-        are sufficient. The programmer must remember, however, to catch all exceptions
-        and convert them to program exits with non-zero return codes. The programmer
-        must also remember to not use the standard library <code class="computeroutput"><span class="identifier">assert</span><span class="special">()</span></code> macro for test code, because on some systems
-        it results in undesirable side effects like a message requiring manual intervention.
-      </p>
-<p>
-        The Boost Test Library's Unit Test Framework is designed to automate those
-        tasks. The library supplied <code class="computeroutput"><span class="identifier">main</span><span class="special">()</span></code> relieves users from messy error detection
-        and reporting duties. Users could use supplied testing tools to perform complex
-        validation tasks. Let's take a look on the following simple test program:
-      </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">my_class</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">my_class</span> <span class="identifier">test_object</span><span class="special">(</span> <span class="string">"qwerty"</span> <span class="special">);</span>
-  <span class="keyword">return</span> <span class="identifier">test_object</span><span class="special">.</span><span class="identifier">is_valid</span><span class="special">()</span> <span class="special">?</span> <span class="identifier">EXIT_SUCCESS</span> <span class="special">:</span> <span class="identifier">EXIT_FAILURE</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<p>
-        There are several issues with above test.
-      </p>
-<div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem">
-            You need to convert <code class="computeroutput"><span class="identifier">is_valid</span></code>
-            result in proper result code.
-          </li>
-<li class="listitem">
-            Would exception happen in test_object construction of method is_valid
-            invocation, the program will crash.
-          </li>
-<li class="listitem">
-            You won't see any output, would you run this test manually.
-          </li>
-</ol></div>
-<p>
-        The Unit Test Framework solves all these issues. To integrate with it above
-        program needs to be changed to:
-      </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">my_class</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#define</span> <a class="link" href="../users_guide/link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> <span class="identifier">MyTest</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<a class="link" href="../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a><span class="special">(</span> <span class="identifier">my_test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">my_class</span> <span class="identifier">test_object</span><span class="special">(</span> <span class="string">"qwerty"</span> <span class="special">);</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">test_object</span><span class="special">.</span><span class="identifier">is_valid</span><span class="special">()</span> <span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<p>
-        Now, you not only receive uniform result code, even in case of exception,
-        but also nicely formatted output from <a class="link" href="../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_CHECK</span></code></a> tool, would you choose
-        to see it. Is there any other ways to perform checks? The following example
-        test program shows several different ways to detect and report an error in
-        the <code class="computeroutput"><span class="identifier">add</span><span class="special">()</span></code>
-        function.
-      </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_TEST_MODULE</span> <span class="identifier">MyTest</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">add</span><span class="special">(</span> <span class="keyword">int</span> <span class="identifier">i</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">j</span> <span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="identifier">i</span><span class="special">+</span><span class="identifier">j</span><span class="special">;</span> <span class="special">}</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span> <span class="identifier">my_test</span> <span class="special">)</span>
-<span class="special">{</span>
-  <span class="comment">// seven ways to detect and report the same error:</span>
-
-  <span class="comment">// continues on error</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="special">);</span>        <a class="co" name="boost_test.tutorial.hello.c0" href="hello.html#boost_test.tutorial.hello.c1"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a>
-
-  <span class="comment">// throws on error</span>
-  <span class="identifier">BOOST_REQUIRE</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">==</span> <span class="number">4</span> <span class="special">);</span>      <a class="co" name="boost_test.tutorial.hello.c2" href="hello.html#boost_test.tutorial.hello.c3"><img src="../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a>
-
-  <span class="comment">//continues on error</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">!=</span> <span class="number">4</span> <span class="special">)</span>
-    <span class="identifier">BOOST_ERROR</span><span class="special">(</span> <span class="string">"Ouch..."</span> <span class="special">);</span>            <a class="co" name="boost_test.tutorial.hello.c4" href="hello.html#boost_test.tutorial.hello.c5"><img src="../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a>
-
-  <span class="comment">// throws on error</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">!=</span> <span class="number">4</span> <span class="special">)</span>
-    <span class="identifier">BOOST_FAIL</span><span class="special">(</span> <span class="string">"Ouch..."</span> <span class="special">);</span>            <a class="co" name="boost_test.tutorial.hello.c6" href="hello.html#boost_test.tutorial.hello.c7"><img src="../../../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a>
-
-  <span class="comment">// throws on error</span>
-  <span class="keyword">if</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">!=</span> <span class="number">4</span> <span class="special">)</span>
-    <span class="keyword">throw</span> <span class="string">"Ouch..."</span><span class="special">;</span>                    <a class="co" name="boost_test.tutorial.hello.c8" href="hello.html#boost_test.tutorial.hello.c9"><img src="../../../../../../../doc/src/images/callouts/5.png" alt="5" border="0"></a>
-
-  <span class="comment">// continues on error</span>
-  <span class="identifier">BOOST_CHECK_MESSAGE</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">==</span> <span class="number">4</span><span class="special">,</span>
-                      <span class="string">"add(..) result: "</span> <span class="special">&lt;&lt;</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">)</span> <span class="special">);</span> <a class="co" name="boost_test.tutorial.hello.c10" href="hello.html#boost_test.tutorial.hello.c11"><img src="../../../../../../../doc/src/images/callouts/6.png" alt="6" border="0"></a>
-
-  <span class="comment">// continues on error</span>
-  <span class="identifier">BOOST_CHECK_EQUAL</span><span class="special">(</span> <span class="identifier">add</span><span class="special">(</span> <span class="number">2</span><span class="special">,</span><span class="number">2</span> <span class="special">),</span> <span class="number">4</span> <span class="special">);</span>   <a class="co" name="boost_test.tutorial.hello.c12" href="hello.html#boost_test.tutorial.hello.c13"><img src="../../../../../../../doc/src/images/callouts/7.png" alt="7" border="0"></a>
-<span class="special">}</span>
-</pre>
-<div class="calloutlist"><table border="0" summary="Callout list">
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c1"></a><a href="#boost_test.tutorial.hello.c0"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach uses the <a class="link" href="../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_CHECK</span></code></a> tool, which displays
-            an error message (by default on <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span></code>)
-            that includes the expression that failed, the source file name, and the
-            source file line number. It also increments the error count. At program
-            termination, the error count will be displayed automatically by the Unit
-            Test Framework.
-          </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c3"></a><a href="#boost_test.tutorial.hello.c2"><img src="../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach uses the <a class="link" href="../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_REQUIRE</span></code></a> tool, is similar
-            to approach #1, except that after displaying the error, an exception
-            is thrown, to be caught by the Unit Test Framework. This approach is
-            suitable when writing an explicit test program, and the error would be
-            so severe as to make further testing impractical. <a class="link" href="../testing_tool_ref/assertion_boost_level.html" title="BOOST_&lt;level&gt;"><code class="computeroutput"><span class="identifier">BOOST_REQUIRE</span></code></a> differs from the
-            C++ Standard Library's assert() macro in that it is always generated,
-            and channels error detection into the uniform Unit Test Framework reporting
-            procedure.
-          </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c5"></a><a href="#boost_test.tutorial.hello.c4"><img src="../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach is similar to approach #1, except that the error detection
-            and error reporting are coded separately. This is most useful when the
-            specific condition being tested requires several independent statements
-            and/or is not indicative of the reason for failure.
-          </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c7"></a><a href="#boost_test.tutorial.hello.c6"><img src="../../../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach is similar to approach #2, except that the error detection
-            and error reporting are coded separately. This is most useful when the
-            specific condition being tested requires several independent statements
-            and/or is not indicative of the reason for failure.
-          </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c9"></a><a href="#boost_test.tutorial.hello.c8"><img src="../../../../../../../doc/src/images/callouts/5.png" alt="5" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach throws an exception, which will be caught and reported
-            by the Unit Test Framework. The error message displayed when the exception
-            is caught will be most meaningful if the exception is derived from <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">exception</span></code>, or is a <code class="computeroutput"><span class="keyword">char</span><span class="special">*</span></code> or <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code>.
-          </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c11"></a><a href="#boost_test.tutorial.hello.c10"><img src="../../../../../../../doc/src/images/callouts/6.png" alt="6" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach uses the <a class="link" href="../testing_tool_ref/assertion_boost_level_message.html" title="BOOST_&lt;level&gt;_MESSAGE"><code class="computeroutput"><span class="identifier">BOOST_CHECK_MESSAGE</span></code></a> tool, is
-            similar to approach #1, except that similar to the approach #3 displays
-            an alternative error message specified as a second argument.
-          </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="boost_test.tutorial.hello.c13"></a><a href="#boost_test.tutorial.hello.c12"><img src="../../../../../../../doc/src/images/callouts/7.png" alt="7" border="0"></a> </p></td>
-<td valign="top" align="left"><p>
-            This approach uses the <a class="link" href="../testing_tool_ref/assertion_boost_level_eq.html" title="BOOST_&lt;level&gt;_EQUAL"><code class="computeroutput"><span class="identifier">BOOST_CHECK_EQUAL</span></code></a> tool and functionally
-            is similar to approach #1. This approach is most attractive for checking
-            equality of two variables, since in case of error it shows mismatched
-            values.
-          </p></td>
-</tr>
-</table></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-          check why there is a remaining TO FIX: all the coords in the source doc
-          + why TO FIX: some finishing statements here
-        </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../tutorial.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorial.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="bt_and_tdd.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide.html b/doc/v2/html/boost_test/users_guide.html
old mode 100644
new mode 100755
index 0df11418..c0c4b66c
--- a/doc/v2/html/boost_test/users_guide.html
+++ b/doc/v2/html/boost_test/users_guide.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Building a test module with the UTF</title>
-<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>Building a test module with the Unit Test Framework</title>
+<link rel="stylesheet" href="../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Test">
 <link rel="up" href="../index.html" title="Boost.Test">
-<link rel="prev" href="tutorial/bt_and_tdd.html" title="Boost.Test driven development">
+<link rel="prev" href="intro/how_to_read_this_documentation.html" title="How to read this documentation?">
 <link rel="next" href="users_guide/module_initialization.html" title="Test module initialization">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,49 +20,17 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="tutorial/bt_and_tdd.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="users_guide/module_initialization.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="intro/how_to_read_this_documentation.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="users_guide/module_initialization.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_test.users_guide"></a><a class="link" href="users_guide.html" title="Building a test module with the UTF">Building a test module with the
-    <span class="emphasis"><em>UTF</em></span></a>
+<a name="boost_test.users_guide"></a><a class="link" href="users_guide.html" title="Building a test module with the Unit Test Framework">Building a test module with the
+    <span class="emphasis"><em>Unit Test Framework</em></span></a>
 </h2></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="users_guide/module_initialization.html">Test module
-      initialization</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="users_guide/module_initialization/custom_module_initialisation.html">Custom
-        module initialisation</a></span></dt>
-<dt><span class="section"><a href="users_guide/module_initialization/module_initialisation_automated.html">Automated
-        generation</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="users_guide/usage_variants.html">Linking with the
-      <span class="emphasis"><em>UTF</em></span></a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="users_guide/usage_variants/static_lib_variant.html">Static
-        library variant</a></span></dt>
-<dt><span class="section"><a href="users_guide/usage_variants/dynamic_lib_variant.html">Dynamic
-        library variant</a></span></dt>
-<dt><span class="section"><a href="users_guide/usage_variants/single_header_variant.html">The
-        single-header variant of the <span class="emphasis"><em>UTF</em></span></a></span></dt>
-<dt><span class="section"><a href="users_guide/usage_variants/extern_test_runner_variant.html">The
-        external test runner variant of the <span class="emphasis"><em>UTF</em></span></a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="users_guide/link_references.html">Macros that control
-      the build behaviours</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="users_guide/link_references/link_boost_test_main_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a></span></dt>
-<dt><span class="section"><a href="users_guide/link_references/link_boost_test_alternative_init_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></span></dt>
-<dt><span class="section"><a href="users_guide/link_references/link_boost_test_no_lib.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a></span></dt>
-<dt><span class="section"><a href="users_guide/link_references/link_boost_test_dyn_link.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></span></dt>
-<dt><span class="section"><a href="users_guide/link_references/link_boost_test_no_main.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a></span></dt>
-<dt><span class="section"><a href="users_guide/link_references/link_boost_test_module_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a></span></dt>
-</dl></dd>
-</dl></div>
 <p>
       There are two tasks should be performed before actual testing is able to start:
     </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
           The test tree needs to be built: unless automated test units registration
           is used, the tests that should be run and their relationship should be
@@ -71,14 +39,14 @@
 <li class="listitem">
           Custom <span class="emphasis"><em>test module initialization</em></span> needs to be performed.
           This includes initialization of the code under test and custom tune-up
-          of the <span class="emphasis"><em>UTF</em></span> parameters (for example the test log or
-          the test results report output streams redirection, some command line parameters
-          passed to the test module, etc.).
+          of the <span class="emphasis"><em>Unit Test Framework</em></span> parameters (for example
+          the test log or the test results report output streams redirection, some
+          command line parameters passed to the test module, etc.).
         </li>
 </ul></div>
 <p>
-      The part of the <span class="emphasis"><em>UTF</em></span> dedicated for this purpose is called
-      <a class="link" href="users_guide/module_initialization.html" title="Test module initialization"><span class="emphasis"><em>the
+      The part of the <span class="emphasis"><em>Unit Test Framework</em></span> dedicated for this
+      purpose is called <a class="link" href="users_guide/module_initialization.html" title="Test module initialization"><span class="emphasis"><em>the
       test module initialization</em></span></a> function.
     </p>
 <div class="note"><table border="0" summary="Note">
@@ -94,13 +62,14 @@
 </table></div>
 <p>
       The <span class="emphasis"><em>module initialization</em></span> and the way the test module
-      is linked against the <span class="emphasis"><em>UTF</em></span> are closely related. The method
-      used to link against the <span class="emphasis"><em>UTF</em></span> are often lead by considerations
-      external to the tests themselves (compilation time, size of the generated binaries,
-      etc). However, the functions of the <span class="emphasis"><em>module initialization</em></span>
-      involved in, say static and dynamic linking, will not be the same. To cover
-      many possible usages, the <span class="emphasis"><em>UTF</em></span> handles several different
-      variants of linking, and indirectly the tools for proper <span class="emphasis"><em>module initialization</em></span>
+      is linked against the <span class="emphasis"><em>Unit Test Framework</em></span> are closely
+      related. The method used to link against the <span class="emphasis"><em>Unit Test Framework</em></span>
+      are often lead by considerations external to the tests themselves (compilation
+      time, size of the generated binaries, etc). However, the functions of the
+      <span class="emphasis"><em>module initialization</em></span> involved in, say static and dynamic
+      linking, will not be the same. To cover many possible usages, the <span class="emphasis"><em>Unit
+      Test Framework</em></span> handles several different variants of linking, and
+      indirectly the tools for proper <span class="emphasis"><em>module initialization</em></span>
       corresponding to each of these variants are provided.
     </p>
 </div>
@@ -115,7 +84,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="tutorial/bt_and_tdd.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="users_guide/module_initialization.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="intro/how_to_read_this_documentation.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="users_guide/module_initialization.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references.html b/doc/v2/html/boost_test/users_guide/link_references.html
old mode 100644
new mode 100755
index 517aa2a8..8fd574ca
--- a/doc/v2/html/boost_test/users_guide/link_references.html
+++ b/doc/v2/html/boost_test/users_guide/link_references.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macros that control the build behaviours</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../users_guide.html" title="Building a test module with the UTF">
-<link rel="prev" href="usage_variants/extern_test_runner_variant.html" title="The external test runner variant of the UTF">
-<link rel="next" href="link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN">
+<link rel="up" href="../users_guide.html" title="Building a test module with the Unit Test Framework">
+<link rel="prev" href="usage_variants.html" title="Linking with the Unit Test Framework">
+<link rel="next" href="../tests_organization.html" title="Test organization using the Unit Test Framework">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,21 +20,100 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="usage_variants/extern_test_runner_variant.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_references/link_boost_test_main_macro.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="usage_variants.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_test.users_guide.link_references"></a><a class="link" href="link_references.html" title="Macros that control the build behaviours">Macros that control
       the build behaviours</a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="link_references/link_boost_test_main_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a></span></dt>
-<dt><span class="section"><a href="link_references/link_boost_test_alternative_init_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></span></dt>
-<dt><span class="section"><a href="link_references/link_boost_test_no_lib.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a></span></dt>
-<dt><span class="section"><a href="link_references/link_boost_test_dyn_link.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></span></dt>
-<dt><span class="section"><a href="link_references/link_boost_test_no_main.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a></span></dt>
-<dt><span class="section"><a href="link_references/link_boost_test_module_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a></span></dt>
-</dl></div>
+<div class="section"><div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.link_references.link_boost_test_main_macro"></a><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a>
+</h4></div></div></div></div>
+<div class="section"><div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.link_references.link_boost_test_alternative_init_macro"></a><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>
+</h4></div></div></div></div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.link_references.link_boost_test_no_lib"></a><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_no_lib" title="BOOST_TEST_NO_LIB"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a>
+</h4></div></div></div>
+<p>
+          Define this flag to prevent auto-linking.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The same flag is used for the <span class="emphasis"><em>Unit Test Framework</em></span>
+            and the /Program Exceution Monitor components.
+          </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.link_references.link_boost_test_dyn_link"></a><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a>
+</h4></div></div></div>
+<p>
+          Define this flag to link against the <span class="emphasis"><em>Unit Test Framework</em></span>
+          shared library.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The same flag is used for the <span class="emphasis"><em>Unit Test Framework</em></span>
+            and the /Program Exceution Monitor components.
+          </p></td></tr>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.link_references.link_boost_test_no_main"></a><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_no_main" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a>
+</h4></div></div></div>
+<p>
+          Prevents the auto generation of the test module initialisation functions.
+          This macro is particularly relevant for manually registered tests in conjunction
+          with dynamic variant of the <span class="emphasis"><em>Unit Test Framework</em></span>. When
+          defined, a <code class="computeroutput"><span class="identifier">main</span></code> function
+          registering all the tests should be implemented.
+        </p>
+<p>
+          An example of a module initialisation would be
+        </p>
+<pre class="programlisting"><span class="preprocessor">#define</span> <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_no_main" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="comment">// a function in another compilation unit registering tests under the master test suite.</span>
+<span class="keyword">void</span> <span class="identifier">register_some_tests_manually</span><span class="special">(</span><span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">test</span><span class="special">);</span>
+
+<span class="keyword">bool</span> <span class="identifier">registering_all_tests</span><span class="special">()</span>
+<span class="special">{</span>
+  <span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">test_master_suite</span> <span class="special">=</span> <span class="special">&amp;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">();</span>
+  <span class="identifier">register_some_tests_manually</span><span class="special">(</span><span class="identifier">test_master_suite</span><span class="special">);</span>
+
+  <span class="comment">// register any other tests function or test suite to the master test suite</span>
+  <span class="comment">// ...</span>
+  <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
+<span class="special">}</span>
+
+<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[])</span>
+<span class="special">{</span>
+  <span class="keyword">return</span> <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_main</span><span class="special">(&amp;</span><span class="identifier">registering_all_tests</span><span class="special">,</span> <span class="identifier">argc</span><span class="special">,</span> <span class="identifier">argv</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.link_references.link_boost_test_module_macro"></a><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a>
+</h4></div></div></div>
+<p>
+          An example may be found <a class="link" href="../tests_organization/test_organization_test_suite.html#ref_BOOST_TEST_MODULE">here</a>.
+        </p>
+</div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -47,7 +126,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="usage_variants/extern_test_runner_variant.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_references/link_boost_test_main_macro.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="usage_variants.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../tests_organization.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_alternative_init_macro.html b/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_alternative_init_macro.html
deleted file mode 100644
index 61fc3fdf..00000000
--- a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_alternative_init_macro.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_TEST_ALTERNATIVE_INIT_API</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="prev" href="link_boost_test_main_macro.html" title="BOOST_TEST_MAIN">
-<link rel="next" href="link_boost_test_no_lib.html" title="BOOST_TEST_NO_LIB">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_main_macro.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_no_lib.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section"><div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.link_references.link_boost_test_alternative_init_macro"></a><a class="link" href="link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>
-</h4></div></div></div></div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_main_macro.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_no_lib.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_dyn_link.html b/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_dyn_link.html
deleted file mode 100644
index eb12b495..00000000
--- a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_dyn_link.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_TEST_DYN_LINK</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="prev" href="link_boost_test_no_lib.html" title="BOOST_TEST_NO_LIB">
-<link rel="next" href="link_boost_test_no_main.html" title="BOOST_TEST_NO_MAIN">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_no_lib.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_no_main.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.link_references.link_boost_test_dyn_link"></a><a class="link" href="link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a>
-</h4></div></div></div>
-<p>
-          Define this flag to link against the <span class="emphasis"><em>UTF</em></span> shared library.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The same flag is used for the <span class="emphasis"><em>UTF</em></span> and the <span class="emphasis"><em>PEM</em></span>
-            components.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_no_lib.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_no_main.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_main_macro.html b/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_main_macro.html
deleted file mode 100644
index 78ee82c0..00000000
--- a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_main_macro.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_TEST_MAIN</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="prev" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="next" href="link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../link_references.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_alternative_init_macro.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section"><div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.link_references.link_boost_test_main_macro"></a><a class="link" href="link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a>
-</h4></div></div></div></div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../link_references.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_alternative_init_macro.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_module_macro.html b/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_module_macro.html
deleted file mode 100644
index 2e322263..00000000
--- a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_module_macro.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_TEST_MODULE</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="prev" href="link_boost_test_no_main.html" title="BOOST_TEST_NO_MAIN">
-<link rel="next" href="../../tests_organization.html" title="Registering, generating and organizing the unit tests">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_no_main.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../tests_organization.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.link_references.link_boost_test_module_macro"></a><a class="link" href="link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a>
-</h4></div></div></div>
-<p>
-          An example may be found <a class="link" href="../../tests_organization/test_organization_test_suite/master_test_suite.html#ref_BOOST_TEST_MODULE">here</a>.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_no_main.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../tests_organization.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_no_lib.html b/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_no_lib.html
deleted file mode 100644
index 836daa07..00000000
--- a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_no_lib.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_TEST_NO_LIB</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="prev" href="link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API">
-<link rel="next" href="link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_alternative_init_macro.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_dyn_link.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.link_references.link_boost_test_no_lib"></a><a class="link" href="link_boost_test_no_lib.html" title="BOOST_TEST_NO_LIB"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a>
-</h4></div></div></div>
-<p>
-          Define this flag to prevent auto-linking.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The same flag is used for the <span class="emphasis"><em>UTF</em></span> and the <span class="emphasis"><em>PEM</em></span>
-            components.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_alternative_init_macro.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_dyn_link.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_no_main.html b/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_no_main.html
deleted file mode 100644
index b8e0dbaa..00000000
--- a/doc/v2/html/boost_test/users_guide/link_references/link_boost_test_no_main.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>BOOST_TEST_NO_MAIN</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../link_references.html" title="Macros that control the build behaviours">
-<link rel="prev" href="link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK">
-<link rel="next" href="link_boost_test_module_macro.html" title="BOOST_TEST_MODULE">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_dyn_link.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_module_macro.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.link_references.link_boost_test_no_main"></a><a class="link" href="link_boost_test_no_main.html" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a>
-</h4></div></div></div>
-<p>
-          Prevents the auto generation of the test module initialisation functions.
-          This macro is particularly relevant for manually registered tests in conjunction
-          with dynamic variant of the <span class="emphasis"><em>UTF</em></span>. When defined, a
-          <code class="computeroutput"><span class="identifier">main</span></code> function registering
-          all the tests should be implemented.
-        </p>
-<p>
-          An example of a module initialisation would be
-        </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <a class="link" href="link_boost_test_no_main.html" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="comment">// a function in another compilation unit registering tests under the master test suite.</span>
-<span class="keyword">void</span> <span class="identifier">register_some_tests_manually</span><span class="special">(</span><span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">test</span><span class="special">);</span>
-
-<span class="keyword">bool</span> <span class="identifier">registering_all_tests</span><span class="special">()</span>
-<span class="special">{</span>
-  <span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">test_master_suite</span> <span class="special">=</span> <span class="special">&amp;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">framework</span><span class="special">::</span><span class="identifier">master_test_suite</span><span class="special">();</span>
-  <span class="identifier">register_some_tests_manually</span><span class="special">(</span><span class="identifier">test_master_suite</span><span class="special">);</span>
-
-  <span class="comment">// register any other tests function or test suite to the master test suite</span>
-  <span class="comment">// ...</span>
-  <span class="keyword">return</span> <span class="keyword">true</span><span class="special">;</span>
-<span class="special">}</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[])</span>
-<span class="special">{</span>
-  <span class="keyword">return</span> <span class="special">::</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">unit_test_main</span><span class="special">(&amp;</span><span class="identifier">registering_all_tests</span><span class="special">,</span> <span class="identifier">argc</span><span class="special">,</span> <span class="identifier">argv</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="link_boost_test_dyn_link.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../link_references.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_boost_test_module_macro.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/module_initialization.html b/doc/v2/html/boost_test/users_guide/module_initialization.html
old mode 100644
new mode 100755
index 6cb3f260..99c267a2
--- a/doc/v2/html/boost_test/users_guide/module_initialization.html
+++ b/doc/v2/html/boost_test/users_guide/module_initialization.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Test module initialization</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../users_guide.html" title="Building a test module with the UTF">
-<link rel="prev" href="../users_guide.html" title="Building a test module with the UTF">
-<link rel="next" href="module_initialization/custom_module_initialisation.html" title="Custom module initialisation">
+<link rel="up" href="../users_guide.html" title="Building a test module with the Unit Test Framework">
+<link rel="prev" href="../users_guide.html" title="Building a test module with the Unit Test Framework">
+<link rel="next" href="usage_variants.html" title="Linking with the Unit Test Framework">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,25 +20,19 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../users_guide.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="module_initialization/custom_module_initialisation.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../users_guide.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="usage_variants.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_test.users_guide.module_initialization"></a><a class="link" href="module_initialization.html" title="Test module initialization">Test module
       initialization</a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="module_initialization/custom_module_initialisation.html">Custom
-        module initialisation</a></span></dt>
-<dt><span class="section"><a href="module_initialization/module_initialisation_automated.html">Automated
-        generation</a></span></dt>
-</dl></div>
 <p>
         As explained in the introductory material, the <span class="emphasis"><em>module initialization</em></span>
-        part of the <span class="emphasis"><em>UTF</em></span> prepares the test module for execution,
-        including:
+        part of the <span class="emphasis"><em>Unit Test Framework</em></span> prepares the test module
+        for execution, including:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             the construction of the test tree
           </li>
@@ -65,27 +59,28 @@
         The argument against the implementation of a custom <span class="emphasis"><em>module initialization</em></span>
         are the following:
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             The test tree can be easily and efficiently constructed automatically
-            (covered in details in <a class="link" href="../tests_organization.html" title="Registering, generating and organizing the unit tests">this</a>
+            (covered in details in <a class="link" href="../tests_organization.html" title="Test organization using the Unit Test Framework">this</a>
             section).
           </li>
 <li class="listitem">
-            <span class="emphasis"><em>UTF</em></span> also provides means to <a class="link" href="../tests_organization/test_organization_test_suite/master_test_suite.html#ref_BOOST_TEST_MODULE">rename</a>
-            the <span class="emphasis"><em>master test suite</em></span>.
+            <span class="emphasis"><em>Unit Test Framework</em></span> also provides means to <a class="link" href="../tests_organization/test_organization_test_suite.html#ref_BOOST_TEST_MODULE">rename</a> the <span class="emphasis"><em>master test
+            suite</em></span>.
           </li>
 <li class="listitem">
-            Most of the command line parameters, except the ones used by the <span class="emphasis"><em>UTF</em></span>,
-            may be accessed through the <span class="emphasis"><em>master test suite</em></span>
+            Most of the command line parameters, except the ones used by the <span class="emphasis"><em>Unit
+            Test Framework</em></span>, may be accessed through the <span class="emphasis"><em>master
+            test suite</em></span>
           </li>
 <li class="listitem">
-            <a class="link" href="../tests_organization/fixtures/global_fixture.html#ref_fixture_test_global">Global fixtures</a> may provide
+            <a class="link" href="../tests_organization/fixtures.html#ref_fixture_test_global">Global fixtures</a> may provide
             <span class="emphasis"><em>states</em></span> that can be accessed during the lifetime
             of the tests, with proper and controlled initialization and release.
             This approach covers several use case that might need the tweaking of
-            the initialization functions, adding the robustness of the <span class="emphasis"><em>UTF</em></span>
-            in the initialization and release themselves.
+            the initialization functions, adding the robustness of the <span class="emphasis"><em>Unit
+            Test Framework</em></span> in the initialization and release themselves.
           </li>
 <li class="listitem">
             If the test module is old and the need for <span class="emphasis"><em>module initialization</em></span>
@@ -95,9 +90,179 @@
 </ul></div>
 <p>
         From the points above, if the need for <span class="emphasis"><em>module initialization</em></span>
-        is not there anymore, then you may jump directly to the <a class="link" href="module_initialization/module_initialisation_automated.html" title="Automated generation">automated
+        is not there anymore, then you may jump directly to the <a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.module_initialisation_automated" title="Automated generation">automated
         section</a> directly.
       </p>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.module_initialization.custom_module_initialisation"></a><a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation" title="Custom module initialisation">Custom
+        module initialisation</a>
+</h4></div></div></div>
+<h6>
+<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.h0"></a>
+          <span><a name="boost_test.users_guide.module_initialization.custom_module_initialisation.a_bit_of_history"></a></span><a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.a_bit_of_history">A
+          bit of history</a>
+        </h6>
+<p>
+          Original design of the <span class="emphasis"><em>Unit Test Framework</em></span> supported
+          the manual test tree construction only. Later versions introduced the automated
+          registration of test units. In later versions of the <span class="emphasis"><em>Unit Test
+          Framework</em></span> the original initialization function specification
+          became inconvenient and unnecessary unsafe, and the alternative initialization
+          function specification was introduced. This change is not backward compatible.
+        </p>
+<p>
+          These initialisation functions are refered to as <span class="bold"><strong>legacy</strong></span>
+          and <span class="bold"><strong>alternative/simplified</strong></span> respectively.
+        </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              The test runners supplied with the static library and single-header
+              variants of the <span class="emphasis"><em>Unit Test Framework</em></span> by default
+              still require original/legacy initialization function, but support
+              <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API">compilation
+              flags</a> that switch to the alternative/simplified one.
+            </li>
+<li class="listitem">
+              The test runner supplied with dynamic library variant of the <span class="emphasis"><em>Unit
+              Test Framework</em></span> requires the simplified initialisation and
+              doesn't support legacy one.
+            </li>
+</ul></div>
+<p>
+          The legacy initialization function is, at its name suggest, deprecated.
+        </p>
+<div class="important"><table border="0" summary="Important">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../../doc/src/images/important.png"></td>
+<th align="left">Important</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            The initialization function invocation is monitored by the <span class="emphasis"><em>Unit
+            Test Framework</em></span> the same way as all the test cases. An unexpected
+            exception or system error detected during initialization function invocation
+            is treated as initialization error and is reported as such.
+          </p></td></tr>
+</table></div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.legacy_initialization_function"></a><a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.legacy_initialization_function" title="Legacy initialization function">Legacy
+          initialization function</a>
+</h5></div></div></div>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+              In this section, the <span class="bold"><strong>legacy</strong></span> initialisation
+              function is described. For new code, consider using the simplified
+              initialisation function.
+            </p></td></tr>
+</table></div>
+<p>
+            The original design of the <span class="emphasis"><em>Unit Test Framework</em></span> initialization
+            required you to implement the function with the following specification:
+          </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]);</span>
+</pre>
+<p>
+            This function was intended to initialize and return a master test suite.
+            The null value was considered an initialization error. The current design
+            of the <span class="emphasis"><em>Unit Test Framework</em></span> maintains master test
+            suite instance internally and does not treat the <code class="computeroutput"><span class="identifier">null</span></code>
+            result value as an initialization error. In fact it's recommended to
+            return <code class="computeroutput"><span class="identifier">null</span></code> value always
+            and register test units in the master test suite using the regular <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code> interface (see <a class="link" href="../tests_organization/test_cases.html#ref_BOOST_TEST_CASE">here</a>
+            for an example). The only way to indicate an initialization error is
+            to throw a <code class="computeroutput"><a class="link" href="../../boost/unit_test/framework/setup_error.html" title="Struct setup_error">boost::unit_test::framework::setup_error</a></code>
+            exception.
+          </p>
+<p>
+            The initialization function parameters <code class="computeroutput"><span class="identifier">argc</span></code>,
+            <code class="computeroutput"><span class="identifier">argv</span></code> provide the command
+            line arguments specified during test module invocation. It's guarantied
+            that any framework-specific command line arguments are excluded. To be
+            consistant with the <span class="emphasis"><em>simplified</em></span> initialization function
+            specification it's recommended though to access the command line arguments
+            using the <a class="link" href="../tests_organization/test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite" title="Master Test Suite">master
+            test suite</a> interface.
+          </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.switching_from_legacy_to_simplif"></a><a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.switching_from_legacy_to_simplif" title="Switching from legacy to simplified">Switching
+          from legacy to simplified</a>
+</h5></div></div></div>
+<p>
+            The test runner interface needs to refer to the initialization function
+            signature. The <span class="emphasis"><em>Unit Test Framework</em></span> provides the
+            <code class="computeroutput"><span class="keyword">typedef</span></code> that resolves to
+            proper signature in all configurations:
+          </p>
+<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
+  <span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
+<span class="preprocessor">#ifdef</span> <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>
+    <span class="keyword">typedef</span> <span class="keyword">bool</span>        <span class="special">(*</span><span class="identifier">init_unit_test_func</span><span class="special">)();</span>
+<span class="preprocessor">#else</span>
+    <span class="keyword">typedef</span> <span class="identifier">test_suite</span><span class="special">*</span> <span class="special">(*</span><span class="identifier">init_unit_test_func</span><span class="special">)(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">);</span>
+<span class="preprocessor">#endif</span>
+  <span class="special">}</span>
+<span class="special">}</span>
+</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.simplified_initialization_functi"></a><a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.simplified_initialization_functi" title="Simplified initialization function">Simplified
+          initialization function</a>
+</h5></div></div></div>
+<p>
+            The alternative design of the <span class="emphasis"><em>Unit Test Framework</em></span>
+            initialization requires you to implement a function with the following
+            specification:
+          </p>
+<pre class="programlisting"><span class="keyword">bool</span> <span class="identifier">init_unit_test</span><span class="special">();</span>
+</pre>
+<p>
+            The result value of this function indicates whether or not initialization
+            was successful. To register test units in a master test suite use the
+            <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code> interface (see <a class="link" href="../tests_organization/test_cases.html#ref_BOOST_TEST_CASE">here</a>
+            for an example). To access command line arguments use the <a class="link" href="../tests_organization/test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite" title="Master Test Suite">master
+            test suite</a> interface. It's guarantied that any framework-specific
+            command line arguments are excluded.
+          </p>
+</div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.module_initialization.module_initialisation_automated"></a><a class="link" href="module_initialization.html#boost_test.users_guide.module_initialization.module_initialisation_automated" title="Automated generation">Automated
+        generation</a>
+</h4></div></div></div>
+<p>
+          To automatically generate an empty test module initialization function
+          you need to define <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> before including
+          the
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
+<p>
+          header. The value of this define is ignored. Alternatively you can define
+          the macro <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> to be equal
+          to any string (not necessarily in quotes). This macro causes the same result
+          as <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a>, and in addition
+          the macro value becomes the name of the master test suite.
+        </p>
+<div class="important"><table border="0" summary="Important">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../../doc/src/images/important.png"></td>
+<th align="left">Important</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            For a test module consisting of multiple source files you have to define
+            these flags in a single test file only. Otherwise you end up with multiple
+            instances of the initialization function.
+          </p></td></tr>
+</table></div>
+</div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -110,7 +275,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../users_guide.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="module_initialization/custom_module_initialisation.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../users_guide.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="usage_variants.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation.html b/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation.html
deleted file mode 100644
index bc531ffb..00000000
--- a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Custom module initialisation</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../module_initialization.html" title="Test module initialization">
-<link rel="prev" href="../module_initialization.html" title="Test module initialization">
-<link rel="next" href="custom_module_initialisation/legacy_initialization_function.html" title="Legacy initialization function">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../module_initialization.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../module_initialization.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="custom_module_initialisation/legacy_initialization_function.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.module_initialization.custom_module_initialisation"></a><a class="link" href="custom_module_initialisation.html" title="Custom module initialisation">Custom
-        module initialisation</a>
-</h4></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="custom_module_initialisation/legacy_initialization_function.html">Legacy
-          initialization function</a></span></dt>
-<dt><span class="section"><a href="custom_module_initialisation/switching_from_legacy_to_simplif.html">Switching
-          from legacy to simplified</a></span></dt>
-<dt><span class="section"><a href="custom_module_initialisation/simplified_initialization_functi.html">Simplified
-          initialization function</a></span></dt>
-</dl></div>
-<h6>
-<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.h0"></a>
-          <span class="phrase"><a name="boost_test.users_guide.module_initialization.custom_module_initialisation.a_bit_of_history"></a></span><a class="link" href="custom_module_initialisation.html#boost_test.users_guide.module_initialization.custom_module_initialisation.a_bit_of_history">A
-          bit of history</a>
-        </h6>
-<p>
-          Original design of the <span class="emphasis"><em>UTF</em></span> supported the manual test
-          tree construction only. Later versions introduced the automated registration
-          of test units. In later versions of the <span class="emphasis"><em>UTF</em></span> the original
-          initialization function specification became inconvenient and unnecessary
-          unsafe, and the alternative initialization function specification was introduced.
-          This change is not backward compatible.
-        </p>
-<p>
-          These initialisation functions are refered to as <span class="bold"><strong>legacy</strong></span>
-          and <span class="bold"><strong>alternative/simplified</strong></span> respectively.
-        </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-              The test runners supplied with the static library and single-header
-              variants of the <span class="emphasis"><em>UTF</em></span> by default still require original/legacy
-              initialization function, but support <a class="link" href="../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API">compilation
-              flags</a> that switch to the alternative/simplified one.
-            </li>
-<li class="listitem">
-              The test runner supplied with dynamic library variant of the <span class="emphasis"><em>UTF</em></span>
-              requires the simplified initialisation and doesn't support legacy one.
-            </li>
-</ul></div>
-<p>
-          The legacy initialization function is, at its name suggest, deprecated.
-        </p>
-<div class="important"><table border="0" summary="Important">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../../../doc/src/images/important.png"></td>
-<th align="left">Important</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            The initialization function invocation is monitored by the <span class="emphasis"><em>UTF</em></span>
-            the same way as all the test cases. An unexpected exception or system
-            error detected during initialization function invocation is treated as
-            initialization error and is reported as such.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../module_initialization.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../module_initialization.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="custom_module_initialisation/legacy_initialization_function.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/legacy_initialization_function.html b/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/legacy_initialization_function.html
deleted file mode 100644
index dd69af3c..00000000
--- a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/legacy_initialization_function.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Legacy initialization function</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../custom_module_initialisation.html" title="Custom module initialisation">
-<link rel="prev" href="../custom_module_initialisation.html" title="Custom module initialisation">
-<link rel="next" href="switching_from_legacy_to_simplif.html" title="Switching from legacy to simplified">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="switching_from_legacy_to_simplif.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.legacy_initialization_function"></a><a class="link" href="legacy_initialization_function.html" title="Legacy initialization function">Legacy
-          initialization function</a>
-</h5></div></div></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-              In this section, the <span class="bold"><strong>legacy</strong></span> initialisation
-              function is described. For new code, consider using the simplified
-              initialisation function.
-            </p></td></tr>
-</table></div>
-<p>
-            The original design of the <span class="emphasis"><em>UTF</em></span> initialization required
-            you to implement the function with the following specification:
-          </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">test_suite</span><span class="special">*</span> <span class="identifier">init_unit_test_suite</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">argc</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="identifier">argv</span><span class="special">[]);</span>
-</pre>
-<p>
-            This function was intended to initialize and return a master test suite.
-            The null value was considered an initialization error. The current design
-            of the <span class="emphasis"><em>UTF</em></span> maintains master test suite instance
-            internally and does not treat the <code class="computeroutput"><span class="identifier">null</span></code>
-            result value as an initialization error. In fact it's recommended to
-            return <code class="computeroutput"><span class="identifier">null</span></code> value always
-            and register test units in the master test suite using the regular <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code> interface (see <a class="link" href="../../../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_TEST_CASE">here</a>
-            for an example). The only way to indicate an initialization error is
-            to throw a <code class="computeroutput"><a class="link" href="../../../../boost/unit_test/framework/setup_error.html" title="Struct setup_error">boost::unit_test::framework::setup_error</a></code>
-            exception.
-          </p>
-<p>
-            The initialization function parameters <code class="computeroutput"><span class="identifier">argc</span></code>,
-            <code class="computeroutput"><span class="identifier">argv</span></code> provide the command
-            line arguments specified during test module invocation. It's guarantied
-            that any framework-specific command line arguments are excluded. To be
-            consistant with the <span class="emphasis"><em>simplified</em></span> initialization function
-            specification it's recommended though to access the command line arguments
-            using the <a class="link" href="../../../tests_organization/test_organization_test_suite/master_test_suite.html" title="Master Test Suite">master
-            test suite</a> interface.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="switching_from_legacy_to_simplif.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/simplified_initialization_functi.html b/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/simplified_initialization_functi.html
deleted file mode 100644
index bb55684b..00000000
--- a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/simplified_initialization_functi.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Simplified initialization function</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../custom_module_initialisation.html" title="Custom module initialisation">
-<link rel="prev" href="switching_from_legacy_to_simplif.html" title="Switching from legacy to simplified">
-<link rel="next" href="../module_initialisation_automated.html" title="Automated generation">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="switching_from_legacy_to_simplif.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../module_initialisation_automated.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.simplified_initialization_functi"></a><a class="link" href="simplified_initialization_functi.html" title="Simplified initialization function">Simplified
-          initialization function</a>
-</h5></div></div></div>
-<p>
-            The alternative design of the <span class="emphasis"><em>UTF</em></span> initialization
-            requires you to implement a function with the following specification:
-          </p>
-<pre class="programlisting"><span class="keyword">bool</span> <span class="identifier">init_unit_test</span><span class="special">();</span>
-</pre>
-<p>
-            The result value of this function indicates whether or not initialization
-            was successful. To register test units in a master test suite use the
-            <code class="computeroutput"><span class="identifier">test_suite</span><span class="special">::</span><span class="identifier">add</span></code> interface (see <a class="link" href="../../../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_TEST_CASE">here</a>
-            for an example). To access command line arguments use the <a class="link" href="../../../tests_organization/test_organization_test_suite/master_test_suite.html" title="Master Test Suite">master
-            test suite</a> interface. It's guarantied that any framework-specific
-            command line arguments are excluded.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="switching_from_legacy_to_simplif.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../module_initialisation_automated.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/switching_from_legacy_to_simplif.html b/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/switching_from_legacy_to_simplif.html
deleted file mode 100644
index aa3808f5..00000000
--- a/doc/v2/html/boost_test/users_guide/module_initialization/custom_module_initialisation/switching_from_legacy_to_simplif.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Switching from legacy to simplified</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../custom_module_initialisation.html" title="Custom module initialisation">
-<link rel="prev" href="legacy_initialization_function.html" title="Legacy initialization function">
-<link rel="next" href="simplified_initialization_functi.html" title="Simplified initialization function">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="legacy_initialization_function.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="simplified_initialization_functi.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.users_guide.module_initialization.custom_module_initialisation.switching_from_legacy_to_simplif"></a><a class="link" href="switching_from_legacy_to_simplif.html" title="Switching from legacy to simplified">Switching
-          from legacy to simplified</a>
-</h5></div></div></div>
-<p>
-            The test runner interface needs to refer to the initialization function
-            signature. The <span class="emphasis"><em>UTF</em></span> provides the <code class="computeroutput"><span class="keyword">typedef</span></code>
-            that resolves to proper signature in all configurations:
-          </p>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
-  <span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
-<span class="preprocessor">#ifdef</span> <a class="link" href="../../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>
-    <span class="keyword">typedef</span> <span class="keyword">bool</span>        <span class="special">(*</span><span class="identifier">init_unit_test_func</span><span class="special">)();</span>
-<span class="preprocessor">#else</span>
-    <span class="keyword">typedef</span> <span class="identifier">test_suite</span><span class="special">*</span> <span class="special">(*</span><span class="identifier">init_unit_test_func</span><span class="special">)(</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">*</span> <span class="special">[]</span> <span class="special">);</span>
-<span class="preprocessor">#endif</span>
-  <span class="special">}</span>
-<span class="special">}</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="legacy_initialization_function.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../custom_module_initialisation.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="simplified_initialization_functi.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/module_initialization/module_initialisation_automated.html b/doc/v2/html/boost_test/users_guide/module_initialization/module_initialisation_automated.html
deleted file mode 100644
index 4efca293..00000000
--- a/doc/v2/html/boost_test/users_guide/module_initialization/module_initialisation_automated.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Automated generation</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../module_initialization.html" title="Test module initialization">
-<link rel="prev" href="custom_module_initialisation/simplified_initialization_functi.html" title="Simplified initialization function">
-<link rel="next" href="../usage_variants.html" title="Linking with the UTF">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="custom_module_initialisation/simplified_initialization_functi.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../module_initialization.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.module_initialization.module_initialisation_automated"></a><a class="link" href="module_initialisation_automated.html" title="Automated generation">Automated
-        generation</a>
-</h4></div></div></div>
-<p>
-          To automatically generate an empty test module initialization function
-          you need to define <a class="link" href="../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> before including
-          the
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
-<p>
-          header. The value of this define is ignored. Alternatively you can define
-          the macro <a class="link" href="../link_references/link_boost_test_module_macro.html" title="BOOST_TEST_MODULE"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a> to be equal
-          to any string (not necessarily in quotes). This macro causes the same result
-          as <a class="link" href="../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a>, and in addition
-          the macro value becomes the name of the master test suite.
-        </p>
-<div class="important"><table border="0" summary="Important">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../../../doc/src/images/important.png"></td>
-<th align="left">Important</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            For a test module consisting of multiple source files you have to define
-            these flags in a single test file only. Otherwise you end up with multiple
-            instances of the initialization function.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="custom_module_initialisation/simplified_initialization_functi.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../module_initialization.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants.html b/doc/v2/html/boost_test/users_guide/usage_variants.html
old mode 100644
new mode 100755
index a6002113..2484bfde
--- a/doc/v2/html/boost_test/users_guide/usage_variants.html
+++ b/doc/v2/html/boost_test/users_guide/usage_variants.html
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Linking with the UTF</title>
-<link rel="stylesheet" href="../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<title>Linking with the Unit Test Framework</title>
+<link rel="stylesheet" href="../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../index.html" title="Boost.Test">
-<link rel="up" href="../users_guide.html" title="Building a test module with the UTF">
-<link rel="prev" href="module_initialization/module_initialisation_automated.html" title="Automated generation">
-<link rel="next" href="usage_variants/static_lib_variant.html" title="Static library variant">
+<link rel="up" href="../users_guide.html" title="Building a test module with the Unit Test Framework">
+<link rel="prev" href="module_initialization.html" title="Test module initialization">
+<link rel="next" href="link_references.html" title="Macros that control the build behaviours">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,25 +20,16 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="module_initialization/module_initialisation_automated.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="usage_variants/static_lib_variant.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="module_initialization.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_references.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_test.users_guide.usage_variants"></a><a class="link" href="usage_variants.html" title="Linking with the UTF">Linking with the
-      <span class="emphasis"><em>UTF</em></span></a>
+<a name="boost_test.users_guide.usage_variants"></a><a class="link" href="usage_variants.html" title="Linking with the Unit Test Framework">Linking with the
+      <span class="emphasis"><em>Unit Test Framework</em></span></a>
 </h3></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="usage_variants/static_lib_variant.html">Static
-        library variant</a></span></dt>
-<dt><span class="section"><a href="usage_variants/dynamic_lib_variant.html">Dynamic
-        library variant</a></span></dt>
-<dt><span class="section"><a href="usage_variants/single_header_variant.html">The
-        single-header variant of the <span class="emphasis"><em>UTF</em></span></a></span></dt>
-<dt><span class="section"><a href="usage_variants/extern_test_runner_variant.html">The
-        external test runner variant of the <span class="emphasis"><em>UTF</em></span></a></span></dt>
-</dl></div>
 <p>
-        The <span class="emphasis"><em>UTF</em></span> presents you with 4 different variants:
+        The <span class="emphasis"><em>Unit Test Framework</em></span> supports four different usage
+        variants:
       </p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
@@ -60,7 +51,7 @@
         one.
       </p>
 <p>
-        In most cases to compile a test module based on the <span class="emphasis"><em>UTF</em></span>
+        In most cases to compile a test module based on the <span class="emphasis"><em>Unit Test Framework</em></span>
         all you need to include is just the <code class="computeroutput"><a class="link" href="../../header/boost/test/unit_test_hpp.html" title="Header &lt;boost/test/unit_test.hpp&gt;">single
         header</a></code>
       </p>
@@ -68,10 +59,267 @@
 </pre>
 <p>
         This header includes internally most of the other headers that contains the
-        <span class="emphasis"><em>UTF</em></span> definitions. Some advanced features, like the floating
-        point comparison or the logged expectations testing, are defined in independent
-        headers and need to be included explicitly.
+        <span class="emphasis"><em>Unit Test Framework</em></span> definitions. Some advanced features,
+        like the floating point comparison or the logged expectations testing, are
+        defined in independent headers and need to be included explicitly.
       </p>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.usage_variants.static_lib_variant"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.static_lib_variant" title="Static library variant">Static
+        library variant</a>
+</h4></div></div></div>
+<p>
+          The <span class="emphasis"><em>Unit Test Framework</em></span> can be built into a static
+          library. If you opt to link a test module with the <span class="bold"><strong>standalone
+          static library</strong></span>, this usage is called the static library variant
+          of the <span class="emphasis"><em>Unit Test Framework</em></span>.
+        </p>
+<p>
+          The test runner supplied with this variant required you to implement the
+          <span class="bold"><strong>test module</strong></span> initialization function that
+          matches one of the two specifications depending on the compilation flag
+          <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>.
+          If flag isn't defined you are required to match the original specification.
+          If you define the flag <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>
+          during a test module compilation you are required to use the alternative
+          initialization function specification. The <span class="emphasis"><em>Unit Test Framework</em></span>
+          provides an ability to <span class="bold"><strong>automatically generate</strong></span>
+          an empty test module initialization function with correct specification
+          if no custom initialization is required by a test module.
+        </p>
+<p>
+          If you opted to use an alternative initialization API, for a test module
+          to be able to link with prebuilt library, the flag <code class="computeroutput"><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></code>
+          has to be defined both during library and a test module compilation.
+        </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant" title="Dynamic library variant">Dynamic
+        library variant</a>
+</h4></div></div></div>
+<p>
+          In the project with large number of test modules <a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.static_lib_variant" title="Static library variant">the
+          static library variant</a> of the <span class="emphasis"><em>Unit Test Framework</em></span>
+          may cause you to waste a lot of disk space, since the <span class="emphasis"><em>Unit Test
+          Framework</em></span> is linked statically with every test module. The solution
+          is to link with the <span class="emphasis"><em>Unit Test Framework</em></span> built into
+          a dynamic library (dynamic library variant of the <span class="emphasis"><em>Unit Test Framework</em></span>).
+        </p>
+<p>
+          This variant requires you to define the flag <code class="computeroutput"><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></code> either
+          in a makefile or before the header <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></code>
+          inclusion.
+        </p>
+<p>
+          The test runner supplied with this variant requires you to implement the
+          <a class="link" href="../section_glossary.html#ref_test_module">test module</a> initialization function
+          that matches the alternative initialization function signature. The <span class="emphasis"><em>Unit
+          Test Framework</em></span> provides an ability to automatically generate
+          an empty test module initialization function with correct signature if
+          no custom initialization is required by a test module through the definition
+          of the <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> macro.
+        </p>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> may be defined
+            if the macro <code class="computeroutput"><span class="identifier">BOOST_ALL_DYN_LINK</span></code>
+            is defined
+          </p></td></tr>
+</table></div>
+<div class="warning"><table border="0" summary="Warning">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../doc/src/images/warning.png"></td>
+<th align="left">Warning</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            In order to be able to run a test built with the dynamic variant, the
+            operating system should be able to find the dynamic library of the <span class="emphasis"><em>Unit
+            Test Framework</em></span>. This means, for example on Linux and MacOSX
+            respectively, setting the environment variable <code class="computeroutput"><span class="identifier">LD_LIBRARY_PATH</span></code>
+            or <code class="computeroutput"><span class="identifier">DYLD_LIBRARY_PATH</span></code>
+            properly prior to the execution of the test module.
+          </p></td></tr>
+</table></div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_minimal_example"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_minimal_example" title="Minimal example">Minimal
+          example</a>
+</h5></div></div></div>
+<p>
+            A trivial example of dynamic variant of the <span class="emphasis"><em>Unit Test Framework</em></span>
+            would be the following:
+          </p>
+<pre class="programlisting"><span class="preprocessor">#define</span> <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a>
+<span class="preprocessor">#define</span> <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a>
+<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+
+<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span><span class="identifier">my_test</span><span class="special">)</span>
+<span class="special">{</span>
+  <span class="identifier">BOOST_CHECK</span><span class="special">(</span><span class="keyword">true</span><span class="special">);</span>
+<span class="special">}</span>
+</pre>
+<p>
+            Behind the scenes:
+          </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+                <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> tells
+                the compiler/linker to dynamically link against the <span class="emphasis"><em>Unit
+                Test Framework</em></span>
+              </li>
+<li class="listitem">
+                <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> generates
+                a <code class="computeroutput"><span class="identifier">main</span></code> entry point
+                to the test module executable, as well as a generic test registration
+                function, which registers all tests declared with the macros <a class="link" href="../tests_organization/test_cases.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a>,
+                <a class="link" href="../tests_organization/fixtures.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a>,
+                <a class="link" href="../tests_organization/test_cases.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span></code></a>
+                or <a class="link" href="../tests_organization/test_cases.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a>
+                .
+              </li>
+</ul></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_multiple_source_files"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_multiple_source_files" title="Multiple source files">Multiple
+          source files</a>
+</h5></div></div></div>
+<p>
+            The macro <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> defines a <code class="computeroutput"><span class="identifier">main</span></code> function and an automated registration
+            of the tests. If the test module contains several files, only one <code class="computeroutput"><span class="identifier">main</span></code> and one registration function
+            should be defined, which also means that <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> should be defined
+            in one compilation unit only.
+          </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_manual_registration"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_manual_registration" title="Manual test registration">Manual
+          test registration</a>
+</h5></div></div></div>
+<p>
+            The automatic generation of the test module works well with auto-registrated
+            tests (explained in detail <a class="link" href="../tests_organization/test_cases.html" title="Test cases">here</a>),
+            but needs some tweaking for tests registered manually.
+          </p>
+<p>
+            In that case, <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_no_main" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a> may be defined
+            in order to prevent the generation of the test module initialisation.
+          </p>
+<div class="tip"><table border="0" summary="Tip">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../doc/src/images/tip.png"></td>
+<th align="left">Tip</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+              Another advantage of defining <a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_no_main" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a> is that
+              the code for the test module initialisation would then be independant
+              against the static/dynamic variant of the <span class="emphasis"><em>Unit Test Framework</em></span>
+            </p></td></tr>
+</table></div>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+              The name of the test module initialization function is not enforced,
+              since the function is passed as an argument to the test runner.
+            </p></td></tr>
+</table></div>
+</div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.usage_variants.single_header_variant"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.single_header_variant" title="The single-header variant of the Unit Test Framework">The
+        single-header variant of the <span class="emphasis"><em>Unit Test Framework</em></span></a>
+</h4></div></div></div>
+<p>
+          If you prefer to avoid the <span class="bold"><strong>standalone library compilation</strong></span>,
+          you should use the single-header variant of the <span class="emphasis"><em>Unit Test Framework</em></span>.
+          This variant is implemented, as it follows from its name, in the single
+          header
+        </p>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+</pre>
+<p>
+          An inclusion of the header causes the complete implementation of the <span class="emphasis"><em>Unit
+          Test Framework</em></span> to be included as a part of a test module's source
+          file. The header
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
+<p>
+          doesn't have to be included anymore. You don't have to worry about disabling
+          <span class="bold"><strong>auto-linking</strong></span> feature either. It's done
+          in the implementation header already. This variant can't be used with the
+          <span class="bold"><strong>multi-file test module</strong></span>. Otherwise it's
+          almost identical from the usage prospective to the static library variant
+          of the <span class="emphasis"><em>Unit Test Framework</em></span>. In fact the only difference
+          is the name of the include file:
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
+<p>
+          instead of
+        </p>
+<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
+<p>
+          .
+        </p>
+<p>
+          The test runner supplied with this variant requires you to implement the
+          <a class="link" href="../section_glossary.html#ref_test_module">test module</a> initialization function
+          that matches one of the two specifications depending on the compilation
+          flag <code class="computeroutput"><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></code>.
+          If flag isn't defined you are required to match the original specification.
+          If you define the flag <code class="computeroutput"><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></code>
+          during a test module compilation you are required to use the alternative
+          initialization function specification. The <span class="emphasis"><em>Unit Test Framework</em></span>
+          provides an ability to <span class="bold"><strong>automatically generate</strong></span>
+          an empty test module initialization function with correct specification
+          if no custom initialization is required by a test module.
+        </p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="boost_test.users_guide.usage_variants.extern_test_runner_variant"></a><a class="link" href="usage_variants.html#boost_test.users_guide.usage_variants.extern_test_runner_variant" title="The external test runner variant of the Unit Test Framework">The
+        external test runner variant of the <span class="emphasis"><em>Unit Test Framework</em></span></a>
+</h4></div></div></div>
+<p>
+          All other usage variants employ the build-in test runners. If you plan
+          to use an external test runner with your test module you need to build
+          it as a dynamic library. This usage of the <span class="emphasis"><em>Unit Test Framework</em></span>
+          is called the external test runner variant of the <span class="emphasis"><em>Unit Test Framework</em></span>.
+          The variant requires you to define the flag <code class="computeroutput"><a class="link" href="link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></code> either
+          in a makefile or before the header <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></code>
+          inclusion. An external test runner utility is required to link with dynamic
+          library.
+        </p>
+<p>
+          If an external test runner is based on the test runner built in to the
+          dynamic library (like the standalone boost_test_runner utility supplied
+          by the <span class="emphasis"><em>Unit Test Framework</em></span>), it requires you to implement
+          the <a class="link" href="../section_glossary.html#ref_test_module">test module</a> initialization function
+          that matches the alternative initialization function signature. The <span class="emphasis"><em>Unit
+          Test Framework</em></span> provides an ability to <span class="bold"><strong>automatically
+          generate</strong></span> an empty test module initialization function with correct
+          signature if no custom initialization is required by a test module.
+        </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/src/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+            An advanced test runner doesn't have to be based on the build-in one
+            and may require a different test module initialization function signature
+            and/or name.
+          </p></td></tr>
+</table></div>
+</div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
@@ -84,7 +332,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="module_initialization/module_initialisation_automated.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="usage_variants/static_lib_variant.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="module_initialization.html"><img src="../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../users_guide.html"><img src="../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="link_references.html"><img src="../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant.html b/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant.html
deleted file mode 100644
index d9206d92..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Dynamic library variant</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../usage_variants.html" title="Linking with the UTF">
-<link rel="prev" href="static_lib_variant.html" title="Static library variant">
-<link rel="next" href="dynamic_lib_variant/dynamic_lib_variant_minimal_example.html" title="Minimal example">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="static_lib_variant.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant/dynamic_lib_variant_minimal_example.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant"></a><a class="link" href="dynamic_lib_variant.html" title="Dynamic library variant">Dynamic
-        library variant</a>
-</h4></div></div></div>
-<div class="toc"><dl class="toc">
-<dt><span class="section"><a href="dynamic_lib_variant/dynamic_lib_variant_minimal_example.html">Minimal
-          example</a></span></dt>
-<dt><span class="section"><a href="dynamic_lib_variant/dynamic_lib_variant_multiple_source_files.html">Multiple
-          source files</a></span></dt>
-<dt><span class="section"><a href="dynamic_lib_variant/dynamic_lib_variant_manual_registration.html">Manual
-          test registration</a></span></dt>
-</dl></div>
-<p>
-          In the project with large number of test modules <a class="link" href="static_lib_variant.html" title="Static library variant">the
-          static library variant</a> of the <span class="emphasis"><em>UTF</em></span> may cause
-          you to waste a lot of disk space, since the <span class="emphasis"><em>UTF</em></span> is
-          linked statically with every test module. The solution is to link with
-          the <span class="emphasis"><em>UTF</em></span> built into a dynamic library (dynamic library
-          variant of the <span class="emphasis"><em>UTF</em></span>).
-        </p>
-<p>
-          This variant requires you to define the flag <code class="computeroutput"><a class="link" href="../link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></code> either
-          in a makefile or before the header <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></code>
-          inclusion.
-        </p>
-<p>
-          The test runner supplied with this variant requires you to implement the
-          <a class="link" href="../../section_glossary.html#ref_test_module">test module</a> initialization function
-          that matches the alternative initialization function signature. The <span class="emphasis"><em>UTF</em></span>
-          provides an ability to automatically generate an empty test module initialization
-          function with correct signature if no custom initialization is required
-          by a test module through the definition of the <a class="link" href="../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> macro.
-        </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            <a class="link" href="../link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> may be defined
-            if the macro <code class="computeroutput"><span class="identifier">BOOST_ALL_DYN_LINK</span></code>
-            is defined
-          </p></td></tr>
-</table></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../../../doc/src/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            In order to be able to run a test built with the dynamic variant, the
-            operating system should be able to find the dynamic library of the <span class="emphasis"><em>UTF</em></span>.
-            This means, for example on Linux and MacOSX respectively, setting the
-            environment variable <code class="computeroutput"><span class="identifier">LD_LIBRARY_PATH</span></code>
-            or <code class="computeroutput"><span class="identifier">DYLD_LIBRARY_PATH</span></code>
-            properly prior to the execution of the test module.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="static_lib_variant.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant/dynamic_lib_variant_minimal_example.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_manual_registration.html b/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_manual_registration.html
deleted file mode 100644
index dbf8f880..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_manual_registration.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Manual test registration</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../dynamic_lib_variant.html" title="Dynamic library variant">
-<link rel="prev" href="dynamic_lib_variant_multiple_source_files.html" title="Multiple source files">
-<link rel="next" href="../single_header_variant.html" title="The single-header variant of the UTF">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="dynamic_lib_variant_multiple_source_files.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../single_header_variant.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_manual_registration"></a><a class="link" href="dynamic_lib_variant_manual_registration.html" title="Manual test registration">Manual
-          test registration</a>
-</h5></div></div></div>
-<p>
-            The automatic generation of the test module works well with auto-registrated
-            tests (explained in detail <a class="link" href="../../../tests_organization/test_cases.html" title="Test cases">here</a>),
-            but needs some tweaking for tests registered manually.
-          </p>
-<p>
-            In that case, <a class="link" href="../../link_references/link_boost_test_no_main.html" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a> may be defined
-            in order to prevent the generation of the test module initialisation.
-          </p>
-<div class="tip"><table border="0" summary="Tip">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../../../../doc/src/images/tip.png"></td>
-<th align="left">Tip</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-              Another advantage of defining <a class="link" href="../../link_references/link_boost_test_no_main.html" title="BOOST_TEST_NO_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a> is that
-              the code for the test module initialisation would then be independant
-              against the static/dynamic variant of the <span class="emphasis"><em>UTF</em></span>
-            </p></td></tr>
-</table></div>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-              The name of the test module initialization function is not enforced,
-              since the function is passed as an argument to the test runner.
-            </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="dynamic_lib_variant_multiple_source_files.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../single_header_variant.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_minimal_example.html b/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_minimal_example.html
deleted file mode 100644
index 70ba6ce2..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_minimal_example.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Minimal example</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../dynamic_lib_variant.html" title="Dynamic library variant">
-<link rel="prev" href="../dynamic_lib_variant.html" title="Dynamic library variant">
-<link rel="next" href="dynamic_lib_variant_multiple_source_files.html" title="Multiple source files">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant_multiple_source_files.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_minimal_example"></a><a class="link" href="dynamic_lib_variant_minimal_example.html" title="Minimal example">Minimal
-          example</a>
-</h5></div></div></div>
-<p>
-            A trivial example of dynamic variant of the <span class="emphasis"><em>UTF</em></span>
-            would be the following:
-          </p>
-<pre class="programlisting"><span class="preprocessor">#define</span> <a class="link" href="../../link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a>
-<span class="preprocessor">#define</span> <a class="link" href="../../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-
-<span class="identifier">BOOST_AUTO_TEST_CASE</span><span class="special">(</span><span class="identifier">my_test</span><span class="special">)</span>
-<span class="special">{</span>
-  <span class="identifier">BOOST_CHECK</span><span class="special">(</span><span class="keyword">true</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<p>
-            Behind the scenes:
-          </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-                <a class="link" href="../../link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a> tells
-                the compiler/linker to dynamically link against the <span class="emphasis"><em>UTF</em></span>
-              </li>
-<li class="listitem">
-                <a class="link" href="../../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> generates
-                a <code class="computeroutput"><span class="identifier">main</span></code> entry point
-                to the test module executable, as well as a generic test registration
-                function, which registers all tests declared with the macros <a class="link" href="../../../tests_organization/test_cases/test_organization_nullary.html#ref_BOOST_AUTO_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE</span></code></a>,
-                <a class="link" href="../../../tests_organization/fixtures/per_test_case_fixture.html#ref_fixture_test_case"><code class="computeroutput"><span class="identifier">BOOST_FIXTURE_TEST_CASE</span></code></a>,
-                <a class="link" href="../../../tests_organization/test_cases/test_organization_templates.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE"><code class="computeroutput"><span class="identifier">BOOST_AUTO_TEST_CASE_TEMPLATE</span></code></a>
-                or <a class="link" href="../../../tests_organization/test_cases/unary_function_based_test_case.html#ref_BOOST_PARAM_TEST_CASE"><code class="computeroutput"><span class="identifier">BOOST_PARAM_TEST_CASE</span></code></a>
-                .
-              </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant_multiple_source_files.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_multiple_source_files.html b/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_multiple_source_files.html
deleted file mode 100644
index 4b2f84d6..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_multiple_source_files.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Multiple source files</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../index.html" title="Boost.Test">
-<link rel="up" href="../dynamic_lib_variant.html" title="Dynamic library variant">
-<link rel="prev" href="dynamic_lib_variant_minimal_example.html" title="Minimal example">
-<link rel="next" href="dynamic_lib_variant_manual_registration.html" title="Manual test registration">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="dynamic_lib_variant_minimal_example.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant_manual_registration.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_multiple_source_files"></a><a class="link" href="dynamic_lib_variant_multiple_source_files.html" title="Multiple source files">Multiple
-          source files</a>
-</h5></div></div></div>
-<p>
-            The macro <a class="link" href="../../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> defines a <code class="computeroutput"><span class="identifier">main</span></code> function and an automated registration
-            of the tests. If the test module contains several files, only one <code class="computeroutput"><span class="identifier">main</span></code> and one registration function
-            should be defined, which also means that <a class="link" href="../../link_references/link_boost_test_main_macro.html" title="BOOST_TEST_MAIN"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a> should be defined
-            in one compilation unit only.
-          </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="dynamic_lib_variant_minimal_example.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../dynamic_lib_variant.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant_manual_registration.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/extern_test_runner_variant.html b/doc/v2/html/boost_test/users_guide/usage_variants/extern_test_runner_variant.html
deleted file mode 100644
index 306aa7d9..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/extern_test_runner_variant.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The external test runner variant of the UTF</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../usage_variants.html" title="Linking with the UTF">
-<link rel="prev" href="single_header_variant.html" title="The single-header variant of the UTF">
-<link rel="next" href="../link_references.html" title="Macros that control the build behaviours">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="single_header_variant.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../link_references.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.usage_variants.extern_test_runner_variant"></a><a class="link" href="extern_test_runner_variant.html" title="The external test runner variant of the UTF">The
-        external test runner variant of the <span class="emphasis"><em>UTF</em></span></a>
-</h4></div></div></div>
-<p>
-          All other usage variants employ the build-in test runners. If you plan
-          to use an external test runner with your test module you need to build
-          it as a dynamic library. This usage of the <span class="emphasis"><em>UTF</em></span> is
-          called the external test runner variant of the <span class="emphasis"><em>UTF</em></span>.
-          The variant requires you to define the flag <code class="computeroutput"><a class="link" href="../link_references/link_boost_test_dyn_link.html" title="BOOST_TEST_DYN_LINK"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></code> either
-          in a makefile or before the header <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></code>
-          inclusion. An external test runner utility is required to link with dynamic
-          library.
-        </p>
-<p>
-          If an external test runner is based on the test runner built in to the
-          dynamic library (like the standalone boost_test_runner utility supplied
-          by the <span class="emphasis"><em>UTF</em></span>), it requires you to implement the <a class="link" href="../../section_glossary.html#ref_test_module">test module</a> initialization function that
-          matches the alternative initialization function signature. The <span class="emphasis"><em>UTF</em></span>
-          provides an ability to <span class="bold"><strong>automatically generate</strong></span>
-          an empty test module initialization function with correct signature if
-          no custom initialization is required by a test module.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../../doc/src/images/note.png"></td>
-<th align="left">Note</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            An advanced test runner doesn't have to be based on the build-in one
-            and may require a different test module initialization function signature
-            and/or name.
-          </p></td></tr>
-</table></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="single_header_variant.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../link_references.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/single_header_variant.html b/doc/v2/html/boost_test/users_guide/usage_variants/single_header_variant.html
deleted file mode 100644
index 5c61ab53..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/single_header_variant.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>The single-header variant of the UTF</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../usage_variants.html" title="Linking with the UTF">
-<link rel="prev" href="dynamic_lib_variant/dynamic_lib_variant_manual_registration.html" title="Manual test registration">
-<link rel="next" href="extern_test_runner_variant.html" title="The external test runner variant of the UTF">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="dynamic_lib_variant/dynamic_lib_variant_manual_registration.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="extern_test_runner_variant.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.usage_variants.single_header_variant"></a><a class="link" href="single_header_variant.html" title="The single-header variant of the UTF">The
-        single-header variant of the <span class="emphasis"><em>UTF</em></span></a>
-</h4></div></div></div>
-<p>
-          If you prefer to avoid the <span class="bold"><strong>standalone library compilation</strong></span>,
-          you should use the single-header variant of the <span class="emphasis"><em>UTF</em></span>.
-          This variant is implemented, as it follows from its name, in the single
-          header
-        </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<p>
-          An inclusion of the header causes the complete implementation of the <span class="emphasis"><em>UTF</em></span>
-          to be included as a part of a test module's source file. The header
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
-<p>
-          doesn't have to be included anymore. You don't have to worry about disabling
-          <span class="bold"><strong>auto-linking</strong></span> feature either. It's done
-          in the implementation header already. This variant can't be used with the
-          <span class="bold"><strong>multi-file test module</strong></span>. Otherwise it's
-          almost identical from the usage prospective to the static library variant
-          of the <span class="emphasis"><em>UTF</em></span>. In fact the only difference is the name
-          of the include file:
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">included</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
-<p>
-          instead of
-        </p>
-<pre class="programlisting"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">unit_test</span><span class="special">.</span><span class="identifier">hpp</span></pre>
-<p>
-          .
-        </p>
-<p>
-          The test runner supplied with this variant requires you to implement the
-          <a class="link" href="../../section_glossary.html#ref_test_module">test module</a> initialization function
-          that matches one of the two specifications depending on the compilation
-          flag <code class="computeroutput"><a class="link" href="../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></code>.
-          If flag isn't defined you are required to match the original specification.
-          If you define the flag <code class="computeroutput"><a class="link" href="../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></code>
-          during a test module compilation you are required to use the alternative
-          initialization function specification. The <span class="emphasis"><em>UTF</em></span> provides
-          an ability to <span class="bold"><strong>automatically generate</strong></span> an
-          empty test module initialization function with correct specification if
-          no custom initialization is required by a test module.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="dynamic_lib_variant/dynamic_lib_variant_manual_registration.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="extern_test_runner_variant.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/boost_test/users_guide/usage_variants/static_lib_variant.html b/doc/v2/html/boost_test/users_guide/usage_variants/static_lib_variant.html
deleted file mode 100644
index 62827e53..00000000
--- a/doc/v2/html/boost_test/users_guide/usage_variants/static_lib_variant.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Static library variant</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../index.html" title="Boost.Test">
-<link rel="up" href="../usage_variants.html" title="Linking with the UTF">
-<link rel="prev" href="../usage_variants.html" title="Linking with the UTF">
-<link rel="next" href="dynamic_lib_variant.html" title="Dynamic library variant">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="boost_test.users_guide.usage_variants.static_lib_variant"></a><a class="link" href="static_lib_variant.html" title="Static library variant">Static
-        library variant</a>
-</h4></div></div></div>
-<p>
-          The <span class="emphasis"><em>UTF</em></span> can be built into a static library. If you
-          opt to link a test module with the <span class="bold"><strong>standalone static
-          library</strong></span>, this usage is called the static library variant of
-          the <span class="emphasis"><em>UTF</em></span>.
-        </p>
-<p>
-          The test runner supplied with this variant required you to implement the
-          <span class="bold"><strong>test module</strong></span> initialization function that
-          matches one of the two specifications depending on the compilation flag
-          <a class="link" href="../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>.
-          If flag isn't defined you are required to match the original specification.
-          If you define the flag <a class="link" href="../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a>
-          during a test module compilation you are required to use the alternative
-          initialization function specification. The <span class="emphasis"><em>UTF</em></span> provides
-          an ability to <span class="bold"><strong>automatically generate</strong></span> an
-          empty test module initialization function with correct specification if
-          no custom initialization is required by a test module.
-        </p>
-<p>
-          If you opted to use an alternative initialization API, for a test module
-          to be able to link with prebuilt library, the flag <code class="computeroutput"><a class="link" href="../link_references/link_boost_test_alternative_init_macro.html" title="BOOST_TEST_ALTERNATIVE_INIT_API"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></code>
-          has to be defined both during library and a test module compilation.
-        </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../usage_variants.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="dynamic_lib_variant.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/header/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html b/doc/v2/html/header/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html
deleted file mode 100644
index 80a2ab50..00000000
--- a/doc/v2/html/header/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../../../../../../../../index.html" title="Boost.Test">
-<link rel="up" href="../../../../../../../../../boost_test/reference.html" title="Reference">
-<link rel="prev" href="../../../../../../../../../boost_test/reference.html" title="Reference">
-<link rel="next" href="../../../../../../../../../my_exception1.html" title="Struct my_exception1">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../../../../../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../../../../../../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../../../../../../../../../boost_test/reference.html"><img src="../../../../../../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../../../../../../../boost_test/reference.html"><img src="../../../../../../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../../../../../../index.html"><img src="../../../../../../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../../../../../../../my_exception1.html"><img src="../../../../../../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="header..Users.raffi.Personnel.boost_github.libs.test.example.exec_mon_example_cpp"></a>Header &lt;<a href="../../../../../../../../../../../../../..//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp" target="_top">/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp</a>&gt;</h3></div></div></div>
-<pre class="synopsis">
-<span class="keyword">struct</span> <a class="link" href="../../../../../../../../../my_exception1.html" title="Struct my_exception1">my_exception1</a><span class="special">;</span>
-<span class="keyword">struct</span> <a class="link" href="../../../../../../../../../my_exception2.html" title="Struct my_exception2">my_exception2</a><span class="special">;</span>
-<span class="keyword">int</span> <a name="cpp_main"></a><span class="identifier">cpp_main</span><span class="special">(</span><span class="keyword">int</span> argc<span class="special">,</span> <span class="keyword">char</span> <span class="special">*</span><span class="special">)</span><span class="special">;</span></pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../../../../../../../../../boost_test/reference.html"><img src="../../../../../../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../../../../../../../boost_test/reference.html"><img src="../../../../../../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../../../../../../index.html"><img src="../../../../../../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../../../../../../../my_exception1.html"><img src="../../../../../../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/header/boost/test/debug_config_hpp.html b/doc/v2/html/header/boost/test/debug_config_hpp.html
old mode 100644
new mode 100755
index d75b9c66..a2d60398
--- a/doc/v2/html/header/boost/test/debug_config_hpp.html
+++ b/doc/v2/html/header/boost/test/debug_config_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/debug_config.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../boost/debug/break_memory_alloc.html" title="Function break_memory_alloc">
diff --git a/doc/v2/html/header/boost/test/debug_hpp.html b/doc/v2/html/header/boost/test/debug_hpp.html
old mode 100644
new mode 100755
index f6eb55bf..b34bd81a
--- a/doc/v2/html/header/boost/test/debug_hpp.html
+++ b/doc/v2/html/header/boost/test/debug_hpp.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/debug.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
-<link rel="prev" href="../../../my_exception2.html" title="Struct my_exception2">
+<link rel="prev" href="../../../BOOST_DATA_TEST_CASE.html" title="Macro BOOST_DATA_TEST_CASE">
 <link rel="next" href="../../../boost/debug/dbg_startup_info.html" title="Struct dbg_startup_info">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../my_exception2.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/debug/dbg_startup_info.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../BOOST_DATA_TEST_CASE.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/debug/dbg_startup_info.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -56,7 +56,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../my_exception2.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/debug/dbg_startup_info.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../BOOST_DATA_TEST_CASE.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/debug/dbg_startup_info.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/header/boost/test/execution_monitor_hpp.html b/doc/v2/html/header/boost/test/execution_monitor_hpp.html
old mode 100644
new mode 100755
index a934db32..2ae00eb3
--- a/doc/v2/html/header/boost/test/execution_monitor_hpp.html
+++ b/doc/v2/html/header/boost/test/execution_monitor_hpp.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/execution_monitor.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="debug_config_hpp.html" title="Header &lt;boost/test/debug_config.hpp&gt;">
-<link rel="next" href="../../../boost/execution_exception.html" title="Class execution_exception">
+<link rel="next" href="../../../boost/execution_aborted.html" title="Class execution_aborted">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="debug_config_hpp.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/execution_exception.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="debug_config_hpp.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/execution_aborted.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -30,9 +30,9 @@
 
 <a class="link" href="../../../BOOST_TEST_SYS_ASSERT.html" title="Macro BOOST_TEST_SYS_ASSERT">BOOST_TEST_SYS_ASSERT</a>(exp)</pre>
 <pre class="synopsis"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
+  <span class="keyword">class</span> <a class="link" href="../../../boost/execution_aborted.html" title="Class execution_aborted">execution_aborted</a><span class="special">;</span>
   <span class="keyword">class</span> <a class="link" href="../../../boost/execution_exception.html" title="Class execution_exception">execution_exception</a><span class="special">;</span>
   <span class="keyword">class</span> <a class="link" href="../../../boost/execution_monitor.html" title="Class execution_monitor">execution_monitor</a><span class="special">;</span>
-  <span class="keyword">class</span> <a class="link" href="../../../boost/execution_aborted.html" title="Class execution_aborted">execution_aborted</a><span class="special">;</span>
   <span class="keyword">class</span> <a class="link" href="../../../boost/system_error.html" title="Class system_error">system_error</a><span class="special">;</span>
   <span class="keyword">namespace</span> <span class="identifier">fpe</span> <span class="special">{</span>
 
@@ -59,7 +59,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="debug_config_hpp.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/execution_exception.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="debug_config_hpp.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/execution_aborted.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/header/boost/test/framework_hpp.html b/doc/v2/html/header/boost/test/framework_hpp.html
old mode 100644
new mode 100755
index d2cd949d..a6df3e59
--- a/doc/v2/html/header/boost/test/framework_hpp.html
+++ b/doc/v2/html/header/boost/test/framework_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/framework.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../BOOST_TEST_SYS_ASSERT.html" title="Macro BOOST_TEST_SYS_ASSERT">
@@ -25,7 +25,7 @@
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="header.boost.test.framework_hpp"></a>Header &lt;<a href="../../../../../../../../boost/test/framework.hpp" target="_top">boost/test/framework.hpp</a>&gt;</h3></div></div></div>
-<p>Defines Unit Test Framework monostate interfaces. </p>
+<p>Defines Unit Test Framework monostate interfaces. The Unit Test framework is based on Monostate design patern. These interfaces are used to operate on the monostate. </p>
 <pre class="synopsis">
 
 <a class="link" href="../../../BOOST_TEST_SETUP_ASSERT.html" title="Macro BOOST_TEST_SETUP_ASSERT">BOOST_TEST_SETUP_ASSERT</a>(cond, msg)</pre>
@@ -35,17 +35,17 @@
     <span class="keyword">namespace</span> <span class="identifier">framework</span> <span class="special">{</span>
       <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/framework/context_generator.html" title="Struct context_generator">context_generator</a><span class="special">;</span>
       <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/framework/internal_error.html" title="Struct internal_error">internal_error</a><span class="special">;</span>
+      <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/framework/nothing_to_test.html" title="Struct nothing_to_test">nothing_to_test</a><span class="special">;</span>
       <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/framework/setup_error.html" title="Struct setup_error">setup_error</a><span class="special">;</span>
       <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/framework/test_being_aborted.html" title="Struct test_being_aborted">test_being_aborted</a><span class="special">;</span>
-      <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/framework/nothing_to_test.html" title="Struct nothing_to_test">nothing_to_test</a><span class="special">;</span>
       <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/init.html" title="Function init"><span class="identifier">init</span></a><span class="special">(</span><span class="identifier">init_unit_test_func</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
 
       <span class="comment">// This function tells if the framework monostate is initialized. </span>
       <span class="keyword">bool</span> <a name="boost.unit_test.framework.is_initialized"></a><span class="identifier">is_initialized</span><span class="special">(</span><span class="special">)</span><span class="special">;</span>
       <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/shutdown.html" title="Function shutdown"><span class="identifier">shutdown</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
       <a class="link" href="../../../boost/unit_test/test_suite.html" title="Class test_suite">test_suite</a> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/current_auto_test_suite.html" title="Function current_auto_test_suite"><span class="identifier">current_auto_test_suite</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_suite.html" title="Class test_suite">test_suite</a> <span class="special">*</span> <span class="special">=</span> <span class="number">0</span><span class="special">,</span> <span class="keyword">bool</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/register_te_idm18026271216.html" title="Function register_test_unit"><span class="identifier">register_test_unit</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/register_te_idm18026268112.html" title="Function register_test_unit"><span class="identifier">register_test_unit</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_suite.html" title="Class test_suite">test_suite</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/register_test_uni_id329627.html" title="Function register_test_unit"><span class="identifier">register_test_unit</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/register_test_uni_id329651.html" title="Function register_test_unit"><span class="identifier">register_test_unit</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_suite.html" title="Class test_suite">test_suite</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
       <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/deregister_test_unit.html" title="Function deregister_test_unit"><span class="identifier">deregister_test_unit</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
 
       <span class="comment">// Afer this call the framework can be reinitialized to perform a second test run during the same program lifetime. </span>
@@ -60,13 +60,13 @@
       <a class="link" href="../../../boost/unit_test/master_test_suite_t.html" title="Class master_test_suite_t">master_test_suite_t</a> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/master_test_suite.html" title="Function master_test_suite"><span class="identifier">master_test_suite</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
       <a class="link" href="../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="keyword">const</span> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/current_test_case.html" title="Function current_test_case"><span class="identifier">current_test_case</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
       <span class="identifier">test_unit_id</span> <a class="link" href="../../../boost/unit_test/framework/current_test_case_id.html" title="Function current_test_case_id"><span class="identifier">current_test_case_id</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
-      <a class="link" href="../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/get_idm18026239664.html" title="Function get"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="identifier">test_unit_type</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> UnitType<span class="special">&gt;</span> <span class="identifier">UnitType</span> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/get_idm18026235296.html" title="Function template get"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/run_idm18026230112.html" title="Function run"><span class="identifier">run</span></a><span class="special">(</span><span class="identifier">test_unit_id</span> <span class="special">=</span> <span class="identifier">INV_TEST_UNIT_ID</span><span class="special">,</span> <span class="keyword">bool</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span>
+      <a class="link" href="../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/get_id327620.html" title="Function get"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">,</span> <span class="identifier">test_unit_type</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> UnitType<span class="special">&gt;</span> <span class="identifier">UnitType</span> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/framework/get_id327660.html" title="Function template get"><span class="identifier">get</span></a><span class="special">(</span><span class="identifier">test_unit_id</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/framework/run_id327716.html" title="Function run"><span class="identifier">run</span></a><span class="special">(</span><span class="identifier">test_unit_id</span> <span class="special">=</span> <span class="identifier">INV_TEST_UNIT_ID</span><span class="special">,</span> <span class="keyword">bool</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span>
 
       <span class="comment">// Initiates test execution. Same as other overload. </span>
-      <span class="keyword">void</span> <a name="boost.unit_test.framework.run_idm18026225520"></a><span class="identifier">run</span><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">*</span> tu<span class="special">,</span> <span class="keyword">bool</span> continue_test <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">void</span> <a name="boost.unit_test.framework.assertion_r_idm18026222592"></a><span class="identifier">assertion_result</span><span class="special">(</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">assertion_result</span> ar<span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a name="boost.unit_test.framework.run_id327742"></a><span class="identifier">run</span><span class="special">(</span><a class="link" href="../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a> <span class="keyword">const</span> <span class="special">*</span> tu<span class="special">,</span> <span class="keyword">bool</span> continue_test <span class="special">=</span> <span class="keyword">true</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a name="boost.unit_test.framework.assertion_result_id327789"></a><span class="identifier">assertion_result</span><span class="special">(</span><span class="identifier">unit_test</span><span class="special">::</span><span class="identifier">assertion_result</span> ar<span class="special">)</span><span class="special">;</span>
 
       <span class="comment">// Reports uncaught exception to all test observers. </span>
       <span class="keyword">void</span> <a name="boost.unit_test.framework.exception_caught"></a><span class="identifier">exception_caught</span><span class="special">(</span><a class="link" href="../../../boost/execution_exception.html" title="Class execution_exception">execution_exception</a> <span class="keyword">const</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
diff --git a/doc/v2/html/header/boost/test/output/compiler_log_formatter_hpp.html b/doc/v2/html/header/boost/test/output/compiler_log_formatter_hpp.html
old mode 100644
new mode 100755
index b349ae9c..3ac50002
--- a/doc/v2/html/header/boost/test/output/compiler_log_formatter_hpp.html
+++ b/doc/v2/html/header/boost/test/output/compiler_log_formatter_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/output/compiler_log_formatter.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../../BOOST_TEST_SETUP_ASSERT.html" title="Macro BOOST_TEST_SETUP_ASSERT">
diff --git a/doc/v2/html/header/boost/test/output/plain_report_formatter_hpp.html b/doc/v2/html/header/boost/test/output/plain_report_formatter_hpp.html
old mode 100644
new mode 100755
index 7d12bd04..28c0b9a5
--- a/doc/v2/html/header/boost/test/output/plain_report_formatter_hpp.html
+++ b/doc/v2/html/header/boost/test/output/plain_report_formatter_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/output/plain_report_formatter.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../../boost/unit_test/output/compiler_log_formatter.html" title="Class compiler_log_formatter">
diff --git a/doc/v2/html/header/boost/test/output/xml_log_formatter_hpp.html b/doc/v2/html/header/boost/test/output/xml_log_formatter_hpp.html
old mode 100644
new mode 100755
index 9f5dfdff..8fad21fb
--- a/doc/v2/html/header/boost/test/output/xml_log_formatter_hpp.html
+++ b/doc/v2/html/header/boost/test/output/xml_log_formatter_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/output/xml_log_formatter.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../../boost/unit_test/output/plain_report_formatter.html" title="Class plain_report_formatter">
diff --git a/doc/v2/html/header/boost/test/output/xml_report_formatter_hpp.html b/doc/v2/html/header/boost/test/output/xml_report_formatter_hpp.html
old mode 100644
new mode 100755
index 201c0253..3ae68249
--- a/doc/v2/html/header/boost/test/output/xml_report_formatter_hpp.html
+++ b/doc/v2/html/header/boost/test/output/xml_report_formatter_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/output/xml_report_formatter.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../../boost/unit_test/output/xml_log_formatter.html" title="Class xml_log_formatter">
diff --git a/doc/v2/html/header/boost/test/parameterized_test_hpp.html b/doc/v2/html/header/boost/test/parameterized_test_hpp.html
old mode 100644
new mode 100755
index 8798fc88..634901af
--- a/doc/v2/html/header/boost/test/parameterized_test_hpp.html
+++ b/doc/v2/html/header/boost/test/parameterized_test_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/parameterized_test.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../boost/unit_test/output/xml_report_formatter.html" title="Class xml_report_formatter">
@@ -25,6 +25,7 @@
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="header.boost.test.parameterized_test_hpp"></a>Header &lt;<a href="../../../../../../../../boost/test/parameterized_test.hpp" target="_top">boost/test/parameterized_test.hpp</a>&gt;</h3></div></div></div>
+<p>generators and helper macros for parameterized tests </p>
 <pre class="synopsis">
 
 <a class="link" href="../../../BOOST_PARAM_TEST_CASE.html" title="Macro BOOST_PARAM_TEST_CASE">BOOST_PARAM_TEST_CASE</a>(function, begin, end)
@@ -32,17 +33,17 @@
 <pre class="synopsis"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
   <span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> ParamType<span class="special">,</span> <span class="keyword">typename</span> ParamIter<span class="special">&gt;</span> 
-      <span class="emphasis"><em><span class="identifier">unspecified</span></em></span> <a name="boost.unit_test.make_test_c_idm18026024320"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="identifier">ParamType</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">,</span> 
+      <span class="emphasis"><em><span class="identifier">unspecified</span></em></span> <a name="boost.unit_test.make_test_case_id329298"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="identifier">ParamType</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">,</span> 
                                  <span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> 
                                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> <span class="identifier">ParamIter</span> par_begin<span class="special">,</span> 
                                  <span class="identifier">ParamIter</span> par_end<span class="special">)</span><span class="special">;</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> ParamType<span class="special">,</span> <span class="keyword">typename</span> ParamIter<span class="special">&gt;</span> 
-      <span class="emphasis"><em><span class="identifier">unspecified</span></em></span> <a name="boost.unit_test.make_test_c_idm18026018240"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="keyword">void</span><span class="special">(</span><span class="special">*</span><span class="special">)</span><span class="special">(</span><span class="identifier">ParamType</span><span class="special">)</span> test_func<span class="special">,</span> 
+      <span class="emphasis"><em><span class="identifier">unspecified</span></em></span> <a name="boost.unit_test.make_test_case_id332523"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="keyword">void</span><span class="special">(</span><span class="special">*</span><span class="special">)</span><span class="special">(</span><span class="identifier">ParamType</span><span class="special">)</span> test_func<span class="special">,</span> 
                                  <span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> 
                                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> <span class="identifier">ParamIter</span> par_begin<span class="special">,</span> 
                                  <span class="identifier">ParamIter</span> par_end<span class="special">)</span><span class="special">;</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> UserTestCase<span class="special">,</span> <span class="keyword">typename</span> ParamType<span class="special">,</span> <span class="keyword">typename</span> ParamIter<span class="special">&gt;</span> 
-      <span class="emphasis"><em><span class="identifier">unspecified</span></em></span> <a name="boost.unit_test.make_test_c_idm18026012176"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="keyword">void</span><span class="special">(</span><span class="identifier">UserTestCase</span><span class="special">::</span><span class="special">*</span><span class="special">)</span><span class="special">(</span><span class="identifier">ParamType</span><span class="special">)</span> test_method<span class="special">,</span> 
+      <span class="emphasis"><em><span class="identifier">unspecified</span></em></span> <a name="boost.unit_test.make_test_case_id332554"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="keyword">void</span><span class="special">(</span><span class="identifier">UserTestCase</span><span class="special">::</span><span class="special">*</span><span class="special">)</span><span class="special">(</span><span class="identifier">ParamType</span><span class="special">)</span> test_method<span class="special">,</span> 
                                  <span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> 
                                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> 
                                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">shared_ptr</span><span class="special">&lt;</span> <span class="identifier">UserTestCase</span> <span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> user_test_case<span class="special">,</span> 
diff --git a/doc/v2/html/header/boost/test/progress_monitor_hpp.html b/doc/v2/html/header/boost/test/progress_monitor_hpp.html
old mode 100644
new mode 100755
index db4097ed..4cd17378
--- a/doc/v2/html/header/boost/test/progress_monitor_hpp.html
+++ b/doc/v2/html/header/boost/test/progress_monitor_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/progress_monitor.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../BOOST_PARAM_CLASS_TEST_CASE.html" title="Macro BOOST_PARAM_CLASS_TEST_CASE">
diff --git a/doc/v2/html/header/boost/test/results_collector_hpp.html b/doc/v2/html/header/boost/test/results_collector_hpp.html
old mode 100644
new mode 100755
index fb7341ea..4f799fac
--- a/doc/v2/html/header/boost/test/results_collector_hpp.html
+++ b/doc/v2/html/header/boost/test/results_collector_hpp.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/results_collector.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../boost/unit_test/progress_monitor_t.html" title="Class progress_monitor_t">
-<link rel="next" href="../../../boost/unit_test/test_results.html" title="Class test_results">
+<link rel="next" href="../../../boost/unit_test/results_collector_t.html" title="Class results_collector_t">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../boost/unit_test/progress_monitor_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/test_results.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../boost/unit_test/progress_monitor_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/results_collector_t.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -29,8 +29,8 @@
 <p>Defines class results_collector_t that is responsible for gathering test results and class test_results for presenting this information to end-user </p>
 <pre class="synopsis"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
   <span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
-    <span class="keyword">class</span> <a class="link" href="../../../boost/unit_test/test_results.html" title="Class test_results">test_results</a><span class="special">;</span>
     <span class="keyword">class</span> <a class="link" href="../../../boost/unit_test/results_collector_t.html" title="Class results_collector_t">results_collector_t</a><span class="special">;</span>
+    <span class="keyword">class</span> <a class="link" href="../../../boost/unit_test/test_results.html" title="Class test_results">test_results</a><span class="special">;</span>
   <span class="special">}</span>
 <span class="special">}</span></pre>
 </div>
@@ -45,7 +45,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../boost/unit_test/progress_monitor_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/test_results.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../boost/unit_test/progress_monitor_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/results_collector_t.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/header/boost/test/results_reporter_hpp.html b/doc/v2/html/header/boost/test/results_reporter_hpp.html
old mode 100644
new mode 100755
index 458947e8..b54c65fb
--- a/doc/v2/html/header/boost/test/results_reporter_hpp.html
+++ b/doc/v2/html/header/boost/test/results_reporter_hpp.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/results_reporter.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
-<link rel="prev" href="../../../boost/unit_test/results_collector_t.html" title="Class results_collector_t">
+<link rel="prev" href="../../../boost/unit_test/test_results.html" title="Class test_results">
 <link rel="next" href="../../../boost/unit_test/results_reporter/format.html" title="Class format">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../boost/unit_test/results_collector_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/results_reporter/format.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../boost/unit_test/test_results.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/results_reporter/format.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -33,8 +33,8 @@
       <span class="keyword">class</span> <a class="link" href="../../../boost/unit_test/results_reporter/format.html" title="Class format">format</a><span class="special">;</span>
       <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/results_reporter/set_level.html" title="Function set_level"><span class="identifier">set_level</span></a><span class="special">(</span><span class="identifier">report_level</span><span class="special">)</span><span class="special">;</span>
       <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/results_reporter/set_stream.html" title="Function set_stream"><span class="identifier">set_stream</span></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/results_reporter/set_format_idm18025942784.html" title="Function set_format"><span class="identifier">set_format</span></a><span class="special">(</span><span class="identifier">output_format</span><span class="special">)</span><span class="special">;</span>
-      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/results_reporter/set_format_idm18025938864.html" title="Function set_format"><span class="identifier">set_format</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/results_reporter/format.html" title="Class format">results_reporter::format</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/results_reporter/set_format_id333050.html" title="Function set_format"><span class="identifier">set_format</span></a><span class="special">(</span><span class="identifier">output_format</span><span class="special">)</span><span class="special">;</span>
+      <span class="keyword">void</span> <a class="link" href="../../../boost/unit_test/results_reporter/set_format_id333122.html" title="Function set_format"><span class="identifier">set_format</span></a><span class="special">(</span><a class="link" href="../../../boost/unit_test/results_reporter/format.html" title="Class format">results_reporter::format</a> <span class="special">*</span><span class="special">)</span><span class="special">;</span>
       <span class="identifier">std</span><span class="special">::</span><span class="identifier">ostream</span> <span class="special">&amp;</span> <a class="link" href="../../../boost/unit_test/results_reporter/get_stream.html" title="Function get_stream"><span class="identifier">get_stream</span></a><span class="special">(</span><span class="special">)</span><span class="special">;</span>
       <span class="keyword">void</span> <a name="boost.unit_test.results_reporter.make_report"></a><span class="identifier">make_report</span><span class="special">(</span><span class="identifier">report_level</span> l <span class="special">=</span> <span class="identifier">INV_REPORT_LEVEL</span><span class="special">,</span> 
                        <span class="identifier">test_unit_id</span> <span class="special">=</span> <span class="identifier">INV_TEST_UNIT_ID</span><span class="special">)</span><span class="special">;</span>
@@ -56,7 +56,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../boost/unit_test/results_collector_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/results_reporter/format.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../boost/unit_test/test_results.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/results_reporter/format.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/header/boost/test/tools/assertion_result_hpp.html b/doc/v2/html/header/boost/test/tools/assertion_result_hpp.html
old mode 100644
new mode 100755
index 54d9ff54..d8272bfa
--- a/doc/v2/html/header/boost/test/tools/assertion_result_hpp.html
+++ b/doc/v2/html/header/boost/test/tools/assertion_result_hpp.html
@@ -2,8 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/tools/assertion_result.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../../boost/unit_test/results_reporter/get_stream.html" title="Function get_stream">
diff --git a/doc/v2/html/header/boost/test/tree/test_unit_hpp.html b/doc/v2/html/header/boost/test/tree/test_unit_hpp.html
old mode 100644
new mode 100755
index 5213d15e..7efb77af
--- a/doc/v2/html/header/boost/test/tree/test_unit_hpp.html
+++ b/doc/v2/html/header/boost/test/tree/test_unit_hpp.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/tree/test_unit.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../../boost/test_tools/assertion_result/dummy.html" title="Struct dummy">
-<link rel="next" href="../../../../boost/unit_test/test_unit.html" title="Class test_unit">
+<link rel="next" href="../../../../boost/unit_test/master_test_suite_t.html" title="Class master_test_suite_t">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,23 +20,23 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../../boost/test_tools/assertion_result/dummy.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../../boost_test/reference.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../../boost/unit_test/test_unit.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../../boost/test_tools/assertion_result/dummy.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../../boost_test/reference.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../../boost/unit_test/master_test_suite_t.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="header.boost.test.tree.test_unit_hpp"></a>Header &lt;<a href="../../../../../../../../../boost/test/tree/test_unit.hpp" target="_top">boost/test/tree/test_unit.hpp</a>&gt;</h3></div></div></div>
 <pre class="synopsis"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
   <span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
-    <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a><span class="special">;</span>
-    <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a><span class="special">;</span>
+    <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/master_test_suite_t.html" title="Class master_test_suite_t">master_test_suite_t</a><span class="special">;</span>
     <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a><span class="special">;</span>
     <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/test_suite.html" title="Class test_suite">test_suite</a><span class="special">;</span>
-    <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/master_test_suite_t.html" title="Class master_test_suite_t">master_test_suite_t</a><span class="special">;</span>
-    <a class="link" href="../../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="special">*</span> <a name="boost.unit_test.make_test_c_idm18020475152"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">,</span> 
+    <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/test_unit.html" title="Class test_unit">test_unit</a><span class="special">;</span>
+    <span class="keyword">class</span> <a class="link" href="../../../../boost/unit_test/test_unit_generator.html" title="Class test_unit_generator">test_unit_generator</a><span class="special">;</span>
+    <a class="link" href="../../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="special">*</span> <a name="boost.unit_test.make_test_case_id332378"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">function</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="special">)</span><span class="special">&gt;</span> <span class="keyword">const</span> <span class="special">&amp;</span> test_func<span class="special">,</span> 
                                <span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> 
                                <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">)</span><span class="special">;</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> UserTestCase<span class="special">,</span> <span class="keyword">typename</span> InstanceType<span class="special">&gt;</span> 
-      <a class="link" href="../../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="special">*</span> <a name="boost.unit_test.make_test_c_idm18020471504"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="keyword">void</span><span class="special">(</span><span class="identifier">UserTestCase</span><span class="special">::</span><span class="special">*</span><span class="special">)</span><span class="special">(</span><span class="special">)</span> test_method<span class="special">,</span> 
+      <a class="link" href="../../../../boost/unit_test/test_case.html" title="Class test_case">test_case</a> <span class="special">*</span> <a name="boost.unit_test.make_test_case_id332421"></a><span class="identifier">make_test_case</span><span class="special">(</span><span class="keyword">void</span><span class="special">(</span><span class="identifier">UserTestCase</span><span class="special">::</span><span class="special">*</span><span class="special">)</span><span class="special">(</span><span class="special">)</span> test_method<span class="special">,</span> 
                                  <span class="identifier">const_string</span> tc_name<span class="special">,</span> <span class="identifier">const_string</span> tc_file<span class="special">,</span> 
                                  <span class="identifier">std</span><span class="special">::</span><span class="identifier">size_t</span> tc_line<span class="special">,</span> 
                                  <span class="identifier">boost</span><span class="special">::</span><span class="identifier">shared_ptr</span><span class="special">&lt;</span> <span class="identifier">InstanceType</span> <span class="special">&gt;</span> user_test_case<span class="special">)</span><span class="special">;</span>
@@ -54,7 +54,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../../boost/test_tools/assertion_result/dummy.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../../boost_test/reference.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../../boost/unit_test/test_unit.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../../boost/test_tools/assertion_result/dummy.html"><img src="../../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../../boost_test/reference.html"><img src="../../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../../boost/unit_test/master_test_suite_t.html"><img src="../../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/header/boost/test/unit_test_hpp.html b/doc/v2/html/header/boost/test/unit_test_hpp.html
old mode 100644
new mode 100755
index 7b171ae1..346e9c63
--- a/doc/v2/html/header/boost/test/unit_test_hpp.html
+++ b/doc/v2/html/header/boost/test/unit_test_hpp.html
@@ -2,11 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/unit_test.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
-<link rel="prev" href="../../../boost/unit_test/master_test_suite_t.html" title="Class master_test_suite_t">
+<link rel="prev" href="../../../boost/unit_test/test_unit_generator.html" title="Class test_unit_generator">
 <link rel="next" href="../../../BOOST_LIB_NAME.html" title="Macro BOOST_LIB_NAME">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../boost/unit_test/master_test_suite_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../boost/unit_test/test_unit_generator.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -47,7 +47,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../boost/unit_test/master_test_suite_t.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../boost/unit_test/test_unit_generator.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/header/boost/test/unit_test_log_formatter_hpp.html b/doc/v2/html/header/boost/test/unit_test_log_formatter_hpp.html
old mode 100644
new mode 100755
index a0b3b8c0..73e2516b
--- a/doc/v2/html/header/boost/test/unit_test_log_formatter_hpp.html
+++ b/doc/v2/html/header/boost/test/unit_test_log_formatter_hpp.html
@@ -2,12 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Header &lt;boost/test/unit_test_log_formatter.hpp&gt;</title>
-<link rel="stylesheet" href="../../../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="../../../boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../../../index.html" title="Boost.Test">
 <link rel="up" href="../../../boost_test/reference.html" title="Reference">
 <link rel="prev" href="../../../BOOST_LIB_NAME.html" title="Macro BOOST_LIB_NAME">
-<link rel="next" href="../../../boost/unit_test/log_entry_data.html" title="Struct log_entry_data">
+<link rel="next" href="../../../boost/unit_test/log_checkpoint_data.html" title="Struct log_checkpoint_data">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/log_entry_data.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/log_checkpoint_data.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
@@ -29,8 +29,8 @@
 <p>You can define a class with implements this interface and use an instance of it as a Unit Test Framework log formatter </p>
 <pre class="synopsis"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>
   <span class="keyword">namespace</span> <span class="identifier">unit_test</span> <span class="special">{</span>
-    <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/log_entry_data.html" title="Struct log_entry_data">log_entry_data</a><span class="special">;</span>
     <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/log_checkpoint_data.html" title="Struct log_checkpoint_data">log_checkpoint_data</a><span class="special">;</span>
+    <span class="keyword">struct</span> <a class="link" href="../../../boost/unit_test/log_entry_data.html" title="Struct log_entry_data">log_entry_data</a><span class="special">;</span>
 
     <span class="keyword">class</span> <a class="link" href="../../../boost/unit_test/unit_test_log_formatter.html" title="Class unit_test_log_formatter">unit_test_log_formatter</a><span class="special">;</span>
   <span class="special">}</span>
@@ -47,7 +47,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/log_entry_data.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../../../BOOST_LIB_NAME.html"><img src="../../../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../../../boost_test/reference.html"><img src="../../../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../../../boost/unit_test/log_checkpoint_data.html"><img src="../../../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
diff --git a/doc/v2/html/index.html b/doc/v2/html/index.html
old mode 100644
new mode 100755
index 17e5cc54..0ea6da1c
--- a/doc/v2/html/index.html
+++ b/doc/v2/html/index.html
@@ -2,10 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Boost.Test</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="stylesheet" href="boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Test">
-<link rel="next" href="boost_test/intro.html" title="What is Boost.Test?">
+<link rel="next" href="boost_test/intro.html" title="Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -36,88 +36,100 @@
 </div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
-<dt><span class="section"><a href="boost_test/intro.html">What is Boost.Test?</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/intro/objective_and_content.html">Objective and
-      content</a></span></dt>
-<dt><span class="section"><a href="boost_test/intro/features_implemented.html">Features implemented</a></span></dt>
-<dt><span class="section"><a href="boost_test/intro/portability_concerns.html">Portability concerns</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="boost_test/how_to_read_this_documentation.html">How to read
-    this documentation?</a></span></dt>
-<dt><span class="section"><a href="boost_test/tutorial.html">Tutorials</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/tutorial/hello.html">Hello the testing world!</a></span></dt>
-<dt><span class="section"><a href="boost_test/tutorial/bt_and_tdd.html">Boost.Test driven development</a></span></dt>
-</dl></dd>
+<dl>
+<dt><span class="section"><a href="boost_test/intro.html">Introduction</a></span></dt>
+<dd><dl><dt><span class="section"><a href="boost_test/intro/how_to_read_this_documentation.html">How
+      to read this documentation?</a></span></dt></dl></dd>
 <dt><span class="section"><a href="boost_test/users_guide.html">Building a test module with the
-    <span class="emphasis"><em>UTF</em></span></a></span></dt>
+    <span class="emphasis"><em>Unit Test Framework</em></span></a></span></dt>
 <dd><dl>
 <dt><span class="section"><a href="boost_test/users_guide/module_initialization.html">Test module
       initialization</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/users_guide/module_initialization/custom_module_initialisation.html">Custom
+<dt><span class="section"><a href="boost_test/users_guide/module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation">Custom
         module initialisation</a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/module_initialization/module_initialisation_automated.html">Automated
+<dd><dl>
+<dt><span class="section"><a href="boost_test/users_guide/module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.legacy_initialization_function">Legacy
+          initialization function</a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.switching_from_legacy_to_simplif">Switching
+          from legacy to simplified</a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/module_initialization.html#boost_test.users_guide.module_initialization.custom_module_initialisation.simplified_initialization_functi">Simplified
+          initialization function</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_test/users_guide/module_initialization.html#boost_test.users_guide.module_initialization.module_initialisation_automated">Automated
         generation</a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="boost_test/users_guide/usage_variants.html">Linking with the
-      <span class="emphasis"><em>UTF</em></span></a></span></dt>
+      <span class="emphasis"><em>Unit Test Framework</em></span></a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/users_guide/usage_variants/static_lib_variant.html">Static
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.static_lib_variant">Static
         library variant</a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/usage_variants/dynamic_lib_variant.html">Dynamic
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant">Dynamic
         library variant</a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/usage_variants/single_header_variant.html">The
-        single-header variant of the <span class="emphasis"><em>UTF</em></span></a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/usage_variants/extern_test_runner_variant.html">The
-        external test runner variant of the <span class="emphasis"><em>UTF</em></span></a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_minimal_example">Minimal
+          example</a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_multiple_source_files">Multiple
+          source files</a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.dynamic_lib_variant.dynamic_lib_variant_manual_registration">Manual
+          test registration</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.single_header_variant">The
+        single-header variant of the <span class="emphasis"><em>Unit Test Framework</em></span></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/usage_variants.html#boost_test.users_guide.usage_variants.extern_test_runner_variant">The
+        external test runner variant of the <span class="emphasis"><em>Unit Test Framework</em></span></a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="boost_test/users_guide/link_references.html">Macros that control
       the build behaviours</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/users_guide/link_references/link_boost_test_main_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/link_references/link_boost_test_alternative_init_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/link_references/link_boost_test_no_lib.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/link_references/link_boost_test_dyn_link.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/link_references/link_boost_test_no_main.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/users_guide/link_references/link_boost_test_module_macro.html"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_main_macro"><code class="computeroutput"><span class="identifier">BOOST_TEST_MAIN</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_alternative_init_macro"><code class="computeroutput"><span class="identifier">BOOST_TEST_ALTERNATIVE_INIT_API</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_no_lib"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_LIB</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_dyn_link"><code class="computeroutput"><span class="identifier">BOOST_TEST_DYN_LINK</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_no_main"><code class="computeroutput"><span class="identifier">BOOST_TEST_NO_MAIN</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/users_guide/link_references.html#boost_test.users_guide.link_references.link_boost_test_module_macro"><code class="computeroutput"><span class="identifier">BOOST_TEST_MODULE</span></code></a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="section"><a href="boost_test/tests_organization.html">Registering, generating
-    and organizing the unit tests</a></span></dt>
+<dt><span class="section"><a href="boost_test/tests_organization.html">Test organization using
+    the <span class="emphasis"><em>Unit Test Framework</em></span></a></span></dt>
 <dd><dl>
 <dt><span class="section"><a href="boost_test/tests_organization/test_cases.html">Test cases</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/tests_organization/test_cases/test_organization_nullary.html">Nullary
-        function based test case</a></span></dt>
-<dt><span class="section"><a href="boost_test/tests_organization/test_cases/unary_function_based_test_case.html">Unary
-        function based test case</a></span></dt>
-<dt><span class="section"><a href="boost_test/tests_organization/test_cases/test_organization_templates.html">Template
+<dt><span class="section"><a href="boost_test/tests_organization/test_cases.html#boost_test.tests_organization.test_cases.test_organization_nullary">Non-parameterized
         test cases</a></span></dt>
+<dt><span class="section"><a href="boost_test/tests_organization/test_cases.html#boost_test.tests_organization.test_cases.test_organization_unary">Parameterized
+        test cases</a></span></dt>
+<dt><span class="section"><a href="boost_test/tests_organization/test_cases.html#boost_test.tests_organization.test_cases.test_organization_templates">Template
+        test cases</a></span></dt>
+<dt><span class="section"><a href="boost_test/tests_organization/test_cases.html#boost_test.tests_organization.test_cases.test_case_generation">Generation
+        of test case parameters</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_test/tests_organization/test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets">Datasets</a></span></dt>
+<dt><span class="section"><a href="boost_test/tests_organization/test_cases.html#boost_test.tests_organization.test_cases.test_case_generation.datasets_auto_registration">Declaring
+          test case with datasets</a></span></dt>
+</dl></dd>
 </dl></dd>
 <dt><span class="section"><a href="boost_test/tests_organization/test_organization_test_suite.html">Test
       suite</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/tests_organization/test_organization_test_suite/master_test_suite.html">Master
+<dt><span class="section"><a href="boost_test/tests_organization/test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.master_test_suite">Master
         Test Suite</a></span></dt>
-<dt><span class="section"><a href="boost_test/tests_organization/test_organization_test_suite/test_suite_expected_failure.html">Expected
+<dt><span class="section"><a href="boost_test/tests_organization/test_organization_test_suite.html#boost_test.tests_organization.test_organization_test_suite.test_suite_expected_failure">Expected
         failures specification</a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="boost_test/tests_organization/fixtures.html">Fixtures</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/tests_organization/fixtures/generic_fixture_model.html">Generic
+<dt><span class="section"><a href="boost_test/tests_organization/fixtures.html#boost_test.tests_organization.fixtures.generic_fixture_model">Generic
         fixture model</a></span></dt>
-<dt><span class="section"><a href="boost_test/tests_organization/fixtures/per_test_case_fixture.html">Per
+<dt><span class="section"><a href="boost_test/tests_organization/fixtures.html#boost_test.tests_organization.fixtures.per_test_case_fixture">Per
         test case fixture</a></span></dt>
-<dt><span class="section"><a href="boost_test/tests_organization/fixtures/test_suite_level_fixture.html">Test
+<dt><span class="section"><a href="boost_test/tests_organization/fixtures.html#boost_test.tests_organization.fixtures.test_suite_level_fixture">Test
         suite level fixture</a></span></dt>
-<dt><span class="section"><a href="boost_test/tests_organization/fixtures/global_fixture.html">Global
+<dt><span class="section"><a href="boost_test/tests_organization/fixtures.html#boost_test.tests_organization.fixtures.global_fixture">Global
         fixture</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="section"><a href="boost_test/testing_tools.html">The <span class="emphasis"><em>UTF</em></span>
+<dt><span class="section"><a href="boost_test/testing_tools.html">The <span class="emphasis"><em>Unit Test Framework</em></span>
     testing tools</a></span></dt>
 <dd><dl>
 <dt><span class="section"><a href="boost_test/testing_tools/tools_assertion_severity_level.html">Assertion
@@ -128,9 +140,32 @@
       streams testing tool</a></span></dt>
 <dt><span class="section"><a href="boost_test/testing_tools/testing_floating_points.html">Floating-point
       testing</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html">Reference</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level">BOOST_&lt;level&gt;</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_bitwise_eq">BOOST_&lt;level&gt;_BITWISE_EQUAL</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq">BOOST_&lt;level&gt;_EQUAL</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq_collections">BOOST_&lt;level&gt;_EQUAL_COLLECTIONS</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_close">BOOST_&lt;level&gt;_CLOSE</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_close_fraction">BOOST_&lt;level&gt;_CLOSE_FRACTION</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_exception">BOOST_&lt;level&gt;_EXCEPTION</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_ge">BOOST_&lt;level&gt;_GE</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_gt">BOOST_&lt;level&gt;_GT</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_le">BOOST_&lt;level&gt;_LE</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_lt">BOOST_&lt;level&gt;_LT</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_message">BOOST_&lt;level&gt;_MESSAGE</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_ne">BOOST_&lt;level&gt;_NE</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_no_throw">BOOST_&lt;level&gt;_NO_THROW</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_predicate">BOOST_&lt;level&gt;_PREDICATE</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_small">BOOST_&lt;level&gt;_SMALL</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_level_throw">BOOST_&lt;level&gt;_THROW</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_error">BOOST_ERROR</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_fail">BOOST_FAIL</a></span></dt>
+<dt><span class="section"><a href="boost_test/testing_tools/testing_tool_ref.html#boost_test.testing_tools.testing_tool_ref.assertion_boost_is_defined">BOOST_IS_DEFINED</a></span></dt>
+</dl></dd>
 </dl></dd>
 <dt><span class="section"><a href="boost_test/test_output.html">Controlling
-    the outputs</a></span></dt>
+    the <span class="emphasis"><em>Unit Test Framework</em></span> outputs</a></span></dt>
 <dd><dl>
 <dt><span class="section"><a href="boost_test/test_output/test_log_output.html">Test log output</a></span></dt>
 <dt><span class="section"><a href="boost_test/test_output/log_runtime_config.html">Configuring
@@ -149,122 +184,85 @@
 <dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration.html">Compile
       time configuration</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration/log_ct_output_stream_redirection.html">Log
+<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_output_stream_redirection">Log
         output stream redirection</a></span></dt>
-<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration/log_ct_log_level.html">Log
+<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_log_level">Log
         level configuration</a></span></dt>
-<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration/log_ct_log_format.html">Predefined
+<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.log_ct_log_format">Predefined
         log format selection</a></span></dt>
-<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration/custom_log_formatter.html">Custom
+<dt><span class="section"><a href="boost_test/test_output/log_compil_time_configuration.html#boost_test.test_output.log_compil_time_configuration.custom_log_formatter">Custom
         log format support</a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="boost_test/test_output/test_reports.html">Test
       reports</a></span></dt>
-<dt><span class="section"><a href="boost_test/test_output/test_output_progress.html">Progression
+<dt><span class="section"><a href="boost_test/test_output/test_output_progress.html">Progress
       display</a></span></dt>
-<dt><span class="section"><a href="boost_test/test_output/reference.html">Reference</a></span></dt>
 </dl></dd>
-<dt><span class="section"><a href="boost_test/runtime_configuration.html">Runtime
-    configuration</a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters.html">The
+    <span class="emphasis"><em>Unit Test Framework</em></span> runtime parameters</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/runtime_configuration/running_specific_test_units_sele.html">Running
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/running_specific_test_units_sele.html">Running
       specific test units selected by their name</a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_configuration/runtime_parameters_summary.html">Runtime
-      parameters summary</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="boost_test/the_unit_test_framework_usage_re.html">The
-    unit test framework usage recommendations</a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html">Reference</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_test/the_unit_test_framework_usage_re/general.html">General</a></span></dt>
-<dt><span class="section"><a href="boost_test/the_unit_test_framework_usage_re/microsoft_visual_studio_net_usag.html">Microsoft
-      Visual Studio .NET usage recommendations</a></span></dt>
-<dt><span class="section"><a href="boost_test/the_unit_test_framework_usage_re/command_line_usage_recommendatio.html">Command
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.show_progress"><code class="computeroutput"><span class="identifier">show_progress</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.build_info"><code class="computeroutput"><span class="identifier">build_info</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.auto_start_dbg"><code class="computeroutput"><span class="identifier">auto_start_dbg</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.catch_system_errors"><code class="computeroutput"><span class="identifier">catch_system_errors</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.break_exec_path"><code class="computeroutput"><span class="identifier">break_exec_path</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.color_output"><code class="computeroutput"><span class="identifier">color_output</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.log_format"><code class="computeroutput"><span class="identifier">log_format</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.log_level"><code class="computeroutput"><span class="identifier">log_level</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.run_test"><code class="computeroutput"><span class="identifier">run_test</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.output_format"><code class="computeroutput"><span class="identifier">output_format</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.report_format"><code class="computeroutput"><span class="identifier">report_format</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.result_code"><code class="computeroutput"><span class="identifier">result_code</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.report_level"><code class="computeroutput"><span class="identifier">report_level</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.random"><code class="computeroutput"><span class="identifier">random</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.detect_memory_leaks"><code class="computeroutput"><span class="identifier">detect_memory_leaks</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.use_alt_stack"><code class="computeroutput"><span class="identifier">use_alt_stack</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.detect_fp_exceptions"><code class="computeroutput"><span class="identifier">detect_fp_exceptions</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.log_sink"><code class="computeroutput"><span class="identifier">log_sink</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.report_sink"><code class="computeroutput"><span class="identifier">report_sink</span></code></a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_runtime_parameters/reference.html#boost_test.the_utf_runtime_parameters.reference.save_patterm"><code class="computeroutput"><span class="identifier">save_patterm</span></code></a></span></dt>
+</dl></dd>
+</dl></dd>
+<dt><span class="section"><a href="boost_test/the_utf_usage_recommendations.html">The
+    <span class="emphasis"><em>Unit Test Framework</em></span> usage recommendations</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_test/the_utf_usage_recommendations/general.html">General</a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_usage_recommendations/ide_usage_recommendations.html">IDE
+      usage recommendations</a></span></dt>
+<dt><span class="section"><a href="boost_test/the_utf_usage_recommendations/command_line_usage_recommendatio.html">Command
       line usage recommendations</a></span></dt>
 </dl></dd>
-<dt><span class="section"><a href="boost_test/section_faq.html">Frequently Asked Questions</a></span></dt>
-<dt><span class="section"><a href="boost_test/section_glossary.html">Glossary</a></span></dt>
-<dt><span class="section"><a href="boost_test/change_log.html">Change log</a></span></dt>
-<dt><span class="section"><a href="boost_test/open_issues.html">Open issues</a></span></dt>
-<dt><span class="section"><a href="boost_test/acknowledgements.html">Acknowledgements</a></span></dt>
-<dt><span class="section"><a href="boost_test/components.html">Components</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/components/bt_minimal_testing.html">Minimal testing
-      facility</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/components/bt_minimal_testing/bt_minimal_usage.html">Usage</a></span></dt>
-<dt><span class="section"><a href="boost_test/components/bt_minimal_testing/bt_minimal.html">Testing
-        tools</a></span></dt>
-<dt><span class="section"><a href="boost_test/components/bt_minimal_testing/example.html">Example</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="boost_test/components/execution_monitor.html">The
-      Execution Monitor</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/components/execution_monitor/compilation_variants_and_procedu.html">Compilation
-        variants and procedures</a></span></dt>
-<dt><span class="section"><a href="boost_test/components/execution_monitor/section_em_users_guide.html">The
-        Execution Monitor user's guide</a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="boost_test/components/section_pem.html">Program Execution
-      Monitor</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/components/section_pem/usage.html">Usage</a></span></dt>
-<dt><span class="section"><a href="boost_test/components/section_pem/runtime_configuration.html">Runtime
-        configuration</a></span></dt>
-<dt><span class="section"><a href="boost_test/components/section_pem/implementation.html">Implementation</a></span></dt>
-<dt><span class="section"><a href="boost_test/components/section_pem/section_pem_compilation.html">Compilation</a></span></dt>
-</dl></dd>
-</dl></dd>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference.html">Runtime parameters
-    reference</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/show_progress.html"><code class="computeroutput"><span class="identifier">show_progress</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/build_info.html"><code class="computeroutput"><span class="identifier">build_info</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/auto_start_dbg.html"><code class="computeroutput"><span class="identifier">auto_start_dbg</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/catch_system_errors.html"><code class="computeroutput"><span class="identifier">catch_system_errors</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/break_exec_path.html"><code class="computeroutput"><span class="identifier">break_exec_path</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/color_output.html"><code class="computeroutput"><span class="identifier">color_output</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/log_format.html"><code class="computeroutput"><span class="identifier">log_format</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/log_level.html"><code class="computeroutput"><span class="identifier">log_level</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/run_test.html"><code class="computeroutput"><span class="identifier">run_test</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/output_format.html"><code class="computeroutput"><span class="identifier">output_format</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/report_format.html"><code class="computeroutput"><span class="identifier">report_format</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/result_code.html"><code class="computeroutput"><span class="identifier">result_code</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/report_level.html"><code class="computeroutput"><span class="identifier">report_level</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/random.html"><code class="computeroutput"><span class="identifier">random</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/detect_memory_leaks.html"><code class="computeroutput"><span class="identifier">detect_memory_leaks</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/use_alt_stack.html"><code class="computeroutput"><span class="identifier">use_alt_stack</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/detect_fp_exceptions.html"><code class="computeroutput"><span class="identifier">detect_fp_exceptions</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/log_sink.html"><code class="computeroutput"><span class="identifier">log_sink</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/report_sink.html"><code class="computeroutput"><span class="identifier">report_sink</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/runtime_parameters_reference/save_patterm.html"><code class="computeroutput"><span class="identifier">save_patterm</span></code></a></span></dt>
-</dl></dd>
-<dt><span class="section"><a href="boost_test/testing_tool_ref.html"><span class="emphasis"><em>UTF</em></span> testing
-    tools reference</a></span></dt>
-<dd><dl>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_bitwise_eq.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_BITWISE_EQUAL</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_eq.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_eq_collections.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EQUAL_COLLECTIONS</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_close.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_close_fraction.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_CLOSE_FRACTION</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_exception.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_EXCEPTION</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_ge.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GE</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_gt.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_GT</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_le.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LE</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_lt.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_LT</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_message.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_MESSAGE</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_ne.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NE</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_no_throw.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_NO_THROW</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_predicate.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_PREDICATE</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_small.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_SMALL</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_level_throw.html"><code class="computeroutput"><span class="identifier">BOOST_</span><span class="special">&lt;</span><span class="identifier">level</span><span class="special">&gt;</span><span class="identifier">_THROW</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_error.html"><code class="computeroutput"><span class="identifier">BOOST_ERROR</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_fail.html"><code class="computeroutput"><span class="identifier">BOOST_FAIL</span></code></a></span></dt>
-<dt><span class="section"><a href="boost_test/testing_tool_ref/assertion_boost_is_defined.html"><code class="computeroutput"><span class="identifier">BOOST_IS_DEFINED</span></code></a></span></dt>
-</dl></dd>
 <dt><span class="section"><a href="boost_test/reference.html">Reference</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html">Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;</a></span></dt>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/array_hpp.html">Header &lt;boost/test/data/monomorphic/array.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/collection_hpp.html">Header &lt;boost/test/data/monomorphic/collection.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/dataset_hpp.html">Header &lt;boost/test/data/monomorphic/dataset.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/generate_hpp.html">Header &lt;boost/test/data/monomorphic/generate.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/generators_hpp.html">Header &lt;boost/test/data/monomorphic/generators.hpp&gt;</a></span></dt>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/generators/keywords_hpp.html">Header &lt;boost/test/data/monomorphic/generators/keywords.hpp&gt;</a></span></dt>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/generators/random_hpp.html">Header &lt;boost/test/data/monomorphic/generators/random.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/generators/xrange_hpp.html">Header &lt;boost/test/data/monomorphic/generators/xrange.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/grid_hpp.html">Header &lt;boost/test/data/monomorphic/grid.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/join_hpp.html">Header &lt;boost/test/data/monomorphic/join.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/singleton_hpp.html">Header &lt;boost/test/data/monomorphic/singleton.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/monomorphic/zip_hpp.html">Header &lt;boost/test/data/monomorphic/zip.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/size_hpp.html">Header &lt;boost/test/data/size.hpp&gt;</a></span></dt>
+<dd><dl></dl></dd>
+<dt><span class="section"><a href="header/boost/test/data/test_case_hpp.html">Header &lt;boost/test/data/test_case.hpp&gt;</a></span></dt>
 <dd><dl></dl></dd>
 <dt><span class="section"><a href="header/boost/test/debug_hpp.html">Header &lt;boost/test/debug.hpp&gt;</a></span></dt>
 <dd><dl></dl></dd>
@@ -298,52 +296,21 @@
 <dt><span class="section"><a href="header/boost/test/unit_test_log_formatter_hpp.html">Header &lt;boost/test/unit_test_log_formatter.hpp&gt;</a></span></dt>
 <dd><dl></dl></dd>
 </dl></dd>
+<dt><span class="section"><a href="boost_test/tutorials.html">Tutorials</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="boost_test/tutorials/hello.html">Hello the testing world!</a></span></dt>
+<dt><span class="section"><a href="boost_test/tutorials/bt_and_tdd.html">Boost.Test driven development</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="boost_test/section_faq.html">Frequently Asked Questions</a></span></dt>
+<dt><span class="section"><a href="boost_test/section_glossary.html">Glossary</a></span></dt>
+<dt><span class="section"><a href="boost_test/change_log.html">Change log</a></span></dt>
+<dt><span class="section"><a href="boost_test/open_issues.html">Open issues</a></span></dt>
+<dt><span class="section"><a href="boost_test/acknowledgements.html">Acknowledgements</a></span></dt>
 </dl>
 </div>
-<div class="blockquote"><blockquote class="blockquote"><p>
-      <span class="bold"><strong>Test everything that could possibly break</strong></span>
-      - <span class="emphasis"><em>XP maxim</em></span>
-    </p></blockquote></div>
-<p>
-    The Boost.Test library provides a matched set of components for writing test
-    programs, organizing tests into simple test cases and test suites, and controlling
-    their runtime execution. The Program Execution Monitor is also useful in some
-    production (non-test) environments.
-  </p>
-<h3>
-<a name="boost_test.h0"></a>
-    <span class="phrase"><a name="boost_test.about_this_documentation"></a></span><a class="link" href="index.html#boost_test.about_this_documentation">About
-    this documentation</a>
-  </h3>
-<p>
-    This documentation is <span class="bold"><strong>not</strong></span> intended to be read
-    though from the beginning to the end by a novice user. You can do that if you
-    are interested in detailed bottom-up description of all Boost.Test components.
-    Otherwise you are better off jumping directly to the subject of your interest.
-  </p>
-<p>
-    For example:
-  </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-        If you are interested in unit testing framework you may go directly &lt;link
-        linkend="utf"&gt;there&lt;/link&gt;
-      </li>
-<li class="listitem">
-        For novice users I recommend to start from simple <a class="link" href="boost_test/tutorial.html" title="Tutorials">tutorials</a>.
-      </li>
-<li class="listitem">
-        Looking for quick help - check the <a class="link" href="boost_test/section_faq.html" title="Frequently Asked Questions">FAQ</a>
-        section for resolution to many popular issues you may be faced with. Most
-        pages should link you directly to the terms that you need to understand it.
-      </li>
-<li class="listitem">
-        For help with compilation see compilation sections of an appropriate component.
-      </li>
-</ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: August 24, 2014 at 20:38:37 GMT</small></p></td>
+<td align="left"><p><small>Last revised: November 17, 2014 at 04:16:17 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/doc/v2/html/my_exception1.html b/doc/v2/html/my_exception1.html
deleted file mode 100644
index 7954af19..00000000
--- a/doc/v2/html/my_exception1.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Struct my_exception1</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Boost.Test">
-<link rel="up" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html" title="Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;">
-<link rel="prev" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html" title="Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;">
-<link rel="next" href="my_exception2.html" title="Struct my_exception2">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="my_exception2.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="my_exception1"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Struct my_exception1</span></h2>
-<p>my_exception1</p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html" title="Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;">/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp</a>&gt;
-
-</span>
-<span class="keyword">struct</span> <a class="link" href="my_exception1.html" title="Struct my_exception1">my_exception1</a> <span class="special">{</span>
-  <span class="comment">// <a class="link" href="my_exception1.html#my_exception1construct-copy-destruct">construct/copy/destruct</a></span>
-  <span class="keyword">explicit</span> <a class="link" href="my_exception1.html#idm18026429024-bb"><span class="identifier">my_exception1</span></a><span class="special">(</span><span class="keyword">int</span><span class="special">)</span><span class="special">;</span>
-
-  <span class="comment">// public data members</span>
-  <span class="keyword">int</span> <span class="identifier">m_res_code</span><span class="special">;</span>
-<span class="special">}</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436480822592"></a><h2>Description</h2>
-<div class="refsect2">
-<a name="idm436480822192"></a><h3>
-<a name="my_exception1construct-copy-destruct"></a><code class="computeroutput">my_exception1</code> 
-        public
-       construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18026429024-bb"></a><span class="identifier">my_exception1</span><span class="special">(</span><span class="keyword">int</span> res_code<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
-</div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="my_exception2.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/my_exception2.html b/doc/v2/html/my_exception2.html
deleted file mode 100644
index cc911e84..00000000
--- a/doc/v2/html/my_exception2.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Struct my_exception2</title>
-<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Boost.Test">
-<link rel="up" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html" title="Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;">
-<link rel="prev" href="my_exception1.html" title="Struct my_exception1">
-<link rel="next" href="header/boost/test/debug_hpp.html" title="Header &lt;boost/test/debug.hpp&gt;">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
-<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
-<td align="center"><a href="../../../../../more/index.htm">More</a></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="my_exception1.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="header/boost/test/debug_hpp.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-<div class="refentry">
-<a name="my_exception2"></a><div class="titlepage"></div>
-<div class="refnamediv">
-<h2><span class="refentrytitle">Struct my_exception2</span></h2>
-<p>my_exception2</p>
-</div>
-<h2 xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv-title">Synopsis</h2>
-<div xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="refsynopsisdiv"><pre class="synopsis"><span class="comment">// In header: &lt;<a class="link" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html" title="Header &lt;/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp&gt;">/Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example.cpp</a>&gt;
-
-</span>
-<span class="keyword">struct</span> <a class="link" href="my_exception2.html" title="Struct my_exception2">my_exception2</a> <span class="special">{</span>
-  <span class="comment">// <a class="link" href="my_exception2.html#my_exception2construct-copy-destruct">construct/copy/destruct</a></span>
-  <span class="keyword">explicit</span> <a class="link" href="my_exception2.html#idm18026426048-bb"><span class="identifier">my_exception2</span></a><span class="special">(</span><span class="keyword">int</span><span class="special">)</span><span class="special">;</span>
-
-  <span class="comment">// public data members</span>
-  <span class="keyword">int</span> <span class="identifier">m_res_code</span><span class="special">;</span>
-<span class="special">}</span><span class="special">;</span></pre></div>
-<div class="refsect1">
-<a name="idm436480800864"></a><h2>Description</h2>
-<div class="refsect2">
-<a name="idm436480800464"></a><h3>
-<a name="my_exception2construct-copy-destruct"></a><code class="computeroutput">my_exception2</code> 
-        public
-       construct/copy/destruct</h3>
-<div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><pre class="literallayout"><span class="keyword">explicit</span> <a name="idm18026426048-bb"></a><span class="identifier">my_exception2</span><span class="special">(</span><span class="keyword">int</span> res_code<span class="special">)</span><span class="special">;</span></pre></li></ol></div>
-</div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2014 Gennadiy
-      Rozental<p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="my_exception1.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="header/boost/test/debug_hpp.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>
diff --git a/doc/v2/html/standalone_HTML.manifest b/doc/v2/html/standalone_HTML.manifest
old mode 100644
new mode 100755
index f94a75eb..246b9931
--- a/doc/v2/html/standalone_HTML.manifest
+++ b/doc/v2/html/standalone_HTML.manifest
@@ -1,52 +1,20 @@
 index.html
 boost_test/intro.html
-boost_test/intro/objective_and_content.html
-boost_test/intro/features_implemented.html
-boost_test/intro/portability_concerns.html
-boost_test/how_to_read_this_documentation.html
-boost_test/tutorial.html
-boost_test/tutorial/hello.html
-boost_test/tutorial/bt_and_tdd.html
+boost_test/intro/how_to_read_this_documentation.html
 boost_test/users_guide.html
 boost_test/users_guide/module_initialization.html
-boost_test/users_guide/module_initialization/custom_module_initialisation.html
-boost_test/users_guide/module_initialization/custom_module_initialisation/legacy_initialization_function.html
-boost_test/users_guide/module_initialization/custom_module_initialisation/switching_from_legacy_to_simplif.html
-boost_test/users_guide/module_initialization/custom_module_initialisation/simplified_initialization_functi.html
-boost_test/users_guide/module_initialization/module_initialisation_automated.html
 boost_test/users_guide/usage_variants.html
-boost_test/users_guide/usage_variants/static_lib_variant.html
-boost_test/users_guide/usage_variants/dynamic_lib_variant.html
-boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_minimal_example.html
-boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_multiple_source_files.html
-boost_test/users_guide/usage_variants/dynamic_lib_variant/dynamic_lib_variant_manual_registration.html
-boost_test/users_guide/usage_variants/single_header_variant.html
-boost_test/users_guide/usage_variants/extern_test_runner_variant.html
 boost_test/users_guide/link_references.html
-boost_test/users_guide/link_references/link_boost_test_main_macro.html
-boost_test/users_guide/link_references/link_boost_test_alternative_init_macro.html
-boost_test/users_guide/link_references/link_boost_test_no_lib.html
-boost_test/users_guide/link_references/link_boost_test_dyn_link.html
-boost_test/users_guide/link_references/link_boost_test_no_main.html
-boost_test/users_guide/link_references/link_boost_test_module_macro.html
 boost_test/tests_organization.html
 boost_test/tests_organization/test_cases.html
-boost_test/tests_organization/test_cases/test_organization_nullary.html
-boost_test/tests_organization/test_cases/unary_function_based_test_case.html
-boost_test/tests_organization/test_cases/test_organization_templates.html
 boost_test/tests_organization/test_organization_test_suite.html
-boost_test/tests_organization/test_organization_test_suite/master_test_suite.html
-boost_test/tests_organization/test_organization_test_suite/test_suite_expected_failure.html
 boost_test/tests_organization/fixtures.html
-boost_test/tests_organization/fixtures/generic_fixture_model.html
-boost_test/tests_organization/fixtures/per_test_case_fixture.html
-boost_test/tests_organization/fixtures/test_suite_level_fixture.html
-boost_test/tests_organization/fixtures/global_fixture.html
 boost_test/testing_tools.html
 boost_test/testing_tools/tools_assertion_severity_level.html
 boost_test/testing_tools/custom_predicates.html
 boost_test/testing_tools/output_stream_testing.html
 boost_test/testing_tools/testing_floating_points.html
+boost_test/testing_tools/testing_tool_ref.html
 boost_test/test_output.html
 boost_test/test_output/test_log_output.html
 boost_test/test_output/log_runtime_config.html
@@ -58,93 +26,73 @@ boost_test/test_output/log_floating_points.html
 boost_test/test_output/log_human_readable_format.html
 boost_test/test_output/log_xml_format.html
 boost_test/test_output/log_compil_time_configuration.html
-boost_test/test_output/log_compil_time_configuration/log_ct_output_stream_redirection.html
-boost_test/test_output/log_compil_time_configuration/log_ct_log_level.html
-boost_test/test_output/log_compil_time_configuration/log_ct_log_format.html
-boost_test/test_output/log_compil_time_configuration/custom_log_formatter.html
 boost_test/test_output/test_reports.html
 boost_test/test_output/test_output_progress.html
-boost_test/test_output/reference.html
-boost_test/runtime_configuration.html
-boost_test/runtime_configuration/running_specific_test_units_sele.html
-boost_test/runtime_configuration/runtime_parameters_summary.html
-boost_test/the_unit_test_framework_usage_re.html
-boost_test/the_unit_test_framework_usage_re/general.html
-boost_test/the_unit_test_framework_usage_re/microsoft_visual_studio_net_usag.html
-boost_test/the_unit_test_framework_usage_re/command_line_usage_recommendatio.html
-boost_test/section_faq.html
-boost_test/section_glossary.html
-boost_test/change_log.html
-boost_test/open_issues.html
-boost_test/acknowledgements.html
-boost_test/components.html
-boost_test/components/bt_minimal_testing.html
-boost_test/components/bt_minimal_testing/bt_minimal_usage.html
-boost_test/components/bt_minimal_testing/bt_minimal.html
-boost_test/components/bt_minimal_testing/example.html
-boost_test/components/execution_monitor.html
-boost_test/components/execution_monitor/compilation_variants_and_procedu.html
-boost_test/components/execution_monitor/section_em_users_guide.html
-boost_test/components/execution_monitor/section_em_users_guide/section_em_monitored_functions.html
-boost_test/components/execution_monitor/section_em_users_guide/section_em_parameters.html
-boost_test/components/execution_monitor/section_em_users_guide/section_em_error_reporting.html
-boost_test/components/execution_monitor/section_em_users_guide/memory_leaks_detection.html
-boost_test/components/section_pem.html
-boost_test/components/section_pem/usage.html
-boost_test/components/section_pem/runtime_configuration.html
-boost_test/components/section_pem/implementation.html
-boost_test/components/section_pem/section_pem_compilation.html
-boost_test/components/section_pem/section_pem_compilation/section_pem_standalone.html
-boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_static.html
-boost_test/components/section_pem/section_pem_compilation/section_pem_standalone/section_pem_compilation_dynamic.html
-boost_test/components/section_pem/section_pem_compilation/support_of_the_auto_linking_feat.html
-boost_test/components/section_pem/section_pem_compilation/section_pem_full_include.html
-boost_test/runtime_parameters_reference.html
-boost_test/runtime_parameters_reference/show_progress.html
-boost_test/runtime_parameters_reference/build_info.html
-boost_test/runtime_parameters_reference/auto_start_dbg.html
-boost_test/runtime_parameters_reference/catch_system_errors.html
-boost_test/runtime_parameters_reference/break_exec_path.html
-boost_test/runtime_parameters_reference/color_output.html
-boost_test/runtime_parameters_reference/log_format.html
-boost_test/runtime_parameters_reference/log_level.html
-boost_test/runtime_parameters_reference/run_test.html
-boost_test/runtime_parameters_reference/output_format.html
-boost_test/runtime_parameters_reference/report_format.html
-boost_test/runtime_parameters_reference/result_code.html
-boost_test/runtime_parameters_reference/report_level.html
-boost_test/runtime_parameters_reference/random.html
-boost_test/runtime_parameters_reference/detect_memory_leaks.html
-boost_test/runtime_parameters_reference/use_alt_stack.html
-boost_test/runtime_parameters_reference/detect_fp_exceptions.html
-boost_test/runtime_parameters_reference/log_sink.html
-boost_test/runtime_parameters_reference/report_sink.html
-boost_test/runtime_parameters_reference/save_patterm.html
-boost_test/testing_tool_ref.html
-boost_test/testing_tool_ref/assertion_boost_level.html
-boost_test/testing_tool_ref/assertion_boost_level_bitwise_eq.html
-boost_test/testing_tool_ref/assertion_boost_level_eq.html
-boost_test/testing_tool_ref/assertion_boost_level_eq_collections.html
-boost_test/testing_tool_ref/assertion_boost_level_close.html
-boost_test/testing_tool_ref/assertion_boost_level_close_fraction.html
-boost_test/testing_tool_ref/assertion_boost_level_exception.html
-boost_test/testing_tool_ref/assertion_boost_level_ge.html
-boost_test/testing_tool_ref/assertion_boost_level_gt.html
-boost_test/testing_tool_ref/assertion_boost_level_le.html
-boost_test/testing_tool_ref/assertion_boost_level_lt.html
-boost_test/testing_tool_ref/assertion_boost_level_message.html
-boost_test/testing_tool_ref/assertion_boost_level_ne.html
-boost_test/testing_tool_ref/assertion_boost_level_no_throw.html
-boost_test/testing_tool_ref/assertion_boost_level_predicate.html
-boost_test/testing_tool_ref/assertion_boost_level_small.html
-boost_test/testing_tool_ref/assertion_boost_level_throw.html
-boost_test/testing_tool_ref/assertion_boost_error.html
-boost_test/testing_tool_ref/assertion_boost_fail.html
-boost_test/testing_tool_ref/assertion_boost_is_defined.html
+boost_test/the_utf_runtime_parameters.html
+boost_test/the_utf_runtime_parameters/running_specific_test_units_sele.html
+boost_test/the_utf_runtime_parameters/reference.html
+boost_test/the_utf_usage_recommendations.html
+boost_test/the_utf_usage_recommendations/general.html
+boost_test/the_utf_usage_recommendations/ide_usage_recommendations.html
+boost_test/the_utf_usage_recommendations/command_line_usage_recommendatio.html
 boost_test/reference.html
-header//Users/raffi/Personnel/boost_github/libs/test/example/exec_mon_example_cpp.html
-my_exception1.html
-my_exception2.html
+header/boost/test/data/monomorphic/array_hpp.html
+boost/unit_test/data/monomorphic/array.html
+boost/unit_test/data/monomorphic/array/iterator.html
+boost/unit_test/data/monomorphic/is_dataset_array__id324484.html
+header/boost/test/data/monomorphic/collection_hpp.html
+boost/unit_test/data/monomorphic/collection.html
+boost/unit_test/data/monomorphic/collection/iterator.html
+boost/unit_test/data/monomorphic/is_dataset_collec_id324686.html
+header/boost/test/data/monomorphic/dataset_hpp.html
+boost/unit_test/data/monomorphic/dataset.html
+boost/unit_test/data/monomorphic/dataset/iterator.html
+boost/unit_test/data/monomorphic/traits.html
+boost/unit_test/data/monomorphic/traits_std_tuple__id324853.html
+boost/unit_test/data/monomorphic/traits_std_tuple__id324895.html
+header/boost/test/data/monomorphic/generate_hpp.html
+boost/unit_test/data/monomorphic/generated_by.html
+boost/unit_test/data/monomorphic/generated_by/iterator.html
+boost/unit_test/data/monomorphic/is_dataset_genera_id325176.html
+header/boost/test/data/monomorphic/generators_hpp.html
+header/boost/test/data/monomorphic/generators/keywords_hpp.html
+header/boost/test/data/monomorphic/generators/random_hpp.html
+boost/unit_test/data/monomorphic/random_t.html
+header/boost/test/data/monomorphic/generators/xrange_hpp.html
+boost/unit_test/data/monomorphic/xrange_t.html
+boost/unit_test/data/xrange_id323262.html
+boost/unit_test/data/xrange_id323371.html
+header/boost/test/data/monomorphic/grid_hpp.html
+boost/unit_test/data/monomorphic/result_of/grid.html
+boost/unit_test/data/monomorphic/grid.html
+boost/unit_test/data/monomorphic/grid/iterator.html
+boost/unit_test/data/monomorphic/is_dataset_grid_D_id323518.html
+header/boost/test/data/monomorphic/join_hpp.html
+boost/unit_test/data/monomorphic/result_of/join.html
+boost/unit_test/data/monomorphic/is_dataset_join_D_id323710.html
+boost/unit_test/data/monomorphic/join.html
+boost/unit_test/data/monomorphic/join/iterator.html
+header/boost/test/data/monomorphic/singleton_hpp.html
+boost/unit_test/data/monomorphic/is_dataset_single_id325667.html
+boost/unit_test/data/monomorphic/singleton.html
+boost/unit_test/data/monomorphic/singleton/iterator.html
+header/boost/test/data/monomorphic/zip_hpp.html
+boost/unit_test/data/monomorphic/result_of/zip.html
+boost/unit_test/data/monomorphic/is_dataset_zip_DS_id325861.html
+boost/unit_test/data/monomorphic/zip.html
+boost/unit_test/data/monomorphic/zip/iterator.html
+header/boost/test/data/size_hpp.html
+boost/unit_test/data/size_t.html
+boost/unit_test/data/size_t/dummy.html
+header/boost/test/data/test_case_hpp.html
+TC_MAKE.html
+BOOST_DATA_TEST_CASE_PARAM.html
+BOOST_DATA_TEST_CONTEXT.html
+BOOST_DATA_TEST_CASE_PARAMS.html
+BOOST_DATA_TEST_CASE_IMPL.html
+BOOST_DATA_TEST_CASE_WITH_PARAMS.html
+BOOST_DATA_TEST_CASE_NO_PARAMS.html
+BOOST_DATA_TEST_CASE.html
 header/boost/test/debug_hpp.html
 boost/debug/dbg_startup_info.html
 boost/debug/under_debugger.html
@@ -154,24 +102,24 @@ boost/debug/detect_memory_leaks.html
 boost/debug/break_memory_alloc.html
 header/boost/test/debug_config_hpp.html
 header/boost/test/execution_monitor_hpp.html
+boost/execution_aborted.html
 boost/execution_exception.html
 boost/execution_exception/location.html
 boost/execution_exception/error_code.html
 boost/execution_monitor.html
-boost/execution_aborted.html
 boost/system_error.html
 BOOST_TEST_SYS_ASSERT.html
 header/boost/test/framework_hpp.html
 boost/unit_test/framework/context_generator.html
 boost/unit_test/framework/internal_error.html
+boost/unit_test/framework/nothing_to_test.html
 boost/unit_test/framework/setup_error.html
 boost/unit_test/framework/test_being_aborted.html
-boost/unit_test/framework/nothing_to_test.html
 boost/unit_test/framework/init.html
 boost/unit_test/framework/shutdown.html
 boost/unit_test/framework/current_auto_test_suite.html
-boost/unit_test/framework/register_te_idm18026271216.html
-boost/unit_test/framework/register_te_idm18026268112.html
+boost/unit_test/framework/register_test_uni_id329627.html
+boost/unit_test/framework/register_test_uni_id329651.html
 boost/unit_test/framework/deregister_test_unit.html
 boost/unit_test/framework/register_observer.html
 boost/unit_test/framework/deregister_observer.html
@@ -180,9 +128,9 @@ boost/unit_test/framework/clear_context.html
 boost/unit_test/framework/master_test_suite.html
 boost/unit_test/framework/current_test_case.html
 boost/unit_test/framework/current_test_case_id.html
-boost/unit_test/framework/get_idm18026239664.html
-boost/unit_test/framework/get_idm18026235296.html
-boost/unit_test/framework/run_idm18026230112.html
+boost/unit_test/framework/get_id327620.html
+boost/unit_test/framework/get_id327660.html
+boost/unit_test/framework/run_id327716.html
 boost/unit_test/init_unit_test_func.html
 BOOST_TEST_SETUP_ASSERT.html
 header/boost/test/output/compiler_log_formatter_hpp.html
@@ -199,27 +147,35 @@ BOOST_PARAM_CLASS_TEST_CASE.html
 header/boost/test/progress_monitor_hpp.html
 boost/unit_test/progress_monitor_t.html
 header/boost/test/results_collector_hpp.html
-boost/unit_test/test_results.html
 boost/unit_test/results_collector_t.html
+boost/unit_test/test_results.html
 header/boost/test/results_reporter_hpp.html
 boost/unit_test/results_reporter/format.html
 boost/unit_test/results_reporter/set_level.html
 boost/unit_test/results_reporter/set_stream.html
-boost/unit_test/results_reporter/set_format_idm18025942784.html
-boost/unit_test/results_reporter/set_format_idm18025938864.html
+boost/unit_test/results_reporter/set_format_id333050.html
+boost/unit_test/results_reporter/set_format_id333122.html
 boost/unit_test/results_reporter/get_stream.html
 header/boost/test/tools/assertion_result_hpp.html
 boost/test_tools/assertion_result.html
 boost/test_tools/assertion_result/dummy.html
 header/boost/test/tree/test_unit_hpp.html
-boost/unit_test/test_unit.html
-boost/unit_test/test_unit_generator.html
+boost/unit_test/master_test_suite_t.html
 boost/unit_test/test_case.html
 boost/unit_test/test_suite.html
-boost/unit_test/master_test_suite_t.html
+boost/unit_test/test_unit.html
+boost/unit_test/test_unit_generator.html
 header/boost/test/unit_test_hpp.html
 BOOST_LIB_NAME.html
 header/boost/test/unit_test_log_formatter_hpp.html
-boost/unit_test/log_entry_data.html
 boost/unit_test/log_checkpoint_data.html
+boost/unit_test/log_entry_data.html
 boost/unit_test/unit_test_log_formatter.html
+boost_test/tutorials.html
+boost_test/tutorials/hello.html
+boost_test/tutorials/bt_and_tdd.html
+boost_test/section_faq.html
+boost_test/section_glossary.html
+boost_test/change_log.html
+boost_test/open_issues.html
+boost_test/acknowledgements.html
diff --git a/doc/v2/overview.qbk b/doc/v2/overview.qbk
deleted file mode 100644
index 43d10b3e..00000000
--- a/doc/v2/overview.qbk
+++ /dev/null
@@ -1,93 +0,0 @@
-[/
- / Copyright (c) 2003-2014 Gennadiy Rozental (rogeeff at gmail dot com)
- /
- / Distributed under the Boost Software License, Version 1.0. (See accompanying
- / file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- /]
-
-
-[section:intro What is Boost.Test?]
-[:The acceptance test makes the customer satisfied that the software provides the business value that makes them
-    willing to pay for it. The unit test makes the programmer satisfied that the software does what the programmer 
-    thinks it does]--Xp Maxim
-
-
-What is the first thing you need to do when you start working on new library/class/program? That's right -
-you need to start with the unit test module (I hope you all gave this answer!). Occasional, simple test may be
-implemented using `assert`s. But any professional developer soon finds this approach lacking. It becomes clear that
-it's too time-consuming and tedious for simple, but repetitive unit testing tasks and it's too inflexible for
-most non-trivial ones.
-
-
-The Boost Test Library Unit Test Framework (further in the documentation referred by the acronym __UTF__) provides both
-an easy to use and flexible solution to this problem domain: C++ unit test implementation and organization.
-
-[/ ##################################################################### ]
-[section Objective and content]
-Unit testing tasks arise during many different stages of software development: from initial project implementation
-to its maintenance and later revisions. These tasks differ in their complexity and purpose and accordingly are
-approached differently by different developers. The wide spectrum of tasks in a problem domain cause many
-requirements (sometimes conflicting) to be placed on a unit testing framework. These include:
-
-* Writing a unit test module should be simple and obvious for new users.
-* The framework should allow advanced users to perform non-trivial tests.
-* Test module should be able to have many small test cases and developer should be able to group them into test suites.
-* At the beginning of the development users want to see verbose and descriptive error message, whereas during the
-  regression testing they just want to know if any tests failed.
-* For a small test modules run time should prevail over compilation time: user don't want to wait a minute to
-  compile a test that takes a second to run.
-* For long and complex tests users want to be able to see the test progress.
-* Simplest tests shouldn't require an external library.
-* For long term usage users of a unit test framework should be able to build it as a standalone library.
-
-The __UTF__ design is based on above rationale and provides versatile facilities to:
-
-* Simplify writing test cases by using various testing tools [/ add a link]
-* Organize test cases into a test tree. [/todo add a link utf.user-guide.test-organization]
-* Relieve you from messy error detection, reporting duties and framework runtime parameters processing.
-
-[endsect]
-
-[/ ##################################################################### ]
-[section Features implemented]
-[note the elements in bold below should be linked to the appropriate places once the doc ported]
-The __UTF__ keeps track of all passed/failed testing tools [*assertions], [/ todo link to assertion]
-provides an ability to check the [*test progress]
-and generates a [*result report] in several different formats. 
-The __UTF__ supplies command line test runners that initialize the framework and run the requested tests.
-
-Depending on the selected [*compilation flags] the function `main()` default implementation, that invoke the 
-supplied test runner, can be generated automatically as well.
-
-The __UTF__ is intended to be used both for a simple and non trivial testing. It is not intended to be used with
-production code. In this case the [*Program Execution Monitor] is more suitable.
-
-Given the largely differing requirements of new and advanced users, it is clear that the __UTF__ must provide both
-simple, easy-to-use interfaces with limited customization options and advanced interfaces, which allow unit testing
-to be fully customized. Accordingly the material provided in this documentation is split into two sections:
-
-# [*The User's Guide] covers all functionality that doesn't require knowledge of the __UTF__ internals
-# [*The Advanced User's Guide] covers all implementation details
-  required for a user to understand the advanced customization options available in the __UTF__, and for a user
-  interested in extending the testing framework.
-
-
-For those interested in getting started quickly please visit [*collection of examples] presented in this documentation.
-
-[endsect]
-
-
-[/ ##################################################################### ]
-[section Portability concerns]
-Because the Boost Test Library is critical for porting and testing Boost libraries, it has been written to be 
-conservative in its use of C++ features, and to keep dependencies to a bare minimum.
-
-Boost.Test supports all main Boost compilers and platforms. Confirmation of its status on core and additional 
-platforms/compilers can be seen by viewing Boost.Test's own internal regression test results on 
-[@http://www.boost.org/development/tests/master/developer/test.html master branch status page] or
-[@http://www.boost.org/development/tests/develop/developer/test.html development branch status page]
-
-[endsect]
-
-
-[endsect] [/ What is Boost.Test?]
diff --git a/doc/v2/runtime_configuration/runtime_configuration.qbk b/doc/v2/runtime_configuration/runtime_configuration.qbk
index becf4540..2ca6b42b 100644
--- a/doc/v2/runtime_configuration/runtime_configuration.qbk
+++ b/doc/v2/runtime_configuration/runtime_configuration.qbk
@@ -1,4 +1,4 @@
-[#ref_section_runtime_configuration][section Runtime configuration]
+[#ref_section_runtime_configuration][section The __UTF__ runtime parameters]
  
 
 The __UTF__ supports multiple parameters that affect test module execution. To set the parameter's value you can
@@ -26,164 +26,7 @@ parameter specification.
 All information about supported parameters is summarized below in the reference section.
 
 [include runtime_configuration.running_specific_test.qbk]
-
-
-[section Runtime parameters summary]
-Each parameter specification includes: 
-
-# the full parameter name
-# corresponding environment variable name
-# command line argument name
-# acceptable values and 
-# a long description
-
-The default value for the parameter is bold in the
-acceptable values list. All values are case sensitive and are required to exactly match the parameter specification.
-
-
-[table
-  [
-    [Command]
-    [Short description]
-  ] 
-  
-  [/ ###############################################################################################]
-  [
-    [__param_auto_start_dbg__]
-    [Automatically attach debugger in case of system failure.]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_show_progress__]
-    [Makes the framework to print progress information. More details [link boost_test.test_output.test_output_progress here].]
-  ]
-  
-
-  [/ ###############################################################################################]
-  [
-    [__param_build_info__]
-    [Print build information.]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_catch_system__]
-    [Catch system errors.]
-  ]
-  
-  [/ ###############################################################################################]
-  [
-    [__param_break_exec_path__]
-    [Break execution path]
-  ]    
-
-
-  [/ ###############################################################################################]
-  [
-    [__param_param_color_output__]
-    [Produce colour output]
-  ]  
-
-  [/ ###############################################################################################]
-  [
-    [__param_log_format__]
-    [Specifies the log format]
-  ]
-
-  [/ ###############################################################################################]
-  [
-    [__param_log_level__]
-    [Specifies the logging level of the __UTF__]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_run_test__]
-    [Specifies which test units to run.]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_output_format__]
-    [Specifies the log format and the report format.]
-  ]  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_report_format__]
-    [Specifies the report format.]
-  ]
-
-  [/ ###############################################################################################]
-  [
-    [__param_result_code__]
-    [Make the framework return a result code indicating an error in the tests.]
-  ]
-  
-  [/ ###############################################################################################]
-  [
-    [__param_report_level__]
-    [The level of details carried by the __UTF__ report.]
-  ]
-  
-  [/ ###############################################################################################]
-  [
-    [__param_random__]
-    [Runs the tests in random order]
-  ]
-  
-  [/ ###############################################################################################]
-  [
-    [__param_detect_memory_leaks__]
-    [Detects memory leaks.]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_use_alt_stack__]
-    [Uses an alternative stack for running tests (on supported platforms).]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_detect_fp_exceptions__]
-    [Traps floating point exceptions (on supported platforms).]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_log_sink__]
-    [Specifies the sink stream for logging.]
-  ]
-  
-  
-  [/ ###############################################################################################]
-  [
-    [__param_report_sink__]
-    [Specifies the sink stream for tests reports.]
-  ]
-  
-  [/ ###############################################################################################]
-  [
-    [__param_save_pattern__]
-    [Provides parameters for testing output streams.]
-  ]
-  
-  
-  
-]
-[warning There is a link to the Boost.Test debug API, never heard about]
-
-[endsect] [/ runtime parameter summary]
-
+[include runtime_configuration.reference.qbk]
 
 
 [endsect] [/ runtime configuration]
\ No newline at end of file
diff --git a/doc/v2/runtime_configuration/runtime_configuration.reference.qbk b/doc/v2/runtime_configuration/runtime_configuration.reference.qbk
index 39c9497c..37a17163 100644
--- a/doc/v2/runtime_configuration/runtime_configuration.reference.qbk
+++ b/doc/v2/runtime_configuration/runtime_configuration.reference.qbk
@@ -1,5 +1,154 @@
-[section Runtime parameters reference]
+[section Reference]
 
+Each parameter specification includes: 
+
+# the full parameter name
+# corresponding environment variable name
+# command line argument name
+# acceptable values and 
+# a long description
+
+The default value for the parameter is bold in the
+acceptable values list. All values are case sensitive and are required to exactly match the parameter specification.
+
+
+[table
+  [
+    [Command]
+    [Short description]
+  ] 
+  
+  [/ ###############################################################################################]
+  [
+    [__param_auto_start_dbg__]
+    [Automatically attach debugger in case of system failure.]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_show_progress__]
+    [Makes the framework to print progress information. More details [link boost_test.test_output.test_output_progress here].]
+  ]
+  
+
+  [/ ###############################################################################################]
+  [
+    [__param_build_info__]
+    [Print build information.]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_catch_system__]
+    [Catch system errors.]
+  ]
+  
+  [/ ###############################################################################################]
+  [
+    [__param_break_exec_path__]
+    [Break execution path]
+  ]    
+
+
+  [/ ###############################################################################################]
+  [
+    [__param_param_color_output__]
+    [Produce colour output]
+  ]  
+
+  [/ ###############################################################################################]
+  [
+    [__param_log_format__]
+    [Specifies the log format]
+  ]
+
+  [/ ###############################################################################################]
+  [
+    [__param_log_level__]
+    [Specifies the logging level of the __UTF__]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_run_test__]
+    [Specifies which test units to run.]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_output_format__]
+    [Specifies the log format and the report format.]
+  ]  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_report_format__]
+    [Specifies the report format.]
+  ]
+
+  [/ ###############################################################################################]
+  [
+    [__param_result_code__]
+    [Make the framework return a result code indicating an error in the tests.]
+  ]
+  
+  [/ ###############################################################################################]
+  [
+    [__param_report_level__]
+    [The level of details carried by the __UTF__ report.]
+  ]
+  
+  [/ ###############################################################################################]
+  [
+    [__param_random__]
+    [Runs the tests in random order]
+  ]
+  
+  [/ ###############################################################################################]
+  [
+    [__param_detect_memory_leaks__]
+    [Detects memory leaks.]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_use_alt_stack__]
+    [Uses an alternative stack for running tests (on supported platforms).]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_detect_fp_exceptions__]
+    [Traps floating point exceptions (on supported platforms).]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_log_sink__]
+    [Specifies the sink stream for logging.]
+  ]
+  
+  
+  [/ ###############################################################################################]
+  [
+    [__param_report_sink__]
+    [Specifies the sink stream for tests reports.]
+  ]
+  
+  [/ ###############################################################################################]
+  [
+    [__param_save_pattern__]
+    [Provides parameters for testing output streams.]
+  ]
+  
+]
 
 [/ ###############################################################################################]
 
diff --git a/doc/v2/test.qbk b/doc/v2/test.qbk
index 70ba5a75..83620eea 100644
--- a/doc/v2/test.qbk
+++ b/doc/v2/test.qbk
@@ -6,7 +6,7 @@
  /]
 
 [library Boost.Test
-    [quickbook 1.6]
+    [quickbook 1.7]
     [copyright 2001 - 2014 Gennadiy Rozental]
     [id boost_test]
     [purpose Testing library]
@@ -19,7 +19,7 @@
     [category Correctness and testing]
 ]
 
-[/ email Gennadiy, I do not know how to make this in fact]
+[/TOFIX email Gennadiy, I do not know how to make this in fact]
 [def __email_gr__ [@mailto:boost-test=at=emailaccount-dot-com Gennadiy Rozental]]
 
 
@@ -30,11 +30,10 @@
 
 [def __POSIX__ /POSIX/]
 [def __Windows__ /Windows/]
-[def __UTF__ /UTF/]
+[def __UTF__ /Unit Test Framework/]
+[def __PEM__ /Program Exceution Monitor]
+
 [def __IEEE754__ [*IEEE754]]
-[def __PEM__     ['PEM]]
-[def __EM__      [link boost_test.components.execution_monitor ['EM]]]
-[def __MTF__     ['Minimal Testing Facility]]
 
 [def __part_glossary__                [link boost_test.section_glossary Glossary]]
 [def __part_faq__                     [link boost_test.section_faq FAQ]]
@@ -73,43 +72,43 @@
 
 
 [/ Assertions ]
-[def __BOOST_LEVEL__                      [link boost_test.testing_tool_ref.assertion_boost_level `BOOST_<level>`]]
-[def __BOOST_CHECK__                      [link boost_test.testing_tool_ref.assertion_boost_level `BOOST_CHECK`]]
-[def __BOOST_REQUIRE__                    [link boost_test.testing_tool_ref.assertion_boost_level `BOOST_REQUIRE`]]
+[def __BOOST_LEVEL__                      [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level `BOOST_<level>`]]
+[def __BOOST_CHECK__                      [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level `BOOST_CHECK`]]
+[def __BOOST_REQUIRE__                    [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level `BOOST_REQUIRE`]]
 
-[def __BOOST_LEVEL_MESSAGE__              [link boost_test.testing_tool_ref.assertion_boost_level_message `BOOST_<level>_MESSAGE`]]
-[def __BOOST_CHECK_MESSAGE__              [link boost_test.testing_tool_ref.assertion_boost_level_message `BOOST_CHECK_MESSAGE`]]
-[def __BOOST_REQUIRE_MESSAGE__            [link boost_test.testing_tool_ref.assertion_boost_level_message `BOOST_REQUIRE_MESSAGE`]]
+[def __BOOST_LEVEL_MESSAGE__              [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_message `BOOST_<level>_MESSAGE`]]
+[def __BOOST_CHECK_MESSAGE__              [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_message `BOOST_CHECK_MESSAGE`]]
+[def __BOOST_REQUIRE_MESSAGE__            [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_message `BOOST_REQUIRE_MESSAGE`]]
 
-[def __BOOST_LEVEL_EQUAL__                [link boost_test.testing_tool_ref.assertion_boost_level_eq `BOOST_<level>_EQUAL`]]
-[def __BOOST_WARN_EQUAL__                 [link boost_test.testing_tool_ref.assertion_boost_level_eq `BOOST_WARN_EQUAL`]]
-[def __BOOST_CHECK_EQUAL__                [link boost_test.testing_tool_ref.assertion_boost_level_eq `BOOST_CHECK_EQUAL`]]
-[def __BOOST_REQUIRE_EQUAL__              [link boost_test.testing_tool_ref.assertion_boost_level_eq `BOOST_REQUIRE_EQUAL`]]
+[def __BOOST_LEVEL_EQUAL__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq `BOOST_<level>_EQUAL`]]
+[def __BOOST_WARN_EQUAL__                 [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq `BOOST_WARN_EQUAL`]]
+[def __BOOST_CHECK_EQUAL__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq `BOOST_CHECK_EQUAL`]]
+[def __BOOST_REQUIRE_EQUAL__              [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq `BOOST_REQUIRE_EQUAL`]]
 
-[def __BOOST_LEVEL_PREDICATE__            [link boost_test.testing_tool_ref.assertion_boost_level_predicate `BOOST_<level>_PREDICATE`]]
-[def __BOOST_LEVEL_EQUAL_COLLECTIONS__    [link boost_test.testing_tool_ref.assertion_boost_level_eq_collections `BOOST_<level>_EQUAL_COLLECTIONS`]]
-[def __BOOST_LEVEL_NE__                   [link boost_test.testing_tool_ref.assertion_boost_level_ne `BOOST_<level>_NE`]]
-[def __BOOST_LEVEL_GE__                   [link boost_test.testing_tool_ref.assertion_boost_level_ge `BOOST_<level>_GE`]]
-[def __BOOST_LEVEL_GT__                   [link boost_test.testing_tool_ref.assertion_boost_level_gt `BOOST_<level>_GT`]]
-[def __BOOST_LEVEL_LE__                   [link boost_test.testing_tool_ref.assertion_boost_level_le `BOOST_<level>_LE`]]
-[def __BOOST_LEVEL_LT__                   [link boost_test.testing_tool_ref.assertion_boost_level_lt `BOOST_<level>_LT`]]
+[def __BOOST_LEVEL_PREDICATE__            [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_predicate `BOOST_<level>_PREDICATE`]]
+[def __BOOST_LEVEL_EQUAL_COLLECTIONS__    [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_eq_collections `BOOST_<level>_EQUAL_COLLECTIONS`]]
+[def __BOOST_LEVEL_NE__                   [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_ne `BOOST_<level>_NE`]]
+[def __BOOST_LEVEL_GE__                   [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_ge `BOOST_<level>_GE`]]
+[def __BOOST_LEVEL_GT__                   [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_gt `BOOST_<level>_GT`]]
+[def __BOOST_LEVEL_LE__                   [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_le `BOOST_<level>_LE`]]
+[def __BOOST_LEVEL_LT__                   [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_lt `BOOST_<level>_LT`]]
 
-[def __BOOST_LEVEL_NO_THROW__             [link boost_test.testing_tool_ref.assertion_boost_level_no_throw `BOOST_<level>_NO_THROW`]]
-[def __BOOST_LEVEL_THROW__                [link boost_test.testing_tool_ref.assertion_boost_level_throw `BOOST_<level>_THROW`]]
-[def __BOOST_LEVEL_EXCEPTION__            [link boost_test.testing_tool_ref.assertion_boost_level_exception `BOOST_<level>_EXCEPTION`]]
+[def __BOOST_LEVEL_NO_THROW__             [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_no_throw `BOOST_<level>_NO_THROW`]]
+[def __BOOST_LEVEL_THROW__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_throw `BOOST_<level>_THROW`]]
+[def __BOOST_LEVEL_EXCEPTION__            [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_exception `BOOST_<level>_EXCEPTION`]]
 
-[def __BOOST_LEVEL_BITWISE_EQUAL__        [link boost_test.testing_tool_ref.assertion_boost_level_bitwise_eq `BOOST_<level>_BITWISE_EQUAL`]]
-[def __BOOST_ERROR__                      [link boost_test.testing_tool_ref.assertion_boost_error `BOOST_ERROR`]]
-[def __BOOST_FAIL__                       [link boost_test.testing_tool_ref.assertion_boost_fail `BOOST_FAIL`]]
-[def __BOOST_IS_DEFINED__                 [link boost_test.testing_tool_ref.assertion_boost_is_defined `BOOST_IS_DEFINED`]]
+[def __BOOST_LEVEL_BITWISE_EQUAL__        [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_bitwise_eq `BOOST_<level>_BITWISE_EQUAL`]]
+[def __BOOST_ERROR__                      [link boost_test.testing_tools.testing_tool_ref.assertion_boost_error `BOOST_ERROR`]]
+[def __BOOST_FAIL__                       [link boost_test.testing_tools.testing_tool_ref.assertion_boost_fail `BOOST_FAIL`]]
+[def __BOOST_IS_DEFINED__                 [link boost_test.testing_tools.testing_tool_ref.assertion_boost_is_defined `BOOST_IS_DEFINED`]]
 
 
 [/ Assertions / floating point]
-[def __BOOST_LEVEL_SMALL__                [link boost_test.testing_tool_ref.assertion_boost_level_small `BOOST_<level>_SMALL`]]
-[def __BOOST_CHECK_SMALL__                [link boost_test.testing_tool_ref.assertion_boost_level_small `BOOST_CHECK_SMALL`]]
-[def __BOOST_LEVEL_CLOSE__                [link boost_test.testing_tool_ref.assertion_boost_level_close `BOOST_<level>_CLOSE`]]
-[def __BOOST_CHECK_CLOSE__                [link boost_test.testing_tool_ref.assertion_boost_level_close `BOOST_CHECK_CLOSE`]]
-[def __BOOST_LEVEL_CLOSE_FRACTION__       [link boost_test.testing_tool_ref.assertion_boost_level_close_fraction `BOOST_<level>_CLOSE_FRACTION`]]
+[def __BOOST_LEVEL_SMALL__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_small `BOOST_<level>_SMALL`]]
+[def __BOOST_CHECK_SMALL__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_small `BOOST_CHECK_SMALL`]]
+[def __BOOST_LEVEL_CLOSE__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_close `BOOST_<level>_CLOSE`]]
+[def __BOOST_CHECK_CLOSE__                [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_close `BOOST_CHECK_CLOSE`]]
+[def __BOOST_LEVEL_CLOSE_FRACTION__       [link boost_test.testing_tools.testing_tool_ref.assertion_boost_level_close_fraction `BOOST_<level>_CLOSE_FRACTION`]]
 
 [/ Tests cases]
 [def __BOOST_AUTO_TEST_CASE__                 [link ref_BOOST_AUTO_TEST_CASE `BOOST_AUTO_TEST_CASE`]]
@@ -159,31 +158,39 @@
 [def __param_report_sink__            [link ref_param_report_sink `report_sink`]]
 [def __param_save_pattern__           [link ref_param_save_patterm `save_patterm`]]
 
+[/=============================================================================]
 
+[template bt_example[name descr]
+
+[h5 Example: [descr]]
+
+[import ../examples/[name].cpp]
+[import ../examples/[name].output]
+[table
+  [
+    [Code]
+    [Output]
+  ]
+  [
+    [[example_code]]
+    [[example_output]]
+  ]
+]
+] [/ end bt_example]
 
 [/=============================================================================]
 
-
-
-[/ this is the introduction that appears on the first page of the documentation]
-[/ maybe we can just get rid of it]
-[include forewords.qbk]
-
 [/ introduction material and general presentation ]
-[include overview.qbk]
-[include how_to_read_this_documentation.qbk]
-
-[/ some tutorial ]
-[include tutorials/tutorial.qbk]
+[include introduction.qbk]
 
 [/ build and link with boost.test]
 [include building_and_linking/building_and_linking.qbk]
 
 [/ organizing, generating and registering tests]
-[include tests_organization/test-organization.qbk]
+[include test_organization/test_organization.qbk]
 
 [/ creating assertions]
-[include utf.testing-tools.qbk]
+[include testing_tools/testing_tools.qbk]
 
 [/ controlling outputs]
 [include test_output/test_output.qbk]
@@ -192,25 +199,28 @@
 [include runtime_configuration/runtime_configuration.qbk]
 
 [include usage_recommandations.qbk]
-[include faq.qbk]
-[include glossary.qbk]
-[include change_log.qbk]
-
-[include open_issues.qbk]
-[include acknowledgments.qbk]
-
 
 [/=============================================================================]
-[section Components]
-[include component_minimal_testing.qbk]
-[include component_execution_monitor.qbk]
-[include component_program_execution_monitor.qbk]
-[endsect]
 
-
-[/ reference sections]
-[include runtime_configuration/runtime_configuration.reference.qbk]
-[include testing_tools/testing_tools_reference.qbk]
-
-[/ doxygen autogenerated documentation] 
+[/ doxygen autogenerated reference documentation] 
 [xinclude autodoc_execution_monitor.xml]
+
+[/=============================================================================]
+
+[/TOFIX section Components]
+[/include component_program_execution_monitor.qbk]
+[/endsect]
+
+[/=============================================================================]
+
+[/ some tutorial ]
+[include tutorials/tutorials.qbk]
+
+[include closing_chapters/faq.qbk]
+[include closing_chapters/glossary.qbk]
+[include closing_chapters/change_log.qbk]
+[include closing_chapters/open_issues.qbk]
+[include closing_chapters/acknowledgments.qbk]
+
+[/ EOF]
+
diff --git a/doc/v2/test_organization/fixtures.qbk b/doc/v2/test_organization/fixtures.qbk
index 7c0c597d..3ee9efbb 100644
--- a/doc/v2/test_organization/fixtures.qbk
+++ b/doc/v2/test_organization/fixtures.qbk
@@ -102,22 +102,9 @@ The only difference from the macro __BOOST_AUTO_TEST_CASE__ is the presence of a
 - fixture name. Unlike the pure C++ solution you have direct access to the public and protected members of the
 fixture, though you still need to refer to the fixture name in every test case.
 
-[note You can't access private members of fixture, but then why would you make anything private?
- ]
+[note You can't access private members of fixture, but then why would you make anything private?]
 
- 
-[import ../examples/example18.cpp]
-[import ../examples/example18.output]
-[table:id_example18 Per test case fixture
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example18]]
-    [[example18o]]
-  ]
-]
+[bt_example example18..Per test case fixture]
 
 In this example only `test_case1` and `test_case2` have fixture `F` assigned. In the next section you going to see
 what can be done if all test cases in a test suite require the same fixture.
@@ -147,21 +134,10 @@ the same fixture automatically.
     same fixture is assigned to all test cases, including ones that belong to the sub test suites.
 ]
 
-[import ../examples/example19.cpp]
-[import ../examples/example19.output]
-[table:id_example19 Test suite level fixture
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example19]]
-    [[example19o]]
-  ]
-]
+[bt_example example19..Test suite level fixture]
 
-[caution The fixture constructor and destructor is called for each test cases (the state of the fixture is not shared among
-         the test cases).]
+[caution The fixture constructor and destructor is called for each test cases (the state of the 
+         fixture is not shared among the test cases).]
 
 [endsect] [/ testsuite fixtures]
 
@@ -196,18 +172,8 @@ passed it as an argument to the macro __BOOST_GLOBAL_FIXTURE__.
 
 The statement, that performs global fixture definition, has to reside at a test file scope.
 
-[import ../examples/example20.cpp]
-[import ../examples/example20.output]
-[table:id_example20 Global fixture
-[
-  [Code]
-  [Output]
-]
-[
-  [[example20]]
-  [[example20o]]
-]
-]
+[bt_example example20..Global fixture]
+
 [endsect] [/section Global fixtures]
 
 [endsect] [/ section fixtures]
diff --git a/doc/v2/test_organization/nullary_tests.qbk b/doc/v2/test_organization/nullary_tests.qbk
index f998c5c7..4626f1e8 100644
--- a/doc/v2/test_organization/nullary_tests.qbk
+++ b/doc/v2/test_organization/nullary_tests.qbk
@@ -20,22 +20,9 @@ macro __BOOST_AUTO_TEST_CASE__.
 
 The macro is designed to closely mimic nullary free function syntax. Changes that are required to make an
 existing test case, implemented as a free function, registered in place are illustrated in the following
-example (compare with [link boost_test.tests_organization.test_cases.test_organization_nullary.id_example01 manual registration]):
-
-
-[import ../examples/example06.cpp]
-[import ../examples/example06.output]
-[table:id_example06 Nullary function based test case with automated registration
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example06]]
-    [[example06o]]
-  ]
-]
+example (compare with [link ref_bt_example01 manual registration]):
 
+[bt_example example06..Nullary function based test case with automated registration]
 
 With this macro you don't need to implement the initialization function at all. The macro creates and
 registers the test case with the name `free_test_function` automatically.
@@ -60,18 +47,8 @@ Here is the simplest possible manually registered test case. This example employ
 initialization function specification. A single test case is created and registered in the master test suite.
 Note that the free function name is passed by address to the macro __BOOST_TEST_CASE__`.
 
-[import ../examples/example01.cpp]
-[import ../examples/example01.output]
-[table:id_example01 Nullary free function manually registered
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example01]]
-    [[example01o]]
-  ]
-]
+[#ref_bt_example01]
+[bt_example example01..Nullary free function manually registered]
 
 A test case can be implemented as a method of a class. In this case a pointer to the class instance has to be
 bound to the test method to create a test case. You can use the same instance of the class for multiple test
@@ -84,47 +61,13 @@ instance lifetime yourself.
  shared pointer.
 ]
 
-[import ../examples/example02.cpp]
-[import ../examples/example02.output]
-[table:id_example02 Nullary method of a class bound to global class instance and manually registered
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example02]]
-    [[example02o]]
-  ]
-]
-
-[import ../examples/example03.cpp]
-[import ../examples/example03.output]
-[table:id_example03 Nullary method of a class bound to shared class instance and manually registered
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example03]]
-    [[example03o]]
-  ]
-]
+[bt_example example02..Nullary method of a class bound to global class instance and manually registered]
+[bt_example example03..Nullary method of a class bound to shared class instance and manually registered]
 
 If you do not need to reuse the test class instance and can't or do not wish to create test class
 instance globally it may be easier and safer to create an instance on the stack of free function:
 
-[import ../examples/example04.cpp]
-[import ../examples/example04.output]
-[table:id_example04 Nullary method of a class bound to local class instance inside free function
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example04]]
-    [[example04o]]
-  ]
-]
+[bt_example example04..Nullary method of a class bound to local class instance inside free function]
 
 If you have to perform the same set of tests with different sets of parameters you may want to base your test
 case on a function with arguments and bind particular parameters during test case creation.
@@ -134,22 +77,9 @@ case on a function with arguments and bind particular parameters during test cas
      test module initialization function.
 ]
  
- 
 The example below employs the alternative test module initialization function specification:
 
-[import ../examples/example05.cpp]
-[import ../examples/example05.output]
-[table:id_example05 Binary free function bound to set of different parameter pairs
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example05]]
-    [[example05o]]
-  ]
-]
-
+[bt_example example05..Binary free function bound to set of different parameter pairs]
 
 The __UTF__ also presents an alternative method for parameterized test case creation, which is covered in 
 [link ref_BOOST_PARAM_TEST_CASE next section].
diff --git a/doc/v2/test_organization/parametric_test_case_generation.qbk b/doc/v2/test_organization/parametric_test_case_generation.qbk
index 3ad9c228..96cf0e37 100644
--- a/doc/v2/test_organization/parametric_test_case_generation.qbk
+++ b/doc/v2/test_organization/parametric_test_case_generation.qbk
@@ -62,9 +62,6 @@ The `join` functionality is implemented in the class [classref boost::unit_test:
 
 [endsect]
 
-
-
-
 [section Zips]
 The ['zip] function returns a dataset of tuples, where the i-th tuple contains the i-th element from each of the argument datasets.
 The size of the zipped dataset is as follow:
@@ -74,8 +71,6 @@ The size of the zipped dataset is as follow:
 
 Zips are accessible through the `operator^` on datasets:
 
-
-
 [table:id_example_dataset_zipop Custom predicate support using __BOOST_LEVEL_PREDICATE__
   [
     [Code]
diff --git a/doc/v2/test_organization/test_organization.qbk b/doc/v2/test_organization/test_organization.qbk
index 710b7f8d..04ece622 100644
--- a/doc/v2/test_organization/test_organization.qbk
+++ b/doc/v2/test_organization/test_organization.qbk
@@ -1,4 +1,4 @@
-[section:tests_organization Registering, generating and organizing the unit tests]
+[section:tests_organization Test organization using the __UTF__]
 
 If you look at many legacy test modules, big chance is that it's implemented as one big test function that
 consists of a mixture of check and output statements. Is there anything wrong with it? Yes. There are various
@@ -15,7 +15,6 @@ disadvantages in single test function approach:
 The above points should make it clear that it's preferable to split [link ref_test_module test module] into smaller units.
 These units are [link boost_test.tests_organization.test_cases test cases].
 
-
 To solve test tree creation problem the __UTF__ provides facilities for __section_test_suite__ creation. 
 In some cases it's desirable to allow some ['expected] failures in test case without failing a
 test module. To support this request The __UTF__ allows specifying the number of
diff --git a/doc/v2/test_organization/test_suites.qbk b/doc/v2/test_organization/test_suites.qbk
index 3a87f81e..ddf2279f 100644
--- a/doc/v2/test_organization/test_suites.qbk
+++ b/doc/v2/test_organization/test_suites.qbk
@@ -38,39 +38,15 @@ become members of the master test suite. There is no limit on depth of test suit
 This example creates a test tree that matches exactly the one created in the manual test suite registration
 example.
 
-[import ../examples/example12.cpp]
-[import ../examples/example12.output]
-[table:id_example12 Test suites with automated registration
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example12]]
-    [[example12o]]
-  ]
-]
-As you can see test tree construction in this example is more straightforward and automated.
+[bt_example example12..Test suites with automated registration]
 
+As you can see test tree construction in this example is more straightforward and automated.
 
 In the example below, the test suite `test_suite` consists of two parts. Their definition is remote and is separated by another
 test case. In fact these parts may even reside in different test files. The resulting test tree remains the same. As
 you can see from the output both `test_case1` and `test_case2` reside in the same test suite `test_suite`.
 
-[import ../examples/example53.cpp]
-[import ../examples/example53.output]
-[table:id_example53 Example of test suite extension using automated registration facility
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example53]]
-    [[example53o]]
-  ]
-]
-
-
+[bt_example example53..Test suite extension using automated registration facility]
 
 [h3 Test suites with manual registration]
 To create a test suite manually you need to create an instance of `boost::unit_test::test_suite` class, register
@@ -134,21 +110,7 @@ The example below creates a test tree, which can be represented by the following
 
 [$../img/class-hier.jpg]
 
-[import ../examples/example11.cpp]
-[import ../examples/example11.output]
-[table:id_example11 Manually registered test suites
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example11]]
-    [[example11o]]
-  ]
-]
-
-
-
+[bt_example example11..Manually registered test suites]
 
 [section:master_test_suite Master Test Suite]
 
@@ -208,18 +170,7 @@ master test suite.
 Returning to the free function example, let's modify initialization function to check for absence of any
 test module arguments.
 
-[import ../examples/example13.cpp]
-[import ../examples/example13.output]
-[table:id_example13 Command line access in initialization function
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example13]]
-    [[example13o]]
-  ]
-]
+[bt_example example13..Command line access in initialization function]
 
 [#ref_BOOST_TEST_MODULE][h4 Naming the ['Master test suite]]
 
@@ -228,43 +179,17 @@ reset the name to a different value: using the macro __BOOST_TEST_MODULE__
 and from within the test module initialization function. Former is used for test modules that don't have the
 manually implemented initialization function. Following examples illustrate these methods.
 
-
-[import ../examples/example14.cpp]
-[import ../examples/example14.output]
-[table:id_example14 Naming master test suite using the macro __BOOST_TEST_MODULE__
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example14]]
-    [[example14o]]
-  ]
-]
+[bt_example example14..Naming master test suite using the macro __BOOST_TEST_MODULE__]
 
 If the macro __BOOST_TEST_MODULE__ is defined, the test module initialization
 function is [*automatically generated] and the
 macro value becomes the name of the master test suite. The name may include spaces.
 
-[import ../examples/example15.cpp]
-[import ../examples/example15.output]
-[table:id_example15 Naming master test suite explicitly in the test module initialization function
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example15]]
-    [[example15o]]
-  ]
-]
-
+[bt_example example15..Naming master test suite explicitly in the test module initialization function]
 
 Without the __BOOST_TEST_MAIN__ and the __BOOST_TEST_MODULE__ flags defined, the test module initialization 
 function has to be manually implemented. The master test suite name can be reset at any point within this function.
 
-
-
 [endsect] [/ command line interface]
 
 [section:test_suite_expected_failure Expected failures specification]
@@ -301,18 +226,7 @@ unexpected failure to occur to satisfy this quota.
 To set the value of expected failures for the manually registered test unit pass it as a second argument for the
 [link ref_test_case_registration `test_suite::add`] call during test unit registration.
 
-[import ../examples/example16.cpp]
-[import ../examples/example16.output]
-[table:id_example16 Expected failures specification for manually registered test case
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example16]]
-    [[example16o]]
-  ]
-]
+[bt_example example16..Expected failures specification for manually registered test case]
 
 [#ref_BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES][h3 Usage with automatically registered test cases]
 
@@ -327,20 +241,7 @@ You can use this macro both on a file scope and inside a test suite. Moreover yo
 units coincide in different test suites. Expected failures specification applies to the test unit belonging to the same 
 test suite where __BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES__ resides.
 
-
-[import ../examples/example17.cpp]
-[import ../examples/example17.output]
-[table:id_example17 Expected failures specification for automatically registered test case
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example17]]
-    [[example17o]]
-  ]
-]
-
+[bt_example example17..Expected failures specification for automatically registered test case]
 
 [endsect] [/ expected failures]
 [endsect] [/ test suite]
diff --git a/doc/v2/test_organization/typed_parametrized_tests.qbk b/doc/v2/test_organization/typed_parametrized_tests.qbk
index 269ab425..ff25899e 100644
--- a/doc/v2/test_organization/typed_parametrized_tests.qbk
+++ b/doc/v2/test_organization/typed_parametrized_tests.qbk
@@ -24,24 +24,12 @@ The macro __BOOST_AUTO_TEST_CASE_TEMPLATE__ requires three arguments:
          name of the type the test case template is instantiated with
 # The collection of types to instantiate test case template with: arbitrary MPL sequence
 
-[import ../examples/example10.cpp]
-[import ../examples/example10.output]
-[table:id_example10 Test case template with automated registration
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example10]]
-    [[example10o]]
-  ]
-]
+[bt_example example10..Test case template with automated registration]
 
 [#ref_BOOST_TEST_CASE_TEMPLATE][h4 Test case template with manual registration]
 One way to perform the same set of checks for a component instantiated with different template parameters is
 illustrated in the following example:
 
-[/snippet2 deleted and copied below]
 ``
 template <typename T>
 void single_test()
@@ -133,19 +121,6 @@ case of failure you can't say which type is at fault) and allows you to test all
 them causes termination of the sub test case.
 ]
 
-[import ../examples/example09.cpp]
-[import ../examples/example09.output]
-[table:id_example09 Manually registered test case template
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example09]]
-    [[example09o]]
-  ]
-]
-
-
+[bt_example example09..Manually registered test case template]
 
 [endsect] [/template test cases]
diff --git a/doc/v2/test_organization/unary_tests.qbk b/doc/v2/test_organization/unary_tests.qbk
index 5ceff501..385d5d8d 100644
--- a/doc/v2/test_organization/unary_tests.qbk
+++ b/doc/v2/test_organization/unary_tests.qbk
@@ -51,37 +51,12 @@ In following simple example the same test, implemented in `free_test_function`,
 performed for 5 different parameters. The parameters are defined in the test module initialization function
 scope. The master test suite contains 5 independent test cases.
 
-
-[import ../examples/example07.cpp]
-[import ../examples/example07.output]
-[table:id_example07 Unary free function based test case
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example07]]
-    [[example07o]]
-  ]
-]
-
-
+[bt_example example07..Unary free function based test case]
 
 Next example is similar, but instead of a free function it uses a method of a class. Even though parameters are
 passed into test method by reference you can still define them in the test module initialization function scope.
 This example employs the alternative test module initialization function specification.
 
-[import ../examples/example08.cpp]
-[import ../examples/example08.output]
-[table:id_example08 Unary class method based test case
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example08]]
-    [[example08o]]
-  ]
-]
+[bt_example example08..Unary class method based test case]
 
 [endsect] [/test case with arity]
diff --git a/doc/v2/test_output/compilation_options.qbk b/doc/v2/test_output/compilation_options.qbk
index f0f1441f..84263398 100644
--- a/doc/v2/test_output/compilation_options.qbk
+++ b/doc/v2/test_output/compilation_options.qbk
@@ -21,19 +21,7 @@ interface:
 You can reset the output stream at any time both during the test module initialization and from within test
 cases. There are no limitations on number of output stream resets either.
 
-[import ../examples/example50.cpp]
-[import ../examples/example50.output]
-[table:id_example50 Compile-time log output redirection
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example50]]
-    [[example50o]]
-  ]
-]
-
+[bt_example example50..Compile-time log output redirection]
 
 [warning
   If you redirect test log output stream from global fixture setup, you are [*required] to reset it back to `std::cout`
@@ -54,19 +42,7 @@ If you need to enforce specific log level from within your test module use the f
 In regular circumstances you shouldn't use this interface, since you not only override default log level, but also
 the one supplied at test execution time. Prefer to use runtime parameters __param_log_level__ for log level selection.
 
-
-[import ../examples/example51.cpp]
-[import ../examples/example51.output]
-[table:id_example51 Compile-time log level configuration
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example51]]
-    [[example51o]]
-  ]
-]
+[bt_example example51..Compile-time log level configuration]
 
 [endsect] [/section:log_ct_log_level]
 
@@ -81,18 +57,7 @@ The select at compile time the log format from the list of the formats supplied
 In regular circumstances you shouldn't use this interface. Prefer to use runtime parameters for predefined log
 format selection.
 
-[import ../examples/example52.cpp]
-[import ../examples/example52.output]
-[table:id_example52 Compile-time log format selection
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example52]]
-    [[example52o]]
-  ]
-]
+[bt_example example52..Compile-time log format selection]
 
 [endsect] [/section:log_ct_log_format]
 
diff --git a/doc/v2/test_output/progression_display.qbk b/doc/v2/test_output/progression_display.qbk
deleted file mode 100644
index 44d88481..00000000
--- a/doc/v2/test_output/progression_display.qbk
+++ /dev/null
@@ -1,44 +0,0 @@
-[section:test_output_progress Progression display]
-In case if the test module involves lengthy computation split among multiple test cases you may be interested in 
-progress monitor. The test runners supplied with the __UTF__ support simple text progress display, implemented based
-on 
-``
-  boost::progress_display
-``
-
-[footnote The __UTF__ interfaces allow implementing an advanced GUI based test runner with arbitrary progress display controls]. 
-
-The progress display output is enabled using the __UTF__ parameter __param_show_progress__.
-
-
-The __UTF__ has no ability to estimate how long the test case execution is going to take and the manual test 
-progress update is not supported at this point. The __UTF__ tracks the progress on test case level. If you want to 
-see more frequent progress update, you need to split the test into multiple test cases.
-
-
-In default configuration both test log and test progress outputs are directed into standard output stream. Any test 
-log messages are going to interfere with test progress display. To prevent this you can either set log level to 
-lower level or redirect either test log or test progress output into different stream during test module 
-initialization. Use following interface to redirect test progress output:
-
-
-``
-  boost::unit_test::progress_monitor.set_stream( std::ostream& )
-``
-
-[import ../examples/example49.cpp]
-[import ../examples/example49.output]
-[table:id_example49 Progress report for the test module with large amount of test cases
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example49]]
-    [[example49o]]
-  ]
-]
-
-
-
-[endsect] [/section:test_output_progress]
\ No newline at end of file
diff --git a/doc/v2/test_output/test_output.qbk b/doc/v2/test_output/test_output.qbk
index 50021d6e..bc427f23 100644
--- a/doc/v2/test_output/test_output.qbk
+++ b/doc/v2/test_output/test_output.qbk
@@ -1,7 +1,8 @@
-[#ref_test_outputs][section:test_output Controlling the outputs]
+[#ref_test_outputs][section:test_output Controlling the __UTF__ outputs]
 The output produced by a test module is one of the major assets the __UTF__ brings to users. In comparison with any
 kind of manual/assert based solution the __UTF__ provide following services:
 
+[/TOFIX into proper list]
 * All test errors are reported uniformly[br]
   The test execution monitor along with standardized output from all included
   __testing_tools__ provides uniform reporting for all errors including fatal errors, like memory assess violation and uncaught exceptions.
@@ -127,10 +128,8 @@ The active log level threshold can be configured at runtime using the parameter
 The test log output format can be selected using either parameter __param_log_format__ or the
 parameter __param_output_format__.
 
-
 [endsect] [/section:log_runtime_config]
 
-
 [/ -------------------------------------------------------------------------------------------------- ]
 
 [section:testing_tool_output_disable Disabling automatic printing for specific types]
@@ -148,25 +147,9 @@ failing to compile:
   BOOST_TEST_DONT_PRINT_LOG_VALUE(ArgumentType)
 ``
 
-[import ../examples/example32.cpp]
-[import ../examples/example32.output]
-[table:id_example32 BOOST_TEST_DONT_PRINT_LOG_VALUE usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example32]]
-    [[example32o]]
-  ]
-]
-
-[endsect]
-
-
-
-
+[bt_example example32..BOOST_TEST_DONT_PRINT_LOG_VALUE usage]
 
+[endsect] [/section:testing_tool_output_disable]
 
 [/ -------------------------------------------------------------------------------------------------- ]
 
@@ -185,23 +168,9 @@ with in a manner similar to standard `std::iostream` operation.
    to "message".
 ]
 
-[import ../examples/example21.cpp]
-[import ../examples/example21.output]
-[table:id_example21 __BOOST_TEST_MESSAGE__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example21]]
-    [[example21o]]
-  ]
-]
-
-[endsect] [/section:log_test_messages]
-
-
+[bt_example example21..__BOOST_TEST_MESSAGE__ usage]
 
+[endsect] [/section:test_output_macro_message]
 
 [/ -------------------------------------------------------------------------------------------------- ]
 [section:test_output_macro_checkpoint `BOOST_TEST_CHECKPOINT`]
@@ -218,25 +187,9 @@ The message formatted at the checkpoint position is saved and reported by the ex
 occurs). Similarly to the __BOOST_TEST_MESSAGE__ the message can be formatted from any standard
 output stream compliant components.
 
+[bt_example example22..__BOOST_TEST_CHECKPOINT__ usage]
 
-[import ../examples/example22.cpp]
-[import ../examples/example22.output]
-[table:id_example22 __BOOST_TEST_CHECKPOINT__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example22]]
-    [[example22o]]
-  ]
-]
-[endsect] [/section:log_test_checkpoint]
-
-
-
-
-
+[endsect] [/section:test_output_macro_checkpoint]
 
 [/ -------------------------------------------------------------------------------------------------- ]
 [section:test_output_macro_passpoint `BOOST_TEST_PASSPOINT`]
@@ -244,30 +197,17 @@ output stream compliant components.
 The macro __BOOST_TEST_PASSPOINT__ is intended to be used to inject an [*unnamed] checkpoint position. The
 macro signature is as follows:
 
+``
   __BOOST_TEST_PASSPOINT__();
-
+``
 
 Unlike the macro __BOOST_TEST_CHECKPOINT__ this macro doesn't require any message to be
 supplied with it. It's just a simple "been there" marker that records file name and line number
 code passes through.
 
-[import ../examples/example23.cpp]
-[import ../examples/example23.output]
-[table:id_example23 __BOOST_TEST_PASSPOINT__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example23]]
-    [[example23o]]
-  ]
-]
-[endsect] [/section:log_test_passpoint]
-
-
-
+[bt_example example23..__BOOST_TEST_PASSPOINT__ usage]
 
+[endsect] [/section:test_output_macro_passpoint]
 
 [include logging_floating_point.qbk]
 
@@ -279,14 +219,7 @@ code passes through.
 [warning Section empty]
 [endsect]
 
-[include progression_display.qbk]
-
-[section Reference]
-[:
-  [headerref boost/test/output/compiler_log_formatter.hpp]
-  
-]
-[endsect]
+[include progress_display.qbk]
 
 [endsect] 
 
diff --git a/doc/v2/testing_tools/custom_predicates.qbk b/doc/v2/testing_tools/custom_predicates.qbk
index 1873bb14..fcc35d18 100644
--- a/doc/v2/testing_tools/custom_predicates.qbk
+++ b/doc/v2/testing_tools/custom_predicates.qbk
@@ -13,19 +13,7 @@ The first layer is supported by __BOOST_LEVEL_PREDICATE__ family of testing tool
 predicate that reports the result as boolean value. The values of the predicate arguments are reported by the tool
 automatically in case of failure.
 
-[import ../examples/example30.cpp]
-[import ../examples/example30.output]
-[table:id_example30 Custom predicate support using __BOOST_LEVEL_PREDICATE__
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example30]]
-    [[example30o]]
-  ]
-]
-
+[bt_example example30..Custom predicate support using __BOOST_LEVEL_PREDICATE__]
 
 To use second layer your predicate has to return __class_predicate_result__.
 
@@ -39,16 +27,6 @@ message. You can also assign boolean value to the constructed instance. You can
 using `operator!` or directly accessing public read-only property `p_predicate_value`. The
 error message is stored in public read-write property `p_message`.
 
-[import ../examples/example31.cpp]
-[import ../examples/example31.output]
-[table:id_example31 Custom predicate support using class __class_predicate_result__
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example31]]
-    [[example31o]]
-  ]
-]
+[bt_example example31..Custom predicate support using class __class_predicate_result__]
+
 [endsect] [/predicate]
diff --git a/doc/v2/testing_tools/testing_output_streams.qbk b/doc/v2/testing_tools/testing_output_streams.qbk
index 63710fcd..f19fea47 100644
--- a/doc/v2/testing_tools/testing_output_streams.qbk
+++ b/doc/v2/testing_tools/testing_output_streams.qbk
@@ -42,18 +42,7 @@ There are two ways to employ the class `output_test_stream`:
 
 Use the instance of class `output_test_stream` as an output stream and check output content using tool's methods.
 
-[import ../examples/example28.cpp]
-[import ../examples/example28.output]
-[table:id_example28 Explicit output checks with `output_test_stream`
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example28]]
-    [[example28o]]
-  ]
-]
+[bt_example example28..Explicit output checks with `output_test_stream`]
 
 [note Use of `false` to prevent output flushing in first two invocation of check functions. Unless
 you want to perform several different checks for the same output you wouldn't need to use it though. Your
@@ -67,25 +56,13 @@ identify possible source of failure.]
 The ['pattern file] is a companion file containing the patterns that the stream should match. Your testing will look 
 like a serie of output operators followed by match pattern checks repeated several times.
 
-[import ../examples/example29.cpp]
-[import ../examples/example29.output]
 In the example below, the file `pattern_file` contains the patterns that should match. 
 [pre
 i=2
 File: test.cpp Line:XXX
 ]
 
-[table:id_example29 Pattern file matching with `output_test_stream`
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example29]]
-    [[example29o]]
-  ]
-]
-
+[bt_example example28..Pattern file matching with `output_test_stream`]
 
 [tip Try to perform checks as frequently as possible, because it allows you to more closely identify possible source
     of failure
diff --git a/doc/v2/testing_tools/testing_tools_reference.qbk b/doc/v2/testing_tools/testing_tools_reference.qbk
index 353993a3..d0316dd8 100644
--- a/doc/v2/testing_tools/testing_tools_reference.qbk
+++ b/doc/v2/testing_tools/testing_tools_reference.qbk
@@ -1,4 +1,4 @@
-[section:testing_tool_ref __UTF__ testing tools reference]
+[section:testing_tool_ref Reference]
 
 
 [table
@@ -130,12 +130,8 @@
   
 ]
 
-
-
-
-
 [/ ###############################################################################################]
-[#ref_BOOST_level][section:assertion_boost_level `BOOST_<level>`]
+[#ref_BOOST_level][section:assertion_boost_level BOOST_<level>]
 
 
 ``
@@ -148,18 +144,7 @@ These tools are used to validate the predicate value. The only parameter for the
 value that gets validated. It could be any expression that could be evaluated and converted to boolean value. The
 expression gets evaluated only once, so it's safe to pass complex expression for validation.
 
-[import ../examples/example34.cpp]
-[import ../examples/example34.output]
-[table:id_example34 `BOOST_<level>` usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example34]]
-    [[example34o]]
-  ]
-]
+[bt_example example34..BOOST_<level> usage]
 
 See also:
 
@@ -169,7 +154,7 @@ See also:
 
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_bitwise_eq `BOOST_<level>_BITWISE_EQUAL`]
+[section:assertion_boost_level_bitwise_eq BOOST_<level>_BITWISE_EQUAL]
 
 
 ``
@@ -184,18 +169,7 @@ right value's bits mismatch.
 The first parameter is the left compared value. The second parameter is the right compared value. Parameters are
 not required to be of the same type, but warning is issued if their type's size does not coincide.
 
-[import ../examples/example33.cpp]
-[import ../examples/example33.output]
-[table:id_example33 __BOOST_LEVEL_BITWISE_EQUAL__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example33]]
-    [[example33o]]
-  ]
-]
+[bt_example example33..BOOST_<level>_BITWISE_EQUAL usage]
 
 See also:
 
@@ -204,7 +178,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_eq `BOOST_<level>_EQUAL`]
+[section:assertion_boost_level_eq BOOST_<level>_EQUAL]
 
 ``
   BOOST_WARN_EQUAL(left, right);
@@ -218,19 +192,8 @@ The difference is that the mismatched values are reported as well.
 [note It is bad idea to use these tools to compare floating point values. Use __BOOST_LEVEL_CLOSE__ or
       __BOOST_LEVEL_CLOSE_FRACTION__ tools instead.
 ]
-[import ../examples/example35.cpp]
-[import ../examples/example35.output]
-[table:id_example35 __BOOST_LEVEL_EQUAL__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example35]]
-    [[example35o]]
-  ]
-] 
 
+[bt_example example35..BOOST_<level>_EQUAL usage]
 
 See also:
 
@@ -242,7 +205,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_eq_collections `BOOST_<level>_EQUAL_COLLECTIONS`]
+[section:assertion_boost_level_eq_collections BOOST_<level>_EQUAL_COLLECTIONS]
 
 ``
   BOOST_WARN_EQUAL_COLLECTIONS(left_begin, left_end, right_begin, right_end);
@@ -255,19 +218,7 @@ positions, collection elements at these positions and check that the collections
 parameters designate begin and end of the first collection. The two last parameters designate begin and end of the
 second collection.
 
-[import ../examples/example36.cpp]
-[import ../examples/example36.output]
-[table:id_example36 __BOOST_LEVEL_EQUAL_COLLECTIONS__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example36]]
-    [[example36o]]
-  ]
-]
-
+[bt_example example36..BOOST_<level>_EQUAL_COLLECTIONS usage]
 
 See also:
 
@@ -275,12 +226,8 @@ See also:
 
 [endsect]
 
-
-
-
 [/ ###############################################################################################]
-[section:assertion_boost_level_close `BOOST_<level>_CLOSE`]
-
+[section:assertion_boost_level_close BOOST_<level>_CLOSE]
 
 ``
   BOOST_WARN_CLOSE(left, right, tolerance);
@@ -306,31 +253,8 @@ The first parameter is the ['left] compared value. The second parameter is the
 [note Note that to use these tools you need to include additional header `floating_point_comparison.hpp`.
 ]
 
-[import ../examples/example42.cpp]
-[import ../examples/example42.output]
-[table:id_example42 __BOOST_LEVEL_CLOSE__ usage with small values
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example42]]
-    [[example42o]]
-  ]
-]
-
-[import ../examples/example43.cpp]
-[import ../examples/example43.output]
-[table:id_example43 __BOOST_LEVEL_CLOSE__ usage with big values
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example43]]
-    [[example43o]]
-  ]
-]
+[bt_example example42..BOOST_<level>_CLOSE usage with small values]
+[bt_example example43..BOOST_<level>_CLOSE usage with big values]
 
 See also:
 
@@ -342,7 +266,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_close_fraction `BOOST_<level>_CLOSE_FRACTION`]
+[section:assertion_boost_level_close_fraction BOOST_<level>_CLOSE_FRACTION]
 
 ``
   BOOST_WARN_CLOSE_FRACTION(left, right, tolerance);
@@ -364,18 +288,7 @@ The first parameter is the ['left] compared value. The second parameter is the
 
 [note Note that to use these tools you need to include additional header `floating_point_comparison.hpp`.]
 
-[import ../examples/example44.cpp]
-[import ../examples/example44.output]
-[table:id_example44 __BOOST_LEVEL_CLOSE_FRACTION__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example44]]
-    [[example44o]]
-  ]
-]
+[bt_example example44..BOOST_<level>_CLOSE_FRACTION usage]
 
 See also:
 
@@ -384,12 +297,10 @@ See also:
 * __BOOST_LEVEL_EQUAL__
 * [link boost_test.testing_tools.testing_floating_points Floating point comparison algorithms]
 
-
 [endsect]
 
-
 [/ ###############################################################################################]
-[section:assertion_boost_level_exception `BOOST_<level>_EXCEPTION`]
+[section:assertion_boost_level_exception BOOST_<level>_EXCEPTION]
 
 ``
   BOOST_WARN_EXCEPTION(expression, exception, predicate);
@@ -404,18 +315,7 @@ predicate evaluates to false, check fails. In comparison with __BOOST_LEVEL_THRO
 allow performing more fine-grained checks. For example: make sure that an expected exception has specific 
 error message.
 
-[import ../examples/example37.cpp]
-[import ../examples/example37.output]
-[table:id_example37 __BOOST_LEVEL_EXCEPTION__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example37]]
-    [[example37o]]
-  ]
-]
+[bt_example example37..BOOST_<level>_EXCEPTION usage]
 
 See also:
 
@@ -423,13 +323,8 @@ See also:
 
 [endsect]
 
-
-
-
-
-
 [/ ###############################################################################################]
-[section:assertion_boost_level_ge `BOOST_<level>_GE`]
+[section:assertion_boost_level_ge BOOST_<level>_GE]
 
 ``
   BOOST_WARN_GE(left, right);
@@ -440,18 +335,7 @@ See also:
 Check performed by these tools is the same as the one performed by `__BOOST_LEVEL__( left >= right )`.
 The difference is that the argument values are reported as well.
 
-[import ../examples/example57.cpp]
-[import ../examples/example57.output]
-[table:id_example57 __BOOST_LEVEL_GE__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example57]]
-    [[example57o]]
-  ]
-]
+[bt_example example57..BOOST_<level>_GE usage]
 
 See also:
 
@@ -463,7 +347,7 @@ See also:
 
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_gt `BOOST_<level>_GT`]
+[section:assertion_boost_level_gt BOOST_<level>_GT]
 
 
 ``
@@ -475,18 +359,8 @@ See also:
 Check performed by these tools is the same as the one performed by __BOOST_LEVEL__`( left > right )`.
 The difference is that the argument values are reported as well.
 
-[import ../examples/example58.cpp]
-[import ../examples/example58.output]
-[table:id_example58 __BOOST_LEVEL_GT__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example58]]
-    [[example58o]]
-  ]
-]
+[bt_example example58..BOOST_<level>_GT usage]
+
 See also:
 
 * __BOOST_LEVEL_LE__
@@ -496,7 +370,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_le `BOOST_<level>_LE`]
+[section:assertion_boost_level_le BOOST_<level>_LE]
 
 ``
   BOOST_WARN_LE(left, right);
@@ -507,18 +381,7 @@ See also:
 Check performed by these tools is the same as the one performed by `__BOOST_LEVEL__( left <= right )`.
 The difference is that the argument values are reported as well.
 
-[import ../examples/example55.cpp]
-[import ../examples/example55.output]
-[table:id_example55 __BOOST_LEVEL_LE__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example55]]
-    [[example55o]]
-  ]
-]
+[bt_example example55..BOOST_<level>_LE usage]
 
 See also:
 
@@ -528,9 +391,8 @@ See also:
 
 [endsect]
 
-
 [/ ###############################################################################################]
-[section:assertion_boost_level_lt `BOOST_<level>_LT`]
+[section:assertion_boost_level_lt BOOST_<level>_LT]
 
 ``
   BOOST_WARN_LT(left, right);
@@ -541,18 +403,7 @@ See also:
 Check performed by these tools is the same as the one performed by `__BOOST_LEVEL__( left < right )`.
 The difference is that the argument values are reported as well.
 
-[import ../examples/example56.cpp]
-[import ../examples/example56.output]
-[table:id_example56 __BOOST_LEVEL_LT__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example56]]
-    [[example56o]]
-  ]
-]
+[bt_example example56..BOOST_<level>_LT usage]
 
 See also:
 
@@ -562,11 +413,8 @@ See also:
 
 [endsect]
 
-
-
 [/ ###############################################################################################]
-[section:assertion_boost_level_message `BOOST_<level>_MESSAGE`]
-
+[section:assertion_boost_level_message BOOST_<level>_MESSAGE]
 
 ``
   BOOST_WARN_MESSAGE(predicate, message);
@@ -581,18 +429,7 @@ The first parameter is the boolean expression. The second parameter is the messa
 failure. The message argument can be constructed of components of any type supporting the 
 `std::ostream& operator<<(std::ostream&)`.
 
-[import ../examples/example38.cpp]
-[import ../examples/example38.output]
-[table:id_example38 __BOOST_LEVEL_MESSAGE__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example38]]
-    [[example38o]]
-  ]
-]
+[bt_example example38..BOOST_<level>_MESSAGE usage]
 
 See also:
 
@@ -602,7 +439,7 @@ See also:
 
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_ne `BOOST_<level>_NE`]
+[section:assertion_boost_level_ne BOOST_<level>_NE]
 
 
 ``
@@ -611,21 +448,10 @@ See also:
   BOOST_REQUIRE_NE(left, right);
 ``
 
-Check performed by these tools is the same as the one performed by `__BOOST_LEVEL__( left != right )`.
+Check performed by these tools is the same as the one performed by `__BOOST_<level>__( left != right )`.
 The difference is that the matched values are reported as well.
 
-[import ../examples/example54.cpp]
-[import ../examples/example54.output]
-[table:id_example54 __BOOST_LEVEL_NE__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example54]]
-    [[example54o]]
-  ]
-]
+[bt_example example54..BOOST_<level>_NE usage]
 
 See also:
 
@@ -634,7 +460,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_no_throw `BOOST_<level>_NO_THROW`]
+[section:assertion_boost_level_no_throw BOOST_<level>_NO_THROW]
 
 
 ``
@@ -653,19 +479,7 @@ a form ``error in <test-case-name>;exception was thrown by <expression>``
 The only parameter is an expression to execute. You can use `do {} while(0)` block if you want to execute more than one
 statement.
 
-[import ../examples/example39.cpp]
-[import ../examples/example39.output]
-[table:id_example39 __BOOST_LEVEL_NO_THROW__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example39]]
-    [[example39o]]
-  ]
-]
-
+[bt_example example39..BOOST_<level>_NO_THROW usage]
 
 See also:
 
@@ -674,7 +488,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_predicate `BOOST_<level>_PREDICATE`]
+[section:assertion_boost_level_predicate BOOST_<level>_PREDICATE]
 
 
 ``
@@ -685,26 +499,15 @@ See also:
 
 These are generic tools used to validate an arbitrary supplied predicate functor (there is a compile time limit on
 predicate arity defined by the configurable macro `BOOST_TEST_MAX_PREDICATE_ARITY`). To
-validate zero arity predicate use __BOOST_LEVEL__ tools. In other cases prefer theses tools. The
+validate zero arity predicate use __BOOST_<level>__ tools. In other cases prefer theses tools. The
 advantage of these tools is that they show arguments values in case of predicate failure.
 
 The first parameter is the predicate itself. The second parameter is the list of predicate arguments each wrapped
 in round brackets (`BOOST_PP` sequence format).
 
-[import ../examples/example40.cpp]
-[import ../examples/example40.output]
-[table:id_example40 __BOOST_LEVEL_PREDICATE__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example40]]
-    [[example40o]]
-  ]
-]
+[bt_example example40..BOOST_<level>_PREDICATE usage]
 
-[note Note difference in error log from __BOOST_LEVEL__]
+[note Note difference in error log from __BOOST_<level>__]
 
 See also:
 
@@ -713,8 +516,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_small `BOOST_<level>_SMALL`]
-
+[section:assertion_boost_level_small BOOST_<level>_SMALL]
 
 ``
   BOOST_WARN_SMALL(value, tolerance);
@@ -724,25 +526,13 @@ See also:
 
 These tools are used to check that supplied value is small enough. The "smallness" is defined by absolute value
 of the tolerance supplied as a second argument. Use these tools with caution. To compare to values on closeness 
-it's preferable to use __BOOST_LEVEL_CLOSE__ tools instead.
+it's preferable to use __BOOST_<level>_CLOSE__ tools instead.
 
 The first parameter is the value to check. The second parameter is the tolerance.
 
 [note Note that to use these tools you need to include additional header `floating_point_comparison.hpp`.]
 
-[import ../examples/example41.cpp]
-[import ../examples/example41.output]
-[table:id_example41 __BOOST_LEVEL_SMALL__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example41]]
-    [[example41o]]
-  ]
-]
-
+[bt_example example41..BOOST_<level>_SMALL usage]
 
 See also:
 
@@ -753,7 +543,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_level_throw `BOOST_<level>_THROW`]
+[section:assertion_boost_level_throw BOOST_<level>_THROW]
 
 
 ``
@@ -775,18 +565,7 @@ error in <test-case-name>: exception <exception> expected
 The first parameter is the expression to execute. Use `do{} while(0)` block if you want to execute more than one
 statement. The second parameter is an expected exception.
 
-[import ../examples/example45.cpp]
-[import ../examples/example45.output]
-[table:id_example45 __BOOST_LEVEL_THROW__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example45]]
-    [[example45o]]
-  ]
-]
+[bt_example example45..BOOST_<level>_THROW usage]
 
 See also:
 
@@ -795,7 +574,7 @@ See also:
 [endsect]
 
 [/ ###############################################################################################]
-[section:assertion_boost_error `BOOST_ERROR`]
+[section:assertion_boost_error BOOST_ERROR]
 
 ``
   BOOST_ERROR(message);
@@ -804,20 +583,9 @@ See also:
 __BOOST_ERROR__ tool behave the same way as `__BOOST_CHECK_MESSAGE__(false, message)`. This tool is used for
 an unconditional error counter increasing and message logging. 
 
-The only tool's parameter is an error message to log.
+The tool's only parameter is an error message to log.
 
-[import ../examples/example46.cpp]
-[import ../examples/example46.output]
-[table:id_example46 __BOOST_ERROR__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example46]]
-    [[example46o]]
-  ]
-]
+[bt_example example46..BOOST_ERROR usage]
 
 See also:
 
@@ -827,7 +595,7 @@ See also:
 
 
 [/ ###############################################################################################]
-[section:assertion_boost_fail `BOOST_FAIL`]
+[section:assertion_boost_fail BOOST_FAIL]
 
 ``
   BOOST_FAIL(message);
@@ -836,20 +604,9 @@ See also:
 `__BOOST_FAIL__(message)` behave the same way as `__BOOST_REQUIRE_MESSAGE__(false, message)`. This tool is used for an
 unconditional error counter increasing, message logging and the current test case aborting. 
 
-The only tool's parameter is an error message to log.
+The tool's only parameter is an error message to log.
 
-[import ../examples/example47.cpp]
-[import ../examples/example47.output]
-[table:id_example47 __BOOST_FAIL__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example47]]
-    [[example47o]]
-  ]
-]
+[bt_example example47..BOOST_FAIL usage]
 
 See also:
 
@@ -860,7 +617,7 @@ See also:
 
 
 [/ ###############################################################################################]
-[section:assertion_boost_is_defined `BOOST_IS_DEFINED`]
+[section:assertion_boost_is_defined BOOST_IS_DEFINED]
 
 ``
   BOOST_IS_DEFINED(symbol);
@@ -868,24 +625,12 @@ See also:
 
 Unlike the rest of the tools in the toolbox this tool does not perform the logging itself. Its only purpose
 is to check at runtime whether or not the supplied preprocessor symbol is defined. Use it in combination with
-__BOOST_LEVEL__ to perform and log validation. Macros of any arity could be checked. To check the
+__BOOST_<level>__ to perform and log validation. Macros of any arity could be checked. To check the
 macro definition with non-zero arity specify dummy arguments for it. See below for example.
 
 The only tool's parameter is a preprocessor symbol that gets validated.
 
-[import ../examples/example48.cpp]
-[import ../examples/example48.output]
-[table:id_example48 __BOOST_IS_DEFINED__ usage
-  [
-    [Code]
-    [Output]
-  ]
-  [
-    [[example48]]
-    [[example48o]]
-  ]
-]
-
+[bt_example example48..BOOST_IS_DEFINED usage]
 
 See also:
 
@@ -893,5 +638,4 @@ See also:
 
 [endsect]
 
-
 [endsect] [/ testing_tool_ref]
diff --git a/doc/v2/tutorials/tutorial.qbk b/doc/v2/tutorials/tutorial.qbk
deleted file mode 100644
index 4c613833..00000000
--- a/doc/v2/tutorials/tutorial.qbk
+++ /dev/null
@@ -1,16 +0,0 @@
-[section:tutorial Tutorials]
-
-You think writing tests is difficult, annoying and fruitless work? I beg to differ. Read through these tutorials
-and I am sure you will agree. One other thing I do suggest you to take a look is 
-<link linkend="utf.compilation">compilation instructions</link>, especially if you plan to build and use standalone 
-library.
-
-
-[include tutorial_hello_world.qbk]
-[include tutorial_new_year_resolution.qbk]
-
-[/
- <xi:include href="tutorial.intro-in-testing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-]
- 
-[endsect] [/tutorial]
\ No newline at end of file
diff --git a/doc/v2/usage_recommandations.qbk b/doc/v2/usage_recommandations.qbk
index b79b5bfc..b12f906c 100644
--- a/doc/v2/usage_recommandations.qbk
+++ b/doc/v2/usage_recommandations.qbk
@@ -1,4 +1,4 @@
-[#ref_usage_recommendations][section The unit test framework usage recommendations]
+[#ref_usage_recommendations][section The __UTF__ usage recommendations]
  
 
 On following pages collected tips and recommendations on how to use and apply the &utf; in your real life practice. 
@@ -61,8 +61,10 @@ applies to other tools supplied by the framework.
 
 [endsect] [/ General recommendations]
  
-[section Microsoft Visual Studio .NET usage recommendations]
-  
+[section IDE usage recommendations]
+
+This recommendation is shown using Microsoft Visual Studio as an example, but you can apply similar steps in 
+different IDEs.
 
 [h4 Use custom build step to automatically start test program after compilation]
 I found it most convenient to put test program execution as a post-build step in compilation. To do so use 
@@ -82,9 +84,8 @@ keyboard shortcuts/mouse clicks you use for compilation error analysis:
      
 [$../img/post_build_out.jpg]
 
-     
 [h4 If you got fatal exception somewhere within test case, make debugger break at the point the failure by adding 
-      extra command line argument]
+    extra command line argument]
 
 If you got "memory access violation" message (or any other message indication fatal or system error) when you 
 run you test, to get more information of error location add 
@@ -97,10 +98,8 @@ to the test run command line:
     
 
 Now run the test again under debugger and it will break at the point of failure.
-[endsect] [/ ms specific]
+[endsect] [/ IDE recommendations]
 
-
- 
 [section Command line usage recommendations]
 
 [h4 If you got fatal exception somewhere within test case, make program generate coredump by adding extra command 
diff --git a/doc/v2/utf.testing-tools.qbk b/doc/v2/utf.testing-tools.qbk
deleted file mode 100644
index 4b02f215..00000000
--- a/doc/v2/utf.testing-tools.qbk
+++ /dev/null
@@ -1,18 +0,0 @@
-[section:testing_tools The __UTF__ testing tools]
-The __UTF__'s supplies a toolbox of testing tools to ease creation and maintenance of test programs and
-provide a  uniform error reporting mechanism. The toolbox supplied in most part in a form of macro and function
-declarations. While the functions can be called directly, the usual way to use testing tools is via convenience
-macros. All macros arguments are calculated once, so it's safe to pass complex expressions in their place.
-All tools automatically supply an error location: a file name and a line number. The testing tools are intended
-for unit test code rather than library or production code, where throwing exceptions, using `assert()`,
-`boost::concept_check` or `BOOST_STATIC_ASSERT()` may be more suitable
-ways to detect and report errors. For list of all supplied testing tools and usage examples see the reference.
-
-[include testing_tools/assertions_severity_levels.qbk]
-[include testing_tools/custom_predicates.qbk]
-[include testing_tools/testing_output_streams.qbk]
-[include testing_tools/testing_floating_points.qbk]
-
-
-
-[endsect] [/ testing tools]