fusion: merge of associative iterators/views and the new fold interface

[SVN r58618]

doc/html/fusion/adapted.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Adapted</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="previous" href="view/nview.html" title="nview">
@@ -49,10 +53,17 @@
       Fusion also provides various schemes to make it easy for the user to adapt
       various data structures, non-intrusively, as full fledged Fusion sequences.
     </p>
+<<<<<<< .working
 <a name="fusion.adapted.header"></a><h3>
 <a name="id530111"></a>
       <a href="adapted.html#fusion.adapted.header">Header</a>
     </h3>
+=======
+<a name="fusion.adapted.header"></a><h4>
+<a name="id737474"></a>
+      <a class="link" href="adapted.html#fusion.adapted.header">Header</a>
+    </h4>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>