qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jr...@apache.org
Subject [17/36] qpid-site git commit: QPID-7903: Refresh the snapshot of the Proton C docs
Date Thu, 31 Aug 2017 12:41:56 GMT
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.html
index f2b2dc1..84e683d 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.html
@@ -97,17 +97,36 @@ $(document).ready(function(){initNavTree('classproton_1_1map.html','');});
 </div><!--header-->
 <div class="contents">
 
-<p>Used to access standard AMQP property, annotation and filter maps attached to <a class="el" href="classproton_1_1message.html" title="An AMQP message. ">proton::message</a> and <a class="el" href="classproton_1_1source.html" title="A point of origin for messages. ">proton::source</a>.  
+<p>A collection of key-value pairs.  
  <a href="classproton_1_1map.html#details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="map_8hpp_source.html">map.hpp</a>&gt;</code></p>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:ada6de583b7cdc95792661bcc0ff8a517"><td class="memTemplParams" colspan="2"><a id="ada6de583b7cdc95792661bcc0ff8a517"></a>
-template&lt;class M &gt; </td></tr>
+<tr class="memitem:a7f35c814c022f4191d359b5dc139d35b"><td class="memItemLeft" align="right" valign="top"><a id="a7f35c814c022f4191d359b5dc139d35b"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#a7f35c814c022f4191d359b5dc139d35b">map</a> ()</td></tr>
+<tr class="memdesc:a7f35c814c022f4191d359b5dc139d35b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Construct an empty map. <br /></td></tr>
+<tr class="separator:a7f35c814c022f4191d359b5dc139d35b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:abd67a924a05c8bd5353cd2fa429b5272"><td class="memItemLeft" align="right" valign="top"><a id="abd67a924a05c8bd5353cd2fa429b5272"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#abd67a924a05c8bd5353cd2fa429b5272">map</a> (const <a class="el" href="classproton_1_1map.html">map</a> &amp;)</td></tr>
+<tr class="memdesc:abd67a924a05c8bd5353cd2fa429b5272"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a map. <br /></td></tr>
+<tr class="separator:abd67a924a05c8bd5353cd2fa429b5272"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a16a75d371d4e6287b352f5066643f030"><td class="memItemLeft" align="right" valign="top"><a id="a16a75d371d4e6287b352f5066643f030"></a>
+<a class="el" href="classproton_1_1map.html">map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#a16a75d371d4e6287b352f5066643f030">operator=</a> (const <a class="el" href="classproton_1_1map.html">map</a> &amp;)</td></tr>
+<tr class="memdesc:a16a75d371d4e6287b352f5066643f030"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a map. <br /></td></tr>
+<tr class="separator:a16a75d371d4e6287b352f5066643f030"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa4042115b50aa33d3e365ce1e4b254d4"><td class="memItemLeft" align="right" valign="top"><a id="aa4042115b50aa33d3e365ce1e4b254d4"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#aa4042115b50aa33d3e365ce1e4b254d4">map</a> (<a class="el" href="classproton_1_1map.html">map</a> &amp;&amp;)</td></tr>
+<tr class="memdesc:aa4042115b50aa33d3e365ce1e4b254d4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Move a map. <br /></td></tr>
+<tr class="separator:aa4042115b50aa33d3e365ce1e4b254d4"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ab96fb2544d53f9ae42d6950c819d25ef"><td class="memItemLeft" align="right" valign="top"><a id="ab96fb2544d53f9ae42d6950c819d25ef"></a>
+<a class="el" href="classproton_1_1map.html">map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#ab96fb2544d53f9ae42d6950c819d25ef">operator=</a> (<a class="el" href="classproton_1_1map.html">map</a> &amp;&amp;)</td></tr>
+<tr class="memdesc:ab96fb2544d53f9ae42d6950c819d25ef"><td class="mdescLeft">&#160;</td><td class="mdescRight">Move a map. <br /></td></tr>
+<tr class="separator:ab96fb2544d53f9ae42d6950c819d25ef"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ada6de583b7cdc95792661bcc0ff8a517"><td class="memTemplParams" colspan="2">template&lt;class M &gt; </td></tr>
 <tr class="memitem:ada6de583b7cdc95792661bcc0ff8a517"><td class="memTemplItemLeft" align="right" valign="top">assignable_map&lt; M, <a class="el" href="classproton_1_1map.html">map</a> &amp; &gt;::type&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#ada6de583b7cdc95792661bcc0ff8a517">operator=</a> (const M &amp;x)</td></tr>
-<tr class="memdesc:ada6de583b7cdc95792661bcc0ff8a517"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type-safe assign from a compatible map, e.g. std::map&lt;K,T&gt; - see <a class="el" href="types_page.html">AMQP and C++ types</a>. <br /></td></tr>
+<tr class="memdesc:ada6de583b7cdc95792661bcc0ff8a517"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type-safe assign from a compatible map, for instance <code>std::map&lt;K,T&gt;</code>.  <a href="#ada6de583b7cdc95792661bcc0ff8a517">More...</a><br /></td></tr>
 <tr class="separator:ada6de583b7cdc95792661bcc0ff8a517"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad7e7efff114db20e5786e0ee89a6808a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#ad7e7efff114db20e5786e0ee89a6808a">value</a> (const <a class="el" href="classproton_1_1value.html">value</a> &amp;x)</td></tr>
 <tr class="memdesc:ad7e7efff114db20e5786e0ee89a6808a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy from a <a class="el" href="classproton_1_1value.html" title="A holder for any AMQP value, simple or complex. ">proton::value</a>.  <a href="#ad7e7efff114db20e5786e0ee89a6808a">More...</a><br /></td></tr>
@@ -120,58 +139,93 @@ template&lt;class M &gt; </td></tr>
 const <a class="el" href="classproton_1_1value.html">proton::value</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#a7644d6a5c6e5a2d7bb8bac2d0111fde1">value</a> () const</td></tr>
 <tr class="memdesc:a7644d6a5c6e5a2d7bb8bac2d0111fde1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Access as a <a class="el" href="classproton_1_1value.html" title="A holder for any AMQP value, simple or complex. ">proton::value</a> containing an AMQP map. <br /></td></tr>
 <tr class="separator:a7644d6a5c6e5a2d7bb8bac2d0111fde1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa5c42da16d5df4154dc8af4c39fbd8e0"><td class="memItemLeft" align="right" valign="top"><a id="aa5c42da16d5df4154dc8af4c39fbd8e0"></a>
-T&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#aa5c42da16d5df4154dc8af4c39fbd8e0">get</a> (const K &amp;k) const</td></tr>
-<tr class="memdesc:aa5c42da16d5df4154dc8af4c39fbd8e0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the map entry for key k, return T() if no such entry. <br /></td></tr>
+<tr class="memitem:aa5c42da16d5df4154dc8af4c39fbd8e0"><td class="memItemLeft" align="right" valign="top">T&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#aa5c42da16d5df4154dc8af4c39fbd8e0">get</a> (const K &amp;k) const</td></tr>
+<tr class="memdesc:aa5c42da16d5df4154dc8af4c39fbd8e0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the map entry for key <code>k</code>.  <a href="#aa5c42da16d5df4154dc8af4c39fbd8e0">More...</a><br /></td></tr>
 <tr class="separator:aa5c42da16d5df4154dc8af4c39fbd8e0"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac310ae7d64b7ad8a70b200c07a55a736"><td class="memItemLeft" align="right" valign="top"><a id="ac310ae7d64b7ad8a70b200c07a55a736"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#ac310ae7d64b7ad8a70b200c07a55a736">put</a> (const K &amp;k, const T &amp;v)</td></tr>
-<tr class="memdesc:ac310ae7d64b7ad8a70b200c07a55a736"><td class="mdescLeft">&#160;</td><td class="mdescRight">Put a map entry for key k. <br /></td></tr>
+<tr class="memdesc:ac310ae7d64b7ad8a70b200c07a55a736"><td class="mdescLeft">&#160;</td><td class="mdescRight">Put a map entry for key <code>k</code>. <br /></td></tr>
 <tr class="separator:ac310ae7d64b7ad8a70b200c07a55a736"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa411e89b8ca1e0107c2e0c5952cf5e5e"><td class="memItemLeft" align="right" valign="top"><a id="aa411e89b8ca1e0107c2e0c5952cf5e5e"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#aa411e89b8ca1e0107c2e0c5952cf5e5e">erase</a> (const K &amp;k)</td></tr>
-<tr class="memdesc:aa411e89b8ca1e0107c2e0c5952cf5e5e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Erase the map entry at k. <br /></td></tr>
+<tr class="memdesc:aa411e89b8ca1e0107c2e0c5952cf5e5e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Erase the map entry at <code>k</code>. <br /></td></tr>
 <tr class="separator:aa411e89b8ca1e0107c2e0c5952cf5e5e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aecd4c56a12e62bf5170a3786a94c9210"><td class="memItemLeft" align="right" valign="top"><a id="aecd4c56a12e62bf5170a3786a94c9210"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#aecd4c56a12e62bf5170a3786a94c9210">exists</a> (const K &amp;k) const</td></tr>
-<tr class="memdesc:aecd4c56a12e62bf5170a3786a94c9210"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if there is a map entry for k. <br /></td></tr>
+<tr class="memdesc:aecd4c56a12e62bf5170a3786a94c9210"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if the map has an entry for <code>k</code>. <br /></td></tr>
 <tr class="separator:aecd4c56a12e62bf5170a3786a94c9210"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a259cb5a711406a8c3e5d937eb9350cca"><td class="memItemLeft" align="right" valign="top"><a id="a259cb5a711406a8c3e5d937eb9350cca"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#a259cb5a711406a8c3e5d937eb9350cca">size</a> () const</td></tr>
-<tr class="memdesc:a259cb5a711406a8c3e5d937eb9350cca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Number of map entries. <br /></td></tr>
+<tr class="memdesc:a259cb5a711406a8c3e5d937eb9350cca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of map entries. <br /></td></tr>
 <tr class="separator:a259cb5a711406a8c3e5d937eb9350cca"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac8bb3912a3ce86b15842e79d0b421204"><td class="memItemLeft" align="right" valign="top"><a id="ac8bb3912a3ce86b15842e79d0b421204"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#ac8bb3912a3ce86b15842e79d0b421204">clear</a> ()</td></tr>
-<tr class="memdesc:ac8bb3912a3ce86b15842e79d0b421204"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear the map. <br /></td></tr>
+<tr class="memdesc:ac8bb3912a3ce86b15842e79d0b421204"><td class="mdescLeft">&#160;</td><td class="mdescRight">Remove all map entries. <br /></td></tr>
 <tr class="separator:ac8bb3912a3ce86b15842e79d0b421204"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a644718bb2fb240de962dc3c9a1fdf0dc"><td class="memItemLeft" align="right" valign="top"><a id="a644718bb2fb240de962dc3c9a1fdf0dc"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1map.html#a644718bb2fb240de962dc3c9a1fdf0dc">empty</a> () const</td></tr>
-<tr class="memdesc:a644718bb2fb240de962dc3c9a1fdf0dc"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if the map is empty. <br /></td></tr>
+<tr class="memdesc:a644718bb2fb240de962dc3c9a1fdf0dc"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if the map has no entries. <br /></td></tr>
 <tr class="separator:a644718bb2fb240de962dc3c9a1fdf0dc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr><td colspan="2"><div class="groupHeader">Construct and assign</div></td></tr>
-<tr class="memitem:a7f35c814c022f4191d359b5dc139d35b"><td class="memItemLeft" align="right" valign="top"><a id="a7f35c814c022f4191d359b5dc139d35b"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>map</b> ()</td></tr>
-<tr class="separator:a7f35c814c022f4191d359b5dc139d35b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a289524af76781539bbbe2c51bec73adf"><td class="memItemLeft" align="right" valign="top"><a id="a289524af76781539bbbe2c51bec73adf"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>map</b> (const <a class="el" href="classproton_1_1map.html">map</a> &amp;cm)</td></tr>
-<tr class="separator:a289524af76781539bbbe2c51bec73adf"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae70c8d890b49bf20be5c71fe26e1d67a"><td class="memItemLeft" align="right" valign="top"><a id="ae70c8d890b49bf20be5c71fe26e1d67a"></a>
-<a class="el" href="classproton_1_1map.html">map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>operator=</b> (const <a class="el" href="classproton_1_1map.html">map</a> &amp;cm)</td></tr>
-<tr class="separator:ae70c8d890b49bf20be5c71fe26e1d67a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa4042115b50aa33d3e365ce1e4b254d4"><td class="memItemLeft" align="right" valign="top"><a id="aa4042115b50aa33d3e365ce1e4b254d4"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>map</b> (<a class="el" href="classproton_1_1map.html">map</a> &amp;&amp;)</td></tr>
-<tr class="separator:aa4042115b50aa33d3e365ce1e4b254d4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab96fb2544d53f9ae42d6950c819d25ef"><td class="memItemLeft" align="right" valign="top"><a id="ab96fb2544d53f9ae42d6950c819d25ef"></a>
-<a class="el" href="classproton_1_1map.html">map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>operator=</b> (<a class="el" href="classproton_1_1map.html">map</a> &amp;&amp;)</td></tr>
-<tr class="separator:ab96fb2544d53f9ae42d6950c819d25ef"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><h3>template&lt;class K, class T&gt;<br />
 class proton::map&lt; K, T &gt;</h3>
 
-<p>Used to access standard AMQP property, annotation and filter maps attached to <a class="el" href="classproton_1_1message.html" title="An AMQP message. ">proton::message</a> and <a class="el" href="classproton_1_1source.html" title="A point of origin for messages. ">proton::source</a>. </p>
-<p>Provides only basic <a class="el" href="classproton_1_1map.html#aa5c42da16d5df4154dc8af4c39fbd8e0" title="Get the map entry for key k, return T() if no such entry. ">get()</a>/set() operations for convenience. For more complicated use (iteration, preserving order etc.) you should convert to a standard C++ map type such as std::map. See <a class="el" href="message_properties_8cpp-example.html">message_properties.cpp</a> and <a class="el" href="types_page.html">AMQP and C++ types</a>. </p>
+<p>A collection of key-value pairs. </p>
+<p>Used to access standard AMQP property, annotation, and filter maps attached to <a class="el" href="classproton_1_1message.html" title="An AMQP message. ">proton::message</a> and <a class="el" href="classproton_1_1source.html" title="A point of origin for messages. ">proton::source</a>.</p>
+<p>This class provides only basic <a class="el" href="classproton_1_1map.html#aa5c42da16d5df4154dc8af4c39fbd8e0" title="Get the map entry for key k. ">get()</a> and <a class="el" href="classproton_1_1map.html#ac310ae7d64b7ad8a70b200c07a55a736" title="Put a map entry for key k. ">put()</a> operations for convenience. For more complicated uses (iteration, preserving order, and so on), convert the value to a standard C++ map type such as <code>std::map</code>. See <a class="el" href="message_properties_8cpp-example.html">message_properties.cpp</a> and <a class="el" href="types_page.html">AMQP and C++ types</a>. </p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
+<a id="aa5c42da16d5df4154dc8af4c39fbd8e0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#aa5c42da16d5df4154dc8af4c39fbd8e0">&#9670;&nbsp;</a></span>get()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">T get </td>
+          <td>(</td>
+          <td class="paramtype">const K &amp;&#160;</td>
+          <td class="paramname"><em>k</em></td><td>)</td>
+          <td> const</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Get the map entry for key <code>k</code>. </p>
+<p>Return <code>T()</code> if there is no such entry. </p>
+<dl><dt><b>Examples: </b></dt><dd><a class="el" href="message_properties_8cpp-example.html#a4">message_properties.cpp</a>.</dd>
+</dl>
+</div>
+</div>
+<a id="ada6de583b7cdc95792661bcc0ff8a517"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ada6de583b7cdc95792661bcc0ff8a517">&#9670;&nbsp;</a></span>operator=()</h2>
+
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+  <tr>
+  <td class="mlabels-left">
+      <table class="memname">
+        <tr>
+          <td class="memname">assignable_map&lt;M, <a class="el" href="classproton_1_1map.html">map</a>&amp;&gt;::type operator= </td>
+          <td>(</td>
+          <td class="paramtype">const M &amp;&#160;</td>
+          <td class="paramname"><em>x</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+  </td>
+  <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">inline</span></span>  </td>
+  </tr>
+</table>
+</div><div class="memdoc">
+
+<p>Type-safe assign from a compatible map, for instance <code>std::map&lt;K,T&gt;</code>. </p>
+<p>See <a class="el" href="types_page.html">AMQP and C++ types</a>. </p>
+
+</div>
+</div>
 <a id="ad7e7efff114db20e5786e0ee89a6808a"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#ad7e7efff114db20e5786e0ee89a6808a">&#9670;&nbsp;</a></span>value()</h2>
 
@@ -191,7 +245,7 @@ class proton::map&lt; K, T &gt;</h3>
 <p>Copy from a <a class="el" href="classproton_1_1value.html" title="A holder for any AMQP value, simple or complex. ">proton::value</a>. </p>
 <dl class="exception"><dt>Exceptions</dt><dd>
   <table class="exception">
-    <tr><td class="paramname"><a class="el" href="structproton_1_1conversion__error.html" title="An error converting between AMQP and C++ data. ">proton::conversion_error</a></td><td>if x does not contain a compatible map. </td></tr>
+    <tr><td class="paramname"><a class="el" href="structproton_1_1conversion__error.html" title="An error converting between AMQP and C++ data. ">proton::conversion_error</a></td><td>if <code>x</code> does not contain a compatible map. </td></tr>
   </table>
   </dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.js
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.js b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.js
index 2a49cd9..22b31d7 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.js
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1map.js
@@ -1,7 +1,7 @@
 var classproton_1_1map =
 [
     [ "map", "classproton_1_1map.html#a7f35c814c022f4191d359b5dc139d35b", null ],
-    [ "map", "classproton_1_1map.html#a289524af76781539bbbe2c51bec73adf", null ],
+    [ "map", "classproton_1_1map.html#abd67a924a05c8bd5353cd2fa429b5272", null ],
     [ "map", "classproton_1_1map.html#aa4042115b50aa33d3e365ce1e4b254d4", null ],
     [ "~map", "classproton_1_1map.html#ae2dd347195a4c3db069b041648bc7ed1", null ],
     [ "clear", "classproton_1_1map.html#ac8bb3912a3ce86b15842e79d0b421204", null ],
@@ -9,7 +9,7 @@ var classproton_1_1map =
     [ "erase", "classproton_1_1map.html#aa411e89b8ca1e0107c2e0c5952cf5e5e", null ],
     [ "exists", "classproton_1_1map.html#aecd4c56a12e62bf5170a3786a94c9210", null ],
     [ "get", "classproton_1_1map.html#aa5c42da16d5df4154dc8af4c39fbd8e0", null ],
-    [ "operator=", "classproton_1_1map.html#ae70c8d890b49bf20be5c71fe26e1d67a", null ],
+    [ "operator=", "classproton_1_1map.html#a16a75d371d4e6287b352f5066643f030", null ],
     [ "operator=", "classproton_1_1map.html#ab96fb2544d53f9ae42d6950c819d25ef", null ],
     [ "operator=", "classproton_1_1map.html#ada6de583b7cdc95792661bcc0ff8a517", null ],
     [ "put", "classproton_1_1map.html#ac310ae7d64b7ad8a70b200c07a55a736", null ],

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html
index dc2f251..3000c9b 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html
@@ -107,10 +107,10 @@ $(document).ready(function(){initNavTree('classproton_1_1message.html','');});
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-types"></a>
 Public Types</h2></td></tr>
 <tr class="memitem:a071e4357cc12168d97a7251b5a5b9784"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="classproton_1_1map.html">map</a>&lt; std::string, <a class="el" href="classproton_1_1scalar.html">scalar</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#a071e4357cc12168d97a7251b5a5b9784">property_map</a></td></tr>
-<tr class="memdesc:a071e4357cc12168d97a7251b5a5b9784"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - A map of string keys and AMQP scalar values.  <a href="#a071e4357cc12168d97a7251b5a5b9784">More...</a><br /></td></tr>
+<tr class="memdesc:a071e4357cc12168d97a7251b5a5b9784"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - A map of string keys and AMQP scalar values.  <a href="#a071e4357cc12168d97a7251b5a5b9784">More...</a><br /></td></tr>
 <tr class="separator:a071e4357cc12168d97a7251b5a5b9784"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3c6892bfc5d3b4b1972dc23c004929b7"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="classproton_1_1map.html">map</a>&lt; <a class="el" href="classproton_1_1annotation__key.html">annotation_key</a>, <a class="el" href="classproton_1_1value.html">value</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#a3c6892bfc5d3b4b1972dc23c004929b7">annotation_map</a></td></tr>
-<tr class="memdesc:a3c6892bfc5d3b4b1972dc23c004929b7"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - A map of AMQP annotation keys and AMQP values.  <a href="#a3c6892bfc5d3b4b1972dc23c004929b7">More...</a><br /></td></tr>
+<tr class="memdesc:a3c6892bfc5d3b4b1972dc23c004929b7"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - A map of AMQP annotation keys and AMQP values.  <a href="#a3c6892bfc5d3b4b1972dc23c004929b7">More...</a><br /></td></tr>
 <tr class="separator:a3c6892bfc5d3b4b1972dc23c004929b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
@@ -314,15 +314,15 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#a2c47345d04743821765ec83e13396f29">group_sequence</a> (int32_t)</td></tr>
 <tr class="memdesc:a2c47345d04743821765ec83e13396f29"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the group sequence for a message. <br /></td></tr>
 <tr class="separator:a2c47345d04743821765ec83e13396f29"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr><td colspan="2"><div class="groupHeader">**Experimental** - Application properties</div></td></tr>
+<tr><td colspan="2"><div class="groupHeader">**Unsettled API** - Application properties</div></td></tr>
 <tr class="memitem:ac163919aa25a6ed5b33a29a96d04e028"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1message.html#a071e4357cc12168d97a7251b5a5b9784">property_map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#ac163919aa25a6ed5b33a29a96d04e028">properties</a> ()</td></tr>
-<tr class="memdesc:ac163919aa25a6ed5b33a29a96d04e028"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - Get the application properties map.  <a href="#ac163919aa25a6ed5b33a29a96d04e028">More...</a><br /></td></tr>
+<tr class="memdesc:ac163919aa25a6ed5b33a29a96d04e028"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - Get the application properties map.  <a href="#ac163919aa25a6ed5b33a29a96d04e028">More...</a><br /></td></tr>
 <tr class="separator:ac163919aa25a6ed5b33a29a96d04e028"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac7c0f75dbd504b5cde8b586a4005e262"><td class="memItemLeft" align="right" valign="top"><a id="ac7c0f75dbd504b5cde8b586a4005e262"></a>
 const <a class="el" href="classproton_1_1message.html#a071e4357cc12168d97a7251b5a5b9784">property_map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#ac7c0f75dbd504b5cde8b586a4005e262">properties</a> () const</td></tr>
-<tr class="memdesc:ac7c0f75dbd504b5cde8b586a4005e262"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - examine the application properties map. <br /></td></tr>
+<tr class="memdesc:ac7c0f75dbd504b5cde8b586a4005e262"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - examine the application properties map. <br /></td></tr>
 <tr class="separator:ac7c0f75dbd504b5cde8b586a4005e262"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr><td colspan="2"><div class="groupHeader">**Experimental** - Annotations</div></td></tr>
+<tr><td colspan="2"><div class="groupHeader">**Unsettled API** - Annotations</div></td></tr>
 <tr><td colspan="2"><div class="groupText"><p>Normally used by messaging infrastructure, not applications. </p>
 </div></td></tr>
 <tr class="memitem:a5d96699458d8be84d821f5651a7b3717"><td class="memItemLeft" align="right" valign="top"><a id="a5d96699458d8be84d821f5651a7b3717"></a>
@@ -362,7 +362,7 @@ static const uint8_t&#160;</td><td class="memItemRight" valign="bottom"><a class
       </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - A map of AMQP annotation keys and AMQP values. </p>
+<p><b>Unsettled API</b> - A map of AMQP annotation keys and AMQP values. </p>
 
 </div>
 </div>
@@ -378,7 +378,7 @@ static const uint8_t&#160;</td><td class="memItemRight" valign="bottom"><a class
       </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - A map of string keys and AMQP scalar values. </p>
+<p><b>Unsettled API</b> - A map of string keys and AMQP scalar values. </p>
 
 </div>
 </div>
@@ -582,7 +582,7 @@ static const uint8_t&#160;</td><td class="memItemRight" valign="bottom"><a class
       </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - Get the application properties map. </p>
+<p><b>Unsettled API</b> - Get the application properties map. </p>
 <p>It can be modified in place. </p>
 <dl><dt><b>Examples: </b></dt><dd><a class="el" href="message_properties_8cpp-example.html#a1">message_properties.cpp</a>.</dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
index c56823e..ae73677 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
@@ -206,10 +206,10 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr class="memdesc:afc96eabc76c471d61627493eadb58ac8"><td class="mdescLeft">&#160;</td><td class="mdescRight">The sending peer settled a transfer. <br /></td></tr>
 <tr class="separator:afc96eabc76c471d61627493eadb58ac8"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad3d23a7c3849dabd137610f8ee1569e3"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1messaging__handler.html#ad3d23a7c3849dabd137610f8ee1569e3">on_sender_drain_start</a> (<a class="el" href="classproton_1_1sender.html">sender</a> &amp;s)</td></tr>
-<tr class="memdesc:ad3d23a7c3849dabd137610f8ee1569e3"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - The receiving peer has requested a drain of remaining credit.  <a href="#ad3d23a7c3849dabd137610f8ee1569e3">More...</a><br /></td></tr>
+<tr class="memdesc:ad3d23a7c3849dabd137610f8ee1569e3"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - The receiving peer has requested a drain of remaining credit.  <a href="#ad3d23a7c3849dabd137610f8ee1569e3">More...</a><br /></td></tr>
 <tr class="separator:ad3d23a7c3849dabd137610f8ee1569e3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a815e30c6d10d923d88dc1085b7b0f116"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116">on_receiver_drain_finish</a> (<a class="el" href="classproton_1_1receiver.html">receiver</a> &amp;r)</td></tr>
-<tr class="memdesc:a815e30c6d10d923d88dc1085b7b0f116"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Experimental - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned.  <a href="#a815e30c6d10d923d88dc1085b7b0f116">More...</a><br /></td></tr>
+<tr class="memdesc:a815e30c6d10d923d88dc1085b7b0f116"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Unsettled API - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned.  <a href="#a815e30c6d10d923d88dc1085b7b0f116">More...</a><br /></td></tr>
 <tr class="separator:a815e30c6d10d923d88dc1085b7b0f116"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5e29fef3b8c5b8cf18aa7d69850ac22e"><td class="memItemLeft" align="right" valign="top"><a id="a5e29fef3b8c5b8cf18aa7d69850ac22e"></a>
 virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e">on_error</a> (const <a class="el" href="classproton_1_1error__condition.html">error_condition</a> &amp;c)</td></tr>
@@ -313,7 +313,7 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Experimental - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned. </p>
+<p><b>Unsettled API</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Unsettled API - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned. </p>
 
 </div>
 </div>
@@ -341,7 +341,7 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - The receiving peer has requested a drain of remaining credit. </p>
+<p><b>Unsettled API</b> - The receiving peer has requested a drain of remaining credit. </p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
index 1c39e6e..0c4d086 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
@@ -136,7 +136,7 @@ class <a class="el" href="classproton_1_1target.html">target</a>&#160;</td><td c
 <tr class="memdesc:a84d3a001340d11201e03c6ed7c763641"><td class="mdescLeft">&#160;</td><td class="mdescRight">Increment the credit available to the sender.  <a href="#a84d3a001340d11201e03c6ed7c763641">More...</a><br /></td></tr>
 <tr class="separator:a84d3a001340d11201e03c6ed7c763641"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:af7d01b5776b9d8a0f218aec331ddaeb9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9">drain</a> ()</td></tr>
-<tr class="memdesc:af7d01b5776b9d8a0f218aec331ddaeb9"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - Commence a drain cycle.  <a href="#af7d01b5776b9d8a0f218aec331ddaeb9">More...</a><br /></td></tr>
+<tr class="memdesc:af7d01b5776b9d8a0f218aec331ddaeb9"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - Commence a drain cycle.  <a href="#af7d01b5776b9d8a0f218aec331ddaeb9">More...</a><br /></td></tr>
 <tr class="separator:af7d01b5776b9d8a0f218aec331ddaeb9"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab51c3843057c4c187574e2d44839f815"><td class="memItemLeft" align="right" valign="top"><a id="ab51c3843057c4c187574e2d44839f815"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#ab51c3843057c4c187574e2d44839f815">uninitialized</a> () const</td></tr>
@@ -168,7 +168,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 <tr class="memdesc:afd27bd11ba72d7df51c44f71b15749eb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Credit available on the link. <br /></td></tr>
 <tr class="separator:afd27bd11ba72d7df51c44f71b15749eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a19c36a38b50e8080b94a47230a56234f"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a19c36a38b50e8080b94a47230a56234f">draining</a> ()</td></tr>
-<tr class="memdesc:a19c36a38b50e8080b94a47230a56234f"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending.  <a href="#a19c36a38b50e8080b94a47230a56234f">More...</a><br /></td></tr>
+<tr class="memdesc:a19c36a38b50e8080b94a47230a56234f"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending.  <a href="#a19c36a38b50e8080b94a47230a56234f">More...</a><br /></td></tr>
 <tr class="separator:a19c36a38b50e8080b94a47230a56234f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a1d89c28bd42ba9a52da008bb69367171"><td class="memItemLeft" align="right" valign="top"><a id="a1d89c28bd42ba9a52da008bb69367171"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a1d89c28bd42ba9a52da008bb69367171">name</a> () const</td></tr>
@@ -180,7 +180,7 @@ class <a class="el" href="classproton_1_1container.html">container</a> &amp;&#16
 <tr class="separator:a2f632b80247e868b8264b8a025b84baf"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7c755d6ac6385e007adb61966598ba63"><td class="memItemLeft" align="right" valign="top"><a id="a7c755d6ac6385e007adb61966598ba63"></a>
 class <a class="el" href="classproton_1_1work__queue.html">work_queue</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a7c755d6ac6385e007adb61966598ba63">work_queue</a> () const</td></tr>
-<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Experimental - A work queue for serial execution. ">work_queue</a> for the link. <br /></td></tr>
+<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Unsettled API - A work queue for serial execution. ">work_queue</a> for the link. <br /></td></tr>
 <tr class="separator:a7c755d6ac6385e007adb61966598ba63"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aff302bb6016f2ae29f01bb4e07389a52"><td class="memItemLeft" align="right" valign="top"><a id="aff302bb6016f2ae29f01bb4e07389a52"></a>
 class <a class="el" href="classproton_1_1connection.html">connection</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a> () const</td></tr>
@@ -322,8 +322,8 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
       </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - Commence a drain cycle. </p>
-<p>If there is positive credit, a request is sent to the sender to immediately use up all of the existing credit balance by sending messages that are immediately available and releasing any unused credit (see <a class="el" href="classproton_1_1sender.html#abc4cb5f2f38643abb47c0b221a130bc8" title="Experimental - Return all unused credit to the receiver in response to a drain request. ">sender::return_credit</a>). Throws <a class="el" href="structproton_1_1error.html" title="The base Proton error. ">proton::error</a> if a drain cycle is already in progress. An on_receiver_drain_finish event will be generated when the outstanding drained credit reaches zero. </p>
+<p><b>Unsettled API</b> - Commence a drain cycle. </p>
+<p>If there is positive credit, a request is sent to the sender to immediately use up all of the existing credit balance by sending messages that are immediately available and releasing any unused credit (see <a class="el" href="classproton_1_1sender.html#abc4cb5f2f38643abb47c0b221a130bc8" title="Unsettled API - Return all unused credit to the receiver in response to a drain request. ">sender::return_credit</a>). Throws <a class="el" href="structproton_1_1error.html" title="The base Proton error. ">proton::error</a> if a drain cycle is already in progress. An on_receiver_drain_finish event will be generated when the outstanding drained credit reaches zero. </p>
 
 </div>
 </div>
@@ -350,7 +350,7 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending. </p>
+<p><b>Unsettled API</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending. </p>
 <p>True for a sender if the receiver has requested a drain of credit and the sender has unused credit.</p>
 <dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9">receiver::drain</a>. </dd></dl>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options-members.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options-members.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options-members.html
index ba573f2..54f870e 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options-members.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options-members.html
@@ -98,7 +98,7 @@ $(document).ready(function(){initNavTree('classproton_1_1receiver__options.html'
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#a9b9ad83418de47f87c6c7062eaefb5b6">auto_accept</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#af313abfa8d5b19e4b61c779907eb9980">auto_settle</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#a0d332416daba4af0ce5cf6677b497226">credit_window</a>(int)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#a714a6a7dd1ea90c6046fe0460d2ce4f0">credit_window</a>(int count)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079">delivery_mode</a>(delivery_mode)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df">handler</a>(class messaging_handler &amp;)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1receiver__options.html#a815be8018205013b8ff011d4b62b7324">operator=</a>(const receiver_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a></td><td class="entry"></td></tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
index a8a6be0..ef5ace9 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
@@ -123,16 +123,14 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr class="memitem:a84f38ac0f31f74011c9dc342e44a53df"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df">handler</a> (class <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a> &amp;)</td></tr>
 <tr class="memdesc:a84f38ac0f31f74011c9dc342e44a53df"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a <a class="el" href="classproton_1_1messaging__handler.html" title="A handler for Proton messaging events. ">messaging_handler</a> for receiver events only.  <a href="#a84f38ac0f31f74011c9dc342e44a53df">More...</a><br /></td></tr>
 <tr class="separator:a84f38ac0f31f74011c9dc342e44a53df"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a582bced77754ed8a85f9597e2e457079"><td class="memItemLeft" align="right" valign="top"><a id="a582bced77754ed8a85f9597e2e457079"></a>
-<a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079">delivery_mode</a> (<a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a>)</td></tr>
-<tr class="memdesc:a582bced77754ed8a85f9597e2e457079"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the delivery mode on the receiver. <br /></td></tr>
+<tr class="memitem:a582bced77754ed8a85f9597e2e457079"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079">delivery_mode</a> (<a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a>)</td></tr>
+<tr class="memdesc:a582bced77754ed8a85f9597e2e457079"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the delivery mode on the receiver.  <a href="#a582bced77754ed8a85f9597e2e457079">More...</a><br /></td></tr>
 <tr class="separator:a582bced77754ed8a85f9597e2e457079"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9b9ad83418de47f87c6c7062eaefb5b6"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a9b9ad83418de47f87c6c7062eaefb5b6">auto_accept</a> (bool)</td></tr>
-<tr class="memdesc:a9b9ad83418de47f87c6c7062eaefb5b6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Automatically accept inbound messages that aren't otherwise released, rejected, or modified (default is true).  <a href="#a9b9ad83418de47f87c6c7062eaefb5b6">More...</a><br /></td></tr>
+<tr class="memdesc:a9b9ad83418de47f87c6c7062eaefb5b6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Enable or disable automatic acceptance of messages that aren't otherwise released, rejected, or modified.  <a href="#a9b9ad83418de47f87c6c7062eaefb5b6">More...</a><br /></td></tr>
 <tr class="separator:a9b9ad83418de47f87c6c7062eaefb5b6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af313abfa8d5b19e4b61c779907eb9980"><td class="memItemLeft" align="right" valign="top"><a id="af313abfa8d5b19e4b61c779907eb9980"></a>
-<a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#af313abfa8d5b19e4b61c779907eb9980">auto_settle</a> (bool)</td></tr>
-<tr class="memdesc:af313abfa8d5b19e4b61c779907eb9980"><td class="mdescLeft">&#160;</td><td class="mdescRight">Automatically settle messages (default is true). <br /></td></tr>
+<tr class="memitem:af313abfa8d5b19e4b61c779907eb9980"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#af313abfa8d5b19e4b61c779907eb9980">auto_settle</a> (bool)</td></tr>
+<tr class="memdesc:af313abfa8d5b19e4b61c779907eb9980"><td class="mdescLeft">&#160;</td><td class="mdescRight">Enable or disable automatic settlement of messages.  <a href="#af313abfa8d5b19e4b61c779907eb9980">More...</a><br /></td></tr>
 <tr class="separator:af313abfa8d5b19e4b61c779907eb9980"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7e2689fd52f88f551d11face38a4157b"><td class="memItemLeft" align="right" valign="top"><a id="a7e2689fd52f88f551d11face38a4157b"></a>
 <a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a7e2689fd52f88f551d11face38a4157b">source</a> (<a class="el" href="classproton_1_1source__options.html">source_options</a> &amp;)</td></tr>
@@ -142,9 +140,9 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a7823f6c72dc78481be578de1658b99eb">target</a> (<a class="el" href="classproton_1_1target__options.html">target_options</a> &amp;)</td></tr>
 <tr class="memdesc:a7823f6c72dc78481be578de1658b99eb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Options for the target node of the receiver. <br /></td></tr>
 <tr class="separator:a7823f6c72dc78481be578de1658b99eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0d332416daba4af0ce5cf6677b497226"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a0d332416daba4af0ce5cf6677b497226">credit_window</a> (int)</td></tr>
-<tr class="memdesc:a0d332416daba4af0ce5cf6677b497226"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set automated flow control to pre-fetch this many messages (default is 10).  <a href="#a0d332416daba4af0ce5cf6677b497226">More...</a><br /></td></tr>
-<tr class="separator:a0d332416daba4af0ce5cf6677b497226"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a714a6a7dd1ea90c6046fe0460d2ce4f0"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1receiver__options.html#a714a6a7dd1ea90c6046fe0460d2ce4f0">credit_window</a> (int count)</td></tr>
+<tr class="memdesc:a714a6a7dd1ea90c6046fe0460d2ce4f0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Automatically replenish credit for flow control up to <code>count</code> messages.  <a href="#a714a6a7dd1ea90c6046fe0460d2ce4f0">More...</a><br /></td></tr>
+<tr class="separator:a714a6a7dd1ea90c6046fe0460d2ce4f0"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Options for creating a receiver. </p>
@@ -169,12 +167,34 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
       </table>
 </div><div class="memdoc">
 
-<p>Automatically accept inbound messages that aren't otherwise released, rejected, or modified (default is true). </p>
+<p>Enable or disable automatic acceptance of messages that aren't otherwise released, rejected, or modified. </p>
+<p>It is enabled by default. </p>
 
 </div>
 </div>
-<a id="a0d332416daba4af0ce5cf6677b497226"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a0d332416daba4af0ce5cf6677b497226">&#9670;&nbsp;</a></span>credit_window()</h2>
+<a id="af313abfa8d5b19e4b61c779907eb9980"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#af313abfa8d5b19e4b61c779907eb9980">&#9670;&nbsp;</a></span>auto_settle()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; auto_settle </td>
+          <td>(</td>
+          <td class="paramtype">bool&#160;</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Enable or disable automatic settlement of messages. </p>
+<p>It is enabled by default. </p>
+
+</div>
+</div>
+<a id="a714a6a7dd1ea90c6046fe0460d2ce4f0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a714a6a7dd1ea90c6046fe0460d2ce4f0">&#9670;&nbsp;</a></span>credit_window()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -183,14 +203,35 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
           <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; credit_window </td>
           <td>(</td>
           <td class="paramtype">int&#160;</td>
+          <td class="paramname"><em>count</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Automatically replenish credit for flow control up to <code>count</code> messages. </p>
+<p>The default is 10. Set to zero to disable automatic replenishment. </p>
+
+</div>
+</div>
+<a id="a582bced77754ed8a85f9597e2e457079"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a582bced77754ed8a85f9597e2e457079">&#9670;&nbsp;</a></span>delivery_mode()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; <a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a> </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a>&#160;</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Set automated flow control to pre-fetch this many messages (default is 10). </p>
-<p>Set to zero to disable automatic credit replenishing. </p>
+<p>Set the delivery mode on the receiver. </p>
+<p>The default is <a class="el" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1" title="The receiver settles the delivery first with an accept/reject/release disposition. ">delivery_mode::AT_LEAST_ONCE</a>. </p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
index e65f97d..fa023e4 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
@@ -5,7 +5,7 @@ var classproton_1_1receiver__options =
     [ "~receiver_options", "classproton_1_1receiver__options.html#ad8168a06620ae6844cb61451d065f4f3", null ],
     [ "auto_accept", "classproton_1_1receiver__options.html#a9b9ad83418de47f87c6c7062eaefb5b6", null ],
     [ "auto_settle", "classproton_1_1receiver__options.html#af313abfa8d5b19e4b61c779907eb9980", null ],
-    [ "credit_window", "classproton_1_1receiver__options.html#a0d332416daba4af0ce5cf6677b497226", null ],
+    [ "credit_window", "classproton_1_1receiver__options.html#a714a6a7dd1ea90c6046fe0460d2ce4f0", null ],
     [ "delivery_mode", "classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079", null ],
     [ "handler", "classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df", null ],
     [ "operator=", "classproton_1_1receiver__options.html#a815be8018205013b8ff011d4b62b7324", null ],

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender.html
index 643c23e..36516f8 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender.html
@@ -137,7 +137,7 @@ class <a class="el" href="classproton_1_1target.html">target</a>&#160;</td><td c
 <tr class="memdesc:a5f0b815f331997411a6794f8628592ba"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the target node. <br /></td></tr>
 <tr class="separator:a5f0b815f331997411a6794f8628592ba"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:abc4cb5f2f38643abb47c0b221a130bc8"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1sender.html#abc4cb5f2f38643abb47c0b221a130bc8">return_credit</a> ()</td></tr>
-<tr class="memdesc:abc4cb5f2f38643abb47c0b221a130bc8"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - Return all unused credit to the receiver in response to a drain request.  <a href="#abc4cb5f2f38643abb47c0b221a130bc8">More...</a><br /></td></tr>
+<tr class="memdesc:abc4cb5f2f38643abb47c0b221a130bc8"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - Return all unused credit to the receiver in response to a drain request.  <a href="#abc4cb5f2f38643abb47c0b221a130bc8">More...</a><br /></td></tr>
 <tr class="separator:abc4cb5f2f38643abb47c0b221a130bc8"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab51c3843057c4c187574e2d44839f815"><td class="memItemLeft" align="right" valign="top"><a id="ab51c3843057c4c187574e2d44839f815"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#ab51c3843057c4c187574e2d44839f815">uninitialized</a> () const</td></tr>
@@ -169,7 +169,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 <tr class="memdesc:afd27bd11ba72d7df51c44f71b15749eb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Credit available on the link. <br /></td></tr>
 <tr class="separator:afd27bd11ba72d7df51c44f71b15749eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a19c36a38b50e8080b94a47230a56234f"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a19c36a38b50e8080b94a47230a56234f">draining</a> ()</td></tr>
-<tr class="memdesc:a19c36a38b50e8080b94a47230a56234f"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending.  <a href="#a19c36a38b50e8080b94a47230a56234f">More...</a><br /></td></tr>
+<tr class="memdesc:a19c36a38b50e8080b94a47230a56234f"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending.  <a href="#a19c36a38b50e8080b94a47230a56234f">More...</a><br /></td></tr>
 <tr class="separator:a19c36a38b50e8080b94a47230a56234f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a1d89c28bd42ba9a52da008bb69367171"><td class="memItemLeft" align="right" valign="top"><a id="a1d89c28bd42ba9a52da008bb69367171"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a1d89c28bd42ba9a52da008bb69367171">name</a> () const</td></tr>
@@ -181,7 +181,7 @@ class <a class="el" href="classproton_1_1container.html">container</a> &amp;&#16
 <tr class="separator:a2f632b80247e868b8264b8a025b84baf"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7c755d6ac6385e007adb61966598ba63"><td class="memItemLeft" align="right" valign="top"><a id="a7c755d6ac6385e007adb61966598ba63"></a>
 class <a class="el" href="classproton_1_1work__queue.html">work_queue</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a7c755d6ac6385e007adb61966598ba63">work_queue</a> () const</td></tr>
-<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Experimental - A work queue for serial execution. ">work_queue</a> for the link. <br /></td></tr>
+<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Unsettled API - A work queue for serial execution. ">work_queue</a> for the link. <br /></td></tr>
 <tr class="separator:a7c755d6ac6385e007adb61966598ba63"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aff302bb6016f2ae29f01bb4e07389a52"><td class="memItemLeft" align="right" valign="top"><a id="aff302bb6016f2ae29f01bb4e07389a52"></a>
 class <a class="el" href="classproton_1_1connection.html">connection</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a> () const</td></tr>
@@ -309,7 +309,7 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending. </p>
+<p><b>Unsettled API</b> - True for a receiver if a drain cycle has been started and the corresponding <code>on_receiver_drain_finish</code> event is still pending. </p>
 <p>True for a sender if the receiver has requested a drain of credit and the sender has unused credit.</p>
 <dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9">receiver::drain</a>. </dd></dl>
 
@@ -372,9 +372,9 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
       </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - Return all unused credit to the receiver in response to a drain request. </p>
+<p><b>Unsettled API</b> - Return all unused credit to the receiver in response to a drain request. </p>
 <p>Has no effect unless there has been a drain request and there is remaining credit to use or return.</p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Experimental - Commence a drain cycle. ">receiver::drain</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Unsettled API - Commence a drain cycle. ">receiver::drain</a> </dd></dl>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender__options.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender__options.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender__options.html
index 0860194..55930f1 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender__options.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1sender__options.html
@@ -144,7 +144,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <div class="textblock"><p>Options for creating a sender. </p>
 <p>Options can be "chained" like this:</p>
 <div class="fragment"><div class="line">l = container.create_sender(url, <a class="code" href="classproton_1_1sender__options.html#a619c789958ede03d0682a1a723cd7658">sender_options</a>().<a class="code" href="classproton_1_1sender__options.html#a0d94e8f4c1746780259f3eb2d1728aff">handler</a>(h).<a class="code" href="classproton_1_1sender__options.html#a087eda4a18c293de85107fcfbb7ff31f">auto_settle</a>(<span class="keyword">false</span>));</div></div><!-- fragment --><p>You can also create an options object with common settings and use it as a base for different connections that have mostly the same settings:</p>
-<div class="fragment"><div class="line"><a class="code" href="classproton_1_1sender__options.html#a619c789958ede03d0682a1a723cd7658">sender_options</a> opts;</div><div class="line">opts.browsing(<span class="keyword">true</span>);</div><div class="line">l1 = container.open_sender(url1, opts.handler(h1));</div><div class="line">c2 = container.open_receiver(url2, opts.handler(h2));</div></div><!-- fragment --><p>Normal value semantics: copy or assign creates a separate copy of the options. </p>
+<div class="fragment"><div class="line"><a class="code" href="classproton_1_1sender__options.html#a619c789958ede03d0682a1a723cd7658">sender_options</a> opts;</div><div class="line">opts.delivery_mode(<a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624">delivery_mode::AT_MOST_ONCE</a>);</div><div class="line">l1 = container.open_sender(url1, opts.handler(h1));</div><div class="line">c2 = container.open_receiver(url2, opts.handler(h2));</div></div><!-- fragment --><p>Normal value semantics: copy or assign creates a separate copy of the options. </p>
 <dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8cpp-example.html#_a13">broker.cpp</a>, <a class="el" href="server_direct_8cpp-example.html#_a9">server_direct.cpp</a>, and <a class="el" href="service_bus_8cpp-example.html#_a2">service_bus.cpp</a>.</dd>
 </dl></div><h2 class="groupheader">Member Function Documentation</h2>
 <a id="a0d94e8f4c1746780259f3eb2d1728aff"></a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1session.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1session.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1session.html
index 0775dee..b547e25 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1session.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1session.html
@@ -151,7 +151,7 @@ class <a class="el" href="classproton_1_1container.html">container</a> &amp;&#16
 <tr class="separator:a2f632b80247e868b8264b8a025b84baf"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7c755d6ac6385e007adb61966598ba63"><td class="memItemLeft" align="right" valign="top"><a id="a7c755d6ac6385e007adb61966598ba63"></a>
 class <a class="el" href="classproton_1_1work__queue.html">work_queue</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1session.html#a7c755d6ac6385e007adb61966598ba63">work_queue</a> () const</td></tr>
-<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Experimental - A work queue for serial execution. ">work_queue</a> for the session. <br /></td></tr>
+<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Unsettled API - A work queue for serial execution. ">work_queue</a> for the session. <br /></td></tr>
 <tr class="separator:a7c755d6ac6385e007adb61966598ba63"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aff302bb6016f2ae29f01bb4e07389a52"><td class="memItemLeft" align="right" valign="top"><a id="aff302bb6016f2ae29f01bb4e07389a52"></a>
 class <a class="el" href="classproton_1_1connection.html">connection</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1session.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a> () const</td></tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/905cafdf/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1source.html
----------------------------------------------------------------------
diff --git a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1source.html b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1source.html
index 7a9a822..dfe715b 100644
--- a/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1source.html
+++ b/input/releases/qpid-proton-master/proton/cpp/api/classproton_1_1source.html
@@ -121,7 +121,7 @@ Public Types</h2></td></tr>
 </td></tr>
 <tr class="separator:ad049690d03cac384636e0c2055726089"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad5af497ef0602d13b06773c910994fd7"><td class="memItemLeft" align="right" valign="top">typedef <a class="el" href="classproton_1_1map.html">map</a>&lt; <a class="el" href="classproton_1_1symbol.html">symbol</a>, <a class="el" href="classproton_1_1value.html">value</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1source.html#ad5af497ef0602d13b06773c910994fd7">filter_map</a></td></tr>
-<tr class="memdesc:ad5af497ef0602d13b06773c910994fd7"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - A map of AMQP symbol keys and filter specifiers.  <a href="#ad5af497ef0602d13b06773c910994fd7">More...</a><br /></td></tr>
+<tr class="memdesc:ad5af497ef0602d13b06773c910994fd7"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - A map of AMQP symbol keys and filter specifiers.  <a href="#ad5af497ef0602d13b06773c910994fd7">More...</a><br /></td></tr>
 <tr class="separator:ad5af497ef0602d13b06773c910994fd7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a61db0571ab7d1a29ad77549ff99d6b3d"><td class="memItemLeft" align="right" valign="top"><a id="a61db0571ab7d1a29ad77549ff99d6b3d"></a>enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1source.html#a61db0571ab7d1a29ad77549ff99d6b3d">durability_mode</a> <tr class="memdesc:a61db0571ab7d1a29ad77549ff99d6b3d"><td class="mdescLeft">&#160;</td><td class="mdescRight">The persistence mode of the source or target. <br /></td></tr>
 </td></tr>
@@ -146,7 +146,7 @@ enum <a class="el" href="classproton_1_1source.html#ad049690d03cac384636e0c20557
 <tr class="separator:abb1886a3a928bddfaf76dc67e3d15525"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5872b2a2f80f74a6f4f5b02791861a6d"><td class="memItemLeft" align="right" valign="top"><a id="a5872b2a2f80f74a6f4f5b02791861a6d"></a>
 const <a class="el" href="classproton_1_1source.html#ad5af497ef0602d13b06773c910994fd7">filter_map</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1source.html#a5872b2a2f80f74a6f4f5b02791861a6d">filters</a> () const</td></tr>
-<tr class="memdesc:a5872b2a2f80f74a6f4f5b02791861a6d"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Experimental</b> - Obtain the set of message filters. <br /></td></tr>
+<tr class="memdesc:a5872b2a2f80f74a6f4f5b02791861a6d"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - Obtain the set of message filters. <br /></td></tr>
 <tr class="separator:a5872b2a2f80f74a6f4f5b02791861a6d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aeb6439d6ea5d274a59dd8e90d97f31d8"><td class="memItemLeft" align="right" valign="top"><a id="aeb6439d6ea5d274a59dd8e90d97f31d8"></a>
 enum <a class="el" href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3d">durability_mode</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8">durability_mode</a> ()</td></tr>
@@ -183,7 +183,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
       </table>
 </div><div class="memdoc">
 
-<p><b>Experimental</b> - A map of AMQP symbol keys and filter specifiers. </p>
+<p><b>Unsettled API</b> - A map of AMQP symbol keys and filter specifiers. </p>
 
 </div>
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message