http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func.html
index acb5c15..62b9030 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func.html
@@ -94,28 +94,36 @@ 
$(document).ready(function(){initNavTree('functions_func.html','');});
 <h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
 <li>accept()
 : <a class="el" 
href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">delivery</a>
-, <a class="el" 
href="classproton_1_1io_1_1socket_1_1listener.html#a7b20021c0d5b97c93aec28cc646a9644">listener</a>
+, <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a8a5938806dc28d71c3ed5f89cc537ddd">connection_engine</a>
 </li>
-<li>address()
-: <a class="el" 
href="classproton_1_1terminus.html#a977efa04715923ca4fa290a6ec90c830">terminus</a>
-</li>
-<li>annotation_key()
-: <a class="el" 
href="classproton_1_1annotation__key.html#a056f77e21066cbf900772853454102a8">annotation_key</a>
+<li>active()
+: <a class="el" 
href="classproton_1_1connection.html#a6fd1dc792a0b98e6530a7383d4ef3074">connection</a>
+, <a class="el" 
href="classproton_1_1endpoint.html#ac6e82b77dfe6fbae3b18e5f14ab7c25b">endpoint</a>
+, <a class="el" 
href="classproton_1_1link.html#a6fd1dc792a0b98e6530a7383d4ef3074">link</a>
+, <a class="el" 
href="classproton_1_1session.html#a6fd1dc792a0b98e6530a7383d4ef3074">session</a>
 </li>
-<li>append()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#a2063391a2df2e01d257a0deea850258f">data</a>
+<li>add_credit()
+: <a class="el" 
href="classproton_1_1receiver.html#a84d3a001340d11201e03c6ed7c763641">receiver</a>
 </li>
-<li>appendn()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#aa93b3077282a673a1cbb7eed3b08993f">data</a>
+<li>address()
+: <a class="el" 
href="classproton_1_1source.html#a977efa04715923ca4fa290a6ec90c830">source</a>
+, <a class="el" 
href="classproton_1_1source__options.html#a36fa9e64134459cfe70707e0439ba850">source_options</a>
+, <a class="el" 
href="classproton_1_1target.html#a977efa04715923ca4fa290a6ec90c830">target</a>
+, <a class="el" 
href="classproton_1_1target__options.html#a39a0acbf2c7de97e77df483ca9c4c6a9">target_options</a>
 </li>
-<li>application_properties()
-: <a class="el" 
href="classproton_1_1message.html#a44ddc8be3787f1e396789dd0b1b965a9">message</a>
+<li>annotation_key()
+: <a class="el" 
href="classproton_1_1annotation__key.html#afdd676d37486aa26af7fdd588f994d26">annotation_key</a>
 </li>
 <li>auto_accept()
-: <a class="el" 
href="classproton_1_1link__options.html#a0aec8f881be0dd6148532f4da99c88ab">link_options</a>
+: <a class="el" 
href="classproton_1_1receiver__options.html#a9b9ad83418de47f87c6c7062eaefb5b6">receiver_options</a>
 </li>
 <li>auto_settle()
-: <a class="el" 
href="classproton_1_1link__options.html#a38ac12bcfa8b3594ed5a3756e5773503">link_options</a>
+: <a class="el" 
href="classproton_1_1receiver__options.html#af313abfa8d5b19e4b61c779907eb9980">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a087eda4a18c293de85107fcfbb7ff31f">sender_options</a>
+</li>
+<li>auto_stop()
+: <a class="el" 
href="classproton_1_1container.html#a74bcb386eb5f833bceb6ec86caf1d546">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a2fd137c99aa9642a54fe36616be40c98">default_container</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/functions_func.js
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func.js 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func.js
index 9d94edf..86656c5 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func.js
@@ -14,7 +14,6 @@ var functions_func =
     [ "n", "functions_func_n.html", null ],
     [ "o", "functions_func_o.html", null ],
     [ "p", "functions_func_p.html", null ],
-    [ "q", "functions_func_q.html", null ],
     [ "r", "functions_func_r.html", null ],
     [ "s", "functions_func_s.html", null ],
     [ "t", "functions_func_t.html", null ],

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_b.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_b.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_b.html
index 925f4b7..268b16a 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_b.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_b.html
@@ -95,9 +95,6 @@ 
$(document).ready(function(){initNavTree('functions_func_b.html','');});
 <li>body()
 : <a class="el" 
href="classproton_1_1message.html#ae9af642f154a68ec0eb8e715ecaf95ae">message</a>
 </li>
-<li>browsing()
-: <a class="el" 
href="classproton_1_1link__options.html#aaf512f41fabc2e05aabc3423696d7c0c">link_options</a>
-</li>
 <li>byte_array()
 : <a class="el" 
href="classproton_1_1byte__array.html#a03b598c27d7d68857a02259eca68ea7c">byte_array&lt;
 N &gt;</a>
 </li>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_c.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_c.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_c.html
index 93395db..a4d0941 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_c.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_c.html
@@ -92,65 +92,96 @@ 
$(document).ready(function(){initNavTree('functions_func_c.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
+<li>cancel()
+: <a class="el" 
href="structproton_1_1codec_1_1state__guard.html#a02d5fa6b14e221f3012a794b905be166">state_guard</a>
+</li>
 <li>clear()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#ac8bb3912a3ce86b15842e79d0b421204">data</a>
-, <a class="el" 
href="classproton_1_1message.html#ac8bb3912a3ce86b15842e79d0b421204">message</a>
+: <a class="el" 
href="classproton_1_1message.html#ac8bb3912a3ce86b15842e79d0b421204">message</a>
 , <a class="el" 
href="classproton_1_1scalar.html#ac8bb3912a3ce86b15842e79d0b421204">scalar</a>
 , <a class="el" 
href="classproton_1_1value.html#ac8bb3912a3ce86b15842e79d0b421204">value</a>
 </li>
 <li>client_connection_options()
-: <a class="el" 
href="classproton_1_1container.html#aca0c01788d99926296d620a23fa22d0c">container</a>
+: <a class="el" 
href="classproton_1_1container.html#a77a1de4f556548c0ddc254b857763844">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#acf08fac023ea76b6c696779a3853c0f8">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1container__impl__base.html#a73a8783e99b047d90593038726e8c999">container_impl_base</a>
 </li>
 <li>close()
-: <a class="el" 
href="classproton_1_1acceptor.html#a5ae591df94fc66ccb85cbb6565368bca">acceptor</a>
-, <a class="el" 
href="classproton_1_1connection.html#a5ae591df94fc66ccb85cbb6565368bca">connection</a>
-, <a class="el" 
href="classproton_1_1link.html#a5ae591df94fc66ccb85cbb6565368bca">link</a>
+: <a class="el" 
href="classproton_1_1connection.html#a5ae591df94fc66ccb85cbb6565368bca">connection</a>
+, <a class="el" 
href="classproton_1_1endpoint.html#af6ee7eacbde6b379b68d954e44f6e549">endpoint</a>
+, <a class="el" 
href="classproton_1_1link.html#a817883d28ce0ac8a29d917d196796f68">link</a>
 , <a class="el" 
href="classproton_1_1session.html#a5ae591df94fc66ccb85cbb6565368bca">session</a>
 </li>
+<li>closed()
+: <a class="el" 
href="classproton_1_1connection.html#a24c88f59fb7d18a293dbc5e6cbebd744">connection</a>
+, <a class="el" 
href="classproton_1_1endpoint.html#a3d80f17e42ec29c1230cdd8098607171">endpoint</a>
+, <a class="el" 
href="classproton_1_1link.html#a24c88f59fb7d18a293dbc5e6cbebd744">link</a>
+, <a class="el" 
href="classproton_1_1session.html#a24c88f59fb7d18a293dbc5e6cbebd744">session</a>
+</li>
 <li>coerce()
 : <a class="el" 
href="classproton_1_1annotation__key.html#ab73c44b530463fda5e11bc403ca9edd3">annotation_key</a>
 , <a class="el" 
href="classproton_1_1message__id.html#a8965a5e1c4122df8aee11e971ceabd07">message_id</a>
 , <a class="el" 
href="classproton_1_1scalar.html#a59517f5cda18ae5c612f0c760398fe1d">scalar</a>
 , <a class="el" 
href="classproton_1_1value.html#a486dfed974ca6f79e75039b3eee6c44c">value</a>
 </li>
+<li>configure()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a397568e30a54ac7d9033f531845be687">connection_engine</a>
+</li>
 <li>connect()
-: <a class="el" 
href="classproton_1_1container.html#a544f214bbb007ed7c2331cbebb60c283">container</a>
+: <a class="el" 
href="classproton_1_1container.html#ae8b4eb94c7de3a287665156a768de8dd">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#aaae8cd4c487d89ea487ab0de36e3646a">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a49ffce3927a9d5013293bf92fde9e9a2">connection_engine</a>
 </li>
 <li>connection()
-: <a class="el" 
href="classproton_1_1delivery.html#af13d10fc3d843719af9ff4c456330a73">delivery</a>
+: <a class="el" 
href="classproton_1_1connection.html#a7fa48f6882eccec91ea9c433e1ad2a57">connection</a>
+, <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a755a99a0561209b60d3ef3897a303b40">connection_engine</a>
 , <a class="el" 
href="classproton_1_1link.html#af13d10fc3d843719af9ff4c456330a73">link</a>
 , <a class="el" 
href="classproton_1_1session.html#af13d10fc3d843719af9ff4c456330a73">session</a>
+, <a class="el" 
href="classproton_1_1transfer.html#af13d10fc3d843719af9ff4c456330a73">transfer</a>
+, <a class="el" 
href="classproton_1_1transport.html#af13d10fc3d843719af9ff4c456330a73">transport</a>
+</li>
+<li>connection_engine()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a1d104efa025513927c754553ca979898">connection_engine</a>
 </li>
 <li>connection_options()
-: <a class="el" 
href="classproton_1_1acceptor.html#ab963172f8e38b29e67d2b0f2081fbd12">acceptor</a>
-, <a class="el" 
href="classproton_1_1connection__options.html#a8034b8d17ca30a4cfc3db8c6a898dc4d">connection_options</a>
+: <a class="el" 
href="classproton_1_1connection__options.html#a8034b8d17ca30a4cfc3db8c6a898dc4d">connection_options</a>
+</li>
+<li>const_buffer()
+: <a class="el" 
href="structproton_1_1io_1_1const__buffer.html#a91a09264a182ec89354136e9b2c51fe4">const_buffer</a>
 </li>
 <li>container()
 : <a class="el" 
href="classproton_1_1connection.html#a604ee46e04955a2323f305b4a81017a0">connection</a>
-, <a class="el" 
href="classproton_1_1container.html#a602b27f3fe6fd33990eb29f165a9c23a">container</a>
-, <a class="el" 
href="classproton_1_1delivery.html#a604ee46e04955a2323f305b4a81017a0">delivery</a>
+, <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a515d1af874b9cbb099e798f5eb5d5e4a">connection_engine</a>
 , <a class="el" 
href="classproton_1_1link.html#a604ee46e04955a2323f305b4a81017a0">link</a>
 , <a class="el" 
href="classproton_1_1session.html#a604ee46e04955a2323f305b4a81017a0">session</a>
+, <a class="el" 
href="classproton_1_1transfer.html#a604ee46e04955a2323f305b4a81017a0">transfer</a>
 </li>
 <li>container_id()
 : <a class="el" 
href="classproton_1_1connection.html#a11010ac968cfdf09018bd47e06646c22">connection</a>
 , <a class="el" 
href="classproton_1_1connection__options.html#a4c6429303ccb719d9c585c88f300e007">connection_options</a>
 </li>
+<li>content_encoding()
+: <a class="el" 
href="classproton_1_1message.html#a2dfb0b7cc7d3c06df89816feea6f6eb2">message</a>
+</li>
+<li>content_type()
+: <a class="el" 
href="classproton_1_1message.html#a1635800ab32c4bccd13ff5b77562e684">message</a>
+</li>
 <li>conversion_error()
 : <a class="el" 
href="structproton_1_1conversion__error.html#a34e1a24b99f9580dc7af4e9252d95ea2">conversion_error</a>
 </li>
 <li>copy()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#aad84d11869f8165c7fd3db0a6546beb5">data</a>
-, <a class="el" 
href="classproton_1_1uuid.html#ad358a92f27b9289e2d5f97864be8242a">uuid</a>
+: <a class="el" 
href="classproton_1_1uuid.html#a01615bb9bde7ec7791a644adfc05aa7e">uuid</a>
+</li>
+<li>correlation_id()
+: <a class="el" 
href="classproton_1_1message.html#ad159656f1742235cd22a9c6aaabf9d2d">message</a>
 </li>
-<li>create()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#ae954badb9bd793d1616544c6dedec60c">data</a>
+<li>creation_time()
+: <a class="el" 
href="classproton_1_1message.html#a49f68f50aeab9cae89f7b8c4748f6b30">message</a>
 </li>
 <li>credit()
 : <a class="el" 
href="classproton_1_1link.html#a75360c7515b9f569871c5ea953286649">link</a>
 </li>
 <li>credit_window()
-: <a class="el" 
href="classproton_1_1link__options.html#acbfc7fd62229aac6ef691539c1d85cff">link_options</a>
+: <a class="el" 
href="classproton_1_1receiver__options.html#a0d332416daba4af0ce5cf6677b497226">receiver_options</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/functions_func_d.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_d.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_d.html
index 103a1d0..e0c9852 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_d.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_d.html
@@ -92,9 +92,6 @@ 
$(document).ready(function(){initNavTree('functions_func_d.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
-<li>data()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#aa3f101f08b701a1320781fec0ff23417">data</a>
-</li>
 <li>decode()
 : <a class="el" 
href="classproton_1_1codec_1_1decoder.html#a2db9ebfc344a8b1718099047639e32b2">decoder</a>
 , <a class="el" 
href="classproton_1_1message.html#a72fbad8f3ef14c3d485f7478271f2cd4">message</a>
@@ -102,6 +99,9 @@ 
$(document).ready(function(){initNavTree('functions_func_d.html','');});
 <li>decoder()
 : <a class="el" 
href="classproton_1_1codec_1_1decoder.html#ac9222fed91a5066887b42f471de0be8a">decoder</a>
 </li>
+<li>default_container()
+: <a class="el" 
href="classproton_1_1default__container.html#a07da6400df75b9e238160f905c64dcff">default_container</a>
+</li>
 <li>default_session()
 : <a class="el" 
href="classproton_1_1connection.html#a0e37f5c26858e9fa4399acbbcdbb6462">connection</a>
 </li>
@@ -112,35 +112,46 @@ 
$(document).ready(function(){initNavTree('functions_func_d.html','');});
 : <a class="el" 
href="classproton_1_1message.html#abeb7d9304ab3f637889e8039083647fa">message</a>
 </li>
 <li>delivery_mode()
-: <a class="el" 
href="classproton_1_1link__options.html#a680f247788d6020dcb3c3e5f2de61399">link_options</a>
+: <a class="el" 
href="classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#ab7dc71a7b5737c2ca642058a296292db">sender_options</a>
 </li>
 <li>description()
-: <a class="el" 
href="classproton_1_1condition.html#a7b5000e45c1386c4e56ef650f6b0ef5b">condition</a>
+: <a class="el" 
href="classproton_1_1error__condition.html#a7b5000e45c1386c4e56ef650f6b0ef5b">error_condition</a>
 </li>
 <li>detach()
 : <a class="el" 
href="classproton_1_1link.html#ac295bade8aee589f6718dfa79edc2a34">link</a>
 </li>
+<li>disconnected()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a3f4d44bc02e9c32598aa40f03e6c5ae7">connection_engine</a>
+</li>
+<li>dispatch()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a4c79ad1c9029d967b9e1b4daf91b7537">connection_engine</a>
+</li>
 <li>distribution_mode()
-: <a class="el" 
href="classproton_1_1link__options.html#aa98d0ee3d43d01bfdff4192fa16a93d0">link_options</a>
-, <a class="el" 
href="classproton_1_1terminus.html#a37e21e0d55ac6f01d394e820cd9966cd">terminus</a>
+: <a class="el" 
href="classproton_1_1source.html#aa87637eb6efc889922c056e34cb61d77">source</a>
+, <a class="el" 
href="classproton_1_1source__options.html#a41ffaf202d22b3276c15bfcf5b5c3ed6">source_options</a>
 </li>
-<li>durability()
-: <a class="el" 
href="classproton_1_1terminus.html#ae921a2b91799100ba3ab684de5123971">terminus</a>
+<li>drain()
+: <a class="el" 
href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9">receiver</a>
+</li>
+<li>draining()
+: <a class="el" 
href="classproton_1_1link.html#a19c36a38b50e8080b94a47230a56234f">link</a>
+</li>
+<li>durability_mode()
+: <a class="el" 
href="classproton_1_1source__options.html#a89176218ec0f2754c6499935368627ab">source_options</a>
+, <a class="el" 
href="classproton_1_1target__options.html#a8ebe0e28560c7873712674314ac9547d">target_options</a>
+, <a class="el" 
href="classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8">terminus</a>
 </li>
 <li>durable()
 : <a class="el" 
href="classproton_1_1message.html#a84f7e28685ffb38fb86e9896743600cd">message</a>
 </li>
-<li>durable_subscription()
-: <a class="el" 
href="classproton_1_1link__options.html#a8a9a2fe87c08f67ae00d16c04ef4e57a">link_options</a>
-</li>
 <li>duration()
 : <a class="el" 
href="classproton_1_1duration.html#aa4fb0163afbe72b04236e39e2b6d2dbf">duration</a>
 </li>
 <li>dynamic()
-: <a class="el" 
href="classproton_1_1terminus.html#a19a9a89e2e753843d320104d5f178c65">terminus</a>
-</li>
-<li>dynamic_address()
-: <a class="el" 
href="classproton_1_1link__options.html#a9deb2276e6cf0695b73dfc8e42e6325a">link_options</a>
+: <a class="el" 
href="classproton_1_1source__options.html#ab491bddac8a47b9478c748f43ab583d7">source_options</a>
+, <a class="el" 
href="classproton_1_1target__options.html#acc2d56132d2a7a0b644429b78ff00756">target_options</a>
+, <a class="el" 
href="classproton_1_1terminus.html#ab6f99d305cf67c3a6c3d786d2b819ca8">terminus</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/functions_func_e.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_e.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_e.html
index d63dc04..7c8385f 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_e.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_e.html
@@ -93,26 +93,38 @@ 
$(document).ready(function(){initNavTree('functions_func_e.html','');});
 
 <h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
 <li>empty()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#ac6e61de369e994009e36f344f99c15ad">data</a>
-, <a class="el" 
href="classproton_1_1condition.html#ac6e61de369e994009e36f344f99c15ad">condition</a>
+: <a class="el" 
href="classproton_1_1error__condition.html#ac6e61de369e994009e36f344f99c15ad">error_condition</a>
 , <a class="el" 
href="classproton_1_1scalar.html#ac6e61de369e994009e36f344f99c15ad">scalar</a>
 , <a class="el" 
href="classproton_1_1url.html#ac6e61de369e994009e36f344f99c15ad">url</a>
 </li>
 <li>encode()
 : <a class="el" 
href="classproton_1_1codec_1_1encoder.html#a05b307b3735c19f17f1fadf74921cd8b">encoder</a>
-, <a class="el" 
href="classproton_1_1message.html#ad3a46dc2afbc10bd8686cf1f69416f3a">message</a>
+, <a class="el" 
href="classproton_1_1message.html#abd8822611da5ab8cdb109e87f74d7bdc">message</a>
 </li>
 <li>encoder()
 : <a class="el" 
href="classproton_1_1codec_1_1encoder.html#a3c0a094e7f852de0a4197c0fdab85004">encoder</a>
 </li>
-<li>engine()
-: <a class="el" 
href="classproton_1_1io_1_1socket_1_1engine.html#a875c72b299b40111b8dff425835d32e3">engine</a>
-</li>
 <li>error()
-: <a class="el" 
href="structproton_1_1error.html#a78012ecea1670fd9d2a63478468d48c8">error</a>
+: <a class="el" 
href="classproton_1_1connection.html#ae94b11511c3ff52ec5b4988122a232ff">connection</a>
+, <a class="el" 
href="classproton_1_1endpoint.html#a179a891abd20d5fa50b38816bfc30242">endpoint</a>
+, <a class="el" 
href="structproton_1_1error.html#a78012ecea1670fd9d2a63478468d48c8">error</a>
+, <a class="el" 
href="classproton_1_1link.html#ae94b11511c3ff52ec5b4988122a232ff">link</a>
+, <a class="el" 
href="classproton_1_1session.html#ae94b11511c3ff52ec5b4988122a232ff">session</a>
+, <a class="el" 
href="classproton_1_1transport.html#ae94b11511c3ff52ec5b4988122a232ff">transport</a>
+</li>
+<li>error_condition()
+: <a class="el" 
href="classproton_1_1error__condition.html#ab882b2726f7171112feba9d03ff9a588">error_condition</a>
+</li>
+<li>event_loop()
+: <a class="el" 
href="classproton_1_1thread__safe.html#a962bee785af89dc06cc49fcf6cd19f6c">thread_safe&lt;
 T &gt;</a>
 </li>
 <li>expiry_policy()
-: <a class="el" 
href="classproton_1_1terminus.html#a35bc709f9c21b76b2bdb1a22127ae790">terminus</a>
+: <a class="el" 
href="classproton_1_1source__options.html#aad9e94ccdd35ae9bd3cfd730d5749760">source_options</a>
+, <a class="el" 
href="classproton_1_1target__options.html#a3ee55474d84d67e826dc56f40b848b5b">target_options</a>
+, <a class="el" 
href="classproton_1_1terminus.html#a35bc709f9c21b76b2bdb1a22127ae790">terminus</a>
+</li>
+<li>expiry_time()
+: <a class="el" 
href="classproton_1_1message.html#a82b8bde393c98dceb63334a7abadb12d">message</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/functions_func_f.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_f.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_f.html
index 30a8404..8cfc1fc 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_f.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_f.html
@@ -92,8 +92,9 @@ 
$(document).ready(function(){initNavTree('functions_func_f.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_f"></a>- f -</h3><ul>
-<li>filter()
-: <a class="el" 
href="classproton_1_1terminus.html#ab3d568477cd77121cfcaf172d317c68b">terminus</a>
+<li>filters()
+: <a class="el" 
href="classproton_1_1source.html#aab15072b9788b3b0570944a7312cab46">source</a>
+, <a class="el" 
href="classproton_1_1source__options.html#a9a38c4697708d223e8163d301e92f6af">source_options</a>
 </li>
 <li>first_acquirer()
 : <a class="el" 
href="classproton_1_1message.html#a122b054276ca071bb4c95bb11916263e">message</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_g.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_g.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_g.html
index 64ed9e6..23a26d4 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_g.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_g.html
@@ -96,7 +96,10 @@ 
$(document).ready(function(){initNavTree('functions_func_g.html','');});
 : <a class="el" 
href="classproton_1_1annotation__key.html#ace2642bea7a7ab2d830f42390eb4a604">annotation_key</a>
 , <a class="el" 
href="classproton_1_1message__id.html#a9df1e3d65a418435d46c08f9cb2948de">message_id</a>
 , <a class="el" 
href="classproton_1_1scalar.html#a61968283b9e1fc067dcad67e9fe58f6a">scalar</a>
-, <a class="el" 
href="classproton_1_1value.html#a2dd4c0151b171f03f2c36d907832522b">value</a>
+, <a class="el" 
href="classproton_1_1value.html#a051c12c4c7efc82a5f268d4f64e15b54">value</a>
+</li>
+<li>group_id()
+: <a class="el" 
href="classproton_1_1message.html#a914482152fd66b188e63a4066ef87586">message</a>
 </li>
 <li>group_sequence()
 : <a class="el" 
href="classproton_1_1message.html#a2c47345d04743821765ec83e13396f29">message</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_h.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_h.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_h.html
index 1eb4985..bdc7824 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_h.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_h.html
@@ -93,11 +93,13 @@ 
$(document).ready(function(){initNavTree('functions_func_h.html','');});
 
 <h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 <li>handler()
-: <a class="el" 
href="classproton_1_1connection__options.html#a6c97b43c08a8ca22f136d8281b38aa8a">connection_options</a>
-, <a class="el" 
href="classproton_1_1link__options.html#a0a491d9f037a669e07311a6cf3a532f5">link_options</a>
+: <a class="el" 
href="classproton_1_1connection__options.html#a7bca23aeb3455378ef2d35975758e504">connection_options</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a0d94e8f4c1746780259f3eb2d1728aff">sender_options</a>
+, <a class="el" 
href="classproton_1_1session__options.html#aeb0051c569cdc2d992a8da4bb476c7e4">session_options</a>
 </li>
 <li>host()
-: <a class="el" 
href="classproton_1_1connection.html#ab85a9642d69a48c9fa5d3a2906d52a9e">connection</a>
+: <a class="el" 
href="classproton_1_1url.html#ab85a9642d69a48c9fa5d3a2906d52a9e">url</a>
 </li>
 <li>host_port()
 : <a class="el" 
href="classproton_1_1url.html#a3bef814cea87fcb9c5b1e152177c1b11">url</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_i.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_i.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_i.html
index 38a9e64..c68ffdd 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_i.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_i.html
@@ -93,16 +93,22 @@ 
$(document).ready(function(){initNavTree('functions_func_i.html','');});
 
 <h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 <li>id()
-: <a class="el" 
href="classproton_1_1container.html#aae9016a4b54d24cae86174baa6a38342">container</a>
+: <a class="el" 
href="classproton_1_1container.html#a8ebfbb187faf8c69d4283fd836ddf2ea">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#ad8c33696e2cd29fd9c155fe1c6c94bc9">default_container</a>
+, <a class="el" 
href="classproton_1_1message.html#a0b88465b45d98000aaf5a7062c03574c">message</a>
 </li>
 <li>idle_timeout()
-: <a class="el" 
href="classproton_1_1connection__options.html#a7c838237bfba8a5a04c2b97e6f023448">connection_options</a>
+: <a class="el" 
href="classproton_1_1connection.html#a39ea24767f058f1be03bb831f4525fc7">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#a7c838237bfba8a5a04c2b97e6f023448">connection_options</a>
+</li>
+<li>incoming_bytes()
+: <a class="el" 
href="classproton_1_1session.html#af62014290a690a2c55e9dbf2bf0b96b2">session</a>
 </li>
 <li>inferred()
-: <a class="el" 
href="classproton_1_1message.html#a174b1b064de4042d155727e4327b3dd7">message</a>
+: <a class="el" 
href="classproton_1_1message.html#a72c7fb9b51a6f42a28dd27aac7c9cae4">message</a>
 </li>
-<li>info()
-: <a class="el" 
href="classproton_1_1condition.html#a8fbefe24bf3e82dc233855d0915574b6">condition</a>
+<li>inject()
+: <a class="el" 
href="classproton_1_1event__loop.html#a2ca52518764b0883e4a05393d384ab26">event_loop</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/functions_func_l.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_l.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_l.html
index 5c7f399..c865b56 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_l.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_l.html
@@ -92,40 +92,18 @@ 
$(document).ready(function(){initNavTree('functions_func_l.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
-<li>lifetime_policy()
-: <a class="el" 
href="classproton_1_1link__options.html#af937f3c5149deff1166defa548161e46">link_options</a>
-</li>
 <li>link()
-: <a class="el" 
href="classproton_1_1delivery.html#aca9726355bb7d42b75d374b5cc459040">delivery</a>
-</li>
-<li>link_options()
-: <a class="el" 
href="classproton_1_1container.html#abe6a163dd9a95e0ef869c8d3bd265b1d">container</a>
-, <a class="el" 
href="classproton_1_1link__options.html#a0982bce7a239e29891b9edd12c79310e">link_options</a>
+: <a class="el" 
href="classproton_1_1link.html#ad29b379b3621ec393ac9f28b4ba8b010">link</a>
 </li>
-<li>links()
-: <a class="el" 
href="classproton_1_1connection.html#af304203ffaff9415b7884f53507b72dc">connection</a>
-, <a class="el" 
href="classproton_1_1session.html#af304203ffaff9415b7884f53507b72dc">session</a>
+<li>link_name()
+: <a class="el" 
href="classproton_1_1io_1_1link__namer.html#ae87e7c07b97273644b32c03abff30a77">link_namer</a>
 </li>
 <li>listen()
-: <a class="el" 
href="classproton_1_1container.html#ab5a976cc459568f13da407a038591ca2">container</a>
+: <a class="el" 
href="classproton_1_1container.html#a2fd8da2aa0f1891ea29a39330eb177dc">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a7bb03676cface6b9310a7849fb9348a2">default_container</a>
 </li>
 <li>listener()
-: <a class="el" 
href="classproton_1_1io_1_1socket_1_1listener.html#ac7d29e395fadfacad9f98bf70e5608fe">listener</a>
-</li>
-<li>local_address()
-: <a class="el" 
href="classproton_1_1link__options.html#a532e4ce92da37e5785001b470a99776b">link_options</a>
-</li>
-<li>local_condition()
-: <a class="el" 
href="classproton_1_1connection.html#aaaea8dc733566e78a066d2435f8a60c5">connection</a>
-, <a class="el" 
href="classproton_1_1endpoint.html#a8e6552f9fc799927204b763969513099">endpoint</a>
-, <a class="el" 
href="classproton_1_1link.html#aaaea8dc733566e78a066d2435f8a60c5">link</a>
-, <a class="el" 
href="classproton_1_1session.html#aaaea8dc733566e78a066d2435f8a60c5">session</a>
-</li>
-<li>local_source()
-: <a class="el" 
href="classproton_1_1link.html#a2246ba119cbaa626fb423e1ba80f84c5">link</a>
-</li>
-<li>local_target()
-: <a class="el" 
href="classproton_1_1link.html#a1e65cc5198f2c2e57d28815f401eb7d9">link</a>
+: <a class="el" 
href="classproton_1_1listener.html#a59dc4506a73a3d4ae084b5fc1d014814">listener</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/functions_func_m.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_m.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_m.html
index 9d94870..c208278 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_m.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_m.html
@@ -92,17 +92,19 @@ 
$(document).ready(function(){initNavTree('functions_func_m.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
-<li>max_channels()
-: <a class="el" 
href="classproton_1_1connection__options.html#ae04e46928f67fef14fc58c501fea1bd8">connection_options</a>
-</li>
 <li>max_frame_size()
-: <a class="el" 
href="classproton_1_1connection__options.html#ad0e93961fd048b2ee5e8bdac2b041686">connection_options</a>
+: <a class="el" 
href="classproton_1_1connection.html#a14f31d608d52352f9e3fb0fa114d0c58">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#ad0e93961fd048b2ee5e8bdac2b041686">connection_options</a>
+</li>
+<li>max_sessions()
+: <a class="el" 
href="classproton_1_1connection.html#a31b6fd31cd4fa9c7dbdc3456f739b380">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#af66706fdb4a2f3f4d9943be9ee4b1347">connection_options</a>
 </li>
 <li>mech()
 : <a class="el" 
href="classproton_1_1sasl.html#ab3e41c9a32534900c35ea46a45635c4c">sasl</a>
 </li>
 <li>message()
-: <a class="el" 
href="classproton_1_1message.html#aba502b8bb024cc38b45756fdf581f915">message</a>
+: <a class="el" 
href="classproton_1_1message.html#aa99aeff68b6093da4e3c11ecf898376d">message</a>
 </li>
 <li>message_annotations()
 : <a class="el" 
href="classproton_1_1message.html#a5d96699458d8be84d821f5651a7b3717">message</a>
@@ -120,9 +122,8 @@ 
$(document).ready(function(){initNavTree('functions_func_m.html','');});
 <li>more()
 : <a class="el" 
href="classproton_1_1codec_1_1decoder.html#aba1201662b7dccd64b782cb43e40d3e0">decoder</a>
 </li>
-<li>ms()
-: <a class="el" 
href="classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d">duration</a>
-, <a class="el" 
href="classproton_1_1timestamp.html#af55ebfb91b3132031de3f8cef94d785d">timestamp</a>
+<li>mutable_buffer()
+: <a class="el" 
href="structproton_1_1io_1_1mutable__buffer.html#ae164359bc44e1b29a68ebc40555972c2">mutable_buffer</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/functions_func_n.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_n.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_n.html
index ddd6ba1..2045fd1 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_n.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_n.html
@@ -93,14 +93,14 @@ 
$(document).ready(function(){initNavTree('functions_func_n.html','');});
 
 <h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 <li>name()
-: <a class="el" 
href="classproton_1_1condition.html#a37627d5d5bba7f4a8690c71c2ab3cb07">condition</a>
+: <a class="el" 
href="classproton_1_1error__condition.html#a37627d5d5bba7f4a8690c71c2ab3cb07">error_condition</a>
 , <a class="el" 
href="classproton_1_1link.html#a37627d5d5bba7f4a8690c71c2ab3cb07">link</a>
 </li>
 <li>next_type()
 : <a class="el" 
href="classproton_1_1codec_1_1decoder.html#af3a00236ce433d05e26c0eb2ed5dfcd0">decoder</a>
 </li>
 <li>node_properties()
-: <a class="el" 
href="classproton_1_1terminus.html#ace437aaec97dcaaed07f05ebbd48837a">terminus</a>
+: <a class="el" 
href="classproton_1_1terminus.html#af931e558d6f75187017273c1e62ff250">terminus</a>
 </li>
 <li>now()
 : <a class="el" 
href="classproton_1_1timestamp.html#a8a432817c74685a518a08ede48d1db34">timestamp</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_o.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_o.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_o.html
index 9f5c43c..feec79e 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_o.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_o.html
@@ -92,97 +92,123 @@ 
$(document).ready(function(){initNavTree('functions_func_o.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
+<li>on_accept()
+: <a class="el" 
href="classproton_1_1listen__handler.html#aaf55d192e098571e9a851dc919968f8e">listen_handler</a>
+</li>
+<li>on_close()
+: <a class="el" 
href="classproton_1_1listen__handler.html#a9eb8253590ebbf23639571ddc290e64a">listen_handler</a>
+</li>
 <li>on_connection_close()
-: <a class="el" 
href="classproton_1_1handler.html#a804f0ea9c2754f143624b4078a61f650">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a804f0ea9c2754f143624b4078a61f650">messaging_handler</a>
 </li>
 <li>on_connection_error()
-: <a class="el" 
href="classproton_1_1handler.html#aafa83dc2f8f477ba1f76e86dc69cd1e9">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#aafa83dc2f8f477ba1f76e86dc69cd1e9">messaging_handler</a>
 </li>
 <li>on_connection_open()
-: <a class="el" 
href="classproton_1_1handler.html#a16ba022e899957b2e25b9561b1f53968">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a16ba022e899957b2e25b9561b1f53968">messaging_handler</a>
 </li>
 <li>on_container_start()
-: <a class="el" 
href="classproton_1_1handler.html#a4949b0c93402fae0c07492d984688a25">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a4949b0c93402fae0c07492d984688a25">messaging_handler</a>
 </li>
-<li>on_delivery_accept()
-: <a class="el" 
href="classproton_1_1handler.html#a7dd4db2d94ff7493e172aaa0a516ea12">handler</a>
+<li>on_delivery_settle()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#afc96eabc76c471d61627493eadb58ac8">messaging_handler</a>
 </li>
-<li>on_delivery_reject()
-: <a class="el" 
href="classproton_1_1handler.html#aa9bb667a0dd8cbe7a0b22323bdf706fd">handler</a>
+<li>on_error()
+: <a class="el" 
href="classproton_1_1listen__handler.html#a1bc02e9d18e7d20dde60dee73b3889ac">listen_handler</a>
+, <a class="el" 
href="classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e">messaging_handler</a>
 </li>
-<li>on_delivery_release()
-: <a class="el" 
href="classproton_1_1handler.html#aa285c53270943fd19df10b62d7f92130">handler</a>
-</li>
-<li>on_delivery_settle()
-: <a class="el" 
href="classproton_1_1handler.html#afc96eabc76c471d61627493eadb58ac8">handler</a>
+<li>on_inject()
+: <a class="el" 
href="classproton_1_1inject__handler.html#a9edc8a337487cf4ddb601a55f37c324a">inject_handler</a>
 </li>
 <li>on_message()
-: <a class="el" 
href="classproton_1_1handler.html#a96879b0b0b7ade11f98d3f450abd4c46">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a96879b0b0b7ade11f98d3f450abd4c46">messaging_handler</a>
 </li>
 <li>on_receiver_close()
-: <a class="el" 
href="classproton_1_1handler.html#a77ac5c1fd05404728451cd06dee1c907">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907">messaging_handler</a>
+</li>
+<li>on_receiver_drain_finish()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116">messaging_handler</a>
 </li>
 <li>on_receiver_error()
-: <a class="el" 
href="classproton_1_1handler.html#a0c281aee5483822bdf4b428834bd7f28">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a0c281aee5483822bdf4b428834bd7f28">messaging_handler</a>
 </li>
 <li>on_receiver_open()
-: <a class="el" 
href="classproton_1_1handler.html#a768b0a50669aa1d512d12e9d68af14cd">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a768b0a50669aa1d512d12e9d68af14cd">messaging_handler</a>
 </li>
 <li>on_sendable()
-: <a class="el" 
href="classproton_1_1handler.html#aa24f522a68cdf382762702cece7790e7">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#aa24f522a68cdf382762702cece7790e7">messaging_handler</a>
 </li>
 <li>on_sender_close()
-: <a class="el" 
href="classproton_1_1handler.html#a7942b98699bd21e827041626ee1b5c84">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a7942b98699bd21e827041626ee1b5c84">messaging_handler</a>
+</li>
+<li>on_sender_drain_start()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#ad3d23a7c3849dabd137610f8ee1569e3">messaging_handler</a>
 </li>
 <li>on_sender_error()
-: <a class="el" 
href="classproton_1_1handler.html#a2d9d98eee878f1e734457ba01e21228a">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a2d9d98eee878f1e734457ba01e21228a">messaging_handler</a>
 </li>
 <li>on_sender_open()
-: <a class="el" 
href="classproton_1_1handler.html#a0b5d066e5463d3365f662c8a7dc52661">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a0b5d066e5463d3365f662c8a7dc52661">messaging_handler</a>
 </li>
 <li>on_session_close()
-: <a class="el" 
href="classproton_1_1handler.html#a54fe4fc5394418f8606f9263f13d2e98">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a54fe4fc5394418f8606f9263f13d2e98">messaging_handler</a>
 </li>
 <li>on_session_error()
-: <a class="el" 
href="classproton_1_1handler.html#aca924d2f68649df7945719be3d29a597">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#aca924d2f68649df7945719be3d29a597">messaging_handler</a>
 </li>
 <li>on_session_open()
-: <a class="el" 
href="classproton_1_1handler.html#adddbfd9b7fc7719490bdc21331c42302">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#adddbfd9b7fc7719490bdc21331c42302">messaging_handler</a>
+</li>
+<li>on_tracker_accept()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a003afbb57c00ce404a863152db7867ad">messaging_handler</a>
+</li>
+<li>on_tracker_reject()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a0740e8c9ed9d0c304d2adced09802893">messaging_handler</a>
+</li>
+<li>on_tracker_release()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#acfde5590c6e826ef9e2c33a28edefe19">messaging_handler</a>
+</li>
+<li>on_tracker_settle()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a023a5c57eeeaf79ed5b768cd172ad0ac">messaging_handler</a>
 </li>
 <li>on_transport_close()
-: <a class="el" 
href="classproton_1_1handler.html#a47c33c5e6c13d23f1b8a745bf7bdfa8f">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a47c33c5e6c13d23f1b8a745bf7bdfa8f">messaging_handler</a>
 </li>
 <li>on_transport_error()
-: <a class="el" 
href="classproton_1_1handler.html#af89551ce0e44ae3465d4b078f1c87653">handler</a>
+: <a class="el" 
href="classproton_1_1messaging__handler.html#af89551ce0e44ae3465d4b078f1c87653">messaging_handler</a>
 </li>
-<li>on_unhandled_error()
-: <a class="el" 
href="classproton_1_1handler.html#ae4aed3af3c63842de90297f851ac7d2a">handler</a>
+<li>on_transport_open()
+: <a class="el" 
href="classproton_1_1messaging__handler.html#a0c141065eda9a26916ccc63ccea5d3b7">messaging_handler</a>
 </li>
 <li>open()
-: <a class="el" 
href="classproton_1_1link.html#afdfda4724950dfecdbc2e74b6a888998">link</a>
+: <a class="el" 
href="classproton_1_1connection.html#a91b014b59b8b14d7f5a26e2e4950cc93">connection</a>
+, <a class="el" 
href="classproton_1_1receiver.html#a9e8555112049fc2b4945120b3c45f8ab">receiver</a>
+, <a class="el" 
href="classproton_1_1sender.html#a9e8555112049fc2b4945120b3c45f8ab">sender</a>
+, <a class="el" 
href="classproton_1_1session.html#a9e8555112049fc2b4945120b3c45f8ab">session</a>
 </li>
 <li>open_receiver()
-: <a class="el" 
href="classproton_1_1connection.html#af1fb4d28f91a33fb7c8a73a4083f6745">connection</a>
-, <a class="el" 
href="classproton_1_1container.html#a9d15beec9803fa359017bb6263cef249">container</a>
-, <a class="el" 
href="classproton_1_1session.html#af1fb4d28f91a33fb7c8a73a4083f6745">session</a>
+: <a class="el" 
href="classproton_1_1connection.html#aad60d14592ee9d34caca4c61214ecd27">connection</a>
+, <a class="el" 
href="classproton_1_1container.html#a92dad1efeba5c14ef01c9e63787cd507">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a2f8df6c524015c9a78918145e9e29dcc">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1container__impl__base.html#a35470b5052f368e9b1bff4b51071e7e4">container_impl_base</a>
+, <a class="el" 
href="classproton_1_1session.html#a1b4552a1ec08cdb5e76d7054dee6b538">session</a>
 </li>
 <li>open_sender()
-: <a class="el" 
href="classproton_1_1connection.html#a7ebd6d1b79102078ccdb1e07b1cd90f7">connection</a>
-, <a class="el" 
href="classproton_1_1container.html#ae8a3a769f9c424c05993f6d137376c76">container</a>
-, <a class="el" 
href="classproton_1_1session.html#a7ebd6d1b79102078ccdb1e07b1cd90f7">session</a>
+: <a class="el" 
href="classproton_1_1connection.html#ae8eece4fd4b9e1a2531ca12d2ab57a32">connection</a>
+, <a class="el" 
href="classproton_1_1container.html#a58a03a1c418f88d50a4b009999066061">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#aff2a6f62e769683a6a5813cc483a0079">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1container__impl__base.html#ac4c1010ff8baa7c7672593c8f7d6b93b">container_impl_base</a>
+, <a class="el" 
href="classproton_1_1session.html#ae8eece4fd4b9e1a2531ca12d2ab57a32">session</a>
 </li>
 <li>open_session()
 : <a class="el" 
href="classproton_1_1connection.html#a417060fdeea996b1684bd0fecc6c6420">connection</a>
 </li>
 <li>operator std::string()
 : <a class="el" 
href="classproton_1_1binary.html#a7d27cc515e59f676f08d399124be099d">binary</a>
+, <a class="el" 
href="classproton_1_1url.html#a7d27cc515e59f676f08d399124be099d">url</a>
 </li>
 <li>operator!()
-: <a class="el" 
href="classproton_1_1condition.html#ac8b1d32dbd52d431450c70b151cfa205">condition</a>
-</li>
-<li>operator++()
-: <a class="el" 
href="classproton_1_1link__iterator.html#ae583d6d66b38c3610cf7cb2e2ae841e0">link_iterator</a>
-, <a class="el" 
href="classproton_1_1session__iterator.html#a2da7487a18e35ffb18eaea5eac7e93ac">session_iterator</a>
+: <a class="el" 
href="classproton_1_1error__condition.html#ac8b1d32dbd52d431450c70b151cfa205">error_condition</a>
 </li>
 <li>operator&lt;&lt;()
 : <a class="el" 
href="classproton_1_1codec_1_1encoder.html#ae899d62164114228541da27e80372bc2">encoder</a>
@@ -191,20 +217,27 @@ 
$(document).ready(function(){initNavTree('functions_func_o.html','');});
 : <a class="el" 
href="classproton_1_1binary.html#ac04f4568094b18213b75d4400d8e2477">binary</a>
 , <a class="el" 
href="classproton_1_1connection__options.html#a2c612e142b60cf61ce50d88582465167">connection_options</a>
 , <a class="el" 
href="classproton_1_1duration.html#a13ff6465e0979fe301b75ea574ce2304">duration</a>
-, <a class="el" 
href="classproton_1_1link__options.html#a64dcbd7bb3c3cf56f79a3e87dde1e14d">link_options</a>
 , <a class="el" 
href="classproton_1_1message.html#af7deffda335cb4457af3830b798182f4">message</a>
 , <a class="el" 
href="classproton_1_1message__id.html#a0e4798868734cc90ea4e9ed3ca870d3d">message_id</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a815be8018205013b8ff011d4b62b7324">receiver_options</a>
 , <a class="el" 
href="classproton_1_1scalar.html#a7166ca618a14fe7e669059cb2ebbdb8f">scalar</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a13e6aa698a300681f88a709ccb50c8f6">sender_options</a>
+, <a class="el" 
href="classproton_1_1session__options.html#a57fc2c11f848dfbaac03010025aa7e93">session_options</a>
+, <a class="el" 
href="classproton_1_1source__options.html#a4c7e157cd06e40dd7fd243fcb47297be">source_options</a>
+, <a class="el" 
href="classproton_1_1target__options.html#aa7c2b9b076f3d98fa3bc67d3bd4fcffd">target_options</a>
 , <a class="el" 
href="classproton_1_1timestamp.html#a9d99d74acbdd9e73e7bfa74e9886cbb6">timestamp</a>
 , <a class="el" 
href="classproton_1_1url.html#a6b36f225c464c30fdf521b23d24761e4">url</a>
 , <a class="el" 
href="classproton_1_1value.html#ad139f5042c366b09078f123f5621c156">value</a>
 </li>
 <li>operator&gt;&gt;()
-: <a class="el" 
href="classproton_1_1codec_1_1decoder.html#ad96e5571bbd7384096ca07a8a9368ffc">decoder</a>
+: <a class="el" 
href="classproton_1_1codec_1_1decoder.html#ac6c6ddca9af56625b28bc7989b02f24b">decoder</a>
 </li>
 <li>outcome()
 : <a class="el" 
href="classproton_1_1sasl.html#ae450d5ece6b6ea827b26fae2a892a4f3">sasl</a>
 </li>
+<li>outgoing_bytes()
+: <a class="el" 
href="classproton_1_1session.html#a04e2a2afb93f9aec61e28375fb4ca863">session</a>
+</li>
 </ul>
 </div><!-- contents -->
 </div><!-- doc-content -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_p.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_p.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_p.html
index 14324ff..b0a5d86 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_p.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_p.html
@@ -92,14 +92,14 @@ 
$(document).ready(function(){initNavTree('functions_func_p.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
-<li>parse()
-: <a class="el" 
href="classproton_1_1url.html#a2cac3dc0deae6dff72ebbea1e14bb66c">url</a>
+<li>password()
+: <a class="el" 
href="classproton_1_1url.html#a8a6e6289dec0db675c85065e13b38528">url</a>
 </li>
 <li>path()
 : <a class="el" 
href="classproton_1_1url.html#a9b67b266207227062c7a2961ef85293a">url</a>
 </li>
 <li>port()
-: <a class="el" 
href="classproton_1_1url.html#ae6cf17271c91e6c45d72d3c4c9af84a9">url</a>
+: <a class="el" 
href="classproton_1_1url.html#a0e60714e27670ed3bb5ab96715b8b740">url</a>
 </li>
 <li>port_int()
 : <a class="el" 
href="classproton_1_1url.html#a6f265f3f5954d9a7dd262b11bb5c32a4">url</a>
@@ -107,6 +107,10 @@ 
$(document).ready(function(){initNavTree('functions_func_p.html','');});
 <li>priority()
 : <a class="el" 
href="classproton_1_1message.html#a63a0efcbdb401f954f6f3499acf8f9fc">message</a>
 </li>
+<li>properties()
+: <a class="el" 
href="classproton_1_1error__condition.html#a72f8cd5a18b7586fb4fb24a5b5243cc0">error_condition</a>
+, <a class="el" 
href="classproton_1_1message.html#ac163919aa25a6ed5b33a29a96d04e028">message</a>
+</li>
 </ul>
 </div><!-- contents -->
 </div><!-- doc-content -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_r.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_r.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_r.html
index 912c1f5..4200ea6 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_r.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_r.html
@@ -95,11 +95,28 @@ 
$(document).ready(function(){initNavTree('functions_func_r.html','');});
 <li>random()
 : <a class="el" 
href="classproton_1_1uuid.html#aadb818b767351748ca49e8404a3c4a77">uuid</a>
 </li>
-<li>read()
-: <a class="el" 
href="classproton_1_1io_1_1socket_1_1engine.html#aaa936da334e29618ece019bd8a9aa06f">engine</a>
+<li>read_buffer()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#af477c1401cee5a0cf3bc8d6f4d2be805">connection_engine</a>
+</li>
+<li>read_close()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#aaa622a6fed072f5b4935881efb42ba5c">connection_engine</a>
+</li>
+<li>read_done()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a3f86a4f778e8c9303e6c0f127e52a5e2">connection_engine</a>
 </li>
 <li>receiver()
-: <a class="el" 
href="classproton_1_1link.html#a08a29346f1a6b36085afc57cbba90894">link</a>
+: <a class="el" 
href="classproton_1_1delivery.html#ad94696eb7d2907efd72e021c2513ed48">delivery</a>
+, <a class="el" 
href="classproton_1_1receiver.html#a24b1f20b28b31ee266f387d1fe31b627">receiver</a>
+</li>
+<li>receiver_options()
+: <a class="el" 
href="classproton_1_1container.html#a81b4e5d313e933183644387b67efa6b9">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a1e98beac106784ebc9eed344151f24e6">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1container__impl__base.html#ac7dc40752236187455632350e4431281">container_impl_base</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a9e10a473b92db75e78a3ad8498f32c36">receiver_options</a>
+</li>
+<li>receivers()
+: <a class="el" 
href="classproton_1_1connection.html#aa54a6bfbe82605570fe0e6b4b386cbf9">connection</a>
+, <a class="el" 
href="classproton_1_1session.html#aa54a6bfbe82605570fe0e6b4b386cbf9">session</a>
 </li>
 <li>reject()
 : <a class="el" 
href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">delivery</a>
@@ -107,27 +124,18 @@ 
$(document).ready(function(){initNavTree('functions_func_r.html','');});
 <li>release()
 : <a class="el" 
href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">delivery</a>
 </li>
-<li>remote_condition()
-: <a class="el" 
href="classproton_1_1connection.html#a492e060bda7b5f5a49a9e5cd19f92834">connection</a>
-, <a class="el" 
href="classproton_1_1endpoint.html#ace88a3cd9782a46cdc46191f7f90f16a">endpoint</a>
-, <a class="el" 
href="classproton_1_1link.html#a492e060bda7b5f5a49a9e5cd19f92834">link</a>
-, <a class="el" 
href="classproton_1_1session.html#a492e060bda7b5f5a49a9e5cd19f92834">session</a>
-</li>
-<li>remote_source()
-: <a class="el" 
href="classproton_1_1link.html#adc8d612ee69e5722919c1bc2c95df66e">link</a>
-</li>
-<li>remote_state()
-: <a class="el" 
href="classproton_1_1delivery.html#a581faf982d53840945a9d2fc9bba441f">delivery</a>
+<li>reply_to()
+: <a class="el" 
href="classproton_1_1message.html#ae5efc75f8afa3a6bcd126501a0418058">message</a>
 </li>
-<li>remote_target()
-: <a class="el" 
href="classproton_1_1link.html#ad5797a56dcc8453297ee6551fed06a95">link</a>
+<li>reply_to_group_id()
+: <a class="el" 
href="classproton_1_1message.html#ae08a04aad333436f3a6a788d8efe310d">message</a>
 </li>
-<li>rewind()
-: <a class="el" 
href="classproton_1_1codec_1_1data.html#ab8734e666421c9fe3b6380a818c6c727">data</a>
+<li>return_credit()
+: <a class="el" 
href="classproton_1_1sender.html#abc4cb5f2f38643abb47c0b221a130bc8">sender</a>
 </li>
 <li>run()
-: <a class="el" 
href="classproton_1_1container.html#a13a43e6d814de94978c515cb084873b1">container</a>
-, <a class="el" 
href="classproton_1_1io_1_1socket_1_1engine.html#a13a43e6d814de94978c515cb084873b1">engine</a>
+: <a class="el" 
href="classproton_1_1container.html#a18954417d3124a8095783ea13dc6d00b">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a88a1f51cd9435a5f06ecc411a2e355dc">default_container</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/functions_func_s.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_s.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_s.html
index 8bd9589..b26f536 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_s.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_s.html
@@ -92,6 +92,9 @@ 
$(document).ready(function(){initNavTree('functions_func_s.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
+<li>sasl()
+: <a class="el" 
href="classproton_1_1transport.html#a68d041918b4f276dc70e68e479333355">transport</a>
+</li>
 <li>sasl_allow_insecure_mechs()
 : <a class="el" 
href="classproton_1_1connection__options.html#afbabea03db40dee25da7bbdc7e918322">connection_options</a>
 </li>
@@ -101,53 +104,98 @@ 
$(document).ready(function(){initNavTree('functions_func_s.html','');});
 <li>sasl_config_name()
 : <a class="el" 
href="classproton_1_1connection__options.html#ad8e93a44cab5e65949046fb036c237a6">connection_options</a>
 </li>
+<li>sasl_config_path()
+: <a class="el" 
href="classproton_1_1connection__options.html#a0fc40d55673b5c89e4b5a13c630edca5">connection_options</a>
+</li>
 <li>sasl_enabled()
 : <a class="el" 
href="classproton_1_1connection__options.html#aedcd8a70f24d08ab0bb6178524ae6a0d">connection_options</a>
 </li>
 <li>scalar()
-: <a class="el" 
href="classproton_1_1scalar.html#a79453d11d5d0a0ab021762a68a73d97e">scalar</a>
+: <a class="el" 
href="classproton_1_1scalar.html#a247e504774a50ea9baeb9330d459a486">scalar</a>
+</li>
+<li>scheme()
+: <a class="el" 
href="classproton_1_1url.html#aacd8c2f1287d7c2e541397cd62612f8d">url</a>
 </li>
 <li>send()
-: <a class="el" 
href="classproton_1_1sender.html#aefaf5ace497245ca76c6c9d629ae7bee">sender</a>
+: <a class="el" 
href="classproton_1_1sender.html#a214eb30b24e6831d016a47b9dddda830">sender</a>
 </li>
 <li>sender()
-: <a class="el" 
href="classproton_1_1link.html#a0c49e11e40611be0b41bf595b6455a83">link</a>
+: <a class="el" 
href="classproton_1_1sender.html#ae8473244d5665777c846fa88eba39252">sender</a>
+, <a class="el" 
href="classproton_1_1tracker.html#a4cf2b9009a9348447011f99ade0f0800">tracker</a>
+</li>
+<li>sender_options()
+: <a class="el" 
href="classproton_1_1container.html#a541ac10e3a1dfaddd1866c3144f718f0">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#aa79d0327d2c0080359e9c4b0c9d25ebd">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1container__impl__base.html#aa68b8a05da39b50fe50931d7c482403e">container_impl_base</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a619c789958ede03d0682a1a723cd7658">sender_options</a>
+</li>
+<li>senders()
+: <a class="el" 
href="classproton_1_1connection.html#a58b522eac213ea860e01ca619b694dbf">connection</a>
+, <a class="el" 
href="classproton_1_1session.html#a58b522eac213ea860e01ca619b694dbf">session</a>
 </li>
 <li>server_connection_options()
-: <a class="el" 
href="classproton_1_1container.html#a0c2d04a8b161f33eeae661b673ac2749">container</a>
+: <a class="el" 
href="classproton_1_1container.html#a057b58d4cd2d1bbe8a51c2e0a4807fbc">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a7f6d9072a69c9c07720ffc98dcb49092">default_container</a>
+, <a class="el" 
href="classproton_1_1io_1_1container__impl__base.html#a11b0add605994e504f141c15df8f3947">container_impl_base</a>
 </li>
 <li>session()
-: <a class="el" 
href="classproton_1_1delivery.html#aa33faff52aea9845efaf184f86676cc5">delivery</a>
-, <a class="el" 
href="classproton_1_1link.html#aa33faff52aea9845efaf184f86676cc5">link</a>
+: <a class="el" 
href="classproton_1_1link.html#aa33faff52aea9845efaf184f86676cc5">link</a>
+, <a class="el" 
href="classproton_1_1session.html#a912187b9bad05f8454864cc5eef14395">session</a>
+, <a class="el" 
href="classproton_1_1transfer.html#aa33faff52aea9845efaf184f86676cc5">transfer</a>
+</li>
+<li>session_options()
+: <a class="el" 
href="classproton_1_1session__options.html#ad0a94848bc139a7628681a3401402f7b">session_options</a>
 </li>
 <li>sessions()
 : <a class="el" 
href="classproton_1_1connection.html#aa246b89acfdf85eff5e58f3fceae46dd">connection</a>
 </li>
+<li>settle()
+: <a class="el" 
href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">transfer</a>
+</li>
+<li>settled()
+: <a class="el" 
href="classproton_1_1transfer.html#ade04b72d05d480bc5cb9ff21cc22d229">transfer</a>
+</li>
 <li>size()
 : <a class="el" 
href="classproton_1_1byte__array.html#a0a22581a091167da9d9db49104dbf751">byte_array&lt;
 N &gt;</a>
 </li>
-<li>socket()
-: <a class="el" 
href="classproton_1_1io_1_1socket_1_1listener.html#a2e1eb43db52be00597b4e7398e78f513">listener</a>
+<li>source()
+: <a class="el" 
href="classproton_1_1receiver.html#a2f1d8ca25f71dff178c462cf984327f9">receiver</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a7e2689fd52f88f551d11face38a4157b">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender.html#a2f1d8ca25f71dff178c462cf984327f9">sender</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#affa248d2fe89882f49936eec6bff245d">sender_options</a>
+, <a class="el" 
href="classproton_1_1source.html#a6cfde826a3d3092bd8a3a636e2336bbb">source</a>
+</li>
+<li>source_options()
+: <a class="el" 
href="classproton_1_1source__options.html#a1d2323580261c3bce5c41cb93d72bff9">source_options</a>
+</li>
+<li>ssl()
+: <a class="el" 
href="classproton_1_1ssl.html#aab73a626b87b792e31ff0eee531fbcb2">ssl</a>
+, <a class="el" 
href="classproton_1_1transport.html#a47704eef267d19ef6411cc8028d3299f">transport</a>
+</li>
+<li>ssl_certificate()
+: <a class="el" 
href="classproton_1_1ssl__certificate.html#a06065e17b1b4e178adc0047ae99335ac">ssl_certificate</a>
 </li>
 <li>ssl_client_options()
 : <a class="el" 
href="classproton_1_1connection__options.html#a4eb280b5a62adb5b2075d6316a590c70">connection_options</a>
-, <a class="el" 
href="classproton_1_1ssl__client__options.html#a05df3dc53e9dc80ed8d90b7724d791b0">ssl_client_options</a>
+, <a class="el" 
href="classproton_1_1ssl__client__options.html#aaeae243f374927d7729927cb343f8130">ssl_client_options</a>
 </li>
 <li>ssl_server_options()
 : <a class="el" 
href="classproton_1_1connection__options.html#a5ce3c4591be545f5ae67f22ef64fb9ef">connection_options</a>
 , <a class="el" 
href="classproton_1_1ssl__server__options.html#a1f181336edbdb677b58eaa1366127da1">ssl_server_options</a>
 </li>
-<li>state()
-: <a class="el" 
href="classproton_1_1connection.html#a1e2622353881ca93799c7d127a1464ce">connection</a>
-, <a class="el" 
href="classproton_1_1link.html#a1e2622353881ca93799c7d127a1464ce">link</a>
-, <a class="el" 
href="classproton_1_1session.html#a1e2622353881ca93799c7d127a1464ce">session</a>
+<li>stop()
+: <a class="el" 
href="classproton_1_1container.html#a40a47814c7196a4c796015fd5c16b542">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a53c748f26c3bd7c50ac14d419f440935">default_container</a>
+, <a class="el" 
href="classproton_1_1listener.html#a8c528baf37154d347366083f0f816846">listener</a>
 </li>
 <li>str()
-: <a class="el" 
href="classproton_1_1url.html#a1b9b8885b0880fc4ddf9a2c7d1ca3dc4">url</a>
-, <a class="el" 
href="classproton_1_1uuid.html#a1b9b8885b0880fc4ddf9a2c7d1ca3dc4">uuid</a>
+: <a class="el" 
href="classproton_1_1uuid.html#a1b9b8885b0880fc4ddf9a2c7d1ca3dc4">uuid</a>
+</li>
+<li>subject()
+: <a class="el" 
href="classproton_1_1message.html#a1b9ed8f3209f303d3c32d31d4f18c23c">message</a>
 </li>
 <li>symbol()
-: <a class="el" 
href="classproton_1_1symbol.html#a5d96e10a5b46e6d9a4cc999cbd7c1467">symbol</a>
+: <a class="el" 
href="classproton_1_1symbol.html#acb24e4da84324613eac952fa3dbdc6a9">symbol</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/functions_func_t.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_t.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_t.html
index 28ac64a..5da4389 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_t.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_t.html
@@ -92,21 +92,43 @@ 
$(document).ready(function(){initNavTree('functions_func_t.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
+<li>target()
+: <a class="el" 
href="classproton_1_1receiver.html#a68cde95e630ce554bb4a2ba9ef087a17">receiver</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a7823f6c72dc78481be578de1658b99eb">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender.html#a68cde95e630ce554bb4a2ba9ef087a17">sender</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a6c2282c68637f6c5aee95668b523c38c">sender_options</a>
+, <a class="el" 
href="classproton_1_1target.html#a1839bce0672e60129fb6c69534a027e6">target</a>
+</li>
+<li>target_options()
+: <a class="el" 
href="classproton_1_1target__options.html#add127463954d31c61475058fe14aef52">target_options</a>
+</li>
+<li>timeout()
+: <a class="el" 
href="classproton_1_1source__options.html#a5fca9a55327631935b124badfebea989">source_options</a>
+, <a class="el" 
href="classproton_1_1target__options.html#a14a86cafc12d543ad6f9c3be88fbd7b6">target_options</a>
+, <a class="el" 
href="classproton_1_1terminus.html#a4199d4b9dbb01186f14833d3e6f27726">terminus</a>
+</li>
 <li>timeout_error()
 : <a class="el" 
href="structproton_1_1timeout__error.html#a62ed6422b084746ba8f6779997e047f8">timeout_error</a>
 </li>
 <li>timestamp()
 : <a class="el" 
href="classproton_1_1timestamp.html#a7dd3e30aaca70057a02dca7cc5eb5b4d">timestamp</a>
 </li>
+<li>to()
+: <a class="el" 
href="classproton_1_1message.html#a6ee91d1657e593e6119937bd5df41cd9">message</a>
+</li>
+<li>tracker()
+: <a class="el" 
href="classproton_1_1tracker.html#a0b9624867cb6a465a71ecf3bce1d64dd">tracker</a>
+</li>
+<li>transfer()
+: <a class="el" 
href="classproton_1_1transfer.html#a27689e22340a12302f25eec6072c5d22">transfer</a>
+</li>
 <li>transport()
 : <a class="el" 
href="classproton_1_1connection.html#a89faad37d419b75c47031ddf530b0ab6">connection</a>
+, <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a7461aa748aa887e1969745fb5f7efd1c">connection_engine</a>
+, <a class="el" 
href="classproton_1_1transport.html#aa1996a887a9af5c8c18c739ab08588d6">transport</a>
 </li>
 <li>ttl()
-: <a class="el" 
href="classproton_1_1message.html#a3ae8a20748fb23fc17a7c221f435a326">message</a>
-</li>
-<li>type()
-: <a class="el" 
href="classproton_1_1scalar__base.html#a6a70b946e3620c70eac8e97f7f33fb27">scalar_base</a>
-, <a class="el" 
href="classproton_1_1terminus.html#a3d63b492e769dd60f923f9d5f91f5af7">terminus</a>
+: <a class="el" 
href="classproton_1_1message.html#a62106618909df7a4a43e88316a9e9d61">message</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/functions_func_u.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_u.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_u.html
index 0725a34..da256ff 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_u.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_u.html
@@ -92,11 +92,24 @@ 
$(document).ready(function(){initNavTree('functions_func_u.html','');});
 &#160;
 
 <h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
+<li>uninitialized()
+: <a class="el" 
href="classproton_1_1connection.html#ac148c054a035b462f4483f38078374bf">connection</a>
+, <a class="el" 
href="classproton_1_1endpoint.html#a580e27d7221fd49d4cb7527972ff186e">endpoint</a>
+, <a class="el" 
href="classproton_1_1link.html#ac148c054a035b462f4483f38078374bf">link</a>
+, <a class="el" 
href="classproton_1_1session.html#ac148c054a035b462f4483f38078374bf">session</a>
+</li>
+<li>update()
+: <a class="el" 
href="classproton_1_1connection__options.html#a68a8c198dfa16653afc4a70a2b845604">connection_options</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a7bbed67f2faac1cd6a5c490dac90bda3">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a16b609dbb6a9df5ab7e719f0de05026b">sender_options</a>
+</li>
 <li>url()
-: <a class="el" 
href="classproton_1_1url.html#abc5ed2ad3f9365fb31cc1eb625b974d9">url</a>
+: <a class="el" 
href="classproton_1_1url.html#a2ac6e124f5c2a7a3c8464099b5c4fde7">url</a>
 </li>
 <li>user()
-: <a class="el" 
href="classproton_1_1sasl.html#a31d44d41f9aee83ac6fdbe8721eaa42f">sasl</a>
+: <a class="el" 
href="classproton_1_1message.html#a31d44d41f9aee83ac6fdbe8721eaa42f">message</a>
+, <a class="el" 
href="classproton_1_1sasl.html#a31d44d41f9aee83ac6fdbe8721eaa42f">sasl</a>
+, <a class="el" 
href="classproton_1_1url.html#a31d44d41f9aee83ac6fdbe8721eaa42f">url</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/functions_func_v.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_v.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_v.html
index 057271d..30ebb3c 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_v.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_v.html
@@ -95,6 +95,10 @@ 
$(document).ready(function(){initNavTree('functions_func_v.html','');});
 <li>value()
 : <a class="el" 
href="classproton_1_1value.html#aefbfa229f1c9e1fc967bff724a010f9e">value</a>
 </li>
+<li>virtual_host()
+: <a class="el" 
href="classproton_1_1connection.html#afd5da4a30e24592cc193f4ce3ed99594">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#a0300a2a68ecca3f684e91e637a45e028">connection_options</a>
+</li>
 </ul>
 </div><!-- contents -->
 </div><!-- doc-content -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_func_w.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_w.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_w.html
index 55d8953..2bc5423 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_func_w.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_func_w.html
@@ -93,10 +93,16 @@ 
$(document).ready(function(){initNavTree('functions_func_w.html','');});
 
 <h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
 <li>what()
-: <a class="el" 
href="classproton_1_1condition.html#acecd2618798017fe94c19a79e5edb35a">condition</a>
+: <a class="el" 
href="classproton_1_1error__condition.html#acecd2618798017fe94c19a79e5edb35a">error_condition</a>
 </li>
-<li>write()
-: <a class="el" 
href="classproton_1_1io_1_1socket_1_1engine.html#aac759501cf6c7895a70eecbef0226ae1">engine</a>
+<li>write_buffer()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#a0e1873d3b36dcba2b3ef6bd09805c9c8">connection_engine</a>
+</li>
+<li>write_close()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#ad730a1d850ea31f35102b765d0eede4a">connection_engine</a>
+</li>
+<li>write_done()
+: <a class="el" 
href="classproton_1_1io_1_1connection__engine.html#aedf05de753467bf31b70db61c8effc80">connection_engine</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/functions_g.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_g.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_g.html
index 4ad15e6..1aa4032 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_g.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_g.html
@@ -96,7 +96,10 @@ 
$(document).ready(function(){initNavTree('functions_g.html','');});
 : <a class="el" 
href="classproton_1_1annotation__key.html#ace2642bea7a7ab2d830f42390eb4a604">annotation_key</a>
 , <a class="el" 
href="classproton_1_1message__id.html#a9df1e3d65a418435d46c08f9cb2948de">message_id</a>
 , <a class="el" 
href="classproton_1_1scalar.html#a61968283b9e1fc067dcad67e9fe58f6a">scalar</a>
-, <a class="el" 
href="classproton_1_1value.html#a2dd4c0151b171f03f2c36d907832522b">value</a>
+, <a class="el" 
href="classproton_1_1value.html#a051c12c4c7efc82a5f268d4f64e15b54">value</a>
+</li>
+<li>group_id()
+: <a class="el" 
href="classproton_1_1message.html#a914482152fd66b188e63a4066ef87586">message</a>
 </li>
 <li>group_sequence()
 : <a class="el" 
href="classproton_1_1message.html#a2c47345d04743821765ec83e13396f29">message</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_h.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_h.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_h.html
index 0734cdf..11433fd 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_h.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_h.html
@@ -93,11 +93,13 @@ 
$(document).ready(function(){initNavTree('functions_h.html','');});
 
 <h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 <li>handler()
-: <a class="el" 
href="classproton_1_1connection__options.html#a6c97b43c08a8ca22f136d8281b38aa8a">connection_options</a>
-, <a class="el" 
href="classproton_1_1link__options.html#a0a491d9f037a669e07311a6cf3a532f5">link_options</a>
+: <a class="el" 
href="classproton_1_1connection__options.html#a7bca23aeb3455378ef2d35975758e504">connection_options</a>
+, <a class="el" 
href="classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df">receiver_options</a>
+, <a class="el" 
href="classproton_1_1sender__options.html#a0d94e8f4c1746780259f3eb2d1728aff">sender_options</a>
+, <a class="el" 
href="classproton_1_1session__options.html#aeb0051c569cdc2d992a8da4bb476c7e4">session_options</a>
 </li>
 <li>host()
-: <a class="el" 
href="classproton_1_1connection.html#ab85a9642d69a48c9fa5d3a2906d52a9e">connection</a>
+: <a class="el" 
href="classproton_1_1url.html#ab85a9642d69a48c9fa5d3a2906d52a9e">url</a>
 </li>
 <li>host_port()
 : <a class="el" 
href="classproton_1_1url.html#a3bef814cea87fcb9c5b1e152177c1b11">url</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/627da724/content/releases/qpid-proton-master/proton/cpp/api/functions_i.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_i.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_i.html
index 72f1a9a..583471c 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_i.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_i.html
@@ -93,19 +93,25 @@ 
$(document).ready(function(){initNavTree('functions_i.html','');});
 
 <h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 <li>id()
-: <a class="el" 
href="classproton_1_1container.html#aae9016a4b54d24cae86174baa6a38342">container</a>
+: <a class="el" 
href="classproton_1_1container.html#a8ebfbb187faf8c69d4283fd836ddf2ea">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#ad8c33696e2cd29fd9c155fe1c6c94bc9">default_container</a>
+, <a class="el" 
href="classproton_1_1message.html#a0b88465b45d98000aaf5a7062c03574c">message</a>
 </li>
 <li>idle_timeout()
-: <a class="el" 
href="classproton_1_1connection__options.html#a7c838237bfba8a5a04c2b97e6f023448">connection_options</a>
+: <a class="el" 
href="classproton_1_1connection.html#a39ea24767f058f1be03bb831f4525fc7">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#a7c838237bfba8a5a04c2b97e6f023448">connection_options</a>
 </li>
 <li>IMMEDIATE
 : <a class="el" 
href="classproton_1_1duration.html#ab804de8e95dd6203d6e72e797440055e">duration</a>
 </li>
+<li>incoming_bytes()
+: <a class="el" 
href="classproton_1_1session.html#af62014290a690a2c55e9dbf2bf0b96b2">session</a>
+</li>
 <li>inferred()
-: <a class="el" 
href="classproton_1_1message.html#a72c7fb9b51a6f42a28dd27aac7c9cae4">message</a>
+: <a class="el" 
href="classproton_1_1message.html#a174b1b064de4042d155727e4327b3dd7">message</a>
 </li>
-<li>info()
-: <a class="el" 
href="classproton_1_1condition.html#a8fbefe24bf3e82dc233855d0915574b6">condition</a>
+<li>inject()
+: <a class="el" 
href="classproton_1_1event__loop.html#a2ca52518764b0883e4a05393d384ab26">event_loop</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/functions_l.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_l.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_l.html
index 61822cc..7c32e5b 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_l.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_l.html
@@ -92,52 +92,21 @@ 
$(document).ready(function(){initNavTree('functions_l.html','');});
 <div class="textblock">Here is a list of all documented class members with 
links to the class documentation for each member:</div>
 
 <h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
-<li>lifetime_policy
-: <a class="el" 
href="classproton_1_1link__options.html#ad111ab21d33decca8c96f90f72cb9a82">link_options</a>
-</li>
 <li>link()
-: <a class="el" 
href="classproton_1_1delivery.html#aca9726355bb7d42b75d374b5cc459040">delivery</a>
+: <a class="el" 
href="classproton_1_1link.html#ad29b379b3621ec393ac9f28b4ba8b010">link</a>
 </li>
-<li>link_options()
-: <a class="el" 
href="classproton_1_1container.html#abe6a163dd9a95e0ef869c8d3bd265b1d">container</a>
-, <a class="el" 
href="classproton_1_1link__options.html#a0982bce7a239e29891b9edd12c79310e">link_options</a>
+<li>LINK_CLOSE
+: <a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba7201cfe403ee6d4b4b717d146e38bee1">terminus</a>
 </li>
-<li>links()
-: <a class="el" 
href="classproton_1_1connection.html#af304203ffaff9415b7884f53507b72dc">connection</a>
-, <a class="el" 
href="classproton_1_1session.html#af304203ffaff9415b7884f53507b72dc">session</a>
+<li>link_name()
+: <a class="el" 
href="classproton_1_1io_1_1link__namer.html#ae87e7c07b97273644b32c03abff30a77">link_namer</a>
 </li>
 <li>listen()
-: <a class="el" 
href="classproton_1_1container.html#ab5a976cc459568f13da407a038591ca2">container</a>
+: <a class="el" 
href="classproton_1_1container.html#a27d60b6665f37220d9be70f11ab69654">container</a>
+, <a class="el" 
href="classproton_1_1default__container.html#a7bb03676cface6b9310a7849fb9348a2">default_container</a>
 </li>
 <li>listener()
-: <a class="el" 
href="classproton_1_1io_1_1socket_1_1listener.html#ac7d29e395fadfacad9f98bf70e5608fe">listener</a>
-</li>
-<li>LOCAL_ACTIVE
-: <a class="el" 
href="classproton_1_1endpoint.html#aa9bb5c15062bee80022f56bffcf2868a">endpoint</a>
-</li>
-<li>local_address()
-: <a class="el" 
href="classproton_1_1link__options.html#a532e4ce92da37e5785001b470a99776b">link_options</a>
-</li>
-<li>LOCAL_CLOSED
-: <a class="el" 
href="classproton_1_1endpoint.html#a4f8d870a4ace6dd1be8728f0e3ccf23c">endpoint</a>
-</li>
-<li>local_condition()
-: <a class="el" 
href="classproton_1_1connection.html#aaaea8dc733566e78a066d2435f8a60c5">connection</a>
-, <a class="el" 
href="classproton_1_1endpoint.html#a8e6552f9fc799927204b763969513099">endpoint</a>
-, <a class="el" 
href="classproton_1_1link.html#aaaea8dc733566e78a066d2435f8a60c5">link</a>
-, <a class="el" 
href="classproton_1_1session.html#aaaea8dc733566e78a066d2435f8a60c5">session</a>
-</li>
-<li>LOCAL_MASK
-: <a class="el" 
href="classproton_1_1endpoint.html#a5017b4c4cc25f9c0932455e13fb223d4">endpoint</a>
-</li>
-<li>local_source()
-: <a class="el" 
href="classproton_1_1link.html#a2246ba119cbaa626fb423e1ba80f84c5">link</a>
-</li>
-<li>local_target()
-: <a class="el" 
href="classproton_1_1link.html#a1e65cc5198f2c2e57d28815f401eb7d9">link</a>
-</li>
-<li>LOCAL_UNINIT
-: <a class="el" 
href="classproton_1_1endpoint.html#a84e5c2baecd6fd28505eac28ab14bacb">endpoint</a>
+: <a class="el" 
href="classproton_1_1listener.html#a59dc4506a73a3d4ae084b5fc1d014814">listener</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/functions_m.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_m.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_m.html
index d6ec262..c9c4c74 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_m.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_m.html
@@ -92,17 +92,19 @@ 
$(document).ready(function(){initNavTree('functions_m.html','');});
 <div class="textblock">Here is a list of all documented class members with 
links to the class documentation for each member:</div>
 
 <h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
-<li>max_channels()
-: <a class="el" 
href="classproton_1_1connection__options.html#ae04e46928f67fef14fc58c501fea1bd8">connection_options</a>
-</li>
 <li>max_frame_size()
-: <a class="el" 
href="classproton_1_1connection__options.html#ad0e93961fd048b2ee5e8bdac2b041686">connection_options</a>
+: <a class="el" 
href="classproton_1_1connection.html#a14f31d608d52352f9e3fb0fa114d0c58">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#ad0e93961fd048b2ee5e8bdac2b041686">connection_options</a>
+</li>
+<li>max_sessions()
+: <a class="el" 
href="classproton_1_1connection.html#a31b6fd31cd4fa9c7dbdc3456f739b380">connection</a>
+, <a class="el" 
href="classproton_1_1connection__options.html#af66706fdb4a2f3f4d9943be9ee4b1347">connection_options</a>
 </li>
 <li>mech()
 : <a class="el" 
href="classproton_1_1sasl.html#ab3e41c9a32534900c35ea46a45635c4c">sasl</a>
 </li>
 <li>message()
-: <a class="el" 
href="classproton_1_1message.html#aba502b8bb024cc38b45756fdf581f915">message</a>
+: <a class="el" 
href="classproton_1_1message.html#aa99aeff68b6093da4e3c11ecf898376d">message</a>
 </li>
 <li>message_annotations()
 : <a class="el" 
href="classproton_1_1message.html#a5d96699458d8be84d821f5651a7b3717">message</a>
@@ -117,8 +119,8 @@ 
$(document).ready(function(){initNavTree('functions_m.html','');});
 <li>MINUTE
 : <a class="el" 
href="classproton_1_1duration.html#a437a5e5f6a7d0c8780f3594b2272cba0">duration</a>
 </li>
-<li>MODIFIED
-: <a class="el" 
href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90a26d303ed91d56d618217b9a038512754">delivery</a>
+<li>modes
+: <a class="el" 
href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">delivery_mode</a>
 </li>
 <li>modify()
 : <a class="el" 
href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">delivery</a>
@@ -126,9 +128,11 @@ 
$(document).ready(function(){initNavTree('functions_m.html','');});
 <li>more()
 : <a class="el" 
href="classproton_1_1codec_1_1decoder.html#aba1201662b7dccd64b782cb43e40d3e0">decoder</a>
 </li>
-<li>ms()
-: <a class="el" 
href="classproton_1_1duration.html#af55ebfb91b3132031de3f8cef94d785d">duration</a>
-, <a class="el" 
href="classproton_1_1timestamp.html#af55ebfb91b3132031de3f8cef94d785d">timestamp</a>
+<li>MOVE
+: <a class="el" 
href="classproton_1_1source.html#ad049690d03cac384636e0c2055726089aed3ef32890b6da0919b57254c5206c62">source</a>
+</li>
+<li>mutable_buffer()
+: <a class="el" 
href="structproton_1_1io_1_1mutable__buffer.html#ae164359bc44e1b29a68ebc40555972c2">mutable_buffer</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/functions_n.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/functions_n.html 
b/content/releases/qpid-proton-master/proton/cpp/api/functions_n.html
index e876fea..fa7f1e3 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/functions_n.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/functions_n.html
@@ -93,9 +93,12 @@ 
$(document).ready(function(){initNavTree('functions_n.html','');});
 
 <h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 <li>name()
-: <a class="el" 
href="classproton_1_1condition.html#a37627d5d5bba7f4a8690c71c2ab3cb07">condition</a>
+: <a class="el" 
href="classproton_1_1error__condition.html#a37627d5d5bba7f4a8690c71c2ab3cb07">error_condition</a>
 , <a class="el" 
href="classproton_1_1link.html#a37627d5d5bba7f4a8690c71c2ab3cb07">link</a>
 </li>
+<li>NEVER
+: <a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba3a267f9424d4d555780a8d26209c8118">terminus</a>
+</li>
 <li>NEW
 : <a class="el" 
href="classproton_1_1ssl.html#a0d3f14f27a1e5af0a5f378fc1a8a8de4aec34b0b90541576a22697631105dc847">ssl</a>
 </li>
@@ -103,17 +106,20 @@ 
$(document).ready(function(){initNavTree('functions_n.html','');});
 : <a class="el" 
href="classproton_1_1codec_1_1decoder.html#af3a00236ce433d05e26c0eb2ed5dfcd0">decoder</a>
 </li>
 <li>node_properties()
-: <a class="el" 
href="classproton_1_1terminus.html#ace437aaec97dcaaed07f05ebbd48837a">terminus</a>
+: <a class="el" 
href="classproton_1_1terminus.html#af931e558d6f75187017273c1e62ff250">terminus</a>
+</li>
+<li>NONDURABLE
+: <a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3dafdced71ad3dc05c5221439eddc3573e8">terminus</a>
 </li>
 <li>NONE
-: <a class="el" 
href="classproton_1_1delivery.html#adc6e5733fc3c22f0a7b2914188c49c90ac157bdf0b85a40d2619cbc8bc1ae5fe2">delivery</a>
+: <a class="el" 
href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">delivery_mode</a>
 , <a class="el" 
href="classproton_1_1sasl.html#af47997198e7e7301a1cd8602c7f02acdac157bdf0b85a40d2619cbc8bc1ae5fe2">sasl</a>
 </li>
 <li>now()
 : <a class="el" 
href="classproton_1_1timestamp.html#a8a432817c74685a518a08ede48d1db34">timestamp</a>
 </li>
 <li>numeric_type
-: <a class="el" 
href="classproton_1_1duration.html#a387648a0c865302ff1a6cc334bce2e5c">duration</a>
+: <a class="el" 
href="classproton_1_1duration.html#a44829e89515fec974f57f37bbdbfaeb2">duration</a>
 , <a class="el" 
href="classproton_1_1timestamp.html#a44829e89515fec974f57f37bbdbfaeb2">timestamp</a>
 </li>
 </ul>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to