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/05/17 12:44:21 UTC

[43/51] [partial] qpid-site git commit: QPID-7201: Update the Proton master snapshot

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery-members.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery-members.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery-members.html
index 369e455..8e0fba9 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery-members.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery-members.html
@@ -97,22 +97,17 @@ $(document).ready(function(){initNavTree('classproton_1_1delivery.html','');});
 <p>This is the complete list of members for <a class="el" href="classproton_1_1delivery.html">delivery</a>, including all inherited members.</p>
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">accept</a>()</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a69c37229a15f9a89e188ad210f31c647">ACCEPTED</a> enum value</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#af13d10fc3d843719af9ff4c456330a73">connection</a>() const </td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#a604ee46e04955a2323f305b4a81017a0">container</a>() const </td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</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_1delivery.html">delivery</a>)</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#aca9726355bb7d42b75d374b5cc459040">link</a>() const </td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a26d303ed91d56d618217b9a038512754">MODIFIED</a> enum value</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">modify</a>()</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90ac157bdf0b85a40d2619cbc8bc1ae5fe2">NONE</a> enum value</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a1cf265da0334753368223d47f242a8df">RECEIVED</a> enum value</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1transfer.html#af13d10fc3d843719af9ff4c456330a73">connection</a>() const </td><td class="entry"><a class="el" href="classproton_1_1transfer.html">transfer</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1transfer.html#a604ee46e04955a2323f305b4a81017a0">container</a>() const </td><td class="entry"><a class="el" href="classproton_1_1transfer.html">transfer</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>delivery</b>() (defined in <a class="el" href="classproton_1_1delivery.html">delivery</a>)</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">modify</a>()</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#ad94696eb7d2907efd72e021c2513ed48">receiver</a>() const </td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">reject</a>()</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90adc7d25ac50cec5a18810f4e4f6614364">REJECTED</a> enum value</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">release</a>()</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90aa38d18fe73a7fc82c112b6917d0b5cd0">RELEASED</a> enum value</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#a581faf982d53840945a9d2fc9bba441f">remote_state</a>() const </td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#aa33faff52aea9845efaf184f86676cc5">session</a>() const </td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90">state</a> enum name</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">release</a>()</td><td class="entry"><a class="el" href="classproton_1_1delivery.html">delivery</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1transfer.html#aa33faff52aea9845efaf184f86676cc5">session</a>() const </td><td class="entry"><a class="el" href="classproton_1_1transfer.html">transfer</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">settle</a>()</td><td class="entry"><a class="el" href="classproton_1_1transfer.html">transfer</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1transfer.html#ade04b72d05d480bc5cb9ff21cc22d229">settled</a>() const </td><td class="entry"><a class="el" href="classproton_1_1transfer.html">transfer</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1transfer.html#a27689e22340a12302f25eec6072c5d22">transfer</a>()</td><td class="entry"><a class="el" href="classproton_1_1transfer.html">transfer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.html
index 7ba7be3..387b2b3 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.html
@@ -90,7 +90,6 @@ $(document).ready(function(){initNavTree('classproton_1_1delivery.html','');});
 
 <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_1delivery-members.html">List of all members</a>  </div>
   <div class="headertitle">
@@ -98,46 +97,26 @@ $(document).ready(function(){initNavTree('classproton_1_1delivery.html','');});
 </div><!--header-->
 <div class="contents">
 
-<p>A message transfer.  
+<p>A received message.  
  <a href="classproton_1_1delivery.html#details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="delivery_8hpp_source.html">delivery.hpp</a>&gt;</code></p>
-
-<p>Inherits object&lt; pn_delivery_t &gt;.</p>
+<div class="dynheader">
+Inheritance diagram for delivery:</div>
+<div class="dyncontent">
+ <div class="center">
+  <img src="classproton_1_1delivery.png" usemap="#delivery_map" alt=""/>
+  <map id="delivery_map" name="delivery_map">
+<area href="classproton_1_1transfer.html" title="The base class for delivery and tracker. " alt="transfer" shape="rect" coords="0,112,237,136"/>
+</map>
+ </div></div>
 <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:adc6e5733fc3c22f0a7b2914188c49c90"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90">state</a> { <br />
-&#160;&#160;<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90ac157bdf0b85a40d2619cbc8bc1ae5fe2">NONE</a>, 
-<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a1cf265da0334753368223d47f242a8df">RECEIVED</a>, 
-<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a69c37229a15f9a89e188ad210f31c647">ACCEPTED</a>, 
-<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90adc7d25ac50cec5a18810f4e4f6614364">REJECTED</a>, 
-<br />
-&#160;&#160;<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90aa38d18fe73a7fc82c112b6917d0b5cd0">RELEASED</a>, 
-<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a26d303ed91d56d618217b9a038512754">MODIFIED</a>
-<br />
- }<tr class="memdesc:adc6e5733fc3c22f0a7b2914188c49c90"><td class="mdescLeft">&#160;</td><td class="mdescRight">Delivery state values.  <a href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90">More...</a><br /></td></tr>
-<tr class="separator:adc6e5733fc3c22f0a7b2914188c49c90"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</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:aca9726355bb7d42b75d374b5cc459040"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aca9726355bb7d42b75d374b5cc459040"></a>
-class <a class="el" href="classproton_1_1link.html">link</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#aca9726355bb7d42b75d374b5cc459040">link</a> () const </td></tr>
-<tr class="memdesc:aca9726355bb7d42b75d374b5cc459040"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the link for this delivery. <br /></td></tr>
-<tr class="separator:aca9726355bb7d42b75d374b5cc459040"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa33faff52aea9845efaf184f86676cc5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa33faff52aea9845efaf184f86676cc5"></a>
-class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#aa33faff52aea9845efaf184f86676cc5">session</a> () const </td></tr>
-<tr class="memdesc:aa33faff52aea9845efaf184f86676cc5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the session for this delivery. <br /></td></tr>
-<tr class="separator:aa33faff52aea9845efaf184f86676cc5"><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_1delivery.html#af13d10fc3d843719af9ff4c456330a73">connection</a> () const </td></tr>
-<tr class="memdesc:af13d10fc3d843719af9ff4c456330a73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the connection for this delivery. <br /></td></tr>
-<tr class="separator:af13d10fc3d843719af9ff4c456330a73"><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_1delivery.html#a604ee46e04955a2323f305b4a81017a0">container</a> () const </td></tr>
-<tr class="memdesc:a604ee46e04955a2323f305b4a81017a0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the container for this delivery. <br /></td></tr>
-<tr class="separator:a604ee46e04955a2323f305b4a81017a0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad94696eb7d2907efd72e021c2513ed48"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad94696eb7d2907efd72e021c2513ed48"></a>
+class <a class="el" href="classproton_1_1receiver.html">receiver</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#ad94696eb7d2907efd72e021c2513ed48">receiver</a> () const </td></tr>
+<tr class="memdesc:ad94696eb7d2907efd72e021c2513ed48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the receiver for this delivery. <br /></td></tr>
+<tr class="separator:ad94696eb7d2907efd72e021c2513ed48"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aadb9f3b844fb4cf98288cd3c60a3af91"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aadb9f3b844fb4cf98288cd3c60a3af91"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">accept</a> ()</td></tr>
 <tr class="memdesc:aadb9f3b844fb4cf98288cd3c60a3af91"><td class="mdescLeft">&#160;</td><td class="mdescRight">Settle with ACCEPTED state. <br /></td></tr>
@@ -154,50 +133,31 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">modify</a> ()</td></tr>
 <tr class="memdesc:a7a2a3abb755d0d1a31414355520d054b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Settle with MODIFIED state. <br /></td></tr>
 <tr class="separator:a7a2a3abb755d0d1a31414355520d054b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a581faf982d53840945a9d2fc9bba441f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a581faf982d53840945a9d2fc9bba441f"></a>
-<a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1delivery.html#a581faf982d53840945a9d2fc9bba441f">remote_state</a> () const </td></tr>
-<tr class="memdesc:a581faf982d53840945a9d2fc9bba441f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the remote state for a delivery. <br /></td></tr>
-<tr class="separator:a581faf982d53840945a9d2fc9bba441f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa33faff52aea9845efaf184f86676cc5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa33faff52aea9845efaf184f86676cc5"></a>
+class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1transfer.html#aa33faff52aea9845efaf184f86676cc5">session</a> () const </td></tr>
+<tr class="memdesc:aa33faff52aea9845efaf184f86676cc5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the session for this transfer. <br /></td></tr>
+<tr class="separator:aa33faff52aea9845efaf184f86676cc5"><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_1transfer.html#af13d10fc3d843719af9ff4c456330a73">connection</a> () const </td></tr>
+<tr class="memdesc:af13d10fc3d843719af9ff4c456330a73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the connection for this transfer. <br /></td></tr>
+<tr class="separator:af13d10fc3d843719af9ff4c456330a73"><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_1transfer.html#a604ee46e04955a2323f305b4a81017a0">container</a> () const </td></tr>
+<tr class="memdesc:a604ee46e04955a2323f305b4a81017a0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the container for this transfer. <br /></td></tr>
+<tr class="separator:a604ee46e04955a2323f305b4a81017a0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a172df06404ec241cee5281536db603a7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a172df06404ec241cee5281536db603a7"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">settle</a> ()</td></tr>
+<tr class="memdesc:a172df06404ec241cee5281536db603a7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Settle the delivery; informs the remote end. <br /></td></tr>
+<tr class="separator:a172df06404ec241cee5281536db603a7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ade04b72d05d480bc5cb9ff21cc22d229"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ade04b72d05d480bc5cb9ff21cc22d229"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1transfer.html#ade04b72d05d480bc5cb9ff21cc22d229">settled</a> () const </td></tr>
+<tr class="memdesc:ade04b72d05d480bc5cb9ff21cc22d229"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return true if the transfer has been settled. <br /></td></tr>
+<tr class="separator:ade04b72d05d480bc5cb9ff21cc22d229"><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 message transfer. </p>
-<p>Every delivery exists within the context of a <a class="el" href="classproton_1_1link.html" title="A named channel for sending or receiving messages. ">proton::link</a>. A delivery attempt can fail. As a result, a particular message may correspond to multiple deliveries. </p>
-</div><h2 class="groupheader">Member Enumeration Documentation</h2>
-<a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90"></a>
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">enum <a class="el" href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90">state</a></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>Delivery state values. </p>
-<table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90ac157bdf0b85a40d2619cbc8bc1ae5fe2"></a>NONE&#160;</td><td class="fielddoc">
-<p>Unknown state. </p>
-</td></tr>
-<tr><td class="fieldname"><a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90a1cf265da0334753368223d47f242a8df"></a>RECEIVED&#160;</td><td class="fielddoc">
-<p>Received but not yet settled. </p>
-</td></tr>
-<tr><td class="fieldname"><a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90a69c37229a15f9a89e188ad210f31c647"></a>ACCEPTED&#160;</td><td class="fielddoc">
-<p>Settled as accepted. </p>
-</td></tr>
-<tr><td class="fieldname"><a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90adc7d25ac50cec5a18810f4e4f6614364"></a>REJECTED&#160;</td><td class="fielddoc">
-<p>Settled as rejected. </p>
-</td></tr>
-<tr><td class="fieldname"><a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90aa38d18fe73a7fc82c112b6917d0b5cd0"></a>RELEASED&#160;</td><td class="fielddoc">
-<p>Settled as released. </p>
-</td></tr>
-<tr><td class="fieldname"><a class="anchor" id="adc6e5733fc3c22f0a7b2914188c49c90a26d303ed91d56d618217b9a038512754"></a>MODIFIED&#160;</td><td class="fielddoc">
-<p>Settled as modified. </p>
-</td></tr>
-</table>
-
-</div>
-</div>
-<hr/>The documentation for this class was generated from the following file:<ul>
+<div class="textblock"><p>A received message. </p>
+<p>A delivery attempt can fail. As a result, a particular message may correspond to multiple deliveries. </p>
+</div><hr/>The documentation for this class was generated from the following file:<ul>
 <li>proton/<a class="el" href="delivery_8hpp_source.html">delivery.hpp</a></li>
 </ul>
 </div><!-- contents -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.js
index 73258e6..4274f8d 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.js
@@ -1,21 +1,14 @@
 var classproton_1_1delivery =
 [
-    [ "state", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90", [
-      [ "NONE", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90ac157bdf0b85a40d2619cbc8bc1ae5fe2", null ],
-      [ "RECEIVED", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a1cf265da0334753368223d47f242a8df", null ],
-      [ "ACCEPTED", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a69c37229a15f9a89e188ad210f31c647", null ],
-      [ "REJECTED", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90adc7d25ac50cec5a18810f4e4f6614364", null ],
-      [ "RELEASED", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90aa38d18fe73a7fc82c112b6917d0b5cd0", null ],
-      [ "MODIFIED", "classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a26d303ed91d56d618217b9a038512754", null ]
-    ] ],
     [ "delivery", "classproton_1_1delivery.html#a1fc41f40a60b380926eb717ed217bf86", null ],
     [ "accept", "classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91", null ],
     [ "connection", "classproton_1_1delivery.html#af13d10fc3d843719af9ff4c456330a73", null ],
     [ "container", "classproton_1_1delivery.html#a604ee46e04955a2323f305b4a81017a0", null ],
-    [ "link", "classproton_1_1delivery.html#aca9726355bb7d42b75d374b5cc459040", null ],
     [ "modify", "classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b", null ],
+    [ "receiver", "classproton_1_1delivery.html#ad94696eb7d2907efd72e021c2513ed48", null ],
     [ "reject", "classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c", null ],
     [ "release", "classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591", null ],
-    [ "remote_state", "classproton_1_1delivery.html#a581faf982d53840945a9d2fc9bba441f", null ],
-    [ "session", "classproton_1_1delivery.html#aa33faff52aea9845efaf184f86676cc5", null ]
+    [ "session", "classproton_1_1delivery.html#aa33faff52aea9845efaf184f86676cc5", null ],
+    [ "settle", "classproton_1_1delivery.html#a172df06404ec241cee5281536db603a7", null ],
+    [ "settled", "classproton_1_1delivery.html#ade04b72d05d480bc5cb9ff21cc22d229", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.png b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.png
new file mode 100755
index 0000000..0ebfca3
Binary files /dev/null and b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1delivery.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration-members.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration-members.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration-members.html
index 8172b1d..5df107d 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration-members.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration-members.html
@@ -101,10 +101,9 @@ $(document).ready(function(){initNavTree('classproton_1_1duration.html','');});
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1duration.html#ab804de8e95dd6203d6e72e797440055e">IMMEDIATE</a></td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1duration.html#a8bdbf450cae4ec7457523cfebef08398">milliseconds</a>() const </td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1duration.html#a437a5e5f6a7d0c8780f3594b2272cba0">MINUTE</a></td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d">ms</a>() const </td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">numeric_type</a> typedef</td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1duration.html#a13ff6465e0979fe301b75ea574ce2304">operator=</a>(numeric_type ms)</td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1duration.html#aced1c394edccf069b2748d46965fb562">SECOND</a></td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2">numeric_type</a> typedef</td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1duration.html#a13ff6465e0979fe301b75ea574ce2304">operator=</a>(numeric_type ms)</td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1duration.html#aced1c394edccf069b2748d46965fb562">SECOND</a></td><td class="entry"><a class="el" href="classproton_1_1duration.html">duration</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.html
index 7d4f70b..765d967 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.html
@@ -103,40 +103,42 @@ $(document).ready(function(){initNavTree('classproton_1_1duration.html','');});
  <a href="classproton_1_1duration.html#details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="duration_8hpp_source.html">duration.hpp</a>&gt;</code></p>
-
-<p>Inherits comparable&lt; duration &gt;.</p>
+<div class="dynheader">
+Inheritance diagram for duration:</div>
+<div class="dyncontent">
+ <div class="center">
+  <img src="classproton_1_1duration.png" usemap="#duration_map" alt=""/>
+  <map id="duration_map" name="duration_map">
+</map>
+ </div></div>
 <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:a387648a0c865302ff1a6cc334bce2e5c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a387648a0c865302ff1a6cc334bce2e5c"></a>
-typedef uint64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">numeric_type</a></td></tr>
-<tr class="memdesc:a387648a0c865302ff1a6cc334bce2e5c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Numeric type used to store milliseconds. <br /></td></tr>
-<tr class="separator:a387648a0c865302ff1a6cc334bce2e5c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a44829e89515fec974f57f37bbdbfaeb2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a44829e89515fec974f57f37bbdbfaeb2"></a>
+typedef int64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2">numeric_type</a></td></tr>
+<tr class="memdesc:a44829e89515fec974f57f37bbdbfaeb2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Numeric type used to store milliseconds. <br /></td></tr>
+<tr class="separator:a44829e89515fec974f57f37bbdbfaeb2"><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:aa4fb0163afbe72b04236e39e2b6d2dbf"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4fb0163afbe72b04236e39e2b6d2dbf"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#aa4fb0163afbe72b04236e39e2b6d2dbf">duration</a> (<a class="el" href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">numeric_type</a> <a class="el" href="classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d">ms</a>=0)</td></tr>
+&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#aa4fb0163afbe72b04236e39e2b6d2dbf">duration</a> (<a class="el" href="classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2">numeric_type</a> ms=0)</td></tr>
 <tr class="memdesc:aa4fb0163afbe72b04236e39e2b6d2dbf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Construct from milliseconds. <br /></td></tr>
 <tr class="separator:aa4fb0163afbe72b04236e39e2b6d2dbf"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a13ff6465e0979fe301b75ea574ce2304"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a13ff6465e0979fe301b75ea574ce2304"></a>
-<a class="el" href="classproton_1_1duration.html">duration</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#a13ff6465e0979fe301b75ea574ce2304">operator=</a> (<a class="el" href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">numeric_type</a> <a class="el" href="classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d">ms</a>)</td></tr>
+<a class="el" href="classproton_1_1duration.html">duration</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#a13ff6465e0979fe301b75ea574ce2304">operator=</a> (<a class="el" href="classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2">numeric_type</a> ms)</td></tr>
 <tr class="memdesc:a13ff6465e0979fe301b75ea574ce2304"><td class="mdescLeft">&#160;</td><td class="mdescRight">Assign. <br /></td></tr>
 <tr class="separator:a13ff6465e0979fe301b75ea574ce2304"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8bdbf450cae4ec7457523cfebef08398"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8bdbf450cae4ec7457523cfebef08398"></a>
-<a class="el" href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">numeric_type</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#a8bdbf450cae4ec7457523cfebef08398">milliseconds</a> () const </td></tr>
+<a class="el" href="classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2">numeric_type</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#a8bdbf450cae4ec7457523cfebef08398">milliseconds</a> () const </td></tr>
 <tr class="memdesc:a8bdbf450cae4ec7457523cfebef08398"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return milliseconds. <br /></td></tr>
 <tr class="separator:a8bdbf450cae4ec7457523cfebef08398"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af55ebfb91b3132031de3f8cef94d785d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af55ebfb91b3132031de3f8cef94d785d"></a>
-<a class="el" href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">numeric_type</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d">ms</a> () const </td></tr>
-<tr class="memdesc:af55ebfb91b3132031de3f8cef94d785d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return milliseconds. <br /></td></tr>
-<tr class="separator:af55ebfb91b3132031de3f8cef94d785d"><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>
 <tr class="memitem:acebdd3ee364870f89665ca128e97a4d7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acebdd3ee364870f89665ca128e97a4d7"></a>
 static const <a class="el" href="classproton_1_1duration.html">duration</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#acebdd3ee364870f89665ca128e97a4d7">FOREVER</a></td></tr>
-<tr class="memdesc:acebdd3ee364870f89665ca128e97a4d7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Wait for ever. <br /></td></tr>
+<tr class="memdesc:acebdd3ee364870f89665ca128e97a4d7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Wait forever. <br /></td></tr>
 <tr class="separator:acebdd3ee364870f89665ca128e97a4d7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab804de8e95dd6203d6e72e797440055e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab804de8e95dd6203d6e72e797440055e"></a>
 static const <a class="el" href="classproton_1_1duration.html">duration</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1duration.html#ab804de8e95dd6203d6e72e797440055e">IMMEDIATE</a></td></tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.js
index 3f0c52a..511f4e3 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.js
@@ -1,8 +1,7 @@
 var classproton_1_1duration =
 [
-    [ "numeric_type", "classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c", null ],
+    [ "numeric_type", "classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2", null ],
     [ "duration", "classproton_1_1duration.html#aa4fb0163afbe72b04236e39e2b6d2dbf", null ],
     [ "milliseconds", "classproton_1_1duration.html#a8bdbf450cae4ec7457523cfebef08398", null ],
-    [ "ms", "classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d", null ],
     [ "operator=", "classproton_1_1duration.html#a13ff6465e0979fe301b75ea574ce2304", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.png b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.png
index f88abec..bd6915e 100755
Binary files a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.png and b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1duration.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint-members.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint-members.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint-members.html
index 198a7e9..a5728a2 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint-members.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint-members.html
@@ -96,18 +96,13 @@ $(document).ready(function(){initNavTree('classproton_1_1endpoint.html','');});
 
 <p>This is the complete list of members for <a class="el" href="classproton_1_1endpoint.html">endpoint</a>, including all inherited members.</p>
 <table class="directory">
-  <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_1endpoint.html#a8e6552f9fc799927204b763969513099">local_condition</a>() const  =0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure 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_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><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_1endpoint.html#ace88a3cd9782a46cdc46191f7f90f16a">remote_condition</a>() const  =0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure 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><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 class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a> typedef</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~endpoint</b>() (defined in <a class="el" href="classproton_1_1endpoint.html">endpoint</a>)</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</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#ac6e82b77dfe6fbae3b18e5f14ab7c25b">active</a>() const  =0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#af6ee7eacbde6b379b68d954e44f6e549">close</a>()=0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#ad4fcddcba5b74ba7766ac6f125469644">close</a>(const error_condition &amp;)=0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a3d80f17e42ec29c1230cdd8098607171">closed</a>() const  =0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a179a891abd20d5fa50b38816bfc30242">error</a>() const  =0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1endpoint.html#a580e27d7221fd49d4cb7527972ff186e">uninitialized</a>() const  =0</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~endpoint</b>() (defined in <a class="el" href="classproton_1_1endpoint.html">endpoint</a>)</td><td class="entry"><a class="el" href="classproton_1_1endpoint.html">endpoint</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.html
index 2b18ee4..8b0bc2f 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.html
@@ -90,9 +90,7 @@ $(document).ready(function(){initNavTree('classproton_1_1endpoint.html','');});
 
 <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="#pub-static-attribs">Static Public Attributes</a> &#124;
 <a href="classproton_1_1endpoint-members.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">endpoint<span class="mlabels"><span class="mlabel">abstract</span></span></div>  </div>
@@ -111,84 +109,69 @@ Inheritance diagram for endpoint:</div>
   <map id="endpoint_map" name="endpoint_map">
 <area href="classproton_1_1connection.html" title="A connection to a remote AMQP peer. " alt="connection" shape="rect" coords="0,56,74,80"/>
 <area href="classproton_1_1link.html" title="A named channel for sending or receiving messages. " alt="link" shape="rect" coords="84,56,158,80"/>
-<area href="classproton_1_1session.html" title="A container of links. " alt="session" shape="rect" coords="168,56,242,80"/>
-<area href="classproton_1_1receiver.html" title="A link for receiving messages. " alt="receiver" shape="rect" coords="42,112,116,136"/>
-<area href="classproton_1_1sender.html" title="A link for sending messages. " alt="sender" shape="rect" coords="126,112,200,136"/>
+<area href="classproton_1_1session.html" title="A container of senders and receivers. " alt="session" shape="rect" coords="168,56,242,80"/>
+<area href="classproton_1_1receiver.html" title="A channel for receiving messages. " alt="receiver" shape="rect" coords="42,112,116,136"/>
+<area href="classproton_1_1sender.html" title="A channel for sending messages. " alt="sender" shape="rect" coords="126,112,200,136"/>
 </map>
  </div></div>
 <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:a9660be8f45524b15c3931fb752de3b3e"><td class="memItemLeft" align="right" valign="top">typedef int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a></td></tr>
-<tr class="memdesc:a9660be8f45524b15c3931fb752de3b3e"><td class="mdescLeft">&#160;</td><td class="mdescRight">A bit mask of state bit values.  <a href="#a9660be8f45524b15c3931fb752de3b3e">More...</a><br /></td></tr>
-<tr class="separator:a9660be8f45524b15c3931fb752de3b3e"><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:a8e6552f9fc799927204b763969513099"><td class="memItemLeft" align="right" valign="top">virtual <a class="el" href="classproton_1_1condition.html">condition</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a8e6552f9fc799927204b763969513099">local_condition</a> () const  =0</td></tr>
-<tr class="memdesc:a8e6552f9fc799927204b763969513099"><td class="mdescLeft">&#160;</td><td class="mdescRight">XXX add endpoint state boolean operations.  <a href="#a8e6552f9fc799927204b763969513099">More...</a><br /></td></tr>
-<tr class="separator:a8e6552f9fc799927204b763969513099"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ace88a3cd9782a46cdc46191f7f90f16a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ace88a3cd9782a46cdc46191f7f90f16a"></a>
-virtual <a class="el" href="classproton_1_1condition.html">condition</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#ace88a3cd9782a46cdc46191f7f90f16a">remote_condition</a> () const  =0</td></tr>
-<tr class="memdesc:ace88a3cd9782a46cdc46191f7f90f16a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the error condition of the remote endpoint. <br /></td></tr>
-<tr class="separator:ace88a3cd9782a46cdc46191f7f90f16a"><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>
-<tr class="memitem:a84e5c2baecd6fd28505eac28ab14bacb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a84e5c2baecd6fd28505eac28ab14bacb"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a84e5c2baecd6fd28505eac28ab14bacb">LOCAL_UNINIT</a></td></tr>
-<tr class="memdesc:a84e5c2baecd6fd28505eac28ab14bacb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Local endpoint is uninitialized. <br /></td></tr>
-<tr class="separator:a84e5c2baecd6fd28505eac28ab14bacb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aca8e5dcefe432fcb32f48dc0433cf5ca"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aca8e5dcefe432fcb32f48dc0433cf5ca"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#aca8e5dcefe432fcb32f48dc0433cf5ca">REMOTE_UNINIT</a></td></tr>
-<tr class="memdesc:aca8e5dcefe432fcb32f48dc0433cf5ca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Remote endpoint is uninitialized. <br /></td></tr>
-<tr class="separator:aca8e5dcefe432fcb32f48dc0433cf5ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa9bb5c15062bee80022f56bffcf2868a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa9bb5c15062bee80022f56bffcf2868a"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#aa9bb5c15062bee80022f56bffcf2868a">LOCAL_ACTIVE</a></td></tr>
-<tr class="memdesc:aa9bb5c15062bee80022f56bffcf2868a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Local endpoint is active. <br /></td></tr>
-<tr class="separator:aa9bb5c15062bee80022f56bffcf2868a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa1f09a6f628fac670f0f92601155e155"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa1f09a6f628fac670f0f92601155e155"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#aa1f09a6f628fac670f0f92601155e155">REMOTE_ACTIVE</a></td></tr>
-<tr class="memdesc:aa1f09a6f628fac670f0f92601155e155"><td class="mdescLeft">&#160;</td><td class="mdescRight">Remote endpoint is active. <br /></td></tr>
-<tr class="separator:aa1f09a6f628fac670f0f92601155e155"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a4f8d870a4ace6dd1be8728f0e3ccf23c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4f8d870a4ace6dd1be8728f0e3ccf23c"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a4f8d870a4ace6dd1be8728f0e3ccf23c">LOCAL_CLOSED</a></td></tr>
-<tr class="memdesc:a4f8d870a4ace6dd1be8728f0e3ccf23c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Local endpoint has been closed. <br /></td></tr>
-<tr class="separator:a4f8d870a4ace6dd1be8728f0e3ccf23c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a37089f32d6a3324908be74116dfe6820"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a37089f32d6a3324908be74116dfe6820"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a37089f32d6a3324908be74116dfe6820">REMOTE_CLOSED</a></td></tr>
-<tr class="memdesc:a37089f32d6a3324908be74116dfe6820"><td class="mdescLeft">&#160;</td><td class="mdescRight">Remote endpoint has been closed. <br /></td></tr>
-<tr class="separator:a37089f32d6a3324908be74116dfe6820"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a5017b4c4cc25f9c0932455e13fb223d4"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5017b4c4cc25f9c0932455e13fb223d4"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a5017b4c4cc25f9c0932455e13fb223d4">LOCAL_MASK</a></td></tr>
-<tr class="memdesc:a5017b4c4cc25f9c0932455e13fb223d4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Mask including all LOCAL_ bits (UNINIT, ACTIVE, CLOSED) <br /></td></tr>
-<tr class="separator:a5017b4c4cc25f9c0932455e13fb223d4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a5ee39a5f2e921db5be1c2a0e56035761"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5ee39a5f2e921db5be1c2a0e56035761"></a>
-static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a5ee39a5f2e921db5be1c2a0e56035761">REMOTE_MASK</a></td></tr>
-<tr class="memdesc:a5ee39a5f2e921db5be1c2a0e56035761"><td class="mdescLeft">&#160;</td><td class="mdescRight">Mask including all REMOTE_ bits (UNINIT, ACTIVE, CLOSED) <br /></td></tr>
-<tr class="separator:a5ee39a5f2e921db5be1c2a0e56035761"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a580e27d7221fd49d4cb7527972ff186e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a580e27d7221fd49d4cb7527972ff186e"></a>
+virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a580e27d7221fd49d4cb7527972ff186e">uninitialized</a> () const  =0</td></tr>
+<tr class="memdesc:a580e27d7221fd49d4cb7527972ff186e"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if the local end is uninitialized. <br /></td></tr>
+<tr class="separator:a580e27d7221fd49d4cb7527972ff186e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac6e82b77dfe6fbae3b18e5f14ab7c25b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac6e82b77dfe6fbae3b18e5f14ab7c25b"></a>
+virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#ac6e82b77dfe6fbae3b18e5f14ab7c25b">active</a> () const  =0</td></tr>
+<tr class="memdesc:ac6e82b77dfe6fbae3b18e5f14ab7c25b"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if the local end is active. <br /></td></tr>
+<tr class="separator:ac6e82b77dfe6fbae3b18e5f14ab7c25b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3d80f17e42ec29c1230cdd8098607171"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3d80f17e42ec29c1230cdd8098607171"></a>
+virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a3d80f17e42ec29c1230cdd8098607171">closed</a> () const  =0</td></tr>
+<tr class="memdesc:a3d80f17e42ec29c1230cdd8098607171"><td class="mdescLeft">&#160;</td><td class="mdescRight">True if the local and remote ends are closed. <br /></td></tr>
+<tr class="separator:a3d80f17e42ec29c1230cdd8098607171"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a179a891abd20d5fa50b38816bfc30242"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a179a891abd20d5fa50b38816bfc30242"></a>
+virtual class <a class="el" href="classproton_1_1error__condition.html">error_condition</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#a179a891abd20d5fa50b38816bfc30242">error</a> () const  =0</td></tr>
+<tr class="memdesc:a179a891abd20d5fa50b38816bfc30242"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the error condition of the remote endpoint. <br /></td></tr>
+<tr class="separator:a179a891abd20d5fa50b38816bfc30242"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:af6ee7eacbde6b379b68d954e44f6e549"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#af6ee7eacbde6b379b68d954e44f6e549">close</a> ()=0</td></tr>
+<tr class="memdesc:af6ee7eacbde6b379b68d954e44f6e549"><td class="mdescLeft">&#160;</td><td class="mdescRight">Close the endpoint.  <a href="#af6ee7eacbde6b379b68d954e44f6e549">More...</a><br /></td></tr>
+<tr class="separator:af6ee7eacbde6b379b68d954e44f6e549"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad4fcddcba5b74ba7766ac6f125469644"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1endpoint.html#ad4fcddcba5b74ba7766ac6f125469644">close</a> (const <a class="el" href="classproton_1_1error__condition.html">error_condition</a> &amp;)=0</td></tr>
+<tr class="memdesc:ad4fcddcba5b74ba7766ac6f125469644"><td class="mdescLeft">&#160;</td><td class="mdescRight">Close the endpoint with an error condition.  <a href="#ad4fcddcba5b74ba7766ac6f125469644">More...</a><br /></td></tr>
+<tr class="separator:ad4fcddcba5b74ba7766ac6f125469644"><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>The base class for session, connection, and link. </p>
-</div><h2 class="groupheader">Member Typedef Documentation</h2>
-<a class="anchor" id="a9660be8f45524b15c3931fb752de3b3e"></a>
+</div><h2 class="groupheader">Member Function Documentation</h2>
+<a class="anchor" id="af6ee7eacbde6b379b68d954e44f6e549"></a>
 <div class="memitem">
 <div class="memproto">
+<table class="mlabels">
+  <tr>
+  <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">typedef int <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e">state</a></td>
+          <td class="memname">virtual void close </td>
+          <td>(</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
         </tr>
       </table>
+  </td>
+  <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">pure virtual</span></span>  </td>
+  </tr>
+</table>
 </div><div class="memdoc">
 
-<p>A bit mask of state bit values. </p>
-<p>A state mask is matched against an endpoint as follows: If the state mask contains both local and remote flags, then an exact match against those flags is performed. If state contains only local or only remote flags, then a match occurs if any of the local or remote flags are set respectively.</p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1connection.html#af304203ffaff9415b7884f53507b72dc" title="Return links on this connection matching the state mask. ">connection::links</a>, <a class="el" href="classproton_1_1connection.html#aa246b89acfdf85eff5e58f3fceae46dd" title="Return sessions on this connection matching the state mask. ">connection::sessions</a> </dd></dl>
+<p>Close the endpoint. </p>
+<dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
+
+<p>Implemented in <a class="el" href="classproton_1_1connection.html#a5ae591df94fc66ccb85cbb6565368bca">connection</a>, <a class="el" href="classproton_1_1link.html#a5ae591df94fc66ccb85cbb6565368bca">link</a>, and <a class="el" href="classproton_1_1session.html#a5ae591df94fc66ccb85cbb6565368bca">session</a>.</p>
 
 </div>
 </div>
-<h2 class="groupheader">Member Function Documentation</h2>
-<a class="anchor" id="a8e6552f9fc799927204b763969513099"></a>
+<a class="anchor" id="ad4fcddcba5b74ba7766ac6f125469644"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -196,10 +179,11 @@ static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c
   <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">virtual <a class="el" href="classproton_1_1condition.html">condition</a> local_condition </td>
+          <td class="memname">virtual void close </td>
           <td>(</td>
+          <td class="paramtype">const <a class="el" href="classproton_1_1error__condition.html">error_condition</a> &amp;&#160;</td>
           <td class="paramname"></td><td>)</td>
-          <td> const</td>
+          <td></td>
         </tr>
       </table>
   </td>
@@ -209,10 +193,10 @@ static const <a class="el" href="classproton_1_1endpoint.html#a9660be8f45524b15c
 </table>
 </div><div class="memdoc">
 
-<p>XXX add endpoint state boolean operations. </p>
-<p>Get the local error condition. </p>
+<p>Close the endpoint with an error condition. </p>
+<dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
 
-<p>Implemented in <a class="el" href="classproton_1_1link.html#aaaea8dc733566e78a066d2435f8a60c5">link</a>, <a class="el" href="classproton_1_1connection.html#aaaea8dc733566e78a066d2435f8a60c5">connection</a>, and <a class="el" href="classproton_1_1session.html#aaaea8dc733566e78a066d2435f8a60c5">session</a>.</p>
+<p>Implemented in <a class="el" href="classproton_1_1connection.html#a817883d28ce0ac8a29d917d196796f68">connection</a>, <a class="el" href="classproton_1_1link.html#a817883d28ce0ac8a29d917d196796f68">link</a>, and <a class="el" href="classproton_1_1session.html#a817883d28ce0ac8a29d917d196796f68">session</a>.</p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.js
index 9c9bf33..554a31e 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1endpoint.js
@@ -1,7 +1,10 @@
 var classproton_1_1endpoint =
 [
-    [ "state", "classproton_1_1endpoint.html#a9660be8f45524b15c3931fb752de3b3e", null ],
     [ "~endpoint", "classproton_1_1endpoint.html#a0337d84a151d0b49ea1ef0f9d8619718", null ],
-    [ "local_condition", "classproton_1_1endpoint.html#a8e6552f9fc799927204b763969513099", null ],
-    [ "remote_condition", "classproton_1_1endpoint.html#ace88a3cd9782a46cdc46191f7f90f16a", null ]
+    [ "active", "classproton_1_1endpoint.html#ac6e82b77dfe6fbae3b18e5f14ab7c25b", null ],
+    [ "close", "classproton_1_1endpoint.html#af6ee7eacbde6b379b68d954e44f6e549", null ],
+    [ "close", "classproton_1_1endpoint.html#ad4fcddcba5b74ba7766ac6f125469644", null ],
+    [ "closed", "classproton_1_1endpoint.html#a3d80f17e42ec29c1230cdd8098607171", null ],
+    [ "error", "classproton_1_1endpoint.html#a179a891abd20d5fa50b38816bfc30242", null ],
+    [ "uninitialized", "classproton_1_1endpoint.html#a580e27d7221fd49d4cb7527972ff186e", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1error__condition-members.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1error__condition-members.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1error__condition-members.html
new file mode 100755
index 0000000..2c0ddc9
--- /dev/null
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1error__condition-members.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.10"/>
+<title>Qpid Proton C++ API: Member List</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">Qpid Proton C++ API
+   &#160;<span id="projectnumber">master</span>
+   </div>
+  </td>
+   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+</td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.10 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('classproton_1_1error__condition.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">error_condition Member List</div>  </div>
+</div><!--header-->
+<div class="contents">
+
+<p>This is the complete list of members for <a class="el" href="classproton_1_1error__condition.html">error_condition</a>, including all inherited members.</p>
+<table class="directory">
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1error__condition.html#a7b5000e45c1386c4e56ef650f6b0ef5b">description</a>() const </td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1error__condition.html#ac6e61de369e994009e36f344f99c15ad">empty</a>() const </td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1error__condition.html#a66ce60ce079e6a9446d8dad21b9a63bb">error_condition</a>()</td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1error__condition.html#a4f32954b9494f55fa28e99c3402f254b">error_condition</a>(std::string description)</td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1error__condition.html#ab882b2726f7171112feba9d03ff9a588">error_condition</a>(std::string name, std::string description)</td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1error__condition.html#a7f06478c5510128d7cf62b394161b9b3">error_condition</a>(std::string name, std::string description, proton::value properties)</td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1error__condition.html#a37627d5d5bba7f4a8690c71c2ab3cb07">name</a>() const </td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1error__condition.html#ac8b1d32dbd52d431450c70b151cfa205">operator!</a>() const </td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1error__condition.html#a72f8cd5a18b7586fb4fb24a5b5243cc0">properties</a>() const </td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1error__condition.html#acecd2618798017fe94c19a79e5edb35a">what</a>() const </td><td class="entry"><a class="el" href="classproton_1_1error__condition.html">error_condition</a></td><td class="entry"></td></tr>
+</table></div><!-- contents -->
+</div><!-- doc-content -->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <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>
+  </ul>
+</div>
+</body>
+</html>


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