You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/04/14 20:29:38 UTC

svn commit: r1739159 [11/45] - in /qpid/site/docs/releases/qpid-proton-master: ./ proton/c/api/ proton/c/api/search/ proton/cpp/api/ proton/cpp/api/search/ proton/cpp/examples/ proton/java/api/ proton/java/api/org/apache/qpid/proton/engine/ proton/java...

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link-members.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link-members.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link-members.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link-members.html Thu Apr 14 18:29:35 2016
@@ -99,20 +99,22 @@ $(document).ready(function(){initNavTree
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#a5ae591df94fc66ccb85cbb6565368bca">close</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>connection</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#af13d10fc3d843719af9ff4c456330a73">connection</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a75360c7515b9f569871c5ea953286649">credit</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>delivery</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#ac295bade8aee589f6718dfa79edc2a34">detach</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>link</b>() (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>link_iterator</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>link_options</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#aa9bb5c15062bee80022f56bffcf2868a">LOCAL_ACTIVE</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a4f8d870a4ace6dd1be8728f0e3ccf23c">LOCAL_CLOSED</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#aaaea8dc733566e78a066d2435f8a60c5">local_condition</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a5017b4c4cc25f9c0932455e13fb223d4">LOCAL_MASK</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a2246ba119cbaa626fb423e1ba80f84c5">local_source</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#a1e65cc5198f2c2e57d28815f401eb7d9">local_target</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a84e5c2baecd6fd28505eac28ab14bacb">LOCAL_UNINIT</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>message</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a604ee46e04955a2323f305b4a81017a0">container</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#a75360c7515b9f569871c5ea953286649">credit</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>delivery</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#ac295bade8aee589f6718dfa79edc2a34">detach</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>link</b>() (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>link_iterator</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>link_options</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#aa9bb5c15062bee80022f56bffcf2868a">LOCAL_ACTIVE</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a4f8d870a4ace6dd1be8728f0e3ccf23c">LOCAL_CLOSED</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#aaaea8dc733566e78a066d2435f8a60c5">local_condition</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a5017b4c4cc25f9c0932455e13fb223d4">LOCAL_MASK</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#a2246ba119cbaa626fb423e1ba80f84c5">local_source</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a1e65cc5198f2c2e57d28815f401eb7d9">local_target</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a84e5c2baecd6fd28505eac28ab14bacb">LOCAL_UNINIT</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>message</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>messaging_adapter</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a37627d5d5bba7f4a8690c71c2ab3cb07">name</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#afdfda4724950dfecdbc2e74b6a888998">open</a>(const link_options &amp;opts=link_options())</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>proton_event</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
@@ -120,20 +122,16 @@ $(document).ready(function(){initNavTree
   <tr bgcolor="#f0f0f0"><td class="entry"><b>receiver</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#ab8db92c685717230b2f19be20c660005">receiver</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a08a29346f1a6b36085afc57cbba90894">receiver</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>receiver_settle_mode</b>() (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#aa1f09a6f628fac670f0f92601155e155">REMOTE_ACTIVE</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a37089f32d6a3324908be74116dfe6820">REMOTE_CLOSED</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a492e060bda7b5f5a49a9e5cd19f92834">remote_condition</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a5ee39a5f2e921db5be1c2a0e56035761">REMOTE_MASK</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>remote_receiver_settle_mode</b>() (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>remote_sender_settle_mode</b>() (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#adc8d612ee69e5722919c1bc2c95df66e">remote_source</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#ad5797a56dcc8453297ee6551fed06a95">remote_target</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#aca8e5dcefe432fcb32f48dc0433cf5ca">REMOTE_UNINIT</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>sender</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a0c49e11e40611be0b41bf595b6455a83">sender</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#aa29986e9373916447665a8791845e7cf">sender</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a60e2fcd52ba2bd03228128a553a014f3">sender_settle_mode</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#aa1f09a6f628fac670f0f92601155e155">REMOTE_ACTIVE</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a37089f32d6a3324908be74116dfe6820">REMOTE_CLOSED</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#a492e060bda7b5f5a49a9e5cd19f92834">remote_condition</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a5ee39a5f2e921db5be1c2a0e56035761">REMOTE_MASK</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#adc8d612ee69e5722919c1bc2c95df66e">remote_source</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#ad5797a56dcc8453297ee6551fed06a95">remote_target</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#aca8e5dcefe432fcb32f48dc0433cf5ca">REMOTE_UNINIT</a></td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>sender</b> (defined in <a class="el" href="classproton_1_1link.html">link</a>)</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#a0c49e11e40611be0b41bf595b6455a83">sender</a>()</td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link.html#aa29986e9373916447665a8791845e7cf">sender</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link.html#aa33faff52aea9845efaf184f86676cc5">session</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1link.html#a1e2622353881ca93799c7d127a1464ce">state</a>() const </td><td class="entry"><a class="el" href="classproton_1_1link.html">link</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">proton::endpoint::state</a> typedef</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"></td></tr>

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.html Thu Apr 14 18:29:35 2016
@@ -188,6 +188,10 @@ int&#160;</td><td class="memItemRight" v
 std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a37627d5d5bba7f4a8690c71c2ab3cb07">name</a> () const </td></tr>
 <tr class="memdesc:a37627d5d5bba7f4a8690c71c2ab3cb07"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the link name. <br /></td></tr>
 <tr class="separator:a37627d5d5bba7f4a8690c71c2ab3cb07"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a604ee46e04955a2323f305b4a81017a0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a604ee46e04955a2323f305b4a81017a0"></a>
+class <a class="el" href="classproton_1_1container.html">container</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a604ee46e04955a2323f305b4a81017a0">container</a> () const </td></tr>
+<tr class="memdesc:a604ee46e04955a2323f305b4a81017a0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the container for this link. <br /></td></tr>
+<tr class="separator:a604ee46e04955a2323f305b4a81017a0"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:af13d10fc3d843719af9ff4c456330a73"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af13d10fc3d843719af9ff4c456330a73"></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#af13d10fc3d843719af9ff4c456330a73">connection</a> () const </td></tr>
 <tr class="memdesc:af13d10fc3d843719af9ff4c456330a73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Connection that owns this link. <br /></td></tr>
@@ -196,19 +200,6 @@ class <a class="el" href="classproton_1_
 class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#aa33faff52aea9845efaf184f86676cc5">session</a> () const </td></tr>
 <tr class="memdesc:aa33faff52aea9845efaf184f86676cc5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Session that owns this link. <br /></td></tr>
 <tr class="separator:aa33faff52aea9845efaf184f86676cc5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a60e2fcd52ba2bd03228128a553a014f3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a60e2fcd52ba2bd03228128a553a014f3"></a>
-<a class="el" href="classproton_1_1link__options.html#a60cb6c4ae773eb41f208e6645d2a926a">link_options::sender_settle_mode</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a60e2fcd52ba2bd03228128a553a014f3">sender_settle_mode</a> ()</td></tr>
-<tr class="memdesc:a60e2fcd52ba2bd03228128a553a014f3"><td class="mdescLeft">&#160;</td><td class="mdescRight">XXX local versus remote, mutability XXX - local_sender_settle_mode and local_receiver_settle_mode. <br /></td></tr>
-<tr class="separator:a60e2fcd52ba2bd03228128a553a014f3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aca635a041b8d3f8e51853ffdfb52f313"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aca635a041b8d3f8e51853ffdfb52f313"></a>
-link_options::receiver_settle_mode&#160;</td><td class="memItemRight" valign="bottom"><b>receiver_settle_mode</b> ()</td></tr>
-<tr class="separator:aca635a041b8d3f8e51853ffdfb52f313"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aeee292f0df11c996f050eeed7ff1ca90"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aeee292f0df11c996f050eeed7ff1ca90"></a>
-<a class="el" href="classproton_1_1link__options.html#a60cb6c4ae773eb41f208e6645d2a926a">link_options::sender_settle_mode</a>&#160;</td><td class="memItemRight" valign="bottom"><b>remote_sender_settle_mode</b> ()</td></tr>
-<tr class="separator:aeee292f0df11c996f050eeed7ff1ca90"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac81056b1a7e924210d29e6b9c7e92a5d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac81056b1a7e924210d29e6b9c7e92a5d"></a>
-link_options::receiver_settle_mode&#160;</td><td class="memItemRight" valign="bottom"><b>remote_receiver_settle_mode</b> ()</td></tr>
-<tr class="separator:ac81056b1a7e924210d29e6b9c7e92a5d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-attribs"></a>
 Static Public Attributes</h2></td></tr>
@@ -271,12 +262,14 @@ class&#160;</td><td class="memItemRight"
 <tr class="memitem:abd8fb0f23fb89a42ed9400c88827e840"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abd8fb0f23fb89a42ed9400c88827e840"></a>
 class&#160;</td><td class="memItemRight" valign="bottom"><b>link_options</b></td></tr>
 <tr class="separator:abd8fb0f23fb89a42ed9400c88827e840"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3f86ab3af4804360f5b23470daba4274"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3f86ab3af4804360f5b23470daba4274"></a>
+class&#160;</td><td class="memItemRight" valign="bottom"><b>messaging_adapter</b></td></tr>
+<tr class="separator:a3f86ab3af4804360f5b23470daba4274"><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>A named channel for sending or receiving messages. </p>
 <p>It is the base class for sender and receiver. </p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8hpp-example.html#_a8">broker.hpp</a>, and <a class="el" href="server_direct_8cpp-example.html#_a7">server_direct.cpp</a>.</dd>
-</dl></div><h2 class="groupheader">Member Typedef Documentation</h2>
+</div><h2 class="groupheader">Member Typedef Documentation</h2>
 <a class="anchor" id="a9660be8f45524b15c3931fb752de3b3e"></a>
 <div class="memitem">
 <div class="memproto">
@@ -316,9 +309,8 @@ class&#160;</td><td class="memItemRight"
 </div><div class="memdoc">
 
 <p>Locally close the link. </p>
-<p>The operation is not complete till <a class="el" href="classproton_1_1handler.html#a4dfebd99ab152b534fe2b2c253534a48" title="The remote peer closed the link. ">handler::on_link_close</a>. </p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" href="direct_recv_8cpp-example.html#a13">direct_recv.cpp</a>, <a class="el" href="engine_2direct_recv_8cpp-example.html#a10">engine/direct_recv.cpp</a>, <a class="el" href="engine_2helloworld_8cpp-example.html#a10">engine/helloworld.cpp</a>, <a class="el" href="engine_2simple_recv_8cpp-example.html#a14">engine/simple_recv.cpp</a>, <a class="el" href="helloworld_8cpp-example.html#a14">helloworld.cpp</a>, <a class="el" href="helloworld_direct_8cpp-example.html#a12">helloworld_direct.cpp</a>, and <a class="el" href="simple_recv_8cpp-example.html#a13">simple_recv.cpp</a>.</dd>
-</dl>
+<p>The operation is not complete till handler::on_link_close. </p>
+
 </div>
 </div>
 <a class="anchor" id="ac295bade8aee589f6718dfa79edc2a34"></a>
@@ -382,7 +374,7 @@ class&#160;</td><td class="memItemRight"
 </div><div class="memdoc">
 
 <p>Locally open the link. </p>
-<p>The operation is not complete till <a class="el" href="classproton_1_1handler.html#a74372127469f54153c13fc617cf14e17" title="The remote peer opened the link. ">handler::on_link_open</a>. </p>
+<p>The operation is not complete till handler::on_link_open. </p>
 
 </div>
 </div>
@@ -394,7 +386,7 @@ class&#160;</td><td class="memItemRight"
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><b>proton</b></li><li class="navelem"><a class="el" href="classproton_1_1link.html">link</a></li>
+    <li class="navelem"><a class="el" href="namespaceproton.html">proton</a></li><li class="navelem"><a class="el" href="classproton_1_1link.html">link</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.js
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.js?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.js (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link.js Thu Apr 14 18:29:35 2016
@@ -4,6 +4,7 @@ var classproton_1_1link =
     [ "link", "classproton_1_1link.html#ad29b379b3621ec393ac9f28b4ba8b010", null ],
     [ "close", "classproton_1_1link.html#a5ae591df94fc66ccb85cbb6565368bca", null ],
     [ "connection", "classproton_1_1link.html#af13d10fc3d843719af9ff4c456330a73", null ],
+    [ "container", "classproton_1_1link.html#a604ee46e04955a2323f305b4a81017a0", null ],
     [ "credit", "classproton_1_1link.html#a75360c7515b9f569871c5ea953286649", null ],
     [ "detach", "classproton_1_1link.html#ac295bade8aee589f6718dfa79edc2a34", null ],
     [ "local_condition", "classproton_1_1link.html#aaaea8dc733566e78a066d2435f8a60c5", null ],
@@ -14,15 +15,11 @@ var classproton_1_1link =
     [ "queued", "classproton_1_1link.html#a42add3dc24b98be816b02f7ba64737f4", null ],
     [ "receiver", "classproton_1_1link.html#ab8db92c685717230b2f19be20c660005", null ],
     [ "receiver", "classproton_1_1link.html#a08a29346f1a6b36085afc57cbba90894", null ],
-    [ "receiver_settle_mode", "classproton_1_1link.html#aca635a041b8d3f8e51853ffdfb52f313", null ],
     [ "remote_condition", "classproton_1_1link.html#a492e060bda7b5f5a49a9e5cd19f92834", null ],
-    [ "remote_receiver_settle_mode", "classproton_1_1link.html#ac81056b1a7e924210d29e6b9c7e92a5d", null ],
-    [ "remote_sender_settle_mode", "classproton_1_1link.html#aeee292f0df11c996f050eeed7ff1ca90", null ],
     [ "remote_source", "classproton_1_1link.html#adc8d612ee69e5722919c1bc2c95df66e", null ],
     [ "remote_target", "classproton_1_1link.html#ad5797a56dcc8453297ee6551fed06a95", null ],
     [ "sender", "classproton_1_1link.html#aa29986e9373916447665a8791845e7cf", null ],
     [ "sender", "classproton_1_1link.html#a0c49e11e40611be0b41bf595b6455a83", null ],
-    [ "sender_settle_mode", "classproton_1_1link.html#a60e2fcd52ba2bd03228128a553a014f3", null ],
     [ "session", "classproton_1_1link.html#aa33faff52aea9845efaf184f86676cc5", null ],
     [ "state", "classproton_1_1link.html#a1e2622353881ca93799c7d127a1464ce", null ],
     [ "connection", "classproton_1_1link.html#adb115488bb4890f7fc705ee527ad71e0", null ],
@@ -30,6 +27,7 @@ var classproton_1_1link =
     [ "link_iterator", "classproton_1_1link.html#a377ff364a7dcdbdb9eecdf093c911c68", null ],
     [ "link_options", "classproton_1_1link.html#abd8fb0f23fb89a42ed9400c88827e840", null ],
     [ "message", "classproton_1_1link.html#a085a31aed84d3c8d710102131bae556e", null ],
+    [ "messaging_adapter", "classproton_1_1link.html#a3f86ab3af4804360f5b23470daba4274", null ],
     [ "proton_event", "classproton_1_1link.html#a00abbe9b0ea0fbe93cc37a97809db803", null ],
     [ "receiver", "classproton_1_1link.html#a19b39d7db55ae2217f9cf411f84d6eb8", null ],
     [ "sender", "classproton_1_1link.html#a87c92a3ab55d72637182d4e945c681cb", null ]

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator-members.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator-members.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator-members.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator-members.html Thu Apr 14 18:29:35 2016
@@ -96,14 +96,7 @@ $(document).ready(function(){initNavTree
 
 <p>This is the complete list of members for <a class="el" href="classproton_1_1link__iterator.html">link_iterator</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>link_iterator</b>(link l=0, pn_session_t *s=0) (defined in <a class="el" href="classproton_1_1link__iterator.html">link_iterator</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__iterator.html">link_iterator</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">explicit</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>operator!=</b>(const iter_base&lt; T, D &gt; &amp;x) const  (defined in <b>iter_base&lt; T, D &gt;</b>)</td><td class="entry"><a class="el" href="classproton_1_1internal_1_1iter__base.html">iter_base&lt; T, D &gt;</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator*</b>() const  (defined in <b>iter_base&lt; T, D &gt;</b>)</td><td class="entry"><a class="el" href="classproton_1_1internal_1_1iter__base.html">iter_base&lt; T, D &gt;</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>operator++</b>() (defined in <a class="el" href="classproton_1_1link__iterator.html">link_iterator</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__iterator.html">link_iterator</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator++</b>(int) (defined in <b>iter_base&lt; T, D &gt;</b>)</td><td class="entry"><a class="el" href="classproton_1_1internal_1_1iter__base.html">iter_base&lt; T, D &gt;</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>operator-&gt;</b>() const  (defined in <b>iter_base&lt; T, D &gt;</b>)</td><td class="entry"><a class="el" href="classproton_1_1internal_1_1iter__base.html">iter_base&lt; T, D &gt;</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator==</b>(const iter_base&lt; T, D &gt; &amp;x) const  (defined in <b>iter_base&lt; T, D &gt;</b>)</td><td class="entry"><a class="el" href="classproton_1_1internal_1_1iter__base.html">iter_base&lt; T, D &gt;</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>value_type</b> typedef (defined in <b>iter_base&lt; T, D &gt;</b>)</td><td class="entry"><a class="el" href="classproton_1_1internal_1_1iter__base.html">iter_base&lt; T, D &gt;</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__iterator.html#ae583d6d66b38c3610cf7cb2e2ae841e0">operator++</a>()</td><td class="entry"><a class="el" href="classproton_1_1link__iterator.html">link_iterator</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.html Thu Apr 14 18:29:35 2016
@@ -90,7 +90,6 @@ $(document).ready(function(){initNavTree
 
 <div class="header">
   <div class="summary">
-<a href="#pub-types">Public Types</a> &#124;
 <a href="#pub-methods">Public Member Functions</a> &#124;
 <a href="classproton_1_1link__iterator-members.html">List of all members</a>  </div>
   <div class="headertitle">
@@ -103,42 +102,18 @@ $(document).ready(function(){initNavTree
 
 <p><code>#include &lt;<a class="el" href="link_8hpp_source.html">link.hpp</a>&gt;</code></p>
 
-<p>Inherits iter_base&lt; T, D &gt;.</p>
+<p>Inherits iter_base&lt; link, link_iterator &gt;.</p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-types"></a>
-Public Types</h2></td></tr>
-<tr class="memitem:a265a253612b46abed17c61b0a5e5ce30"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a265a253612b46abed17c61b0a5e5ce30"></a>
-typedef T&#160;</td><td class="memItemRight" valign="bottom"><b>value_type</b></td></tr>
-<tr class="separator:a265a253612b46abed17c61b0a5e5ce30"><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>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a3fc161753ed124e5fe468007fd6698ca"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3fc161753ed124e5fe468007fd6698ca"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>link_iterator</b> (<a class="el" href="classproton_1_1link.html">link</a> l=0, pn_session_t *s=0)</td></tr>
-<tr class="separator:a3fc161753ed124e5fe468007fd6698ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae583d6d66b38c3610cf7cb2e2ae841e0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae583d6d66b38c3610cf7cb2e2ae841e0"></a>
-<a class="el" href="classproton_1_1link__iterator.html">link_iterator</a>&#160;</td><td class="memItemRight" valign="bottom"><b>operator++</b> ()</td></tr>
+<a class="el" href="classproton_1_1link__iterator.html">link_iterator</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__iterator.html#ae583d6d66b38c3610cf7cb2e2ae841e0">operator++</a> ()</td></tr>
+<tr class="memdesc:ae583d6d66b38c3610cf7cb2e2ae841e0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Advance. <br /></td></tr>
 <tr class="separator:ae583d6d66b38c3610cf7cb2e2ae841e0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af024237e9894681d4839a7d81f58d847"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af024237e9894681d4839a7d81f58d847"></a>
-T&#160;</td><td class="memItemRight" valign="bottom"><b>operator*</b> () const </td></tr>
-<tr class="separator:af024237e9894681d4839a7d81f58d847"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac0ddd007dfcfef3121f74d0665dfd0cd"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac0ddd007dfcfef3121f74d0665dfd0cd"></a>
-T *&#160;</td><td class="memItemRight" valign="bottom"><b>operator-&gt;</b> () const </td></tr>
-<tr class="separator:ac0ddd007dfcfef3121f74d0665dfd0cd"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:abfbfc8aa9aea107652baa046c6c1c546"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abfbfc8aa9aea107652baa046c6c1c546"></a>
-D&#160;</td><td class="memItemRight" valign="bottom"><b>operator++</b> (int)</td></tr>
-<tr class="separator:abfbfc8aa9aea107652baa046c6c1c546"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a774461e089ff2ea68687227d3874ac2a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a774461e089ff2ea68687227d3874ac2a"></a>
-bool&#160;</td><td class="memItemRight" valign="bottom"><b>operator==</b> (const iter_base&lt; T, D &gt; &amp;x) const </td></tr>
-<tr class="separator:a774461e089ff2ea68687227d3874ac2a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adaaa0ce563bcf67a04f2ccdc5285c993"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adaaa0ce563bcf67a04f2ccdc5285c993"></a>
-bool&#160;</td><td class="memItemRight" valign="bottom"><b>operator!=</b> (const iter_base&lt; T, D &gt; &amp;x) const </td></tr>
-<tr class="separator:adaaa0ce563bcf67a04f2ccdc5285c993"><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>An iterator for links. </p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8hpp-example.html#_a28">broker.hpp</a>.</dd>
-</dl></div><hr/>The documentation for this class was generated from the following file:<ul>
+</div><hr/>The documentation for this class was generated from the following file:<ul>
 <li>proton/<a class="el" href="link_8hpp_source.html">link.hpp</a></li>
 </ul>
 </div><!-- contents -->
@@ -146,7 +121,7 @@ bool&#160;</td><td class="memItemRight"
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><b>proton</b></li><li class="navelem"><a class="el" href="classproton_1_1link__iterator.html">link_iterator</a></li>
+    <li class="navelem"><a class="el" href="namespaceproton.html">proton</a></li><li class="navelem"><a class="el" href="classproton_1_1link__iterator.html">link_iterator</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.js
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.js?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.js (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__iterator.js Thu Apr 14 18:29:35 2016
@@ -1,11 +1,4 @@
 var classproton_1_1link__iterator =
 [
-    [ "value_type", "classproton_1_1link__iterator.html#a265a253612b46abed17c61b0a5e5ce30", null ],
-    [ "link_iterator", "classproton_1_1link__iterator.html#a3fc161753ed124e5fe468007fd6698ca", null ],
-    [ "operator!=", "classproton_1_1link__iterator.html#adaaa0ce563bcf67a04f2ccdc5285c993", null ],
-    [ "operator*", "classproton_1_1link__iterator.html#af024237e9894681d4839a7d81f58d847", null ],
-    [ "operator++", "classproton_1_1link__iterator.html#abfbfc8aa9aea107652baa046c6c1c546", null ],
-    [ "operator++", "classproton_1_1link__iterator.html#ae583d6d66b38c3610cf7cb2e2ae841e0", null ],
-    [ "operator->", "classproton_1_1link__iterator.html#ac0ddd007dfcfef3121f74d0665dfd0cd", null ],
-    [ "operator==", "classproton_1_1link__iterator.html#a774461e089ff2ea68687227d3874ac2a", null ]
+    [ "operator++", "classproton_1_1link__iterator.html#ae583d6d66b38c3610cf7cb2e2ae841e0", null ]
 ];
\ No newline at end of file

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options-members.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options-members.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options-members.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options-members.html Thu Apr 14 18:29:35 2016
@@ -98,27 +98,29 @@ $(document).ready(function(){initNavTree
 <table class="directory">
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>AT_LEAST_ONCE</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>AT_MOST_ONCE</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a0aec8f881be0dd6148532f4da99c88ab">auto_accept</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a38ac12bcfa8b3594ed5a3756e5773503">auto_settle</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#aaf512f41fabc2e05aabc3423696d7c0c">browsing</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DELETE_ON_CLOSE</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DELETE_ON_NO_LINKS</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DELETE_ON_NO_LINKS_OR_MESSAGES</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DELETE_ON_NO_MESSAGES</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a57bcf61aaaaaee7fb8da6e3bb1f851f5">delivery_mode</a> enum name</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a680f247788d6020dcb3c3e5f2de61399">delivery_mode</a>(delivery_mode)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DELIVERY_MODE_NONE</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#aa98d0ee3d43d01bfdff4192fa16a93d0">distribution_mode</a>(enum terminus::distribution_mode)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a8a9a2fe87c08f67ae00d16c04ef4e57a">durable_subscription</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a9deb2276e6cf0695b73dfc8e42e6325a">dynamic_address</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a0a491d9f037a669e07311a6cf3a532f5">handler</a>(class handler *)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#ad111ab21d33decca8c96f90f72cb9a82">lifetime_policy</a> enum name</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#af937f3c5149deff1166defa548161e46">lifetime_policy</a>(lifetime_policy)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>LIFETIME_UNSPECIFIED</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a0982bce7a239e29891b9edd12c79310e">link_options</a>()</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#aac5f3c7602f40c9761783fc2811d0288">link_options</a>(const link_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a532e4ce92da37e5785001b470a99776b">local_address</a>(const std::string &amp;addr)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>MIXED</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a64dcbd7bb3c3cf56f79a3e87dde1e14d">operator=</a>(const link_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#ab907c5d9930e8c33102a50f4a5dfc4d9">override</a>(const link_options &amp;other)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#acbfc7fd62229aac6ef691539c1d85cff">credit_window</a>(int)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DELETE_ON_CLOSE</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>DELETE_ON_NO_LINKS</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DELETE_ON_NO_LINKS_OR_MESSAGES</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>DELETE_ON_NO_MESSAGES</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a57bcf61aaaaaee7fb8da6e3bb1f851f5">delivery_mode</a> enum name</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a680f247788d6020dcb3c3e5f2de61399">delivery_mode</a>(delivery_mode)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DELIVERY_MODE_NONE</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#aa98d0ee3d43d01bfdff4192fa16a93d0">distribution_mode</a>(enum terminus::distribution_mode)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a8a9a2fe87c08f67ae00d16c04ef4e57a">durable_subscription</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a9deb2276e6cf0695b73dfc8e42e6325a">dynamic_address</a>(bool)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a0a491d9f037a669e07311a6cf3a532f5">handler</a>(class handler *)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#ad111ab21d33decca8c96f90f72cb9a82">lifetime_policy</a> enum name</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#af937f3c5149deff1166defa548161e46">lifetime_policy</a>(lifetime_policy)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>LIFETIME_UNSPECIFIED</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a0982bce7a239e29891b9edd12c79310e">link_options</a>()</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#aac5f3c7602f40c9761783fc2811d0288">link_options</a>(const link_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a532e4ce92da37e5785001b470a99776b">local_address</a>(const std::string &amp;addr)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>MIXED</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1link__options.html#a64dcbd7bb3c3cf56f79a3e87dde1e14d">operator=</a>(const link_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1link__options.html#a60cb6c4ae773eb41f208e6645d2a926a">sender_settle_mode</a> enum name</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SETTLED</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>UNSETTLED</b> enum value (defined in <a class="el" href="classproton_1_1link__options.html">link_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1link__options.html">link_options</a></td><td class="entry"></td></tr>

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.html Thu Apr 14 18:29:35 2016
@@ -143,10 +143,6 @@ Public Member Functions</h2></td></tr>
 <a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#a64dcbd7bb3c3cf56f79a3e87dde1e14d">operator=</a> (const <a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;)</td></tr>
 <tr class="memdesc:a64dcbd7bb3c3cf56f79a3e87dde1e14d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy options. <br /></td></tr>
 <tr class="separator:a64dcbd7bb3c3cf56f79a3e87dde1e14d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab907c5d9930e8c33102a50f4a5dfc4d9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab907c5d9930e8c33102a50f4a5dfc4d9"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#ab907c5d9930e8c33102a50f4a5dfc4d9">override</a> (const <a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;other)</td></tr>
-<tr class="memdesc:ab907c5d9930e8c33102a50f4a5dfc4d9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Override with options from other. <br /></td></tr>
-<tr class="separator:ab907c5d9930e8c33102a50f4a5dfc4d9"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0a491d9f037a669e07311a6cf3a532f5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#a0a491d9f037a669e07311a6cf3a532f5">handler</a> (class <a class="el" href="classproton_1_1handler.html">handler</a> *)</td></tr>
 <tr class="memdesc:a0a491d9f037a669e07311a6cf3a532f5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a handler for events scoped to the link.  <a href="#a0a491d9f037a669e07311a6cf3a532f5">More...</a><br /></td></tr>
 <tr class="separator:a0a491d9f037a669e07311a6cf3a532f5"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -175,6 +171,16 @@ void&#160;</td><td class="memItemRight"
 <a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#a532e4ce92da37e5785001b470a99776b">local_address</a> (const std::string &amp;addr)</td></tr>
 <tr class="memdesc:a532e4ce92da37e5785001b470a99776b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the local address for the link. <br /></td></tr>
 <tr class="separator:a532e4ce92da37e5785001b470a99776b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0aec8f881be0dd6148532f4da99c88ab"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#a0aec8f881be0dd6148532f4da99c88ab">auto_accept</a> (bool)</td></tr>
+<tr class="memdesc:a0aec8f881be0dd6148532f4da99c88ab"><td class="mdescLeft">&#160;</td><td class="mdescRight">Automatically accept inbound messages that aren't otherwise released, rejected or modified (default value:true).  <a href="#a0aec8f881be0dd6148532f4da99c88ab">More...</a><br /></td></tr>
+<tr class="separator:a0aec8f881be0dd6148532f4da99c88ab"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a38ac12bcfa8b3594ed5a3756e5773503"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a38ac12bcfa8b3594ed5a3756e5773503"></a>
+<a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#a38ac12bcfa8b3594ed5a3756e5773503">auto_settle</a> (bool)</td></tr>
+<tr class="memdesc:a38ac12bcfa8b3594ed5a3756e5773503"><td class="mdescLeft">&#160;</td><td class="mdescRight">Automatically settle messages (default value: true). <br /></td></tr>
+<tr class="separator:a38ac12bcfa8b3594ed5a3756e5773503"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:acbfc7fd62229aac6ef691539c1d85cff"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1link__options.html">link_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link__options.html#acbfc7fd62229aac6ef691539c1d85cff">credit_window</a> (int)</td></tr>
+<tr class="memdesc:acbfc7fd62229aac6ef691539c1d85cff"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set automated flow control to pre-fetch this many messages (default value:10).  <a href="#acbfc7fd62229aac6ef691539c1d85cff">More...</a><br /></td></tr>
+<tr class="separator:acbfc7fd62229aac6ef691539c1d85cff"><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 link. </p>
@@ -186,8 +192,25 @@ void&#160;</td><td class="memItemRight"
 <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="client_8cpp-example.html#_a10">client.cpp</a>, and <a class="el" href="engine_2client_8cpp-example.html#_a10">engine/client.cpp</a>.</dd>
-</dl></div><h2 class="groupheader">Member Function Documentation</h2>
+</div><h2 class="groupheader">Member Function Documentation</h2>
+<a class="anchor" id="a0aec8f881be0dd6148532f4da99c88ab"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1link__options.html">link_options</a>&amp; auto_accept </td>
+          <td>(</td>
+          <td class="paramtype">bool&#160;</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Automatically accept inbound messages that aren't otherwise released, rejected or modified (default value:true). </p>
+
+</div>
+</div>
 <a class="anchor" id="aaf512f41fabc2e05aabc3423696d7c0c"></a>
 <div class="memitem">
 <div class="memproto">
@@ -207,6 +230,25 @@ void&#160;</td><td class="memItemRight"
 
 </div>
 </div>
+<a class="anchor" id="acbfc7fd62229aac6ef691539c1d85cff"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1link__options.html">link_options</a>&amp; credit_window </td>
+          <td>(</td>
+          <td class="paramtype">int&#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 value:10). </p>
+<p>Set to zero to disable automatic credit replenishing. </p>
+
+</div>
+</div>
 <a class="anchor" id="a8a9a2fe87c08f67ae00d16c04ef4e57a"></a>
 <div class="memitem">
 <div class="memproto">
@@ -271,7 +313,7 @@ void&#160;</td><td class="memItemRight"
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><b>proton</b></li><li class="navelem"><a class="el" href="classproton_1_1link__options.html">link_options</a></li>
+    <li class="navelem"><a class="el" href="namespaceproton.html">proton</a></li><li class="navelem"><a class="el" href="classproton_1_1link__options.html">link_options</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.js
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.js?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.js (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1link__options.js Thu Apr 14 18:29:35 2016
@@ -20,7 +20,10 @@ var classproton_1_1link__options =
     [ "link_options", "classproton_1_1link__options.html#a0982bce7a239e29891b9edd12c79310e", null ],
     [ "link_options", "classproton_1_1link__options.html#aac5f3c7602f40c9761783fc2811d0288", null ],
     [ "~link_options", "classproton_1_1link__options.html#ab6388e0a994951063ee07e9ee7d00c38", null ],
+    [ "auto_accept", "classproton_1_1link__options.html#a0aec8f881be0dd6148532f4da99c88ab", null ],
+    [ "auto_settle", "classproton_1_1link__options.html#a38ac12bcfa8b3594ed5a3756e5773503", null ],
     [ "browsing", "classproton_1_1link__options.html#aaf512f41fabc2e05aabc3423696d7c0c", null ],
+    [ "credit_window", "classproton_1_1link__options.html#acbfc7fd62229aac6ef691539c1d85cff", null ],
     [ "delivery_mode", "classproton_1_1link__options.html#a680f247788d6020dcb3c3e5f2de61399", null ],
     [ "distribution_mode", "classproton_1_1link__options.html#aa98d0ee3d43d01bfdff4192fa16a93d0", null ],
     [ "durable_subscription", "classproton_1_1link__options.html#a8a9a2fe87c08f67ae00d16c04ef4e57a", null ],
@@ -28,6 +31,5 @@ var classproton_1_1link__options =
     [ "handler", "classproton_1_1link__options.html#a0a491d9f037a669e07311a6cf3a532f5", null ],
     [ "lifetime_policy", "classproton_1_1link__options.html#af937f3c5149deff1166defa548161e46", null ],
     [ "local_address", "classproton_1_1link__options.html#a532e4ce92da37e5785001b470a99776b", null ],
-    [ "operator=", "classproton_1_1link__options.html#a64dcbd7bb3c3cf56f79a3e87dde1e14d", null ],
-    [ "override", "classproton_1_1link__options.html#ab907c5d9930e8c33102a50f4a5dfc4d9", null ]
+    [ "operator=", "classproton_1_1link__options.html#a64dcbd7bb3c3cf56f79a3e87dde1e14d", null ]
 ];
\ No newline at end of file

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message.html Thu Apr 14 18:29:35 2016
@@ -125,7 +125,7 @@ Public Member Functions</h2></td></tr>
 <tr class="memdesc:a583555130839030cf9aa09d81ff1eb1b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a message. <br /></td></tr>
 <tr class="separator:a583555130839030cf9aa09d81ff1eb1b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa99aeff68b6093da4e3c11ecf898376d"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#aa99aeff68b6093da4e3c11ecf898376d">message</a> (const <a class="el" href="classproton_1_1value.html">value</a> &amp;x)</td></tr>
-<tr class="memdesc:aa99aeff68b6093da4e3c11ecf898376d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a message with its body set from any value that can be converted to a <a class="el" href="classproton_1_1value.html" title="A holder for any single AMQP value, simple or complex (can be list, array, map etc.) ">proton::value</a>.  <a href="#aa99aeff68b6093da4e3c11ecf898376d">More...</a><br /></td></tr>
+<tr class="memdesc:aa99aeff68b6093da4e3c11ecf898376d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a message with its body set from any value that can be converted to a <a class="el" href="classproton_1_1value.html" title="A holder for any AMQP value, simple or complex, see AMQP and C++ types. ">proton::value</a>.  <a href="#aa99aeff68b6093da4e3c11ecf898376d">More...</a><br /></td></tr>
 <tr class="separator:aa99aeff68b6093da4e3c11ecf898376d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:af7deffda335cb4457af3830b798182f4"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af7deffda335cb4457af3830b798182f4"></a>
 <a class="el" href="classproton_1_1message.html">message</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1message.html#af7deffda335cb4457af3830b798182f4">operator=</a> (const <a class="el" href="classproton_1_1message.html">message</a> &amp;)</td></tr>
@@ -304,8 +304,7 @@ const <a class="el" href="classproton_1_
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>An AMQP message. </p>
 <p>Value semantics: can be copied or assigned to make a new message. </p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8hpp-example.html#_a1">broker.hpp</a>, <a class="el" href="client_8cpp-example.html#_a11">client.cpp</a>, <a class="el" href="direct_recv_8cpp-example.html#_a8">direct_recv.cpp</a>, <a class="el" href="direct_send_8cpp-example.html#_a11">direct_send.cpp</a>, <a class="el" href="engine_2client_8cpp-example.html#_a11">engine/client.cpp</a>, <a class="el" href="engine_2direct_recv_8cpp-example.html#_a5">engine/direct_recv.cpp</a>, <a class="el" href="engine_2direct_send_8cpp-example.html#_a8">engine/direct_send.cpp</a>, <a class="el" href="engine_2helloworld_8cpp-example.html#_a7">engine/helloworld.cpp</a>, <a class="el" href="engine_2server_8cpp-example.html#_a11">engine/server.cpp</a>, <a class="el" href="engine_2simple_recv_8cpp-example.html#_a9">engine/simple_recv.cpp</a>, <a class="el" href="engine_2simple_send_8cpp-example.html#_a11">engine/simple_send.cpp</a>, <a class="el" href="helloworld_8cpp-example.html#_a11">hell
 oworld.cpp</a>, <a class="el" href="helloworld_direct_8cpp-example.html#_a9">helloworld_direct.cpp</a>, <a class="el" href="server_8cpp-example.html#_a13">server.cpp</a>, <a class="el" href="server_direct_8cpp-example.html#_a19">server_direct.cpp</a>, <a class="el" href="simple_recv_8cpp-example.html#_a8">simple_recv.cpp</a>, and <a class="el" href="simple_send_8cpp-example.html#_a10">simple_send.cpp</a>.</dd>
-</dl></div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
+</div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="aa99aeff68b6093da4e3c11ecf898376d"></a>
 <div class="memitem">
 <div class="memproto">
@@ -320,7 +319,7 @@ const <a class="el" href="classproton_1_
       </table>
 </div><div class="memdoc">
 
-<p>Create a message with its body set from any value that can be converted to a <a class="el" href="classproton_1_1value.html" title="A holder for any single AMQP value, simple or complex (can be list, array, map etc.) ">proton::value</a>. </p>
+<p>Create a message with its body set from any value that can be converted to a <a class="el" href="classproton_1_1value.html" title="A holder for any AMQP value, simple or complex, see AMQP and C++ types. ">proton::value</a>. </p>
 
 </div>
 </div>
@@ -478,7 +477,7 @@ const <a class="el" href="classproton_1_
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><b>proton</b></li><li class="navelem"><a class="el" href="classproton_1_1message.html">message</a></li>
+    <li class="navelem"><a class="el" href="namespaceproton.html">proton</a></li><li class="navelem"><a class="el" href="classproton_1_1message.html">message</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>

Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id-members.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id-members.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id-members.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id-members.html Thu Apr 14 18:29:35 2016
@@ -96,25 +96,19 @@ $(document).ready(function(){initNavTree
 
 <p>This is the complete list of members for <a class="el" href="classproton_1_1message__id.html">message_id</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>codec::decoder</b> (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>get</b>(uint64_t &amp;x) const  (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>get</b>(uuid &amp;x) const  (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>get</b>(binary &amp;x) const  (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>get</b>(std::string &amp;x) const  (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1message__id.html#a1541aac2858109c409fcf5eb4ba7799e">get</a>() const </td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>message</b> (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1message__id.html#a8965a5e1c4122df8aee11e971ceabd07">coerce</a>(const message_id &amp;x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">related</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1message__id.html#a8e96d12c2968550ffea0e57fc6ca2c7d">get</a>(const message_id &amp;x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">related</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1message__id.html#a9df1e3d65a418435d46c08f9cb2948de">get</a>(const message_id &amp;x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">related</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1message__id.html#aad4dad4f21de91016ac93e6df2f4b897">get</a>(const message_id &amp;x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">related</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1message__id.html#ad99d2405b26cc9862428f13aac25ddf6">get</a>(const message_id &amp;x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">related</span></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1message__id.html#afb6e34ccd03d666d3e5cd4312064c4a3">message_id</a>()</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>message_id</b>(const message_id &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>message_id</b>(uint64_t x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>message_id</b>(const uuid &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>message_id</b>(const binary &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>message_id</b>(const std::string &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1message__id.html#ae3fc740ad955386c29bfc275d4480136">message_id</a>(const char *x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator=</b>(const message_id &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1message__id.html#a37823024300ef4413ca077df9ddcc4d2">message_id</a>(const T &amp;x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>operator=</b>(uint64_t x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator=</b>(const uuid &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>operator=</b>(const binary &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator=</b>(const std::string &amp;x) (defined in <a class="el" href="classproton_1_1message__id.html">message_id</a>)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1message__id.html#a0e4798868734cc90ea4e9ed3ca870d3d">operator=</a>(const char *x)</td><td class="entry"><a class="el" href="classproton_1_1message__id.html">message_id</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1scalar__base.html#a6a70b946e3620c70eac8e97f7f33fb27">type</a>() const </td><td class="entry"><a class="el" href="classproton_1_1scalar__base.html">scalar_base</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->



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