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

[SVN r58618]

doc/html/fusion/tuple/pairs.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Pairs</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="../tuple.html" title="Tuple">
 <link rel="previous" href="class_template_tuple/relational_operators.html" title="Relational
@@ -23,6 +27,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="class_template_tuple/relational_operators.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tuple.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../extension.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
+<<<<<<< .working
 <div class="section" lang="en">
 <div class="titlepage">
 <div><div><h3 class="title">
@@ -34,15 +39,32 @@
 <a name="id598281"></a>
         <a href="pairs.html#fusion.tuple.pairs.description">Description</a>
       </h4>
+=======
+<div class="section" title="Pairs">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.tuple.pairs"></a><a class="link" href="pairs.html" title="Pairs">Pairs</a>
+</h3></div></div></div>
+<a name="fusion.tuple.pairs.description"></a><h5>
+<a name="id806304"></a>
+        <a class="link" href="pairs.html#fusion.tuple.pairs.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
         Tuple</a> interface is specified to provide uniform access to <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>
         as if it were a 2 element tuple.
       </p>
+<<<<<<< .working
 <a name="fusion.tuple.pairs.specification"></a><h4>
 <a name="id598338"></a>
         <a href="pairs.html#fusion.tuple.pairs.specification">Specification</a>
       </h4>
+=======
+<a name="fusion.tuple.pairs.specification"></a><h5>
+<a name="id806341"></a>
+        <a class="link" href="pairs.html#fusion.tuple.pairs.specification">Specification</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">tuple_size</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="identifier">T1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span>
 </pre>
 <p>