diff --git a/doc/boost-exception.html b/doc/boost-exception.html
index 68ec166..3914d22 100644
--- a/doc/boost-exception.html
+++ b/doc/boost-exception.html
@@ -77,7 +77,6 @@ boost
         public:
     
     <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_diagnostic_information.html">diagnostic_information</a></span>() const throw();</span>    
-    <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_what.html">what</a></span>() const throw();</span>    
     
         protected:
     
@@ -167,7 +166,6 @@ boost
         public:
     
     <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_diagnostic_information.html">diagnostic_information</a></span>() const throw();</span>    
-    <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_what.html">what</a></span>() const throw();</span>    
     
         protected:
     
@@ -202,14 +200,6 @@ boost
 <p>Nothing.</p>
 <h4>Note:</h4>
 <p>The return value remains valid until the exception object from which it is obtained is destroyed or modified.</p>
-</div><div class="RenoIncludeDIV"><h3>exception::what</h3>
-<div class="RenoIncludeDIV"><pre>virtual char const * <span class="RenoLink"><a href="exception_what.html">what</a></span>() const throw();</pre>
-</div><h4>Returns:</h4>
-<p>The default implementation is equivalent to return <span class="RenoLink"><a href="exception_diagnostic_information.html">exception::diagnostic_information</a></span>(). The signature of boost::<span class="RenoLink"><a href="exception_what.html">exception::what</a></span> is identical to the familiar std::exception::what function, so that when an exception type that derives both std::exception and boost::<span class="RenoLink"><a href="exception.html">exception</a></span> overrides the what function, it overrides both std::exception::what and boost::<span class="RenoLink"><a href="exception_what.html">exception::what</a></span>.</p>
-<h4>Throws:</h4>
-<p>Nothing.</p>
-<h4>Note:</h4>
-<p>The return value remains valid until the exception object from which it is obtained is destroyed or modified.</p>
 </div></div><h2>Transporting of Arbitrary Data to the Catch Site</h2>
 <div class="RenoIncludeDIV"><h3>error_info</h3>
 <div class="RenoIncludeDIV"><p><span class="RenoEscape">&#35;<!--<wiki>`&#35;</wiki>--></span>include &lt;<span class="RenoLink"><a href="exception_error_info_hpp.html">boost/exception/info.hpp</a></span>&gt;</p>
diff --git a/doc/exception.html b/doc/exception.html
index 2b7f81b..fa4f0b8 100644
--- a/doc/exception.html
+++ b/doc/exception.html
@@ -30,7 +30,6 @@ boost
         public:
     
     <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_diagnostic_information.html">diagnostic_information</a></span>() const throw();</span>    
-    <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_what.html">what</a></span>() const throw();</span>    
     
         protected:
     
@@ -65,14 +64,6 @@ boost
 <p>Nothing.</p>
 <h4>Note:</h4>
 <p>The return value remains valid until the exception object from which it is obtained is destroyed or modified.</p>
-</div><div class="RenoIncludeDIV"><h3>exception::what</h3>
-<div class="RenoIncludeDIV"><pre>virtual char const * <span class="RenoLink"><a href="exception_what.html">what</a></span>() const throw();</pre>
-</div><h4>Returns:</h4>
-<p>The default implementation is equivalent to return <span class="RenoLink"><a href="exception_diagnostic_information.html">exception::diagnostic_information</a></span>(). The signature of boost::<span class="RenoLink"><a href="exception_what.html">exception::what</a></span> is identical to the familiar std::exception::what function, so that when an exception type that derives both std::exception and boost::<span class="RenoLink"><a href="exception.html">exception</a></span> overrides the what function, it overrides both std::exception::what and boost::<span class="RenoLink"><a href="exception_what.html">exception::what</a></span>.</p>
-<h4>Throws:</h4>
-<p>Nothing.</p>
-<h4>Note:</h4>
-<p>The return value remains valid until the exception object from which it is obtained is destroyed or modified.</p>
 </div></div><h3>See also:</h3>
 <div class="RenoPageList"><a href="BOOST_ERROR_INFO.html">BOOST_ERROR_INFO<br/>
 </a><a href="boost-exception.html">Boost Exception<br/>
diff --git a/doc/exception_diagnostic_information.html b/doc/exception_diagnostic_information.html
index f68a336..73c63f6 100644
--- a/doc/exception_diagnostic_information.html
+++ b/doc/exception_diagnostic_information.html
@@ -30,7 +30,6 @@
 </div><h3>See also:</h3>
 <div class="RenoPageList"><a href="diagnostic_information.html">diagnostic_information<br/>
 </a><a href="exception.html">exception<br/>
-</a><a href="exception_what.html">exception::what<br/>
 </a><a href="tutorial_diagnostic_information.html">Tutorial: Diagnostic Information<br/>
 </a></div>
 <!-- Copyright (c) 2006-2008 Emil Dotchevski and Reverge Studios, Inc. -->
diff --git a/doc/exception_exception_hpp.html b/doc/exception_exception_hpp.html
index c16e1a4..1ab0283 100644
--- a/doc/exception_exception_hpp.html
+++ b/doc/exception_exception_hpp.html
@@ -30,7 +30,6 @@ boost
         public:
     
     <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_diagnostic_information.html">diagnostic_information</a></span>() const throw();</span>    
-    <span class="RenoIncludeSPAN">    virtual char const * <span class="RenoLink"><a href="exception_what.html">what</a></span>() const throw();</span>    
     
         protected:
     
diff --git a/doc/name_idx.html b/doc/name_idx.html
index 00633eb..cff1a2e 100644
--- a/doc/name_idx.html
+++ b/doc/name_idx.html
@@ -45,7 +45,6 @@
 <p><a href="exception.html">exception</a></p>
 <p><a href="exception_diagnostic_information.html">exception::diagnostic_information</a></p>
 <p><a href="exception_constructors.html">exception::exception</a></p>
-<p><a href="exception_what.html">exception::what</a></p>
 <p><a href="exception_destructor.html">exception::~exception</a></p>
 <p><a href="exception_ptr.html">exception_ptr</a></p>
 <h3>g</h3>
diff --git a/doc/source/boost-exception.reno b/doc/source/boost-exception.reno
index 8e65761..47999d1 100644
--- a/doc/source/boost-exception.reno
+++ b/doc/source/boost-exception.reno
@@ -44,7 +44,7 @@
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -243,9 +243,9 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>1</size>
-																			<strong>251773B273187F592361DB0624E7F5D52C95845C3A6562F4A0F830C46D775BC8</strong>
-																			<weak>3425410730</weak>
-																			<size>3294</size>
+																			<strong>9CC0F5ADB1C04555FD571DABD1D7D6775D8B11977ECC8320AD4451FC435E89A1</strong>
+																			<weak>1325628148</weak>
+																			<size>3147</size>
 																			<position>323</position>
 																		</container>
 																	</stream_hook_path>
@@ -513,18 +513,18 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>4</size>
-																			<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-																			<weak>665149135</weak>
-																			<size>3114</size>
+																			<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+																			<weak>1430141721</weak>
+																			<size>2967</size>
 																			<position>503</position>
-																			<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-																			<weak>201993397</weak>
-																			<size>2071</size>
+																			<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+																			<weak>4111403263</weak>
+																			<size>1924</size>
 																			<position>878</position>
 																			<strong>85EE1980CFB24E054EDB1B3BDFA61FD4D65AD0EF248A1A42D4C2552700459327</strong>
 																			<weak>2238151539</weak>
 																			<size>428</size>
-																			<position>1070</position>
+																			<position>923</position>
 																			<strong>AD3F339F7126003907BCBDB3EF846FCACA895132E1100D202DA67D2B7846EE65</strong>
 																			<weak>3032091776</weak>
 																			<size>60</size>
@@ -1049,13 +1049,13 @@
 																		<stream_hook_path>
 																			<container>
 																				<size>2</size>
-																				<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-																				<weak>665149135</weak>
-																				<size>3114</size>
+																				<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+																				<weak>1430141721</weak>
+																				<size>2967</size>
 																				<position>503</position>
-																				<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-																				<weak>201993397</weak>
-																				<size>2071</size>
+																				<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+																				<weak>4111403263</weak>
+																				<size>1924</size>
 																				<position>878</position>
 																			</container>
 																		</stream_hook_path>
@@ -1202,13 +1202,13 @@
 																		<stream_hook_path>
 																			<container>
 																				<size>2</size>
-																				<strong>6BE9712680D0514BFC3D878FEA4DD229F4D7354F822CEE0088C260175DAA536A</strong>
-																				<weak>1707118066</weak>
-																				<size>2456</size>
+																				<strong>D36D37BED1D119D9CB6040BE4A9694586CC5EFF7A50C30AB59BB06BF70458015</strong>
+																				<weak>993620616</weak>
+																				<size>2321</size>
 																				<position>457</position>
-																				<strong>1203100C7C62C4006CF1C69686685819E118A3DF3E3774867C8A064F1BE6E707</strong>
-																				<weak>342590922</weak>
-																				<size>2424</size>
+																				<strong>248C5047CA4021C30DE8853D6AEBD138D11A76B3571C856A48C0A442D6D040A5</strong>
+																				<weak>1700162144</weak>
+																				<size>2289</size>
 																				<position>26</position>
 																			</container>
 																		</stream_hook_path>
@@ -1703,9 +1703,9 @@
 																		<stream_hook_path>
 																			<container>
 																				<size>1</size>
-																				<strong>6A493A8C485B322041944D321FD34F6CC4D67ABA527387BDD5DA6287C5E4B966</strong>
-																				<weak>1638644878</weak>
-																				<size>2590</size>
+																				<strong>091CEE4B0BEBD40D864A1BC8288C10A248BEFFD4E472647343F2BEDE0BDE0F10</strong>
+																				<weak>2732630308</weak>
+																				<size>2455</size>
 																				<position>323</position>
 																			</container>
 																		</stream_hook_path>
@@ -2027,6 +2027,123 @@
 													<string>:)&#10;</string>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-26</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso,exception&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-27</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-28</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-29</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-30</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-31</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-32</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-33</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2044,7 +2161,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2066,6 +2183,58 @@
 													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-39</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-40</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-41</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!Index&#10;&#10;(:pagelist fmt=&quot;index&quot; except_tags=&quot;index,noindex&quot;:)&#10;</string>
+												</container>
+											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2080,18 +2249,18 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>3</size>
-																			<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-																			<weak>665149135</weak>
-																			<size>3114</size>
+																			<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+																			<weak>1430141721</weak>
+																			<size>2967</size>
 																			<position>503</position>
-																			<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-																			<weak>201993397</weak>
-																			<size>2071</size>
+																			<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+																			<weak>4111403263</weak>
+																			<size>1924</size>
 																			<position>878</position>
 																			<strong>BAC52AC87CFA3174B3352140A8DC10BB7F48C945FC87787C3AC96F0FC2CFDB40</strong>
 																			<weak>1066412964</weak>
 																			<size>165</size>
-																			<position>204</position>
+																			<position>57</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -2119,84 +2288,6 @@
 													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-30</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-31</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-32</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2211,110 +2302,18 @@
 																	<stream_hook_path>
 																		<container>
 																			<size>3</size>
-																			<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-																			<weak>665149135</weak>
-																			<size>3114</size>
+																			<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+																			<weak>1430141721</weak>
+																			<size>2967</size>
 																			<position>503</position>
-																			<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-																			<weak>201993397</weak>
-																			<size>2071</size>
-																			<position>878</position>
-																			<strong>E1E6A9EFC3D0DCF4197171BA3C804656908C414424194530416F69E471FC99AD</strong>
-																			<weak>120398751</weak>
-																			<size>145</size>
-																			<position>57</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>exception::what</string>
-															</title>
-															<file_name>
-																<string></string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-40</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-29</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-28</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>44</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>3</size>
-																			<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-																			<weak>665149135</weak>
-																			<size>3114</size>
-																			<position>503</position>
-																			<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-																			<weak>201993397</weak>
-																			<size>2071</size>
+																			<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+																			<weak>4111403263</weak>
+																			<size>1924</size>
 																			<position>878</position>
 																			<strong>BACD79DFB4C710C1A67687FC6344DF2251E2379613C2DF5B2729B2CD37E24EA3</strong>
 																			<weak>458367129</weak>
 																			<size>154</size>
-																			<position>393</position>
+																			<position>246</position>
 																		</container>
 																	</stream_hook_path>
 																</hook>
@@ -2342,58 +2341,6 @@
 													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-27</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-39</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-26</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;&#10;!!!See also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;noalso,exception&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-41</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!Index&#10;&#10;(:pagelist fmt=&quot;index&quot; except_tags=&quot;index,noindex&quot;:)&#10;</string>
-												</container>
-											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -2401,13 +2348,13 @@
 							<pair>
 								<string>headers</string>
 								<shared_ptr>
-									<id>45</id>
+									<id>44</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2643,7 +2590,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2654,7 +2601,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2665,7 +2612,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-37</id>
+														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2676,43 +2623,13 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-42</id>
+														<id>-29</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>1</expired>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;@]</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2743,17 +2660,6 @@
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -2769,7 +2675,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2780,7 +2686,26 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>1</expired>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;@]</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-35</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2791,7 +2716,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2802,7 +2727,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
+														<id>-37</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2813,18 +2738,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-44</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-27</id>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2846,7 +2760,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -2864,6 +2778,28 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -2871,13 +2807,13 @@
 							<pair>
 								<string>ctors</string>
 								<shared_ptr>
-									<id>46</id>
+									<id>45</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3113,7 +3049,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3124,7 +3060,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3135,7 +3071,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-37</id>
+														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3146,29 +3082,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
+														<id>-29</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3197,17 +3111,6 @@
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3223,7 +3126,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3234,7 +3137,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3245,7 +3148,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-35</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3256,7 +3159,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3267,7 +3170,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-44</id>
+														<id>-37</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3278,7 +3181,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-27</id>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3300,7 +3203,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3318,6 +3221,28 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -3325,13 +3250,13 @@
 							<pair>
 								<string>free</string>
 								<shared_ptr>
-									<id>47</id>
+									<id>46</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3567,7 +3492,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3578,7 +3503,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3589,7 +3514,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-37</id>
+														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3600,29 +3525,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
+														<id>-29</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3651,17 +3554,6 @@
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -3677,7 +3569,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3688,7 +3580,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3699,7 +3591,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-35</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3710,7 +3602,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3721,7 +3613,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-44</id>
+														<id>-37</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3732,7 +3624,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-27</id>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3754,7 +3646,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -3772,6 +3664,28 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -3779,13 +3693,13 @@
 							<pair>
 								<string>decl</string>
 								<shared_ptr>
-									<id>48</id>
+									<id>47</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -4259,23 +4173,14 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
+													<size>9</size>
 													<variant>2</variant>
 													<string>[@class&#10;(:link </string>
 													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:):&#10;    public std::exception&#10;    public boost::</string>
-													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
@@ -4283,53 +4188,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>&#10;    {&#10;    ---unspecified---&#10;    };@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-38</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-36</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-37</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@virtual char const * (:link </string>
+													<string>:)&#10;    {&#10;    public:&#10;&#10;(:include </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -4338,60 +4197,100 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:::)() const throw();@]&#10;</string>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;&#10;    protected:&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-43</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;    };@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-36</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>[@std::string </string>
+													<string>[@template &lt;class Tag,class T&gt;&#10;class&#10;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-36</id>
+															<id>-27</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>( std::exception const &amp; x );@]&#10;</string>
+													<string>:)&#10;    {&#10;    public:&#10;&#10;    typedef T value_type;&#10;&#10;    error_info( value_type const &amp; );&#10;    };@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-34</id>
+														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
 													<size>5</size>
 													<variant>2</variant>
-													<string>[@void (:link </string>
+													<string>[@template &lt;class E, class Tag, class T&gt;&#10;E const &amp; (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-34</id>
+															<id>-28</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)( (:link </string>
+													<string>|operator&lt;&lt;:)( E const &amp; x, (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-30</id>
+															<id>-27</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:) const &amp; ep );</string>
+													<string>:)&lt;Tag,T&gt; const &amp; v );@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-29</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-29</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( T const &amp; x );@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4438,37 +4337,6 @@
 													<string>:)( T const &amp; e );@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-30</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( T const &amp; e );@]&#10;</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -4504,29 +4372,133 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>3</size>
+													<size>5</size>
 													<variant>2</variant>
-													<string>[@virtual char const * (:link </string>
+													<string>[@template &lt;class T&gt;&#10;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-43</id>
+															<id>-30</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:::)() const throw();@]&#10;</string>
+													<string>:) (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-33</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( T const &amp; e );@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@void (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-34</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const &amp; ep );</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-35</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@class&#10;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-35</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:):&#10;    public std::exception&#10;    public boost::</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&#10;    {&#10;    ---unspecified---&#10;    };@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-36</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@std::string </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>( std::exception const &amp; x );@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-37</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -4537,128 +4509,13 @@
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-29</id>
+															<id>-36</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
 													<string> decl:)@]&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-29</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-29</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( T const &amp; x );@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-28</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@template &lt;class E, class Tag, class T&gt;&#10;E const &amp; (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|operator&lt;&lt;:)( E const &amp; x, (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;Tag,T&gt; const &amp; v );@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-44</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>[@(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-44</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:::)();&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-44</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:::)( (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) const &amp; x );@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-27</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@template &lt;class Tag,class T&gt;&#10;class&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;    {&#10;    public:&#10;&#10;    typedef T value_type;&#10;&#10;    error_info( value_type const &amp; );&#10;    };@]&#10;</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -4685,58 +4542,22 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>11</size>
+													<size>3</size>
 													<variant>2</variant>
-													<string>[@class&#10;(:link </string>
+													<string>[@(:include </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-29</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&#10;    {&#10;    public:&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-42</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-43</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;&#10;    protected:&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-44</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-15</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;    };@]&#10;</string>
+													<string> decl:)@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -4750,6 +4571,68 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@virtual char const * (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-42</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:::)() const throw();@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
+													<variant>2</variant>
+													<string>[@(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-43</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:::)();&#10;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-43</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:::)( (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const &amp; x );@]&#10;</string>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -4757,13 +4640,13 @@
 							<pair>
 								<string>include</string>
 								<shared_ptr>
-									<id>49</id>
+									<id>48</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -5894,70 +5777,13 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>5</size>
+													<size>19</size>
 													<variant>2</variant>
-													<string>!!!unknown_exception&#10;&#10;(:include synopsis:)&#10;&#10;This type is used by the </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-30</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> support in Boost Exception. Please see (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-32</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:).&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-38</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!boost/exception/diagnostic_information.hpp&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-37</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!boost/exception.hpp&#10;&#10;!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>!!!exception::diagnostic_information&#10;&#10;(:include decl:)&#10;&#10;!!!!Returns:&#10;&#10;An string representation of all data stored in the boost::(:link </string>
+													<string>!!!exception&#10;&#10;(:include synopsis:)&#10;&#10;Class boost::(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -5966,7 +5792,25 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:) object by the (:link </string>
+													<string>:) is designed to be used as a universal base for user-defined exception types.&#10;&#10;An object of any type deriving from boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) can store data of arbitrary types, using the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) wrapper and (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -5975,29 +5819,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>|operator&lt;&lt;:) function. See &quot;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-10</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&quot; for details.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The return value remains valid until the exception object from which it is obtained is destroyed or modified.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>!!!diagnostic_information&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;If dynamic_cast&lt;boost::(:link </string>
+													<string>|operator&lt;&lt;:).&#10;&#10;To retrieve data from a boost::(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -6006,7 +5828,34 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:) *&gt;(&amp;x) is not null, the returned string is initialized by a call to (:link </string>
+													<string>:) object, use the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-7</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) function template.&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-43</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;(:include </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -6015,20 +5864,190 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:); otherwise, the returned string combines the output of x.what() and typeid(x).name().&#10;</string>
+													<string>:)&#10;&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-34</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>1</size>
+													<size>21</size>
 													<variant>2</variant>
-													<string>!!!rethrow_exception&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Precondition:&#10;&#10;ep shall not be null.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;The exception to which ep refers.&#10;</string>
+													<string>!!!error_info&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must have accessible copy constructor and must not be a reference.&#10;&#10;!!!!Description:&#10;&#10;This class template is used to associate a Tag type with a value type T. Objects of type (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;Tag,T&gt; can be passed to (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-28</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|operator&lt;&lt;:) to be stored in objects of type boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:).&#10;&#10;!!!!Note:&#10;&#10;The header &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-5</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt; provides a declaration of the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) template, which is sufficient for the purpose of typedefing an instance for specific Tag and T, like this:&#10;&#10;[@#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-5</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;typedef boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;struct tag_errno,int&gt; errno_info;@]&#10;&#10;Of course, to actually add an errno_info object to exceptions using (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-28</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|operator&lt;&lt;:), or to retrieve it using (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-7</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:), you must first #include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-16</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-28</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
+													<variant>2</variant>
+													<string>!!!operator&lt;&lt;, error_info overload&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must be boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:), or a type that derives (indirectly) from boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:).&#10;&#10;!!!!Effects:&#10;&#10;Stores a copy of v into x. If x already contains data of type (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;Tag1,T1&gt;, that data is overwritten.&#10;&#10;!!!!Returns:&#10;&#10;x.&#10;&#10;(:include throws:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-29</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
+													<variant>2</variant>
+													<string>!!!enable_error_info&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must be a user-defined type with accessible no-throw copy constructor.&#10;&#10;!!!!Returns:&#10;&#10;An object of unspecified type with no-throw copy semantics, which derives publicly from both T, and class boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:). The T sub-object is initialized from x by the T copy constructor. If T already derives from boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:), then the type of the returned object does not derive boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-26</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:).&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -6192,28 +6211,6 @@
 													<string>:) and supports exception_ptr functionality.&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>!!!copy_exception&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if try { throw e; } catch( ... ) { return (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-32</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)(); }&#10;</string>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -6357,31 +6354,79 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>9</size>
+													<size>3</size>
 													<variant>2</variant>
-													<string>!!!exception::what&#10;&#10;(:include decl:)&#10;&#10;!!!!Returns:&#10;&#10;The default implementation is equivalent to return (:link </string>
+													<string>!!!copy_exception&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if try { throw e; } catch( ... ) { return (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-42</id>
+															<id>-32</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)(). The signature of boost::(:link </string>
+													<string>:)(); }&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!!rethrow_exception&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Precondition:&#10;&#10;ep shall not be null.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;The exception to which ep refers.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-35</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>!!!unknown_exception&#10;&#10;(:include synopsis:)&#10;&#10;This type is used by the </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-43</id>
+															<id>-30</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:) is identical to the familiar std::exception::what function, so that when an exception type that derives both std::exception and boost::(:link </string>
+													<string> support in Boost Exception. Please see (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-32</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:).&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-36</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>!!!diagnostic_information&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;If dynamic_cast&lt;boost::(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -6390,16 +6435,55 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:) overrides the what function, it overrides both std::exception::what and boost::(:link </string>
+													<string>:) *&gt;(&amp;x) is not null, the returned string is initialized by a call to (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-43</id>
+															<id>-42</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:).&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The return value remains valid until the exception object from which it is obtained is destroyed or modified.&#10;</string>
+													<string>:); otherwise, the returned string combines the output of x.what() and typeid(x).name().&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-37</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!boost/exception.hpp&#10;&#10;!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!boost/exception/diagnostic_information.hpp&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-39</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!boost/exception/enable_current_exception.hpp&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -6419,53 +6503,24 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-41</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>!!!enable_error_info&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must be a user-defined type with accessible no-throw copy constructor.&#10;&#10;!!!!Returns:&#10;&#10;An object of unspecified type with no-throw copy semantics, which derives publicly from both T, and class boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:). The T sub-object is initialized from x by the T copy constructor. If T already derives from boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:), then the type of the returned object does not derive boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:).&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
+													<size>0</size>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
+														<id>-42</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
 													<size>7</size>
 													<variant>2</variant>
-													<string>!!!operator&lt;&lt;, error_info overload&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must be boost::(:link </string>
+													<string>!!!exception::diagnostic_information&#10;&#10;(:include decl:)&#10;&#10;!!!!Returns:&#10;&#10;An string representation of all data stored in the boost::(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -6474,32 +6529,32 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:), or a type that derives (indirectly) from boost::(:link </string>
+													<string>:) object by the (:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-26</id>
+															<id>-28</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:).&#10;&#10;!!!!Effects:&#10;&#10;Stores a copy of v into x. If x already contains data of type (:link </string>
+													<string>|operator&lt;&lt;:) function. See &quot;(:link </string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
 														<shared_ptr>
-															<id>-27</id>
+															<id>-10</id>
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&lt;Tag1,T1&gt;, that data is overwritten.&#10;&#10;!!!!Returns:&#10;&#10;x.&#10;&#10;(:include throws:)&#10;</string>
+													<string>:)&quot; for details.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The return value remains valid until the exception object from which it is obtained is destroyed or modified.&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-44</id>
+														<id>-43</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -6535,236 +6590,6 @@
 													<string>|operator&lt;&lt;:), including data that is added at a future time.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-27</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>21</size>
-													<variant>2</variant>
-													<string>!!!error_info&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must have accessible copy constructor and must not be a reference.&#10;&#10;!!!!Description:&#10;&#10;This class template is used to associate a Tag type with a value type T. Objects of type (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;Tag,T&gt; can be passed to (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|operator&lt;&lt;:) to be stored in objects of type boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:).&#10;&#10;!!!!Note:&#10;&#10;The header &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-5</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt; provides a declaration of the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) template, which is sufficient for the purpose of typedefing an instance for specific Tag and T, like this:&#10;&#10;[@#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-5</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;typedef boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_errno,int&gt; errno_info;@]&#10;&#10;Of course, to actually add an errno_info object to exceptions using (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|operator&lt;&lt;:), or to retrieve it using (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-7</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:), you must first #include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-16</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-39</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!boost/exception/enable_current_exception.hpp&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-26</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>21</size>
-													<variant>2</variant>
-													<string>!!!exception&#10;&#10;(:include synopsis:)&#10;&#10;Class boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) is designed to be used as a universal base for user-defined exception types.&#10;&#10;An object of any type deriving from boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) can store data of arbitrary types, using the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-27</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) wrapper and (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-28</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>|operator&lt;&lt;:).&#10;&#10;To retrieve data from a boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-26</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) object, use the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-7</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) function template.&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-44</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-15</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-42</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-43</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-41</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -6772,13 +6597,13 @@
 							<pair>
 								<string>throws</string>
 								<shared_ptr>
-									<id>50</id>
+									<id>49</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -7016,7 +6841,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7027,7 +6852,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7038,40 +6863,20 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-37</id>
+														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by the T copy constructor.&#10;</string>
 												</container>
 											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
+														<id>-29</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7100,17 +6905,6 @@
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -7126,7 +6920,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7137,7 +6931,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7148,7 +6942,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-35</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7159,20 +6953,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by the T copy constructor.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-44</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7183,7 +6964,18 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-27</id>
+														<id>-37</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7205,7 +6997,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7223,6 +7015,28 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -7230,13 +7044,13 @@
 							<pair>
 								<string>members</string>
 								<shared_ptr>
-									<id>51</id>
+									<id>50</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -7472,7 +7286,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7483,7 +7297,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-27</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7494,7 +7308,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-37</id>
+														<id>-28</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7505,29 +7319,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
+														<id>-29</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7556,17 +7348,6 @@
 													<size>0</size>
 												</container>
 											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -7582,7 +7363,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-43</id>
+														<id>-33</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7593,7 +7374,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-40</id>
+														<id>-34</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7604,7 +7385,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-29</id>
+														<id>-35</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7615,7 +7396,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-28</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7626,7 +7407,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-44</id>
+														<id>-37</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7637,7 +7418,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-27</id>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7659,7 +7440,7 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
@@ -7677,6 +7458,28 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -7684,13 +7487,13 @@
 							<pair>
 								<string>synopsis</string>
 								<shared_ptr>
-									<id>52</id>
+									<id>51</id>
 									<type>
 										<string>reno_layer</string>
 									</type>
 									<object>
 										<sorted>
-											<size>40</size>
+											<size>39</size>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -8023,6 +7826,204 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-26</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-9</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-27</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-16</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-28</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-16</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-29</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-40</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-30</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-21</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-31</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-39</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-32</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-21</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-33</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-21</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-21</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
 											<pair>
 												<weak_ptr>
 													<expired>0</expired>
@@ -8049,13 +8050,22 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-38</id>
+														<id>-36</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>1</size>
+													<size>3</size>
 													<variant>2</variant>
-													<string>[@#include &lt;exception&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>`#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -8120,253 +8130,13 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-42</id>
+														<id>-38</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
+													<size>1</size>
 													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-34</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-30</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-31</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-39</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-33</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-32</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-43</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-40</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-9</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-29</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-40</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-28</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-16</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-44</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-27</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-16</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@#include &lt;exception&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -8395,13 +8165,13 @@
 												<weak_ptr>
 													<expired>0</expired>
 													<shared_ptr>
-														<id>-26</id>
+														<id>-40</id>
 													</shared_ptr>
 												</weak_ptr>
 												<container>
 													<size>3</size>
 													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>[@#include &lt;</string>
 													<variant>1</variant>
 													<weak_ptr>
 														<expired>0</expired>
@@ -8410,7 +8180,7 @@
 														</shared_ptr>
 													</weak_ptr>
 													<variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
 												</container>
 											</pair>
 											<pair>
@@ -8424,6 +8194,28 @@
 													<size>0</size>
 												</container>
 											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
 										</sorted>
 									</object>
 								</shared_ptr>
@@ -8434,14 +8226,14 @@
 			</layers>
 			<contexts>
 				<shared_ptr>
-					<id>53</id>
+					<id>52</id>
 					<type>
 						<string>reno_context_map</string>
 					</type>
 					<object>
 						<contexts>
 							<sorted>
-								<size>40</size>
+								<size>39</size>
 								<shared_ptr>
 									<id>-5</id>
 								</shared_ptr>
@@ -8506,22 +8298,16 @@
 									<id>-25</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-35</id>
+									<id>-26</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-38</id>
+									<id>-27</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-37</id>
+									<id>-28</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-42</id>
-								</shared_ptr>
-								<shared_ptr>
-									<id>-36</id>
-								</shared_ptr>
-								<shared_ptr>
-									<id>-34</id>
+									<id>-29</id>
 								</shared_ptr>
 								<shared_ptr>
 									<id>-30</id>
@@ -8529,44 +8315,47 @@
 								<shared_ptr>
 									<id>-31</id>
 								</shared_ptr>
-								<shared_ptr>
-									<id>-33</id>
-								</shared_ptr>
 								<shared_ptr>
 									<id>-32</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-43</id>
+									<id>-33</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-40</id>
+									<id>-34</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-29</id>
+									<id>-35</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-28</id>
+									<id>-36</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-44</id>
+									<id>-37</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-27</id>
+									<id>-38</id>
 								</shared_ptr>
 								<shared_ptr>
 									<id>-39</id>
 								</shared_ptr>
 								<shared_ptr>
-									<id>-26</id>
+									<id>-40</id>
 								</shared_ptr>
 								<shared_ptr>
 									<id>-41</id>
 								</shared_ptr>
+								<shared_ptr>
+									<id>-42</id>
+								</shared_ptr>
+								<shared_ptr>
+									<id>-43</id>
+								</shared_ptr>
 							</sorted>
 						</contexts>
 						<index>
 							<sorted>
-								<size>40</size>
+								<size>39</size>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -8659,6 +8448,58 @@
 										<id>-21</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>091CEE4B0BEBD40D864A1BC8288C10A248BEFFD4E472647343F2BEDE0BDE0F10</strong>
+												<weak>2732630308</weak>
+												<size>2455</size>
+												<position>323</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/enable_error_info.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-40</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>D36D37BED1D119D9CB6040BE4A9694586CC5EFF7A50C30AB59BB06BF70458015</strong>
+												<weak>993620616</weak>
+												<size>2321</size>
+												<position>457</position>
+												<strong>248C5047CA4021C30DE8853D6AEBD138D11A76B3571C856A48C0A442D6D040A5</strong>
+												<weak>1700162144</weak>
+												<size>2289</size>
+												<position>26</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/enable_error_info.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-29</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -8995,30 +8836,6 @@
 										<id>-16</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>6A493A8C485B322041944D321FD34F6CC4D67ABA527387BDD5DA6287C5E4B966</strong>
-												<weak>1638644878</weak>
-												<size>2590</size>
-												<position>323</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/enable_error_info.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-40</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -9043,34 +8860,6 @@
 										<id>-39</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>6BE9712680D0514BFC3D878FEA4DD229F4D7354F822CEE0088C260175DAA536A</strong>
-												<weak>1707118066</weak>
-												<size>2456</size>
-												<position>457</position>
-												<strong>1203100C7C62C4006CF1C69686685819E118A3DF3E3774867C8A064F1BE6E707</strong>
-												<weak>342590922</weak>
-												<size>2424</size>
-												<position>26</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/enable_error_info.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-29</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -9235,6 +9024,30 @@
 										<id>-23</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>9CC0F5ADB1C04555FD571DABD1D7D6775D8B11977ECC8320AD4451FC435E89A1</strong>
+												<weak>1325628148</weak>
+												<size>3147</size>
+												<position>323</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/exception.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-9</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -9311,30 +9124,6 @@
 										<id>-19</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>251773B273187F592361DB0624E7F5D52C95845C3A6562F4A0F830C46D775BC8</strong>
-												<weak>3425410730</weak>
-												<size>3294</size>
-												<position>323</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-9</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -9383,166 +9172,6 @@
 										<id>-10</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-												<weak>665149135</weak>
-												<size>3114</size>
-												<position>503</position>
-												<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-												<weak>201993397</weak>
-												<size>2071</size>
-												<position>878</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-26</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>4</size>
-												<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-												<weak>665149135</weak>
-												<size>3114</size>
-												<position>503</position>
-												<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-												<weak>201993397</weak>
-												<size>2071</size>
-												<position>878</position>
-												<strong>85EE1980CFB24E054EDB1B3BDFA61FD4D65AD0EF248A1A42D4C2552700459327</strong>
-												<weak>2238151539</weak>
-												<size>428</size>
-												<position>1070</position>
-												<strong>AD3F339F7126003907BCBDB3EF846FCACA895132E1100D202DA67D2B7846EE65</strong>
-												<weak>3032091776</weak>
-												<size>60</size>
-												<position>369</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-15</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>3</size>
-												<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-												<weak>665149135</weak>
-												<size>3114</size>
-												<position>503</position>
-												<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-												<weak>201993397</weak>
-												<size>2071</size>
-												<position>878</position>
-												<strong>BAC52AC87CFA3174B3352140A8DC10BB7F48C945FC87787C3AC96F0FC2CFDB40</strong>
-												<weak>1066412964</weak>
-												<size>165</size>
-												<position>204</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-42</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>3</size>
-												<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-												<weak>665149135</weak>
-												<size>3114</size>
-												<position>503</position>
-												<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-												<weak>201993397</weak>
-												<size>2071</size>
-												<position>878</position>
-												<strong>BACD79DFB4C710C1A67687FC6344DF2251E2379613C2DF5B2729B2CD37E24EA3</strong>
-												<weak>458367129</weak>
-												<size>154</size>
-												<position>393</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-44</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>3</size>
-												<strong>A8142902F961A340F0621653A76FC7941054FFA10ADADB1018A2E797D7EB1FE9</strong>
-												<weak>665149135</weak>
-												<size>3114</size>
-												<position>503</position>
-												<strong>FA32C25852E9BB3A713A7790E50C8060367F9810A8B03F3E63338FBF590F1EB9</strong>
-												<weak>201993397</weak>
-												<size>2071</size>
-												<position>878</position>
-												<strong>E1E6A9EFC3D0DCF4197171BA3C804656908C414424194530416F69E471FC99AD</strong>
-												<weak>120398751</weak>
-												<size>145</size>
-												<position>57</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-43</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -9591,6 +9220,134 @@
 										<id>-12</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+												<weak>1430141721</weak>
+												<size>2967</size>
+												<position>503</position>
+												<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+												<weak>4111403263</weak>
+												<size>1924</size>
+												<position>878</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/exception.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-26</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>4</size>
+												<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+												<weak>1430141721</weak>
+												<size>2967</size>
+												<position>503</position>
+												<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+												<weak>4111403263</weak>
+												<size>1924</size>
+												<position>878</position>
+												<strong>85EE1980CFB24E054EDB1B3BDFA61FD4D65AD0EF248A1A42D4C2552700459327</strong>
+												<weak>2238151539</weak>
+												<size>428</size>
+												<position>923</position>
+												<strong>AD3F339F7126003907BCBDB3EF846FCACA895132E1100D202DA67D2B7846EE65</strong>
+												<weak>3032091776</weak>
+												<size>60</size>
+												<position>369</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/exception.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-15</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>3</size>
+												<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+												<weak>1430141721</weak>
+												<size>2967</size>
+												<position>503</position>
+												<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+												<weak>4111403263</weak>
+												<size>1924</size>
+												<position>878</position>
+												<strong>BAC52AC87CFA3174B3352140A8DC10BB7F48C945FC87787C3AC96F0FC2CFDB40</strong>
+												<weak>1066412964</weak>
+												<size>165</size>
+												<position>57</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/exception.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-42</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>3</size>
+												<strong>13F58566E4D9F20B49F3F30B28528AEE562CD709108ADC1AE19A2F01D86C62F4</strong>
+												<weak>1430141721</weak>
+												<size>2967</size>
+												<position>503</position>
+												<strong>09CB6839AC1E71887371FB8159C2BFCD273A397C54E07B25CEF2EEF2FA24286A</strong>
+												<weak>4111403263</weak>
+												<size>1924</size>
+												<position>878</position>
+												<strong>BACD79DFB4C710C1A67687FC6344DF2251E2379613C2DF5B2729B2CD37E24EA3</strong>
+												<weak>458367129</weak>
+												<size>154</size>
+												<position>246</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/exception.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-43</id>
+									</shared_ptr>
+								</pair>
 							</sorted>
 						</index>
 					</object>
@@ -9598,14 +9355,14 @@
 			</contexts>
 			<index>
 				<shared_ptr>
-					<id>54</id>
+					<id>53</id>
 					<type>
 						<string>tag_index</string>
 					</type>
 					<object>
 						<tag_index>
 							<sorted>
-								<size>41</size>
+								<size>40</size>
 								<pair>
 									<weak_ptr>
 										<expired>1</expired>
@@ -9805,55 +9562,37 @@
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-35</id>
+											<id>-26</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception_ptr,type,unknown_exception</string>
+									<string>exception,type</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-38</id>
+											<id>-27</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>boost/exception/diagnostic_information.hpp,diagnostic_information,header</string>
+									<string>error_info,free,type</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-37</id>
+											<id>-28</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>boost/exception.hpp,header</string>
+									<string>error_info,free,function,operator&lt;&lt;,operator&lt;&lt;/exception</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-42</id>
+											<id>-29</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>diagnostic_information,exception,exception::diagnostic_information,function,member</string>
-								</pair>
-								<pair>
-									<weak_ptr>
-										<expired>0</expired>
-										<shared_ptr>
-											<id>-36</id>
-										</shared_ptr>
-									</weak_ptr>
-									<string>diagnostic_information,free,function</string>
-								</pair>
-								<pair>
-									<weak_ptr>
-										<expired>0</expired>
-										<shared_ptr>
-											<id>-34</id>
-										</shared_ptr>
-									</weak_ptr>
-									<string>exception_ptr,free,function,rethrow_exception</string>
+									<string>enable_error_info,error_info,free,function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -9873,15 +9612,6 @@
 									</weak_ptr>
 									<string>enable_current_exception,exception_ptr,free,function</string>
 								</pair>
-								<pair>
-									<weak_ptr>
-										<expired>0</expired>
-										<shared_ptr>
-											<id>-33</id>
-										</shared_ptr>
-									</weak_ptr>
-									<string>copy_exception,exception_ptr,free,function</string>
-								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
@@ -9895,55 +9625,55 @@
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-43</id>
+											<id>-33</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception,exception::what,function,member</string>
+									<string>copy_exception,exception_ptr,free,function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-40</id>
+											<id>-34</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>boost/exception/enable_error_info.hpp,enable_error_info,error_info,header</string>
+									<string>exception_ptr,free,function,rethrow_exception</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-29</id>
+											<id>-35</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>enable_error_info,error_info,free,function</string>
+									<string>exception_ptr,type,unknown_exception</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-28</id>
+											<id>-36</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>error_info,free,function,operator&lt;&lt;,operator&lt;&lt;/exception</string>
+									<string>diagnostic_information,free,function</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-44</id>
+											<id>-37</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception,exception::exception,function,member</string>
+									<string>boost/exception.hpp,header</string>
 								</pair>
 								<pair>
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-27</id>
+											<id>-38</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>error_info,free,type</string>
+									<string>boost/exception/diagnostic_information.hpp,diagnostic_information,header</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -9958,10 +9688,10 @@
 									<weak_ptr>
 										<expired>0</expired>
 										<shared_ptr>
-											<id>-26</id>
+											<id>-40</id>
 										</shared_ptr>
 									</weak_ptr>
-									<string>exception,type</string>
+									<string>boost/exception/enable_error_info.hpp,enable_error_info,error_info,header</string>
 								</pair>
 								<pair>
 									<weak_ptr>
@@ -9972,6 +9702,24 @@
 									</weak_ptr>
 									<string>index,noindex</string>
 								</pair>
+								<pair>
+									<weak_ptr>
+										<expired>0</expired>
+										<shared_ptr>
+											<id>-42</id>
+										</shared_ptr>
+									</weak_ptr>
+									<string>diagnostic_information,exception,exception::diagnostic_information,function,member</string>
+								</pair>
+								<pair>
+									<weak_ptr>
+										<expired>0</expired>
+										<shared_ptr>
+											<id>-43</id>
+										</shared_ptr>
+									</weak_ptr>
+									<string>exception,exception::exception,function,member</string>
+								</pair>
 							</sorted>
 						</tag_index>
 					</object>
diff --git a/include/boost/exception/enable_error_info.hpp b/include/boost/exception/enable_error_info.hpp
index fa98983..6782d46 100644
--- a/include/boost/exception/enable_error_info.hpp
+++ b/include/boost/exception/enable_error_info.hpp
@@ -33,12 +33,6 @@ boost
                 {
                 }
 
-            char const *
-            what() const throw()
-                {
-                return T::what();
-                }
-
             char const *
             diagnostic_information() const throw()
                 {
diff --git a/include/boost/exception/exception.hpp b/include/boost/exception/exception.hpp
index c8a7e72..d128cd3 100644
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@@ -47,13 +47,6 @@ boost
         {
         public:
 
-        virtual
-        char const *
-        what() const throw()
-            {
-            return diagnostic_information();
-            }
-
         virtual
         char const *
         diagnostic_information() const throw()
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f532e3e..ab465fe 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -29,7 +29,6 @@ run throw_exception_test.cpp helper2.cpp ;
 run errno_test.cpp ;
 run error_info_test.cpp ;
 run diagnostic_information_test.cpp ;
-run what_test.cpp ;
 compile-fail exception_fail.cpp ;
 compile-fail throw_exception_fail.cpp ;
 
diff --git a/test/diagnostic_information_test.cpp b/test/diagnostic_information_test.cpp
index 873f835..51fefa5 100644
--- a/test/diagnostic_information_test.cpp
+++ b/test/diagnostic_information_test.cpp
@@ -44,26 +44,20 @@ get_diagnostic_information( std::exception const & x )
     return boost::diagnostic_information(x);
     }
 
-std::string
-get_what( std::exception const & x )
-    {
-    return x.what();
-    }
-
 int
 main()
     {
     using namespace boost;
         {
         error1 x;
-        BOOST_TEST(get_what(x)=="error1");
+		BOOST_TEST(x.what()==std::string("error1"));
         std::string di=get_diagnostic_information(x);
         BOOST_TEST(di.find("type:")!=std::string::npos);
         BOOST_TEST(di.find("error1")!=std::string::npos);
         }
         {
         error2 x; x << tag_int(42);
-        BOOST_TEST(get_what(x)=="error2");
+		BOOST_TEST(x.what()==std::string("error2"));
         std::string di=get_diagnostic_information(x);
         BOOST_TEST(di.find("type:")!=std::string::npos);
         BOOST_TEST(di.find("error2")!=std::string::npos);
diff --git a/test/enable_error_info_test.cpp b/test/enable_error_info_test.cpp
index eaa34ff..0d7c150 100644
--- a/test/enable_error_info_test.cpp
+++ b/test/enable_error_info_test.cpp
@@ -46,7 +46,6 @@ main()
         {
         BOOST_TEST( 42==*boost::get_error_info<test_int>(x) );
         BOOST_TEST( std::string(x.what())==std::string("exception test length error") );
-        BOOST_TEST( std::string(x.what())!=std::string(boost::diagnostic_information(x)) );
         }
     catch(
     ... )
diff --git a/test/what_test.cpp b/test/what_test.cpp
deleted file mode 100644
index cc7021a..0000000
--- a/test/what_test.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//Copyright (c) 2006-2008 Emil Dotchevski and Reverge Studios, Inc.
-
-//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)
-
-#include <boost/exception/exception.hpp>
-#include <exception>
-#include <string>
-#include <boost/detail/lightweight_test.hpp>
-
-struct
-test_exception:
-    std::exception,
-    boost::exception
-    {
-    char const *
-    what() const throw()
-        {
-        return "test_exception";
-        }
-    };
-
-int
-main()
-    {
-    test_exception x;
-    std::exception & sx(x);
-    boost::exception & bx(x);
-    BOOST_TEST(std::string(sx.what())=="test_exception");
-    BOOST_TEST(std::string(bx.what())=="test_exception");
-    return boost::report_errors();
-    }