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 2018/05/01 13:45:32 UTC

[42/51] [abbrv] [partial] qpid-site git commit: QPID-8154: Refresh the proton doc snapshot

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__messenger.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__messenger.html b/content/releases/qpid-proton-master/proton/c/api/group__messenger.html
index e9131ce..de5f79b 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__messenger.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__messenger.html
@@ -122,8 +122,9 @@ Typedefs</h2></td></tr>
 <tr class="memitem:ga0d342bb795d48591ad6b3f867766b8b1"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group__messenger.html#ga0d342bb795d48591ad6b3f867766b8b1">pn_messenger_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__messenger.html#ga0d342bb795d48591ad6b3f867766b8b1">pn_messenger_t</a></td></tr>
 <tr class="memdesc:ga0d342bb795d48591ad6b3f867766b8b1"><td class="mdescLeft">&#160;</td><td class="mdescRight">A <a class="el" href="group__messenger.html#ga0d342bb795d48591ad6b3f867766b8b1" title="A pn_messenger_t provides a high level interface for sending and receiving messages (See pn_message_t...">pn_messenger_t</a> provides a high level interface for sending and receiving messages (See <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a>).  <a href="#ga0d342bb795d48591ad6b3f867766b8b1">More...</a><br /></td></tr>
 <tr class="separator:ga0d342bb795d48591ad6b3f867766b8b1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gabd73703511b9dae193765e9e57864291"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="group__messenger.html#gabd73703511b9dae193765e9e57864291">pn_subscription_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__messenger.html#gabd73703511b9dae193765e9e57864291">pn_subscription_t</a></td></tr>
-<tr class="memdesc:gabd73703511b9dae193765e9e57864291"><td class="mdescLeft">&#160;</td><td class="mdescRight">A subscription is a request for incoming messages.  <a href="#gabd73703511b9dae193765e9e57864291">More...</a><br /></td></tr>
+<tr class="memitem:gabd73703511b9dae193765e9e57864291"><td class="memItemLeft" align="right" valign="top"><a id="gabd73703511b9dae193765e9e57864291"></a>
+typedef struct <a class="el" href="group__messenger.html#gabd73703511b9dae193765e9e57864291">pn_subscription_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__messenger.html#gabd73703511b9dae193765e9e57864291">pn_subscription_t</a></td></tr>
+<tr class="memdesc:gabd73703511b9dae193765e9e57864291"><td class="mdescLeft">&#160;</td><td class="mdescRight">A subscription is a request for incoming messages. <br /></td></tr>
 <tr class="separator:gabd73703511b9dae193765e9e57864291"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gab1173cfe4bcaa0a530c8035dc75f42c7"><td class="memItemLeft" align="right" valign="top"><a id="gab1173cfe4bcaa0a530c8035dc75f42c7"></a>
 typedef int64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__messenger.html#gab1173cfe4bcaa0a530c8035dc75f42c7">pn_tracker_t</a></td></tr>
@@ -333,7 +334,7 @@ Functions</h2></td></tr>
 <tr class="memdesc:ga9be25d57cda5a6e1c5658b0f362c41c7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Gets the remote idle timeout for the specified remote service address.  <a href="#ga9be25d57cda5a6e1c5658b0f362c41c7">More...</a><br /></td></tr>
 <tr class="separator:ga9be25d57cda5a6e1c5658b0f362c41c7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga59ebaf21eaafaa4b1c359e4284564ff6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__messenger.html#ga59ebaf21eaafaa4b1c359e4284564ff6">pn_messenger_set_ssl_peer_authentication_mode</a> (<a class="el" href="group__messenger.html#ga0d342bb795d48591ad6b3f867766b8b1">pn_messenger_t</a> *messenger, const <a class="el" href="group__ssl.html#gae5e33024ed6af3432d4c76d1484d7ecb">pn_ssl_verify_mode_t</a> mode)</td></tr>
-<tr class="memdesc:ga59ebaf21eaafaa4b1c359e4284564ff6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Sets the SSL peer authentiacation mode required when a trust certificate is used.  <a href="#ga59ebaf21eaafaa4b1c359e4284564ff6">More...</a><br /></td></tr>
+<tr class="memdesc:ga59ebaf21eaafaa4b1c359e4284564ff6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Sets the SSL peer authentication mode required when a trust certificate is used.  <a href="#ga59ebaf21eaafaa4b1c359e4284564ff6">More...</a><br /></td></tr>
 <tr class="separator:ga59ebaf21eaafaa4b1c359e4284564ff6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
@@ -372,14 +373,14 @@ Functions</h2></td></tr>
 <li>amqps://127.0.0.1:1234</li>
 </ul>
 <h1>Sending &amp; Receiving Messages </h1>
-<p>The messenger API works in conjuction with the <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> API. A <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> is a mutable holder of message content.</p>
+<p>The messenger API works in conjunction with the <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> API. A <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> is a mutable holder of message content.</p>
 <p>The <a class="el" href="group__messenger.html#gafede68af29484d50d531cc48ab0d3d4a" title="Puts a message onto the messenger&#39;s outgoing queue. ">pn_messenger_put()</a> operation copies content from the supplied <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> to the outgoing queue, and may send queued messages if it can do so without blocking. The <a class="el" href="group__messenger.html#gae31f9a99dcbedffe83588cf25b805325" title="Send messages from a messenger&#39;s outgoing queue. ">pn_messenger_send()</a> operation blocks until it has sent the requested number of messages, or until a timeout interrupts the attempt.</p>
 <p>pn_messenger_t *messenger = pn_messenger(NULL); pn_message_t *message = <a class="el" href="group__message.html#gaaf98d84b9ddc1c6537dddd4c9c5b979e" title="Construct a new pn_message_t. ">pn_message()</a>; char subject[1024]; for (int i = 0; i &lt; 3; i++) { pn_message_set_address(message, "amqp://host/queue"); sprintf(subject, "Hello World! %i", i); pn_message_set_subject(message, subject); pn_messenger_put(messenger, message) pn_messenger_send(messenger);</p>
 <p>Similarly, the <a class="el" href="group__messenger.html#ga16c945185e4eb5dcb9aac2be2fcab0d6" title="Retrieve messages into a messenger&#39;s incoming queue. ">pn_messenger_recv()</a> method receives messages into the incoming queue, and may block as it attempts to receive up to the requested number of messages, or until the timeout is reached. It may receive fewer than the requested number. The <a class="el" href="group__messenger.html#gaa6d85929e4b4b574690927ddde00c540" title="Get the next message from the head of a messenger&#39;s incoming queue. ">pn_messenger_get()</a> method pops the eldest message off the incoming queue and copies its content into the supplied <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> object. It will not block.</p>
 <p>pn_messenger_t *messenger = pn_messenger(NULL); pn_message_t *message = <a class="el" href="group__message.html#gaaf98d84b9ddc1c6537dddd4c9c5b979e" title="Construct a new pn_message_t. ">pn_message()</a> pn_messenger_recv(messenger): while (pn_messenger_incoming(messenger) &gt; 0) { pn_messenger_get(messenger, message); printf("%s", message.subject); }</p>
 <p>Output: Hello World 0 Hello World 1 Hello World 2</p>
 <p>The blocking flag allows you to turn off blocking behavior entirely, in which case <a class="el" href="group__messenger.html#gae31f9a99dcbedffe83588cf25b805325" title="Send messages from a messenger&#39;s outgoing queue. ">pn_messenger_send()</a> and <a class="el" href="group__messenger.html#ga16c945185e4eb5dcb9aac2be2fcab0d6" title="Retrieve messages into a messenger&#39;s incoming queue. ">pn_messenger_recv()</a> will do whatever they can without blocking, and then return. You can then look at the number of incoming and outgoing messages to see how much outstanding work still remains.</p>
-<h1>Authentication Mechanims </h1>
+<h1>Authentication Mechanisms </h1>
 <p>The messenger API authenticates using some specific mechanisms. In prior versions of Proton the only authentication mechanism available was the PLAIN mechanism which transports the user's password over the network unencrypted. The Proton versions 0.10 and newer support other more secure mechanisms which avoid sending the users's password over the network unencrypted. For backwards compatibility the 0.10 version of the messenger API will also allow the use of the unencrypted PLAIN mechanism. From the 0.11 version and onwards you will need to set the flag PN_FLAGS_ALLOW_INSECURE_MECHS to carry on using the unencrypted PLAIN mechanism.</p>
 <p>The code for this looks like:</p>
 <p>... pn_messenger_set_flags(messenger, PN_FLAGS_ALLOW_INSECURE_MECHS); ...</p>
@@ -387,22 +388,6 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="gabd73703511b9dae193765e9e57864291"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gabd73703511b9dae193765e9e57864291">&#9670;&nbsp;</a></span>pn_subscription_t</h2>
-
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">typedef struct <a class="el" href="group__messenger.html#gabd73703511b9dae193765e9e57864291">pn_subscription_t</a> <a class="el" href="group__messenger.html#gabd73703511b9dae193765e9e57864291">pn_subscription_t</a></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>A subscription is a request for incoming messages. </p>
-
-</div>
-</div>
 <h2 class="groupheader">Enumeration Type Documentation</h2>
 <a id="ga242e4ee54b9c0a416443c7da5f6e045b"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#ga242e4ee54b9c0a416443c7da5f6e045b">&#9670;&nbsp;</a></span>pn_status_t</h2>
@@ -1922,7 +1907,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Get the next message from the head of a messenger's incoming queue. </p>
-<p>The get operation copies the message data from the head of the messenger's incoming queue into the provided <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> object. If provided <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> pointer is NULL, the head essage will be discarded. This operation will return <a class="el" href="group__error.html#ga9e0f51b097f94293cdbbdeb5422a27a3" title="End of stream. ">PN_EOS</a> if there are no messages left on the incoming queue.</p>
+<p>The get operation copies the message data from the head of the messenger's incoming queue into the provided <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> object. If provided <a class="el" href="group__message.html#gad9259fa9271e8844c8e05a7e8978e3b2" title="An AMQP Message object. ">pn_message_t</a> pointer is NULL, the head message will be discarded. This operation will return <a class="el" href="group__error.html#ga9e0f51b097f94293cdbbdeb5422a27a3" title="End of stream. ">PN_EOS</a> if there are no messages left on the incoming queue.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">messenger</td><td>a messenger object </td></tr>
@@ -1980,7 +1965,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Get the subscription of the message most recently retrieved by <a class="el" href="group__messenger.html#gaa6d85929e4b4b574690927ddde00c540" title="Get the next message from the head of a messenger&#39;s incoming queue. ">pn_messenger_get()</a>. </p>
-<p>This operation will return NULL if <a class="el" href="group__messenger.html#gaa6d85929e4b4b574690927ddde00c540" title="Get the next message from the head of a messenger&#39;s incoming queue. ">pn_messenger_get()</a> has never been succesfully called.</p>
+<p>This operation will return NULL if <a class="el" href="group__messenger.html#gaa6d85929e4b4b574690927ddde00c540" title="Get the next message from the head of a messenger&#39;s incoming queue. ">pn_messenger_get()</a> has never been successfully called.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">messenger</td><td>a messenger object </td></tr>
@@ -2591,7 +2576,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Sets the SSL peer authentiacation mode required when a trust certificate is used. </p>
+<p>Sets the SSL peer authentication mode required when a trust certificate is used. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">messenger</td><td>a messenger object </td></tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__proactor.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__proactor.html b/content/releases/qpid-proton-master/proton/c/api/group__proactor.html
index f5fd17c..b2eb3e6 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__proactor.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__proactor.html
@@ -122,22 +122,36 @@ typedef struct <a class="el" href="group__proactor.html#gabba42c7929dfceb9d29653
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
 Functions</h2></td></tr>
 <tr class="memitem:ga9f6a27999303c6082edc581f880de37c"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga9f6a27999303c6082edc581f880de37c">pn_netaddr_str</a> (const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *addr, char *buf, size_t size)</td></tr>
-<tr class="memdesc:ga9f6a27999303c6082edc581f880de37c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Format a network address as a human-readable string in <code>buf</code>.  <a href="#ga9f6a27999303c6082edc581f880de37c">More...</a><br /></td></tr>
+<tr class="memdesc:ga9f6a27999303c6082edc581f880de37c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Format a network address string in <code>buf</code>.  <a href="#ga9f6a27999303c6082edc581f880de37c">More...</a><br /></td></tr>
 <tr class="separator:ga9f6a27999303c6082edc581f880de37c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7edab5e295c55e1c2169e39aaa082f8b"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga7edab5e295c55e1c2169e39aaa082f8b">pn_netaddr_local</a> (<a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *t)</td></tr>
-<tr class="memdesc:ga7edab5e295c55e1c2169e39aaa082f8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the local address of a transport.  <a href="#ga7edab5e295c55e1c2169e39aaa082f8b">More...</a><br /></td></tr>
-<tr class="separator:ga7edab5e295c55e1c2169e39aaa082f8b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga59fa5ba7adc39bc8549645d5d33082c0"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga59fa5ba7adc39bc8549645d5d33082c0">pn_netaddr_remote</a> (<a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *t)</td></tr>
-<tr class="memdesc:ga59fa5ba7adc39bc8549645d5d33082c0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the remote address of a transport.  <a href="#ga59fa5ba7adc39bc8549645d5d33082c0">More...</a><br /></td></tr>
-<tr class="separator:ga59fa5ba7adc39bc8549645d5d33082c0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8bcff2f30c1608c1d883eab461cc9148"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga8bcff2f30c1608c1d883eab461cc9148">pn_transport_local_addr</a> (<a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *t)</td></tr>
+<tr class="memdesc:ga8bcff2f30c1608c1d883eab461cc9148"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the local address of a transport.  <a href="#ga8bcff2f30c1608c1d883eab461cc9148">More...</a><br /></td></tr>
+<tr class="separator:ga8bcff2f30c1608c1d883eab461cc9148"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga3a6d4bda7cfae2780dbb587443eded39"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga3a6d4bda7cfae2780dbb587443eded39">pn_transport_remote_addr</a> (<a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *t)</td></tr>
+<tr class="memdesc:ga3a6d4bda7cfae2780dbb587443eded39"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the local address of a transport.  <a href="#ga3a6d4bda7cfae2780dbb587443eded39">More...</a><br /></td></tr>
+<tr class="separator:ga3a6d4bda7cfae2780dbb587443eded39"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gacdbda4ea3dc040af5a4c1d633ddd7cd9"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#gacdbda4ea3dc040af5a4c1d633ddd7cd9">pn_listener_addr</a> (<a class="el" href="group__listener.html#ga68ac7072ae60612d0bca5470014bf216">pn_listener_t</a> *l)</td></tr>
+<tr class="memdesc:gacdbda4ea3dc040af5a4c1d633ddd7cd9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the listening addresses of a listener.  <a href="#gacdbda4ea3dc040af5a4c1d633ddd7cd9">More...</a><br /></td></tr>
+<tr class="separator:gacdbda4ea3dc040af5a4c1d633ddd7cd9"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6163449ac3b87782628448f192930eb0"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga6163449ac3b87782628448f192930eb0">pn_netaddr_next</a> (const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *na)</td></tr>
+<tr class="separator:ga6163449ac3b87782628448f192930eb0"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga00b1a40af2d837915d21cdb52ccb0c58"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const struct sockaddr *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga00b1a40af2d837915d21cdb52ccb0c58">pn_netaddr_sockaddr</a> (const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *na)</td></tr>
 <tr class="memdesc:ga00b1a40af2d837915d21cdb52ccb0c58"><td class="mdescLeft">&#160;</td><td class="mdescRight">On POSIX or Windows, get the underlying <code>struct sockaddr</code>.  <a href="#ga00b1a40af2d837915d21cdb52ccb0c58">More...</a><br /></td></tr>
 <tr class="separator:ga00b1a40af2d837915d21cdb52ccb0c58"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gaddaf2b0b3e107d100e4c3658116a6c3c"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#gaddaf2b0b3e107d100e4c3658116a6c3c">pn_netaddr_socklen</a> (const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *na)</td></tr>
 <tr class="memdesc:gaddaf2b0b3e107d100e4c3658116a6c3c"><td class="mdescLeft">&#160;</td><td class="mdescRight">On POSIX or Windows, get the size of the underlying <code>struct sockaddr</code>.  <a href="#gaddaf2b0b3e107d100e4c3658116a6c3c">More...</a><br /></td></tr>
 <tr class="separator:gaddaf2b0b3e107d100e4c3658116a6c3c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8cdeab8554e7d376a422dae8ac6d474b"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga8cdeab8554e7d376a422dae8ac6d474b">pn_netaddr_host_port</a> (const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *na, char *host, size_t hlen, char *port, size_t plen)</td></tr>
+<tr class="memdesc:ga8cdeab8554e7d376a422dae8ac6d474b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the host and port name from na as separate strings.  <a href="#ga8cdeab8554e7d376a422dae8ac6d474b">More...</a><br /></td></tr>
+<tr class="separator:ga8cdeab8554e7d376a422dae8ac6d474b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga7edab5e295c55e1c2169e39aaa082f8b"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga7edab5e295c55e1c2169e39aaa082f8b">pn_netaddr_local</a> (<a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *t)</td></tr>
+<tr class="separator:ga7edab5e295c55e1c2169e39aaa082f8b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga59fa5ba7adc39bc8549645d5d33082c0"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga59fa5ba7adc39bc8549645d5d33082c0">pn_netaddr_remote</a> (<a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *t)</td></tr>
+<tr class="separator:ga59fa5ba7adc39bc8549645d5d33082c0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga955471a53dd486a6f227d8d57322a44c"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga955471a53dd486a6f227d8d57322a44c">pn_netaddr_listening</a> (<a class="el" href="group__listener.html#ga68ac7072ae60612d0bca5470014bf216">pn_listener_t</a> *l)</td></tr>
+<tr class="separator:ga955471a53dd486a6f227d8d57322a44c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gaf67a7642c9003b36255b58776b494c96"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#gaf67a7642c9003b36255b58776b494c96">pn_proactor_addr</a> (char *addr, size_t size, const char *host, const char *port)</td></tr>
-<tr class="memdesc:gaf67a7642c9003b36255b58776b494c96"><td class="mdescLeft">&#160;</td><td class="mdescRight">Format a host:port address string for <a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6" title="Bind connection to a new Transport connected to addr. ">pn_proactor_connect()</a> or <a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752" title="Start listening for incoming connections. ">pn_proactor_listen()</a>  <a href="#gaf67a7642c9003b36255b58776b494c96">More...</a><br /></td></tr>
+<tr class="memdesc:gaf67a7642c9003b36255b58776b494c96"><td class="mdescLeft">&#160;</td><td class="mdescRight">Format a host:port address string for <a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6">pn_proactor_connect()</a> or <a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752" title="Start listening for incoming connections. ">pn_proactor_listen()</a>  <a href="#gaf67a7642c9003b36255b58776b494c96">More...</a><br /></td></tr>
 <tr class="separator:gaf67a7642c9003b36255b58776b494c96"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gac2a925b3de00efd8cd40fa9920169554"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN <a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#gac2a925b3de00efd8cd40fa9920169554">pn_proactor</a> (void)</td></tr>
 <tr class="memdesc:gac2a925b3de00efd8cd40fa9920169554"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a proactor.  <a href="#gac2a925b3de00efd8cd40fa9920169554">More...</a><br /></td></tr>
@@ -145,8 +159,10 @@ Functions</h2></td></tr>
 <tr class="memitem:ga5260c2653d4af5eb2f1c8c6190e9d6cf"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga5260c2653d4af5eb2f1c8c6190e9d6cf">pn_proactor_free</a> (<a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *proactor)</td></tr>
 <tr class="memdesc:ga5260c2653d4af5eb2f1c8c6190e9d6cf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Free the proactor.  <a href="#ga5260c2653d4af5eb2f1c8c6190e9d6cf">More...</a><br /></td></tr>
 <tr class="separator:ga5260c2653d4af5eb2f1c8c6190e9d6cf"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gabb093e51449351cf5530bb300bd67ba1"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#gabb093e51449351cf5530bb300bd67ba1">pn_proactor_connect2</a> (<a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *proactor, <a class="el" href="group__connection.html#ga886351d81ff3a977a284a206526c5aff">pn_connection_t</a> *connection, <a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *transport, const char *addr)</td></tr>
+<tr class="memdesc:gabb093e51449351cf5530bb300bd67ba1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Connect <code>transport</code> to <code>addr</code> and bind to <code>connection</code>.  <a href="#gabb093e51449351cf5530bb300bd67ba1">More...</a><br /></td></tr>
+<tr class="separator:gabb093e51449351cf5530bb300bd67ba1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga9a9d1c4138226fa87160f4769b87f8e6"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6">pn_proactor_connect</a> (<a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *proactor, <a class="el" href="group__connection.html#ga886351d81ff3a977a284a206526c5aff">pn_connection_t</a> *connection, const char *addr)</td></tr>
-<tr class="memdesc:ga9a9d1c4138226fa87160f4769b87f8e6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Bind <code>connection</code> to a new <a class="el" href="group__transport.html">Transport</a> connected to <code>addr</code>.  <a href="#ga9a9d1c4138226fa87160f4769b87f8e6">More...</a><br /></td></tr>
 <tr class="separator:ga9a9d1c4138226fa87160f4769b87f8e6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gacbed6a4ab75ef8452c10d52e4cd62752"><td class="memItemLeft" align="right" valign="top">PNP_EXTERN void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752">pn_proactor_listen</a> (<a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *proactor, <a class="el" href="group__listener.html#ga68ac7072ae60612d0bca5470014bf216">pn_listener_t</a> *listener, const char *addr, int backlog)</td></tr>
 <tr class="memdesc:gacbed6a4ab75ef8452c10d52e4cd62752"><td class="mdescLeft">&#160;</td><td class="mdescRight">Start listening for incoming connections.  <a href="#gacbed6a4ab75ef8452c10d52e4cd62752">More...</a><br /></td></tr>
@@ -231,19 +247,19 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Format a network address as a human-readable string in <code>buf</code>. </p>
+<p>Format a network address string in <code>buf</code>. </p>
 <dl class="section return"><dt>Returns</dt><dd>the length of the string (excluding trailing '\0'), if &gt;= size then the address was truncated. </dd></dl>
 
 </div>
 </div>
-<a id="ga7edab5e295c55e1c2169e39aaa082f8b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7edab5e295c55e1c2169e39aaa082f8b">&#9670;&nbsp;</a></span>pn_netaddr_local()</h2>
+<a id="ga8bcff2f30c1608c1d883eab461cc9148"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8bcff2f30c1608c1d883eab461cc9148">&#9670;&nbsp;</a></span>pn_transport_local_addr()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_netaddr_local </td>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_transport_local_addr </td>
           <td>(</td>
           <td class="paramtype"><a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *&#160;</td>
           <td class="paramname"><em>t</em></td><td>)</td>
@@ -253,18 +269,18 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Get the local address of a transport. </p>
-<p>Return <code>NULL</code> if not available. </p>
+<p>Return <code>NULL</code> if not available. Pointer is invalid after the transport closes (PN_TRANSPORT_CLOSED event is handled) </p>
 
 </div>
 </div>
-<a id="ga59fa5ba7adc39bc8549645d5d33082c0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga59fa5ba7adc39bc8549645d5d33082c0">&#9670;&nbsp;</a></span>pn_netaddr_remote()</h2>
+<a id="ga3a6d4bda7cfae2780dbb587443eded39"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3a6d4bda7cfae2780dbb587443eded39">&#9670;&nbsp;</a></span>pn_transport_remote_addr()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_netaddr_remote </td>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_transport_remote_addr </td>
           <td>(</td>
           <td class="paramtype"><a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *&#160;</td>
           <td class="paramname"><em>t</em></td><td>)</td>
@@ -273,8 +289,61 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Get the remote address of a transport. </p>
-<p>Return NULL if not available. </p>
+<p>Get the local address of a transport. </p>
+<p>Return <code>NULL</code> if not available. Pointer is invalid after the transport closes (PN_TRANSPORT_CLOSED event is handled) </p>
+
+</div>
+</div>
+<a id="gacdbda4ea3dc040af5a4c1d633ddd7cd9"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gacdbda4ea3dc040af5a4c1d633ddd7cd9">&#9670;&nbsp;</a></span>pn_listener_addr()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_listener_addr </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__listener.html#ga68ac7072ae60612d0bca5470014bf216">pn_listener_t</a> *&#160;</td>
+          <td class="paramname"><em>l</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Get the listening addresses of a listener. </p>
+<p>Addresses are only available after the <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa6e25f00110ab278fd8b34fee00bd5fd7">PN_LISTENER_OPEN</a> event for the listener.</p>
+<p>A listener can have more than one address for several reasons:</p><ul>
+<li>DNS host records may indicate more than one address</li>
+<li>On a multi-homed host, listening on the default host "" will listen on all local addresses.</li>
+<li>Some IPv4/IPV6 configurations may expand a single address into a v4/v6 pair.</li>
+</ul>
+<p><a class="el" href="group__proactor.html#ga6163449ac3b87782628448f192930eb0">pn_netaddr_next()</a> will iterate over the addresses in the list.</p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">l</td><td>points to the listener </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>The first listening address or NULL if there are no addresses are available. Use <a class="el" href="group__proactor.html#ga6163449ac3b87782628448f192930eb0">pn_netaddr_next()</a> to iterate over the list. Pointer is invalid after the listener closes (PN_LISTENER_CLOSED event is handled) </dd></dl>
+
+</div>
+</div>
+<a id="ga6163449ac3b87782628448f192930eb0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6163449ac3b87782628448f192930eb0">&#9670;&nbsp;</a></span>pn_netaddr_next()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_netaddr_next </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td>
+          <td class="paramname"><em>na</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="section return"><dt>Returns</dt><dd>Pointer to the next address in a list of addresses, NULL if at the end of the list or if this address is not part of a list. </dd></dl>
 
 </div>
 </div>
@@ -320,6 +389,112 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a id="ga8cdeab8554e7d376a422dae8ac6d474b"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8cdeab8554e7d376a422dae8ac6d474b">&#9670;&nbsp;</a></span>pn_netaddr_host_port()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN int pn_netaddr_host_port </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a> *&#160;</td>
+          <td class="paramname"><em>na</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&#160;</td>
+          <td class="paramname"><em>host</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&#160;</td>
+          <td class="paramname"><em>hlen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&#160;</td>
+          <td class="paramname"><em>port</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&#160;</td>
+          <td class="paramname"><em>plen</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Get the host and port name from na as separate strings. </p>
+<p>Returns 0 if successful, non-0 on error. </p>
+
+</div>
+</div>
+<a id="ga7edab5e295c55e1c2169e39aaa082f8b"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7edab5e295c55e1c2169e39aaa082f8b">&#9670;&nbsp;</a></span>pn_netaddr_local()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_netaddr_local </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *&#160;</td>
+          <td class="paramname"><em>t</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>Use pn_transport_local_addr </dd></dl>
+
+</div>
+</div>
+<a id="ga59fa5ba7adc39bc8549645d5d33082c0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga59fa5ba7adc39bc8549645d5d33082c0">&#9670;&nbsp;</a></span>pn_netaddr_remote()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_netaddr_remote </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *&#160;</td>
+          <td class="paramname"><em>t</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000003">Deprecated:</a></b></dt><dd>Use <a class="el" href="group__proactor.html#ga3a6d4bda7cfae2780dbb587443eded39" title="Get the local address of a transport. ">pn_transport_remote_addr()</a> </dd></dl>
+
+</div>
+</div>
+<a id="ga955471a53dd486a6f227d8d57322a44c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga955471a53dd486a6f227d8d57322a44c">&#9670;&nbsp;</a></span>pn_netaddr_listening()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN const <a class="el" href="group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c">pn_netaddr_t</a>* pn_netaddr_listening </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__listener.html#ga68ac7072ae60612d0bca5470014bf216">pn_listener_t</a> *&#160;</td>
+          <td class="paramname"><em>l</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000004">Deprecated:</a></b></dt><dd>Use <a class="el" href="group__proactor.html#gacdbda4ea3dc040af5a4c1d633ddd7cd9" title="Get the listening addresses of a listener. ">pn_listener_addr()</a> </dd></dl>
+
+</div>
+</div>
 <a id="gaf67a7642c9003b36255b58776b494c96"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#gaf67a7642c9003b36255b58776b494c96">&#9670;&nbsp;</a></span>pn_proactor_addr()</h2>
 
@@ -358,7 +533,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Format a host:port address string for <a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6" title="Bind connection to a new Transport connected to addr. ">pn_proactor_connect()</a> or <a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752" title="Start listening for incoming connections. ">pn_proactor_listen()</a> </p>
+<p>Format a host:port address string for <a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6">pn_proactor_connect()</a> or <a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752" title="Start listening for incoming connections. ">pn_proactor_listen()</a> </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[out]</td><td class="paramname">addr</td><td>address is copied to this buffer, with trailing '\0' </td></tr>
@@ -414,14 +589,14 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="ga9a9d1c4138226fa87160f4769b87f8e6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga9a9d1c4138226fa87160f4769b87f8e6">&#9670;&nbsp;</a></span>pn_proactor_connect()</h2>
+<a id="gabb093e51449351cf5530bb300bd67ba1"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gabb093e51449351cf5530bb300bd67ba1">&#9670;&nbsp;</a></span>pn_proactor_connect2()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">PNP_EXTERN void pn_proactor_connect </td>
+          <td class="memname">PNP_EXTERN void pn_proactor_connect2 </td>
           <td>(</td>
           <td class="paramtype"><a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *&#160;</td>
           <td class="paramname"><em>proactor</em>, </td>
@@ -435,6 +610,12 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="group__transport.html#gac26eda05f649bbf0399f3d8d78d12fa8">pn_transport_t</a> *&#160;</td>
+          <td class="paramname"><em>transport</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
           <td class="paramtype">const char *&#160;</td>
           <td class="paramname"><em>addr</em>&#160;</td>
         </tr>
@@ -446,21 +627,56 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Bind <code>connection</code> to a new <a class="el" href="group__transport.html">Transport</a> connected to <code>addr</code>. </p>
+<p>Connect <code>transport</code> to <code>addr</code> and bind to <code>connection</code>. </p>
 <p>Errors are returned as <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa1ca722ce3c0b2c13a33636cded8430ba">PN_TRANSPORT_CLOSED</a> events by <a class="el" href="group__proactor.html#ga2b66a46f3e557010ec61bd105326753d" title="Wait until there are Proactor events to handle. ">pn_proactor_wait()</a>.</p>
 <dl class="section note"><dt>Note</dt><dd>Thread-safe</dd></dl>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">proactor</td><td>the proactor object</td></tr>
-    <tr><td class="paramdir">[in]</td><td class="paramname">connection</td><td><code>proactor</code> <em>takes ownership</em> of <code>connection</code> and will automatically call <a class="el" href="group__connection.html#ga00cbef1a9f5062a6e1f113fda923f65e" title="Free a connection object. ">pn_connection_free()</a> after the final <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa1ca722ce3c0b2c13a33636cded8430ba">PN_TRANSPORT_CLOSED</a> event is handled, or when <a class="el" href="group__proactor.html#ga5260c2653d4af5eb2f1c8c6190e9d6cf" title="Free the proactor. ">pn_proactor_free()</a> is called. You can prevent the automatic free with <a class="el" href="group__proactor.html#ga1950236260353f82729dbb4589ef6c27" title="Release ownership of connection, disassociate it from its proactor. ">pn_proactor_release_connection()</a></td></tr>
-    <tr><td class="paramdir">[in]</td><td class="paramname">addr</td><td>the "host:port" network address, constructed by <a class="el" href="group__proactor.html#gaf67a7642c9003b36255b58776b494c96" title="Format a host:port address string for pn_proactor_connect() or pn_proactor_listen() ...">pn_proactor_addr()</a> An empty host will connect to the local host via the default protocol (IPV6 or IPV4). An empty port will connect to the standard AMQP port (5672).</td></tr>
-    <tr><td class="paramdir">[in]</td><td class="paramname">connection</td><td><a class="el" href="group__connection.html">Connection</a> to be connected to <code>addr</code>. </td></tr>
+    <tr><td class="paramdir">[in]</td><td class="paramname">connection</td><td>If NULL a new connection is created. <code>proactor</code> <em>takes ownership</em> of <code>connection</code> and will automatically call <a class="el" href="group__connection.html#ga00cbef1a9f5062a6e1f113fda923f65e" title="Free a connection object. ">pn_connection_free()</a> after the final <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa1ca722ce3c0b2c13a33636cded8430ba">PN_TRANSPORT_CLOSED</a> event is handled, or when <a class="el" href="group__proactor.html#ga5260c2653d4af5eb2f1c8c6190e9d6cf" title="Free the proactor. ">pn_proactor_free()</a> is called. You can prevent the automatic free with <a class="el" href="group__proactor.html#ga1950236260353f82729dbb4589ef6c27" title="Release ownership of connection, disassociate it from its proactor. ">pn_proactor_release_connection()</a></td></tr>
+    <tr><td class="paramdir">[in]</td><td class="paramname">transport</td><td>If NULL a new transport is created. <code>proactor</code> <em>takes ownership</em> of <code>transport</code>, it will be freed even if <a class="el" href="group__proactor.html#ga1950236260353f82729dbb4589ef6c27" title="Release ownership of connection, disassociate it from its proactor. ">pn_proactor_release_connection()</a> is called.</td></tr>
+    <tr><td class="paramdir">[in]</td><td class="paramname">addr</td><td>the "host:port" network address, constructed by <a class="el" href="group__proactor.html#gaf67a7642c9003b36255b58776b494c96" title="Format a host:port address string for pn_proactor_connect() or pn_proactor_listen() ...">pn_proactor_addr()</a> An empty host will connect to the local host via the default protocol (IPV6 or IPV4). An empty port will connect to the standard AMQP port (5672). </td></tr>
   </table>
   </dd>
 </dl>
 
 </div>
 </div>
+<a id="ga9a9d1c4138226fa87160f4769b87f8e6"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga9a9d1c4138226fa87160f4769b87f8e6">&#9670;&nbsp;</a></span>pn_proactor_connect()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PNP_EXTERN void pn_proactor_connect </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc">pn_proactor_t</a> *&#160;</td>
+          <td class="paramname"><em>proactor</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__connection.html#ga886351d81ff3a977a284a206526c5aff">pn_connection_t</a> *&#160;</td>
+          <td class="paramname"><em>connection</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&#160;</td>
+          <td class="paramname"><em>addr</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000005">Deprecated:</a></b></dt><dd>Use pn_proactor_connect2(proactor, connection, NULL, addr) </dd></dl>
+
+</div>
+</div>
 <a id="gacbed6a4ab75ef8452c10d52e4cd62752"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#gacbed6a4ab75ef8452c10d52e4cd62752">&#9670;&nbsp;</a></span>pn_proactor_listen()</h2>
 
@@ -500,7 +716,8 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Start listening for incoming connections. </p>
-<p>Errors are returned as <a class="el" href="group__proactor__events.html">Proactor events</a> by <a class="el" href="group__proactor.html#ga2b66a46f3e557010ec61bd105326753d" title="Wait until there are Proactor events to handle. ">pn_proactor_wait()</a>.</p>
+<p><a class="el" href="group__proactor.html#ga2b66a46f3e557010ec61bd105326753d" title="Wait until there are Proactor events to handle. ">pn_proactor_wait()</a> will return a <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa6e25f00110ab278fd8b34fee00bd5fd7">PN_LISTENER_OPEN</a> event when the listener is ready to accept connections, or a PN_LISTENER_CLOSE if the listen operation fails. If the listen failed, <a class="el" href="group__listener.html#gaa49d0d11a9f46a75fbbbebf6def2d4b2" title="Get the error condition for a listener. ">pn_listener_condition()</a> will be set.</p>
+<p>When the listener is closed by <a class="el" href="group__listener.html#ga17a5b8573f00e16b233c59a3bb17c104" title="Close the listener. ">pn_listener_close()</a>, or because of an error, a PN_LISTENER_CLOSE event will be returned and <a class="el" href="group__listener.html#gaa49d0d11a9f46a75fbbbebf6def2d4b2" title="Get the error condition for a listener. ">pn_listener_condition()</a> will be set for an error.</p>
 <dl class="section note"><dt>Note</dt><dd>Thread-safe</dd></dl>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
@@ -542,8 +759,8 @@ Functions</h2></td></tr>
 
 <p>Disconnect all connections and listeners belonging to the proactor. </p>
 <p><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaad5920df168cd28daaf253cad789d8aca">PN_LISTENER_CLOSE</a>, <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa1ca722ce3c0b2c13a33636cded8430ba">PN_TRANSPORT_CLOSED</a> and other <a class="el" href="group__proactor__events.html">Proactor events</a> are generated as usual.</p>
-<p>If no new listeners or connections are created, then a <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa894e93f167ef39e28a07c9cdf6b1181b">PN_PROACTOR_INACTIVE</a> event will be generated when all connections and listeners are disconnected and no timeout is pending - see <a class="el" href="group__proactor.html#gad7cd71f06282eb290699d90c316b2d32" title="Return a PN_PROACTOR_TIMEOUT after timeout milliseconds elapse. ">pn_proactor_set_timeout()</a> <a class="el" href="group__proactor.html#gac206e4d0a1b7546d940a83cdd79ce93f" title="Cancel the pending timeout set by pn_proactor_set_timeout(). ">pn_proactor_cancel_timeout()</a></p>
-<p>Note the proactor remains active, connections and listeners created after a call to <a class="el" href="group__proactor.html#gac600bd88ed0fc6c2b66bed4a8740bd68" title="Disconnect all connections and listeners belonging to the proactor. ">pn_proactor_disconnect()</a> are not affected by it.</p>
+<p>A <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa894e93f167ef39e28a07c9cdf6b1181b">PN_PROACTOR_INACTIVE</a> event will be generated when all connections and listeners are disconnected and no timeout is pending. The event will also be generated if there are no listeners, connections or timeout when <a class="el" href="group__proactor.html#gac600bd88ed0fc6c2b66bed4a8740bd68" title="Disconnect all connections and listeners belonging to the proactor. ">pn_proactor_disconnect()</a> is called.</p>
+<p>Creating new connections and listeners after this call and before the PN_PROACTOR_INACTIVE event may prevent the proactor from becoming inactive. After the PN_PROACTOR_INACTIVE event, the proactor can be used normally.</p>
 <dl class="section note"><dt>Note</dt><dd>Thread-safe</dd></dl>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
@@ -684,7 +901,7 @@ Functions</h2></td></tr>
 
 <p>Return a <a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa4afa8c2da61f4c665c669fbe37b1c5fe">PN_PROACTOR_TIMEOUT</a> after <code>timeout</code> milliseconds elapse. </p>
 <p>If no threads are blocked in <a class="el" href="group__proactor.html#ga2b66a46f3e557010ec61bd105326753d" title="Wait until there are Proactor events to handle. ">pn_proactor_wait()</a> when the timeout elapses, the event will be delivered to the next available thread.</p>
-<p>Calling <a class="el" href="group__proactor.html#gad7cd71f06282eb290699d90c316b2d32" title="Return a PN_PROACTOR_TIMEOUT after timeout milliseconds elapse. ">pn_proactor_set_timeout()</a> again before the PN_PROACTOR_TIMEOUT is delivered will cancel the previous timeout and deliver an event only after the new timeout.</p>
+<p>Calling <a class="el" href="group__proactor.html#gad7cd71f06282eb290699d90c316b2d32" title="Return a PN_PROACTOR_TIMEOUT after timeout milliseconds elapse. ">pn_proactor_set_timeout()</a> again before the PN_PROACTOR_TIMEOUT is delivered replaces the previous timeout value.</p>
 <dl class="section note"><dt>Note</dt><dd>Thread-safe </dd></dl>
 
 </div>
@@ -728,7 +945,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Release ownership of <code>connection</code>, disassociate it from its proactor. </p>
-<p>The connection and related objects (<a class="el" href="group__session.html">sessions</a>, <a class="el" href="group__link.html">links</a> and so on) remain intact, but the transport is closed and unbound. The proactor will not return any more events for this connection. The caller must call <a class="el" href="group__connection.html#ga00cbef1a9f5062a6e1f113fda923f65e" title="Free a connection object. ">pn_connection_free()</a>, either directly or indirectly by re-using <code>connection</code> in another call to <a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6" title="Bind connection to a new Transport connected to addr. ">pn_proactor_connect()</a> or <a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752" title="Start listening for incoming connections. ">pn_proactor_listen()</a>.</p>
+<p>The connection and related objects (<a class="el" href="group__session.html">sessions</a>, <a class="el" href="group__link.html">links</a> and so on) remain intact, but the transport is closed and unbound. The proactor will not return any more events for this connection. The caller must call <a class="el" href="group__connection.html#ga00cbef1a9f5062a6e1f113fda923f65e" title="Free a connection object. ">pn_connection_free()</a>, either directly or indirectly by re-using <code>connection</code> in another call to <a class="el" href="group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6">pn_proactor_connect()</a> or <a class="el" href="group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752" title="Start listening for incoming connections. ">pn_proactor_listen()</a>.</p>
 <dl class="section note"><dt>Note</dt><dd><b>Not thread-safe</b>. Call this function from a connection event handler.</dd>
 <dd>
 If <code>connection</code> does not belong to a proactor, this call does nothing.</dd>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__proactor.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__proactor.js b/content/releases/qpid-proton-master/proton/c/api/group__proactor.js
index 5cfcb1a..3eaa04c 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__proactor.js
+++ b/content/releases/qpid-proton-master/proton/c/api/group__proactor.js
@@ -4,13 +4,20 @@ var group__proactor =
     [ "pn_netaddr_t", "group__proactor.html#ga79d820cd3ad391cc5207c83dbb373a9c", null ],
     [ "pn_proactor_t", "group__proactor.html#gabba42c7929dfceb9d296535bad0c93dc", null ],
     [ "pn_netaddr_str", "group__proactor.html#ga9f6a27999303c6082edc581f880de37c", null ],
-    [ "pn_netaddr_local", "group__proactor.html#ga7edab5e295c55e1c2169e39aaa082f8b", null ],
-    [ "pn_netaddr_remote", "group__proactor.html#ga59fa5ba7adc39bc8549645d5d33082c0", null ],
+    [ "pn_transport_local_addr", "group__proactor.html#ga8bcff2f30c1608c1d883eab461cc9148", null ],
+    [ "pn_transport_remote_addr", "group__proactor.html#ga3a6d4bda7cfae2780dbb587443eded39", null ],
+    [ "pn_listener_addr", "group__proactor.html#gacdbda4ea3dc040af5a4c1d633ddd7cd9", null ],
+    [ "pn_netaddr_next", "group__proactor.html#ga6163449ac3b87782628448f192930eb0", null ],
     [ "pn_netaddr_sockaddr", "group__proactor.html#ga00b1a40af2d837915d21cdb52ccb0c58", null ],
     [ "pn_netaddr_socklen", "group__proactor.html#gaddaf2b0b3e107d100e4c3658116a6c3c", null ],
+    [ "pn_netaddr_host_port", "group__proactor.html#ga8cdeab8554e7d376a422dae8ac6d474b", null ],
+    [ "pn_netaddr_local", "group__proactor.html#ga7edab5e295c55e1c2169e39aaa082f8b", null ],
+    [ "pn_netaddr_remote", "group__proactor.html#ga59fa5ba7adc39bc8549645d5d33082c0", null ],
+    [ "pn_netaddr_listening", "group__proactor.html#ga955471a53dd486a6f227d8d57322a44c", null ],
     [ "pn_proactor_addr", "group__proactor.html#gaf67a7642c9003b36255b58776b494c96", null ],
     [ "pn_proactor", "group__proactor.html#gac2a925b3de00efd8cd40fa9920169554", null ],
     [ "pn_proactor_free", "group__proactor.html#ga5260c2653d4af5eb2f1c8c6190e9d6cf", null ],
+    [ "pn_proactor_connect2", "group__proactor.html#gabb093e51449351cf5530bb300bd67ba1", null ],
     [ "pn_proactor_connect", "group__proactor.html#ga9a9d1c4138226fa87160f4769b87f8e6", null ],
     [ "pn_proactor_listen", "group__proactor.html#gacbed6a4ab75ef8452c10d52e4cd62752", null ],
     [ "pn_proactor_disconnect", "group__proactor.html#gac600bd88ed0fc6c2b66bed4a8740bd68", null ],

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__proactor__events.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__proactor__events.html b/content/releases/qpid-proton-master/proton/c/api/group__proactor__events.html
index 3da8e6e..662770e 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__proactor__events.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__proactor__events.html
@@ -163,9 +163,9 @@ $(document).ready(function(){initNavTree('group__proactor__events.html','');});
 <tr>
 <td align="left"><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa1ca722ce3c0b2c13a33636cded8430ba">PN_TRANSPORT_CLOSED</a> </td><td align="left">The final event for a proactor connection, the transport is closed. </td></tr>
 <tr>
-<td align="left"><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa6e25f00110ab278fd8b34fee00bd5fd7">PN_LISTENER_OPEN</a> </td><td align="left">The listener is listeneing. </td></tr>
+<td align="left"><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa6e25f00110ab278fd8b34fee00bd5fd7">PN_LISTENER_OPEN</a> </td><td align="left">The listener is listening. </td></tr>
 <tr>
-<td align="left"><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa0602b15957883e7d00ccdff4abca992c">PN_LISTENER_ACCEPT</a> </td><td align="left">Indicates the listener has an incoming connection, call <a class="el" href="group__listener.html#gaaee3c3f3822484bc2e370406abf5b736" title="Bind connection to a new transport accepted from listener. ">pn_listener_accept()</a> to accept it. </td></tr>
+<td align="left"><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaa0602b15957883e7d00ccdff4abca992c">PN_LISTENER_ACCEPT</a> </td><td align="left">Indicates the listener has an incoming connection, call <a class="el" href="group__listener.html#ga3719a4ab17b8de42fc6bfb262018d070" title="Accept an incoming connection request using transport and connection, which can be configured before ...">pn_listener_accept2()</a> to accept it. </td></tr>
 <tr>
 <td align="left"><a class="el" href="group__event.html#gga4876e2eed24a4d4e4c52b99842103cdaad5920df168cd28daaf253cad789d8aca">PN_LISTENER_CLOSE</a> </td><td align="left">Indicates the listener has closed. </td></tr>
 <tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__sasl.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__sasl.html b/content/releases/qpid-proton-master/proton/c/api/group__sasl.html
index 1d98dec..781bb4e 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__sasl.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__sasl.html
@@ -133,8 +133,9 @@ Functions</h2></td></tr>
 <tr class="memitem:ga0199871440c4ff89a204cc1d8a09f283"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sasl.html#ga0199871440c4ff89a204cc1d8a09f283">pn_sasl_done</a> (<a class="el" href="group__sasl.html#ga4d21fddba80d3f88d0529aafe12328b0">pn_sasl_t</a> *sasl, <a class="el" href="group__sasl.html#gad44e79f52e0669b1930689b56dfa9c3b">pn_sasl_outcome_t</a> outcome)</td></tr>
 <tr class="memdesc:ga0199871440c4ff89a204cc1d8a09f283"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the outcome of SASL negotiation.  <a href="#ga0199871440c4ff89a204cc1d8a09f283">More...</a><br /></td></tr>
 <tr class="separator:ga0199871440c4ff89a204cc1d8a09f283"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga03b6daf742db6a07bd7d03cb197aedb6"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sasl.html#gad44e79f52e0669b1930689b56dfa9c3b">pn_sasl_outcome_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sasl.html#ga03b6daf742db6a07bd7d03cb197aedb6">pn_sasl_outcome</a> (<a class="el" href="group__sasl.html#ga4d21fddba80d3f88d0529aafe12328b0">pn_sasl_t</a> *sasl)</td></tr>
-<tr class="memdesc:ga03b6daf742db6a07bd7d03cb197aedb6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the outcome of SASL negotiation.  <a href="#ga03b6daf742db6a07bd7d03cb197aedb6">More...</a><br /></td></tr>
+<tr class="memitem:ga03b6daf742db6a07bd7d03cb197aedb6"><td class="memItemLeft" align="right" valign="top"><a id="ga03b6daf742db6a07bd7d03cb197aedb6"></a>
+<a class="el" href="group__sasl.html#gad44e79f52e0669b1930689b56dfa9c3b">pn_sasl_outcome_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sasl.html#ga03b6daf742db6a07bd7d03cb197aedb6">pn_sasl_outcome</a> (<a class="el" href="group__sasl.html#ga4d21fddba80d3f88d0529aafe12328b0">pn_sasl_t</a> *sasl)</td></tr>
+<tr class="memdesc:ga03b6daf742db6a07bd7d03cb197aedb6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the outcome of SASL negotiation. <br /></td></tr>
 <tr class="separator:ga03b6daf742db6a07bd7d03cb197aedb6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga700e1d505068f895383dd932af55987e"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sasl.html#ga700e1d505068f895383dd932af55987e">pn_sasl_get_user</a> (<a class="el" href="group__sasl.html#ga4d21fddba80d3f88d0529aafe12328b0">pn_sasl_t</a> *sasl)</td></tr>
 <tr class="memdesc:ga700e1d505068f895383dd932af55987e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the authenticated user.  <a href="#ga700e1d505068f895383dd932af55987e">More...</a><br /></td></tr>
@@ -249,7 +250,7 @@ Functions</h2></td></tr>
 
 <p>Do we support extended SASL negotiation. </p>
 <p>Do we support extended SASL negotiation? All implementations of Proton support ANONYMOUS and EXTERNAL on both client and server sides and PLAIN on the client side.</p>
-<p>Extended SASL implememtations use an external library (Cyrus SASL) to support other mechanisms beyond these basic ones.</p>
+<p>Extended SASL implementations use an external library (Cyrus SASL) to support other mechanisms beyond these basic ones.</p>
 <dl class="section return"><dt>Returns</dt><dd>true if we support extended SASL negotiation, false if we only support basic negotiation. </dd></dl>
 
 </div>
@@ -281,27 +282,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Set the outcome of SASL negotiation. </p>
-<p>Used by the server to set the result of the negotiation process.</p>
-
-</div>
-</div>
-<a id="ga03b6daf742db6a07bd7d03cb197aedb6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga03b6daf742db6a07bd7d03cb197aedb6">&#9670;&nbsp;</a></span>pn_sasl_outcome()</h2>
-
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="group__sasl.html#gad44e79f52e0669b1930689b56dfa9c3b">pn_sasl_outcome_t</a> pn_sasl_outcome </td>
-          <td>(</td>
-          <td class="paramtype"><a class="el" href="group__sasl.html#ga4d21fddba80d3f88d0529aafe12328b0">pn_sasl_t</a> *&#160;</td>
-          <td class="paramname"><em>sasl</em></td><td>)</td>
-          <td></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>Retrieve the outcome of SASL negotiation. </p>
+<p>Used by the server to set the result of the negotiation process. </p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__session.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__session.html b/content/releases/qpid-proton-master/proton/c/api/group__session.html
index 9904d28..5355201 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__session.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__session.html
@@ -115,8 +115,10 @@ Functions</h2></td></tr>
 <tr class="memdesc:ga0f95b5177494a68991d75444c2f6f812"><td class="mdescLeft">&#160;</td><td class="mdescRight">Free a session object.  <a href="#ga0f95b5177494a68991d75444c2f6f812">More...</a><br /></td></tr>
 <tr class="separator:ga0f95b5177494a68991d75444c2f6f812"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga07da6cda67bdb37511b0aa9c8a04d532"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__session.html#ga07da6cda67bdb37511b0aa9c8a04d532">pn_session_get_context</a> (<a class="el" href="group__session.html#ga38ccb93b8f5c2892adafce5d5f0fbcd9">pn_session_t</a> *session)</td></tr>
+<tr class="memdesc:ga07da6cda67bdb37511b0aa9c8a04d532"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Deprecated</b> - Use <a class="el" href="group__session.html#ga0128a4413f413569b91e2bc78217728a" title="Get the attachments that are associated with a session object. ">pn_session_attachments()</a>.  <a href="#ga07da6cda67bdb37511b0aa9c8a04d532">More...</a><br /></td></tr>
 <tr class="separator:ga07da6cda67bdb37511b0aa9c8a04d532"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga31f2e4cc76135f79e96453aa72d441b2"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__session.html#ga31f2e4cc76135f79e96453aa72d441b2">pn_session_set_context</a> (<a class="el" href="group__session.html#ga38ccb93b8f5c2892adafce5d5f0fbcd9">pn_session_t</a> *session, void *context)</td></tr>
+<tr class="memdesc:ga31f2e4cc76135f79e96453aa72d441b2"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Deprecated</b> - Use <a class="el" href="group__session.html#ga0128a4413f413569b91e2bc78217728a" title="Get the attachments that are associated with a session object. ">pn_session_attachments()</a>.  <a href="#ga31f2e4cc76135f79e96453aa72d441b2">More...</a><br /></td></tr>
 <tr class="separator:ga31f2e4cc76135f79e96453aa72d441b2"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga0128a4413f413569b91e2bc78217728a"><td class="memItemLeft" align="right" valign="top">pn_record_t *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__session.html#ga0128a4413f413569b91e2bc78217728a">pn_session_attachments</a> (<a class="el" href="group__session.html#ga38ccb93b8f5c2892adafce5d5f0fbcd9">pn_session_t</a> *session)</td></tr>
 <tr class="memdesc:ga0128a4413f413569b91e2bc78217728a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the attachments that are associated with a session object.  <a href="#ga0128a4413f413569b91e2bc78217728a">More...</a><br /></td></tr>
@@ -125,6 +127,7 @@ Functions</h2></td></tr>
 <tr class="memdesc:ga7e2a4567e3488a225257e4d883a7e78f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the endpoint state flags for a session.  <a href="#ga7e2a4567e3488a225257e4d883a7e78f">More...</a><br /></td></tr>
 <tr class="separator:ga7e2a4567e3488a225257e4d883a7e78f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga1685531ca6fb6fb1058d5455a3c3edde"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__error.html#ga24a289d5b32c9bd8a775600a5af83d52">pn_error_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__session.html#ga1685531ca6fb6fb1058d5455a3c3edde">pn_session_error</a> (<a class="el" href="group__session.html#ga38ccb93b8f5c2892adafce5d5f0fbcd9">pn_session_t</a> *session)</td></tr>
+<tr class="memdesc:ga1685531ca6fb6fb1058d5455a3c3edde"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Deprecated</b>  <a href="#ga1685531ca6fb6fb1058d5455a3c3edde">More...</a><br /></td></tr>
 <tr class="separator:ga1685531ca6fb6fb1058d5455a3c3edde"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:gafdb7b3d530adaaf30aecc73ca6319cf3"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__condition.html#ga11eb7db7d2c205169fe3d47c996a95a5">pn_condition_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__session.html#gafdb7b3d530adaaf30aecc73ca6319cf3">pn_session_condition</a> (<a class="el" href="group__session.html#ga38ccb93b8f5c2892adafce5d5f0fbcd9">pn_session_t</a> *session)</td></tr>
 <tr class="memdesc:gafdb7b3d530adaaf30aecc73ca6319cf3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the local condition associated with the session endpoint.  <a href="#gafdb7b3d530adaaf30aecc73ca6319cf3">More...</a><br /></td></tr>
@@ -257,8 +260,10 @@ Functions</h2></td></tr>
         </tr>
       </table>
 </div><div class="memdoc">
+
+<p><b>Deprecated</b> - Use <a class="el" href="group__session.html#ga0128a4413f413569b91e2bc78217728a" title="Get the attachments that are associated with a session object. ">pn_session_attachments()</a>. </p>
 <p>Get the application context that is associated with a session object.</p>
-<p>The application context for a session may be set using <a class="el" href="group__session.html#ga31f2e4cc76135f79e96453aa72d441b2">pn_session_set_context</a>.</p>
+<p>The application context for a session may be set using <a class="el" href="group__session.html#ga31f2e4cc76135f79e96453aa72d441b2" title="Deprecated - Use pn_session_attachments(). ">pn_session_set_context</a>.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">session</td><td>the session whose context is to be returned. </td></tr>
@@ -294,8 +299,10 @@ Functions</h2></td></tr>
         </tr>
       </table>
 </div><div class="memdoc">
+
+<p><b>Deprecated</b> - Use <a class="el" href="group__session.html#ga0128a4413f413569b91e2bc78217728a" title="Get the attachments that are associated with a session object. ">pn_session_attachments()</a>. </p>
 <p>Set a new application context for a session object.</p>
-<p>The application context for a session object may be retrieved using <a class="el" href="group__session.html#ga07da6cda67bdb37511b0aa9c8a04d532">pn_session_get_context</a>.</p>
+<p>The application context for a session object may be retrieved using <a class="el" href="group__session.html#ga07da6cda67bdb37511b0aa9c8a04d532" title="Deprecated - Use pn_session_attachments(). ">pn_session_get_context</a>.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">session</td><td>the session object </td></tr>
@@ -375,6 +382,8 @@ Functions</h2></td></tr>
         </tr>
       </table>
 </div><div class="memdoc">
+
+<p><b>Deprecated</b> </p>
 <p>Get additional error information associated with the session.</p>
 <p>Whenever a session operation fails (i.e. returns an error code), additional error details can be obtained using this function. The error object that is returned may also be used to clear the error condition.</p>
 <p>The pointer returned by this operation is valid until the session object is freed.</p>
@@ -545,7 +554,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Get the incoming capacity of the session measured in bytes. </p>
-<p>The incoming capacity of a session determines how much incoming message data the session will buffer. Note that if this value is less than the negotiated frame size of the transport, it will be rounded up to one full frame.</p>
+<p>The incoming capacity of a session determines how much incoming message data the session can buffer.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">session</td><td>the session object </td></tr>
@@ -583,11 +592,12 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Set the incoming capacity for a session object. </p>
-<p>The incoming capacity of a session determines how much incoming message data the session will buffer. Note that if this value is less than the negotiated frame size of the transport, it will be rounded up to one full frame.</p>
+<p>The incoming capacity of a session determines how much incoming message data the session can buffer, by governing the size of the session incoming-window for transfer frames. This happens in concert with the transport max frame size, and only when both values have been set.</p>
+<p>NOTE: If set, this value must be greater than or equal to the negotiated frame size of the transport. The window is computed as a whole number of frames when dividing remaining capacity at a given time by the connection max frame size. As such, capacity and max frame size should be chosen so as to ensure the frame window isn't unduly small and limiting performance.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramdir">[in]</td><td class="paramname">session</td><td>the session object </td></tr>
-    <tr><td class="paramdir">[in]</td><td class="paramname">capacity</td><td>the incoming capacity for the session </td></tr>
+    <tr><td class="paramdir">[in]</td><td class="paramname">capacity</td><td>the incoming capacity for the session in bytes </td></tr>
   </table>
   </dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__ssl.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__ssl.html b/content/releases/qpid-proton-master/proton/c/api/group__ssl.html
index 4821e01..86b6ee6 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__ssl.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__ssl.html
@@ -169,6 +169,12 @@ Functions</h2></td></tr>
 <tr class="memitem:ga39b67bd22fb8f0a47bcdbdfd40f80b11"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__ssl.html#ga39b67bd22fb8f0a47bcdbdfd40f80b11">pn_ssl_domain_set_peer_authentication</a> (<a class="el" href="group__ssl.html#gaba83c3a1779c8b35a479bf3a7bb5b175">pn_ssl_domain_t</a> *domain, const <a class="el" href="group__ssl.html#gae5e33024ed6af3432d4c76d1484d7ecb">pn_ssl_verify_mode_t</a> mode, const char *trusted_CAs)</td></tr>
 <tr class="memdesc:ga39b67bd22fb8f0a47bcdbdfd40f80b11"><td class="mdescLeft">&#160;</td><td class="mdescRight">Configure the level of verification used on the peer certificate.  <a href="#ga39b67bd22fb8f0a47bcdbdfd40f80b11">More...</a><br /></td></tr>
 <tr class="separator:ga39b67bd22fb8f0a47bcdbdfd40f80b11"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga333fcb941ed20421373f37b23d84fc98"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__ssl.html#ga333fcb941ed20421373f37b23d84fc98">pn_ssl_domain_set_protocols</a> (<a class="el" href="group__ssl.html#gaba83c3a1779c8b35a479bf3a7bb5b175">pn_ssl_domain_t</a> *domain, const char *protocols)</td></tr>
+<tr class="memdesc:ga333fcb941ed20421373f37b23d84fc98"><td class="mdescLeft">&#160;</td><td class="mdescRight">Configure the list of permitted TLS protocols.  <a href="#ga333fcb941ed20421373f37b23d84fc98">More...</a><br /></td></tr>
+<tr class="separator:ga333fcb941ed20421373f37b23d84fc98"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gac3da0f48aeeb11d8149a559a2a064ddc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__ssl.html#gac3da0f48aeeb11d8149a559a2a064ddc">pn_ssl_domain_set_ciphers</a> (<a class="el" href="group__ssl.html#gaba83c3a1779c8b35a479bf3a7bb5b175">pn_ssl_domain_t</a> *domain, const char *ciphers)</td></tr>
+<tr class="memdesc:gac3da0f48aeeb11d8149a559a2a064ddc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Configure the list of permitted ciphers.  <a href="#gac3da0f48aeeb11d8149a559a2a064ddc">More...</a><br /></td></tr>
+<tr class="separator:gac3da0f48aeeb11d8149a559a2a064ddc"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ga2ac989a62dcd138be770fae0bbb85e74"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__ssl.html#ga2ac989a62dcd138be770fae0bbb85e74">pn_ssl_domain_allow_unsecured_client</a> (<a class="el" href="group__ssl.html#gaba83c3a1779c8b35a479bf3a7bb5b175">pn_ssl_domain_t</a> *domain)</td></tr>
 <tr class="memdesc:ga2ac989a62dcd138be770fae0bbb85e74"><td class="mdescLeft">&#160;</td><td class="mdescRight">Permit a server to accept connection requests from non-SSL clients.  <a href="#ga2ac989a62dcd138be770fae0bbb85e74">More...</a><br /></td></tr>
 <tr class="separator:ga2ac989a62dcd138be770fae0bbb85e74"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -552,6 +558,84 @@ This setting effects only those pn_ssl_t objects created after this call returns
 
 </div>
 </div>
+<a id="ga333fcb941ed20421373f37b23d84fc98"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga333fcb941ed20421373f37b23d84fc98">&#9670;&nbsp;</a></span>pn_ssl_domain_set_protocols()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int pn_ssl_domain_set_protocols </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__ssl.html#gaba83c3a1779c8b35a479bf3a7bb5b175">pn_ssl_domain_t</a> *&#160;</td>
+          <td class="paramname"><em>domain</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&#160;</td>
+          <td class="paramname"><em>protocols</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Configure the list of permitted TLS protocols. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramdir">[in]</td><td class="paramname">domain</td><td>the ssl domain to configure. </td></tr>
+    <tr><td class="paramdir">[in]</td><td class="paramname">protocols</td><td>string representing the protocol list. This list is a space separated string of the allowed TLS protocols, The current possibilities are TLSv1 TLSv1.1 TLSv1.2. None of the earlier SSL protocols are allowed for security reason.</td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section note"><dt>Note</dt><dd>If this API not called then all the TLS protocols are allowed. The API only acts to restrict the allowed protocols to the specified set. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>0 on success </dd></dl>
+
+</div>
+</div>
+<a id="gac3da0f48aeeb11d8149a559a2a064ddc"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gac3da0f48aeeb11d8149a559a2a064ddc">&#9670;&nbsp;</a></span>pn_ssl_domain_set_ciphers()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int pn_ssl_domain_set_ciphers </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__ssl.html#gaba83c3a1779c8b35a479bf3a7bb5b175">pn_ssl_domain_t</a> *&#160;</td>
+          <td class="paramname"><em>domain</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&#160;</td>
+          <td class="paramname"><em>ciphers</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Configure the list of permitted ciphers. </p>
+<dl class="section note"><dt>Note</dt><dd>The syntax of the permitted list is undefined and will depend on the underlying SSL implementation.</dd></dl>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramdir">[in]</td><td class="paramname">domain</td><td>the ssl domain to configure. </td></tr>
+    <tr><td class="paramdir">[in]</td><td class="paramname">ciphers</td><td>string representing the cipher list </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>0 on success </dd></dl>
+
+</div>
+</div>
 <a id="ga2ac989a62dcd138be770fae0bbb85e74"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#ga2ac989a62dcd138be770fae0bbb85e74">&#9670;&nbsp;</a></span>pn_ssl_domain_allow_unsecured_client()</h2>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__ssl.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__ssl.js b/content/releases/qpid-proton-master/proton/c/api/group__ssl.js
index 7d8968b..dacde1a 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__ssl.js
+++ b/content/releases/qpid-proton-master/proton/c/api/group__ssl.js
@@ -25,6 +25,8 @@ var group__ssl =
     [ "pn_ssl_domain_set_credentials", "group__ssl.html#ga7311e46bb756474513f3c331e0c1b0aa", null ],
     [ "pn_ssl_domain_set_trusted_ca_db", "group__ssl.html#ga6cdf12ad6ff3d50ac1d31db3cff11c2d", null ],
     [ "pn_ssl_domain_set_peer_authentication", "group__ssl.html#ga39b67bd22fb8f0a47bcdbdfd40f80b11", null ],
+    [ "pn_ssl_domain_set_protocols", "group__ssl.html#ga333fcb941ed20421373f37b23d84fc98", null ],
+    [ "pn_ssl_domain_set_ciphers", "group__ssl.html#gac3da0f48aeeb11d8149a559a2a064ddc", null ],
     [ "pn_ssl_domain_allow_unsecured_client", "group__ssl.html#ga2ac989a62dcd138be770fae0bbb85e74", null ],
     [ "pn_ssl", "group__ssl.html#gaaeb5284b45f9e2146ff671b1ddc9420c", null ],
     [ "pn_ssl_init", "group__ssl.html#ga45f319dd31ad456b8a85927888f94acf", null ],

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/c/api/group__terminus.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/c/api/group__terminus.html b/content/releases/qpid-proton-master/proton/c/api/group__terminus.html
index 67016e6..49d220f 100755
--- a/content/releases/qpid-proton-master/proton/c/api/group__terminus.html
+++ b/content/releases/qpid-proton-master/proton/c/api/group__terminus.html
@@ -281,7 +281,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 
 <p>Expiry policy of an AMQP terminus. </p>
-<p>An orphaned terminus can only exist for the timeout configured by <a class="el" href="group__terminus.html#ga8b6c30afc3aa73aac6fc30875fbc386d" title="Set the timeout of a terminus object. ">pn_terminus_set_timeout</a>. The expiry policy determins when a terminus is considered orphaned, i.e. when the expiry timer starts counting down. </p>
+<p>An orphaned terminus can only exist for the timeout configured by <a class="el" href="group__terminus.html#ga8b6c30afc3aa73aac6fc30875fbc386d" title="Set the timeout of a terminus object. ">pn_terminus_set_timeout</a>. The expiry policy determines when a terminus is considered orphaned, i.e. when the expiry timer starts counting down. </p>
 <table class="fieldtable">
 <tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><a id="ggab4089b27ee99a348deab776f3d4931f0ad559c0f96078b8b7d8b84b77354b2391"></a>PN_EXPIRE_WITH_LINK&#160;</td><td class="fielddoc"><p>the terminus is orphaned when the parent link is closed </p>
 </td></tr>


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