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

[SVN r58618]

doc/html/fusion/functional/invocation/limits.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Limits</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="../invocation.html" title="Invocation">
 <link rel="previous" href="metafunctions/invoke_fobj.html" title="
@@ -23,6 +27,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="metafunctions/invoke_fobj.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../invocation.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="../adapters.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
+<<<<<<< .working
 <div class="section" lang="en">
 <div class="titlepage">
 <div><div><h4 class="title">
@@ -34,12 +39,29 @@
 <a name="id617510"></a>
           <a href="limits.html#fusion.functional.invocation.limits.header">Header</a>
         </h5>
+=======
+<div class="section" title="Limits">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.invocation.limits"></a><a class="link" href="limits.html" title="Limits">Limits</a>
+</h4></div></div></div>
+<a name="fusion.functional.invocation.limits.header"></a><h6>
+<a name="id825008"></a>
+          <a class="link" href="limits.html#fusion.functional.invocation.limits.header">Header</a>
+        </h6>
+>>>>>>> .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">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">limits</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.functional.invocation.limits.macros"></a><h5>
 <a name="id617613"></a>
           <a href="limits.html#fusion.functional.invocation.limits.macros">Macros</a>
         </h5>
+=======
+<a name="fusion.functional.invocation.limits.macros"></a><h6>
+<a name="id826170"></a>
+          <a class="link" href="limits.html#fusion.functional.invocation.limits.macros">Macros</a>
+        </h6>
+>>>>>>> .merge-right.r57125
 <p>
           The following macros can be defined to change the maximum arity. The default
           is 6.