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 2017/09/12 23:37:50 UTC

[26/51] [partial] qpid-site git commit: QPID-7903: Refresh the Proton C docs snaphot once again

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id.js
index cc56285..4a31277 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1message__id.js
@@ -2,16 +2,16 @@ var classproton_1_1message__id =
 [
     [ "message_id", "classproton_1_1message__id.html#afb6e34ccd03d666d3e5cd4312064c4a3", null ],
     [ "message_id", "classproton_1_1message__id.html#a37823024300ef4413ca077df9ddcc4d2", null ],
-    [ "empty", "classproton_1_1message__id.html#a644718bb2fb240de962dc3c9a1fdf0dc", null ],
     [ "operator=", "classproton_1_1message__id.html#a547edabfd4612cbe7d76cd089c0f8d20", null ],
     [ "operator=", "classproton_1_1message__id.html#a1c223a57d161ae585fe7d498283f3786", null ],
     [ "operator=", "classproton_1_1message__id.html#aed980fe37bb256dba6b312cc2e9082bb", null ],
     [ "operator=", "classproton_1_1message__id.html#a782793e9b93fc85f7f7a0e74dc468521", null ],
     [ "operator=", "classproton_1_1message__id.html#a0e4798868734cc90ea4e9ed3ca870d3d", null ],
     [ "type", "classproton_1_1message__id.html#a89dd77b1757d854f49d49e379f8f9db8", null ],
-    [ "coerce", "classproton_1_1message__id.html#a8965a5e1c4122df8aee11e971ceabd07", null ],
+    [ "empty", "classproton_1_1message__id.html#a644718bb2fb240de962dc3c9a1fdf0dc", null ],
     [ "get", "classproton_1_1message__id.html#a8e96d12c2968550ffea0e57fc6ca2c7d", null ],
     [ "get", "classproton_1_1message__id.html#a9df1e3d65a418435d46c08f9cb2948de", null ],
     [ "get", "classproton_1_1message__id.html#aad4dad4f21de91016ac93e6df2f4b897", null ],
-    [ "get", "classproton_1_1message__id.html#ad99d2405b26cc9862428f13aac25ddf6", null ]
+    [ "get", "classproton_1_1message__id.html#ad99d2405b26cc9862428f13aac25ddf6", null ],
+    [ "coerce", "classproton_1_1message__id.html#a8965a5e1c4122df8aee11e971ceabd07", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler-members.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler-members.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler-members.html
index 1637f48..298aff5 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler-members.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler-members.html
@@ -100,33 +100,34 @@ $(document).ready(function(){initNavTree('classproton_1_1messaging__handler.html
   <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a804f0ea9c2754f143624b4078a61f650">on_connection_close</a>(connection &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#aafa83dc2f8f477ba1f76e86dc69cd1e9">on_connection_error</a>(connection &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a16ba022e899957b2e25b9561b1f53968">on_connection_open</a>(connection &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a4949b0c93402fae0c07492d984688a25">on_container_start</a>(container &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#ab5bb8195e26c8818c4f57a734566ecfd">on_container_stop</a>(container &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#afc96eabc76c471d61627493eadb58ac8">on_delivery_settle</a>(delivery &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e">on_error</a>(const error_condition &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a96879b0b0b7ade11f98d3f450abd4c46">on_message</a>(delivery &amp;d, message &amp;m)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907">on_receiver_close</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a93ab65773954cf12eb7f76a26aa44cfe">on_receiver_detach</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116">on_receiver_drain_finish</a>(receiver &amp;r)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0c281aee5483822bdf4b428834bd7f28">on_receiver_error</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a768b0a50669aa1d512d12e9d68af14cd">on_receiver_open</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#aa24f522a68cdf382762702cece7790e7">on_sendable</a>(sender &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a7942b98699bd21e827041626ee1b5c84">on_sender_close</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a731e7cdbda64b15f069efd560b66ada1">on_sender_detach</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#ad3d23a7c3849dabd137610f8ee1569e3">on_sender_drain_start</a>(sender &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a2d9d98eee878f1e734457ba01e21228a">on_sender_error</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0b5d066e5463d3365f662c8a7dc52661">on_sender_open</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a54fe4fc5394418f8606f9263f13d2e98">on_session_close</a>(session &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#aca924d2f68649df7945719be3d29a597">on_session_error</a>(session &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#adddbfd9b7fc7719490bdc21331c42302">on_session_open</a>(session &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a003afbb57c00ce404a863152db7867ad">on_tracker_accept</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0740e8c9ed9d0c304d2adced09802893">on_tracker_reject</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#acfde5590c6e826ef9e2c33a28edefe19">on_tracker_release</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a023a5c57eeeaf79ed5b768cd172ad0ac">on_tracker_settle</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a47c33c5e6c13d23f1b8a745bf7bdfa8f">on_transport_close</a>(transport &amp;t)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#af89551ce0e44ae3465d4b078f1c87653">on_transport_error</a>(transport &amp;t)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0c141065eda9a26916ccc63ccea5d3b7">on_transport_open</a>(transport &amp;t)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~messaging_handler</b>() (defined in <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a>)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a29bfba2d26604e5d8d7f3183f1374481">on_connection_wake</a>(connection &amp;)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a4949b0c93402fae0c07492d984688a25">on_container_start</a>(container &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#ab5bb8195e26c8818c4f57a734566ecfd">on_container_stop</a>(container &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#afc96eabc76c471d61627493eadb58ac8">on_delivery_settle</a>(delivery &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e">on_error</a>(const error_condition &amp;c)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a96879b0b0b7ade11f98d3f450abd4c46">on_message</a>(delivery &amp;d, message &amp;m)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907">on_receiver_close</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a93ab65773954cf12eb7f76a26aa44cfe">on_receiver_detach</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116">on_receiver_drain_finish</a>(receiver &amp;r)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0c281aee5483822bdf4b428834bd7f28">on_receiver_error</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a768b0a50669aa1d512d12e9d68af14cd">on_receiver_open</a>(receiver &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#aa24f522a68cdf382762702cece7790e7">on_sendable</a>(sender &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a7942b98699bd21e827041626ee1b5c84">on_sender_close</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a731e7cdbda64b15f069efd560b66ada1">on_sender_detach</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#ad3d23a7c3849dabd137610f8ee1569e3">on_sender_drain_start</a>(sender &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a2d9d98eee878f1e734457ba01e21228a">on_sender_error</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0b5d066e5463d3365f662c8a7dc52661">on_sender_open</a>(sender &amp;l)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a54fe4fc5394418f8606f9263f13d2e98">on_session_close</a>(session &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#aca924d2f68649df7945719be3d29a597">on_session_error</a>(session &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#adddbfd9b7fc7719490bdc21331c42302">on_session_open</a>(session &amp;s)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a003afbb57c00ce404a863152db7867ad">on_tracker_accept</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0740e8c9ed9d0c304d2adced09802893">on_tracker_reject</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#acfde5590c6e826ef9e2c33a28edefe19">on_tracker_release</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a023a5c57eeeaf79ed5b768cd172ad0ac">on_tracker_settle</a>(tracker &amp;d)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a47c33c5e6c13d23f1b8a745bf7bdfa8f">on_transport_close</a>(transport &amp;t)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#af89551ce0e44ae3465d4b078f1c87653">on_transport_error</a>(transport &amp;t)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html#a0c141065eda9a26916ccc63ccea5d3b7">on_transport_open</a>(transport &amp;t)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>~messaging_handler</b>() (defined in <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a>)</td><td class="entry"><a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
index ae73677..d5bf2d5 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.html
@@ -211,6 +211,9 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr class="memitem:a815e30c6d10d923d88dc1085b7b0f116"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116">on_receiver_drain_finish</a> (<a class="el" href="classproton_1_1receiver.html">receiver</a> &amp;r)</td></tr>
 <tr class="memdesc:a815e30c6d10d923d88dc1085b7b0f116"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Unsettled API - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned.  <a href="#a815e30c6d10d923d88dc1085b7b0f116">More...</a><br /></td></tr>
 <tr class="separator:a815e30c6d10d923d88dc1085b7b0f116"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a29bfba2d26604e5d8d7f3183f1374481"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1messaging__handler.html#a29bfba2d26604e5d8d7f3183f1374481">on_connection_wake</a> (<a class="el" href="classproton_1_1connection.html">connection</a> &amp;)</td></tr>
+<tr class="memdesc:a29bfba2d26604e5d8d7f3183f1374481"><td class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - an event that can be triggered from another thread.  <a href="#a29bfba2d26604e5d8d7f3183f1374481">More...</a><br /></td></tr>
+<tr class="separator:a29bfba2d26604e5d8d7f3183f1374481"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5e29fef3b8c5b8cf18aa7d69850ac22e"><td class="memItemLeft" align="right" valign="top"><a id="a5e29fef3b8c5b8cf18aa7d69850ac22e"></a>
 virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e">on_error</a> (const <a class="el" href="classproton_1_1error__condition.html">error_condition</a> &amp;c)</td></tr>
 <tr class="memdesc:a5e29fef3b8c5b8cf18aa7d69850ac22e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Fallback error handling. <br /></td></tr>
@@ -255,7 +258,7 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 </div><div class="memdoc">
 
 <p>The container event loop is starting. </p>
-<p>This is the first event received after calling <a class="el" href="classproton_1_1container.html#a13a43e6d814de94978c515cb084873b1" title="Run the container in this thread. ">container::run</a> </p>
+<p>This is the first event received after calling <a class="el" href="classproton_1_1container.html#a13a43e6d814de94978c515cb084873b1" title="Run the container in the current thread. ">container::run</a> </p>
 <dl><dt><b>Examples: </b></dt><dd><a class="el" href="client_8cpp-example.html#a5">client.cpp</a>, <a class="el" href="direct_recv_8cpp-example.html#a2">direct_recv.cpp</a>, <a class="el" href="direct_send_8cpp-example.html#a2">direct_send.cpp</a>, <a class="el" href="helloworld_8cpp-example.html#a2">helloworld.cpp</a>, <a class="el" href="helloworld_direct_8cpp-example.html#a2">helloworld_direct.cpp</a>, <a class="el" href="multithreaded_client_8cpp-example.html#a8">multithreaded_client.cpp</a>, <a class="el" href="scheduled_send_8cpp-example.html#a5">scheduled_send.cpp</a>, <a class="el" href="scheduled_send_03_8cpp-example.html#a4">scheduled_send_03.cpp</a>, <a class="el" href="server_8cpp-example.html#a3">server.cpp</a>, <a class="el" href="server_direct_8cpp-example.html#a1">server_direct.cpp</a>, <a class="el" href="simple_recv_8cpp-example.html#a2">simple_recv.cpp</a>, and <a class="el" href="simple_send_8cpp-example.html#a2">simple_send.cpp</a>.</dd>
 </dl>
 </div>
@@ -289,8 +292,8 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 </div>
 </div>
-<a id="a815e30c6d10d923d88dc1085b7b0f116"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a815e30c6d10d923d88dc1085b7b0f116">&#9670;&nbsp;</a></span>on_receiver_drain_finish()</h2>
+<a id="af89551ce0e44ae3465d4b078f1c87653"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#af89551ce0e44ae3465d4b078f1c87653">&#9670;&nbsp;</a></span>on_transport_error()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -299,10 +302,10 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
   <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">virtual void on_receiver_drain_finish </td>
+          <td class="memname">virtual void on_transport_error </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="classproton_1_1receiver.html">receiver</a> &amp;&#160;</td>
-          <td class="paramname"><em>r</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="classproton_1_1transport.html">transport</a> &amp;&#160;</td>
+          <td class="paramname"><em>t</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -313,7 +316,7 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 </table>
 </div><div class="memdoc">
 
-<p><b>Unsettled API</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Unsettled API - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned. </p>
+<p>The underlying network transport has closed with an error condition. </p>
 
 </div>
 </div>
@@ -345,8 +348,8 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 </div>
 </div>
-<a id="af89551ce0e44ae3465d4b078f1c87653"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#af89551ce0e44ae3465d4b078f1c87653">&#9670;&nbsp;</a></span>on_transport_error()</h2>
+<a id="a815e30c6d10d923d88dc1085b7b0f116"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a815e30c6d10d923d88dc1085b7b0f116">&#9670;&nbsp;</a></span>on_receiver_drain_finish()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -355,10 +358,10 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
   <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">virtual void on_transport_error </td>
+          <td class="memname">virtual void on_receiver_drain_finish </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="classproton_1_1transport.html">transport</a> &amp;&#160;</td>
-          <td class="paramname"><em>t</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="classproton_1_1receiver.html">receiver</a> &amp;&#160;</td>
+          <td class="paramname"><em>r</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -369,7 +372,39 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 </table>
 </div><div class="memdoc">
 
-<p>The underlying network transport has closed with an error condition. </p>
+<p><b>Unsettled API</b> - The credit outstanding at the time of the call to <a class="el" href="classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9" title="Unsettled API - Commence a drain cycle. ">receiver::drain</a> has been consumed or returned. </p>
+
+</div>
+</div>
+<a id="a29bfba2d26604e5d8d7f3183f1374481"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a29bfba2d26604e5d8d7f3183f1374481">&#9670;&nbsp;</a></span>on_connection_wake()</h2>
+
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+  <tr>
+  <td class="mlabels-left">
+      <table class="memname">
+        <tr>
+          <td class="memname">virtual void on_connection_wake </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classproton_1_1connection.html">connection</a> &amp;&#160;</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+  </td>
+  <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">virtual</span></span>  </td>
+  </tr>
+</table>
+</div><div class="memdoc">
+
+<p><b>Unsettled API</b> - an event that can be triggered from another thread. </p>
+<p><a class="el" href="classproton_1_1messaging__handler.html#a29bfba2d26604e5d8d7f3183f1374481" title="Unsettled API - an event that can be triggered from another thread. ">on_connection_wake()</a> can be triggered by any thread calling <a class="el" href="classproton_1_1connection.html#a473371542eaeba6f67660582fe6a6074" title="Unsettled API - Trigger an event from another thread. ">connection::wake()</a> It is used to notify the application's <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a> instance that something needs attention.</p>
+<p>The application handler and the triggering thread must use some form of thread-safe state or communication to tell the handler what it needs to do.</p>
+<dl class="section note"><dt>Note</dt><dd>spurious calls to <a class="el" href="classproton_1_1messaging__handler.html#a29bfba2d26604e5d8d7f3183f1374481" title="Unsettled API - an event that can be triggered from another thread. ">on_connection_wake()</a> can occur without any application call to <a class="el" href="classproton_1_1connection.html#a473371542eaeba6f67660582fe6a6074" title="Unsettled API - Trigger an event from another thread. ">connection::wake()</a></dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1work__queue.html" title="Unsettled API - A context for thread-safe execution of work. ">work_queue</a> provides an easier way execute code safely in the handler thread. </dd></dl>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.js
index eb27ab8..8ec14b1 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1messaging__handler.js
@@ -2,33 +2,34 @@ var classproton_1_1messaging__handler =
 [
     [ "messaging_handler", "classproton_1_1messaging__handler.html#a6a8e214436bb8eda1d60a13fb4bc1cc2", null ],
     [ "~messaging_handler", "classproton_1_1messaging__handler.html#a68692afef03d64a8ae1af0923e1fa13e", null ],
-    [ "on_connection_close", "classproton_1_1messaging__handler.html#a804f0ea9c2754f143624b4078a61f650", null ],
-    [ "on_connection_error", "classproton_1_1messaging__handler.html#aafa83dc2f8f477ba1f76e86dc69cd1e9", null ],
-    [ "on_connection_open", "classproton_1_1messaging__handler.html#a16ba022e899957b2e25b9561b1f53968", null ],
     [ "on_container_start", "classproton_1_1messaging__handler.html#a4949b0c93402fae0c07492d984688a25", null ],
     [ "on_container_stop", "classproton_1_1messaging__handler.html#ab5bb8195e26c8818c4f57a734566ecfd", null ],
-    [ "on_delivery_settle", "classproton_1_1messaging__handler.html#afc96eabc76c471d61627493eadb58ac8", null ],
-    [ "on_error", "classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e", null ],
     [ "on_message", "classproton_1_1messaging__handler.html#a96879b0b0b7ade11f98d3f450abd4c46", null ],
-    [ "on_receiver_close", "classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907", null ],
+    [ "on_sendable", "classproton_1_1messaging__handler.html#aa24f522a68cdf382762702cece7790e7", null ],
+    [ "on_transport_open", "classproton_1_1messaging__handler.html#a0c141065eda9a26916ccc63ccea5d3b7", null ],
+    [ "on_transport_close", "classproton_1_1messaging__handler.html#a47c33c5e6c13d23f1b8a745bf7bdfa8f", null ],
+    [ "on_transport_error", "classproton_1_1messaging__handler.html#af89551ce0e44ae3465d4b078f1c87653", null ],
+    [ "on_connection_open", "classproton_1_1messaging__handler.html#a16ba022e899957b2e25b9561b1f53968", null ],
+    [ "on_connection_close", "classproton_1_1messaging__handler.html#a804f0ea9c2754f143624b4078a61f650", null ],
+    [ "on_connection_error", "classproton_1_1messaging__handler.html#aafa83dc2f8f477ba1f76e86dc69cd1e9", null ],
+    [ "on_session_open", "classproton_1_1messaging__handler.html#adddbfd9b7fc7719490bdc21331c42302", null ],
+    [ "on_session_close", "classproton_1_1messaging__handler.html#a54fe4fc5394418f8606f9263f13d2e98", null ],
+    [ "on_session_error", "classproton_1_1messaging__handler.html#aca924d2f68649df7945719be3d29a597", null ],
+    [ "on_receiver_open", "classproton_1_1messaging__handler.html#a768b0a50669aa1d512d12e9d68af14cd", null ],
     [ "on_receiver_detach", "classproton_1_1messaging__handler.html#a93ab65773954cf12eb7f76a26aa44cfe", null ],
-    [ "on_receiver_drain_finish", "classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116", null ],
+    [ "on_receiver_close", "classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907", null ],
     [ "on_receiver_error", "classproton_1_1messaging__handler.html#a0c281aee5483822bdf4b428834bd7f28", null ],
-    [ "on_receiver_open", "classproton_1_1messaging__handler.html#a768b0a50669aa1d512d12e9d68af14cd", null ],
-    [ "on_sendable", "classproton_1_1messaging__handler.html#aa24f522a68cdf382762702cece7790e7", null ],
-    [ "on_sender_close", "classproton_1_1messaging__handler.html#a7942b98699bd21e827041626ee1b5c84", null ],
+    [ "on_sender_open", "classproton_1_1messaging__handler.html#a0b5d066e5463d3365f662c8a7dc52661", null ],
     [ "on_sender_detach", "classproton_1_1messaging__handler.html#a731e7cdbda64b15f069efd560b66ada1", null ],
-    [ "on_sender_drain_start", "classproton_1_1messaging__handler.html#ad3d23a7c3849dabd137610f8ee1569e3", null ],
+    [ "on_sender_close", "classproton_1_1messaging__handler.html#a7942b98699bd21e827041626ee1b5c84", null ],
     [ "on_sender_error", "classproton_1_1messaging__handler.html#a2d9d98eee878f1e734457ba01e21228a", null ],
-    [ "on_sender_open", "classproton_1_1messaging__handler.html#a0b5d066e5463d3365f662c8a7dc52661", null ],
-    [ "on_session_close", "classproton_1_1messaging__handler.html#a54fe4fc5394418f8606f9263f13d2e98", null ],
-    [ "on_session_error", "classproton_1_1messaging__handler.html#aca924d2f68649df7945719be3d29a597", null ],
-    [ "on_session_open", "classproton_1_1messaging__handler.html#adddbfd9b7fc7719490bdc21331c42302", null ],
     [ "on_tracker_accept", "classproton_1_1messaging__handler.html#a003afbb57c00ce404a863152db7867ad", null ],
     [ "on_tracker_reject", "classproton_1_1messaging__handler.html#a0740e8c9ed9d0c304d2adced09802893", null ],
     [ "on_tracker_release", "classproton_1_1messaging__handler.html#acfde5590c6e826ef9e2c33a28edefe19", null ],
     [ "on_tracker_settle", "classproton_1_1messaging__handler.html#a023a5c57eeeaf79ed5b768cd172ad0ac", null ],
-    [ "on_transport_close", "classproton_1_1messaging__handler.html#a47c33c5e6c13d23f1b8a745bf7bdfa8f", null ],
-    [ "on_transport_error", "classproton_1_1messaging__handler.html#af89551ce0e44ae3465d4b078f1c87653", null ],
-    [ "on_transport_open", "classproton_1_1messaging__handler.html#a0c141065eda9a26916ccc63ccea5d3b7", null ]
+    [ "on_delivery_settle", "classproton_1_1messaging__handler.html#afc96eabc76c471d61627493eadb58ac8", null ],
+    [ "on_sender_drain_start", "classproton_1_1messaging__handler.html#ad3d23a7c3849dabd137610f8ee1569e3", null ],
+    [ "on_receiver_drain_finish", "classproton_1_1messaging__handler.html#a815e30c6d10d923d88dc1085b7b0f116", null ],
+    [ "on_connection_wake", "classproton_1_1messaging__handler.html#a29bfba2d26604e5d8d7f3183f1374481", null ],
+    [ "on_error", "classproton_1_1messaging__handler.html#a5e29fef3b8c5b8cf18aa7d69850ac22e", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
index 0c4d086..ed2e3c0 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.html
@@ -180,7 +180,7 @@ class <a class="el" href="classproton_1_1container.html">container</a> &amp;&#16
 <tr class="separator:a2f632b80247e868b8264b8a025b84baf"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7c755d6ac6385e007adb61966598ba63"><td class="memItemLeft" align="right" valign="top"><a id="a7c755d6ac6385e007adb61966598ba63"></a>
 class <a class="el" href="classproton_1_1work__queue.html">work_queue</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#a7c755d6ac6385e007adb61966598ba63">work_queue</a> () const</td></tr>
-<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Unsettled API - A work queue for serial execution. ">work_queue</a> for the link. <br /></td></tr>
+<tr class="memdesc:a7c755d6ac6385e007adb61966598ba63"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the <a class="el" href="classproton_1_1work__queue.html" title="Unsettled API - A context for thread-safe execution of work. ">work_queue</a> for the link. <br /></td></tr>
 <tr class="separator:a7c755d6ac6385e007adb61966598ba63"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aff302bb6016f2ae29f01bb4e07389a52"><td class="memItemLeft" align="right" valign="top"><a id="aff302bb6016f2ae29f01bb4e07389a52"></a>
 class <a class="el" href="classproton_1_1connection.html">connection</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1link.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a> () const</td></tr>
@@ -195,6 +195,48 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 <div class="textblock"><p>A channel for receiving messages. </p>
 <dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8cpp-example.html#_a15">broker.cpp</a>, <a class="el" href="client_8cpp-example.html#_a4">client.cpp</a>, <a class="el" href="multithreaded_client_flow_control_8cpp-example.html#_a17">multithreaded_client_flow_control.cpp</a>, <a class="el" href="service_bus_8cpp-example.html#_a9">service_bus.cpp</a>, and <a class="el" href="simple_recv_8cpp-example.html#_a1">simple_recv.cpp</a>.</dd>
 </dl></div><h2 class="groupheader">Member Function Documentation</h2>
+<a id="a9e8555112049fc2b4945120b3c45f8ab"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a9e8555112049fc2b4945120b3c45f8ab">&#9670;&nbsp;</a></span>open() <span class="overload">[1/2]</span></h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void open </td>
+          <td>(</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Open the receiver. </p>
+<dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
+<dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8cpp-example.html#a17">broker.cpp</a>.</dd>
+</dl>
+</div>
+</div>
+<a id="a897e5c9bbc85f213403e0c6fcb69426d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a897e5c9bbc85f213403e0c6fcb69426d">&#9670;&nbsp;</a></span>open() <span class="overload">[2/2]</span></h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void open </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td>
+          <td class="paramname"><em>opts</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Open the receiver. </p>
+<dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
+
+</div>
+</div>
 <a id="a84d3a001340d11201e03c6ed7c763641"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a84d3a001340d11201e03c6ed7c763641">&#9670;&nbsp;</a></span>add_credit()</h2>
 
@@ -217,6 +259,26 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 </dl>
 </div>
 </div>
+<a id="af7d01b5776b9d8a0f218aec331ddaeb9"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#af7d01b5776b9d8a0f218aec331ddaeb9">&#9670;&nbsp;</a></span>drain()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void drain </td>
+          <td>(</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p><b>Unsettled API</b> - Commence a drain cycle. </p>
+<p>If there is positive credit, a request is sent to the sender to immediately use up all of the existing credit balance by sending messages that are immediately available and releasing any unused credit (see <a class="el" href="classproton_1_1sender.html#abc4cb5f2f38643abb47c0b221a130bc8" title="Unsettled API - Return all unused credit to the receiver in response to a drain request. ">sender::return_credit</a>). Throws <a class="el" href="structproton_1_1error.html" title="The base Proton error. ">proton::error</a> if a drain cycle is already in progress. An on_receiver_drain_finish event will be generated when the outstanding drained credit reaches zero. </p>
+
+</div>
+</div>
 <a id="a5ae591df94fc66ccb85cbb6565368bca"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a5ae591df94fc66ccb85cbb6565368bca">&#9670;&nbsp;</a></span>close() <span class="overload">[1/2]</span></h2>
 
@@ -244,7 +306,7 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 <dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
 
 <p>Implements <a class="el" href="classproton_1_1endpoint.html#af6ee7eacbde6b379b68d954e44f6e549">endpoint</a>.</p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" href="direct_recv_8cpp-example.html#a11">direct_recv.cpp</a>, <a class="el" href="helloworld_8cpp-example.html#a14">helloworld.cpp</a>, <a class="el" href="helloworld_direct_8cpp-example.html#a10">helloworld_direct.cpp</a>, <a class="el" href="service_bus_8cpp-example.html#a21">service_bus.cpp</a>, and <a class="el" href="simple_recv_8cpp-example.html#a14">simple_recv.cpp</a>.</dd>
+<dl><dt><b>Examples: </b></dt><dd><a class="el" href="direct_recv_8cpp-example.html#a11">direct_recv.cpp</a>, <a class="el" href="helloworld_8cpp-example.html#a14">helloworld.cpp</a>, <a class="el" href="helloworld_direct_8cpp-example.html#a10">helloworld_direct.cpp</a>, <a class="el" href="service_bus_8cpp-example.html#a20">service_bus.cpp</a>, and <a class="el" href="simple_recv_8cpp-example.html#a14">simple_recv.cpp</a>.</dd>
 </dl>
 </div>
 </div>
@@ -307,26 +369,6 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 
 </div>
 </div>
-<a id="af7d01b5776b9d8a0f218aec331ddaeb9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#af7d01b5776b9d8a0f218aec331ddaeb9">&#9670;&nbsp;</a></span>drain()</h2>
-
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void drain </td>
-          <td>(</td>
-          <td class="paramname"></td><td>)</td>
-          <td></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p><b>Unsettled API</b> - Commence a drain cycle. </p>
-<p>If there is positive credit, a request is sent to the sender to immediately use up all of the existing credit balance by sending messages that are immediately available and releasing any unused credit (see <a class="el" href="classproton_1_1sender.html#abc4cb5f2f38643abb47c0b221a130bc8" title="Unsettled API - Return all unused credit to the receiver in response to a drain request. ">sender::return_credit</a>). Throws <a class="el" href="structproton_1_1error.html" title="The base Proton error. ">proton::error</a> if a drain cycle is already in progress. An on_receiver_drain_finish event will be generated when the outstanding drained credit reaches zero. </p>
-
-</div>
-</div>
 <a id="a19c36a38b50e8080b94a47230a56234f"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a19c36a38b50e8080b94a47230a56234f">&#9670;&nbsp;</a></span>draining()</h2>
 
@@ -356,48 +398,6 @@ class <a class="el" href="classproton_1_1session.html">session</a>&#160;</td><td
 
 </div>
 </div>
-<a id="a9e8555112049fc2b4945120b3c45f8ab"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a9e8555112049fc2b4945120b3c45f8ab">&#9670;&nbsp;</a></span>open() <span class="overload">[1/2]</span></h2>
-
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void open </td>
-          <td>(</td>
-          <td class="paramname"></td><td>)</td>
-          <td></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>Open the receiver. </p>
-<dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8cpp-example.html#a17">broker.cpp</a>.</dd>
-</dl>
-</div>
-</div>
-<a id="a897e5c9bbc85f213403e0c6fcb69426d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a897e5c9bbc85f213403e0c6fcb69426d">&#9670;&nbsp;</a></span>open() <span class="overload">[2/2]</span></h2>
-
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void open </td>
-          <td>(</td>
-          <td class="paramtype">const <a class="el" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;&#160;</td>
-          <td class="paramname"><em>opts</em></td><td>)</td>
-          <td></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>Open the receiver. </p>
-<dl class="section see"><dt>See also</dt><dd>endpoint_lifecycle </dd></dl>
-
-</div>
-</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li>proton/<a class="el" href="receiver_8hpp_source.html">receiver.hpp</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.js
index b99f6f1..2bc8d84 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver.js
@@ -1,24 +1,24 @@
 var classproton_1_1receiver =
 [
     [ "receiver", "classproton_1_1receiver.html#a24b1f20b28b31ee266f387d1fe31b627", null ],
-    [ "active", "classproton_1_1receiver.html#ad9735e23cb0888fb98e1c5893aecff7e", null ],
+    [ "open", "classproton_1_1receiver.html#a9e8555112049fc2b4945120b3c45f8ab", null ],
+    [ "open", "classproton_1_1receiver.html#a897e5c9bbc85f213403e0c6fcb69426d", null ],
+    [ "source", "classproton_1_1receiver.html#a91a9e8a9445b29d83dd0514cd76503ae", null ],
+    [ "target", "classproton_1_1receiver.html#a5f0b815f331997411a6794f8628592ba", null ],
     [ "add_credit", "classproton_1_1receiver.html#a84d3a001340d11201e03c6ed7c763641", null ],
+    [ "drain", "classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9", null ],
+    [ "uninitialized", "classproton_1_1receiver.html#ab51c3843057c4c187574e2d44839f815", null ],
+    [ "active", "classproton_1_1receiver.html#ad9735e23cb0888fb98e1c5893aecff7e", null ],
+    [ "closed", "classproton_1_1receiver.html#ae54500202b0333927a28c440c85cf07e", null ],
+    [ "error", "classproton_1_1receiver.html#a090a10fab22d7faf0f74c8ccda0f1470", null ],
     [ "close", "classproton_1_1receiver.html#a5ae591df94fc66ccb85cbb6565368bca", null ],
     [ "close", "classproton_1_1receiver.html#a817883d28ce0ac8a29d917d196796f68", null ],
-    [ "closed", "classproton_1_1receiver.html#ae54500202b0333927a28c440c85cf07e", null ],
-    [ "connection", "classproton_1_1receiver.html#aff302bb6016f2ae29f01bb4e07389a52", null ],
-    [ "container", "classproton_1_1receiver.html#a2f632b80247e868b8264b8a025b84baf", null ],
-    [ "credit", "classproton_1_1receiver.html#afd27bd11ba72d7df51c44f71b15749eb", null ],
     [ "detach", "classproton_1_1receiver.html#ac295bade8aee589f6718dfa79edc2a34", null ],
-    [ "drain", "classproton_1_1receiver.html#af7d01b5776b9d8a0f218aec331ddaeb9", null ],
+    [ "credit", "classproton_1_1receiver.html#afd27bd11ba72d7df51c44f71b15749eb", null ],
     [ "draining", "classproton_1_1receiver.html#a19c36a38b50e8080b94a47230a56234f", null ],
-    [ "error", "classproton_1_1receiver.html#a090a10fab22d7faf0f74c8ccda0f1470", null ],
     [ "name", "classproton_1_1receiver.html#a1d89c28bd42ba9a52da008bb69367171", null ],
-    [ "open", "classproton_1_1receiver.html#a9e8555112049fc2b4945120b3c45f8ab", null ],
-    [ "open", "classproton_1_1receiver.html#a897e5c9bbc85f213403e0c6fcb69426d", null ],
-    [ "session", "classproton_1_1receiver.html#ab55cf76248b8b6e571a869c407ba39e6", null ],
-    [ "source", "classproton_1_1receiver.html#a91a9e8a9445b29d83dd0514cd76503ae", null ],
-    [ "target", "classproton_1_1receiver.html#a5f0b815f331997411a6794f8628592ba", null ],
-    [ "uninitialized", "classproton_1_1receiver.html#ab51c3843057c4c187574e2d44839f815", null ],
-    [ "work_queue", "classproton_1_1receiver.html#a7c755d6ac6385e007adb61966598ba63", null ]
+    [ "container", "classproton_1_1receiver.html#a2f632b80247e868b8264b8a025b84baf", null ],
+    [ "work_queue", "classproton_1_1receiver.html#a7c755d6ac6385e007adb61966598ba63", null ],
+    [ "connection", "classproton_1_1receiver.html#aff302bb6016f2ae29f01bb4e07389a52", null ],
+    [ "session", "classproton_1_1receiver.html#ab55cf76248b8b6e571a869c407ba39e6", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
index ef5ace9..75f1f3c 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.html
@@ -151,108 +151,108 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <div class="fragment"><div class="line"><a class="code" href="classproton_1_1receiver__options.html#a9e10a473b92db75e78a3ad8498f32c36">receiver_options</a> opts;</div><div class="line">opts.auto_settle(<span class="keyword">true</span>);</div><div class="line">c2 = container.open_receiver(url2, opts.handler(h2));</div></div><!-- fragment --><p>Normal value semantics: copy or assign creates a separate copy of the options. </p>
 <dl><dt><b>Examples: </b></dt><dd><a class="el" href="broker_8cpp-example.html#_a18">broker.cpp</a>, <a class="el" href="client_8cpp-example.html#_a0">client.cpp</a>, <a class="el" href="multithreaded_client_flow_control_8cpp-example.html#_a19">multithreaded_client_flow_control.cpp</a>, and <a class="el" href="service_bus_8cpp-example.html#_a3">service_bus.cpp</a>.</dd>
 </dl></div><h2 class="groupheader">Member Function Documentation</h2>
-<a id="a9b9ad83418de47f87c6c7062eaefb5b6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a9b9ad83418de47f87c6c7062eaefb5b6">&#9670;&nbsp;</a></span>auto_accept()</h2>
+<a id="a84f38ac0f31f74011c9dc342e44a53df"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a84f38ac0f31f74011c9dc342e44a53df">&#9670;&nbsp;</a></span>handler()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; auto_accept </td>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; handler </td>
           <td>(</td>
-          <td class="paramtype">bool&#160;</td>
+          <td class="paramtype">class <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a> &amp;&#160;</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Enable or disable automatic acceptance of messages that aren't otherwise released, rejected, or modified. </p>
-<p>It is enabled by default. </p>
+<p>Set a <a class="el" href="classproton_1_1messaging__handler.html" title="A handler for Proton messaging events. ">messaging_handler</a> for receiver events only. </p>
+<p>The handler is no longer in use when <a class="el" href="classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907" title="The remote peer closed the link. ">messaging_handler::on_receiver_close()</a> is called. </p>
 
 </div>
 </div>
-<a id="af313abfa8d5b19e4b61c779907eb9980"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#af313abfa8d5b19e4b61c779907eb9980">&#9670;&nbsp;</a></span>auto_settle()</h2>
+<a id="a582bced77754ed8a85f9597e2e457079"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a582bced77754ed8a85f9597e2e457079">&#9670;&nbsp;</a></span>delivery_mode()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; auto_settle </td>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; <a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a> </td>
           <td>(</td>
-          <td class="paramtype">bool&#160;</td>
+          <td class="paramtype"><a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a>&#160;</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Enable or disable automatic settlement of messages. </p>
-<p>It is enabled by default. </p>
+<p>Set the delivery mode on the receiver. </p>
+<p>The default is <a class="el" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1" title="The receiver settles the delivery first with an accept/reject/release disposition. ">delivery_mode::AT_LEAST_ONCE</a>. </p>
 
 </div>
 </div>
-<a id="a714a6a7dd1ea90c6046fe0460d2ce4f0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a714a6a7dd1ea90c6046fe0460d2ce4f0">&#9670;&nbsp;</a></span>credit_window()</h2>
+<a id="a9b9ad83418de47f87c6c7062eaefb5b6"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a9b9ad83418de47f87c6c7062eaefb5b6">&#9670;&nbsp;</a></span>auto_accept()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; credit_window </td>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; auto_accept </td>
           <td>(</td>
-          <td class="paramtype">int&#160;</td>
-          <td class="paramname"><em>count</em></td><td>)</td>
+          <td class="paramtype">bool&#160;</td>
+          <td class="paramname"></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Automatically replenish credit for flow control up to <code>count</code> messages. </p>
-<p>The default is 10. Set to zero to disable automatic replenishment. </p>
+<p>Enable or disable automatic acceptance of messages that aren't otherwise released, rejected, or modified. </p>
+<p>It is enabled by default. </p>
 
 </div>
 </div>
-<a id="a582bced77754ed8a85f9597e2e457079"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a582bced77754ed8a85f9597e2e457079">&#9670;&nbsp;</a></span>delivery_mode()</h2>
+<a id="af313abfa8d5b19e4b61c779907eb9980"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#af313abfa8d5b19e4b61c779907eb9980">&#9670;&nbsp;</a></span>auto_settle()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; <a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a> </td>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; auto_settle </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structproton_1_1delivery__mode.html">delivery_mode</a>&#160;</td>
+          <td class="paramtype">bool&#160;</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Set the delivery mode on the receiver. </p>
-<p>The default is <a class="el" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1" title="The receiver settles the delivery first with an accept/reject/release disposition. ">delivery_mode::AT_LEAST_ONCE</a>. </p>
+<p>Enable or disable automatic settlement of messages. </p>
+<p>It is enabled by default. </p>
 
 </div>
 </div>
-<a id="a84f38ac0f31f74011c9dc342e44a53df"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a84f38ac0f31f74011c9dc342e44a53df">&#9670;&nbsp;</a></span>handler()</h2>
+<a id="a714a6a7dd1ea90c6046fe0460d2ce4f0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a714a6a7dd1ea90c6046fe0460d2ce4f0">&#9670;&nbsp;</a></span>credit_window()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; handler </td>
+          <td class="memname"><a class="el" href="classproton_1_1receiver__options.html">receiver_options</a>&amp; credit_window </td>
           <td>(</td>
-          <td class="paramtype">class <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a> &amp;&#160;</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramtype">int&#160;</td>
+          <td class="paramname"><em>count</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Set a <a class="el" href="classproton_1_1messaging__handler.html" title="A handler for Proton messaging events. ">messaging_handler</a> for receiver events only. </p>
-<p>The handler is no longer in use when <a class="el" href="classproton_1_1messaging__handler.html#a77ac5c1fd05404728451cd06dee1c907" title="The remote peer closed the link. ">messaging_handler::on_receiver_close()</a> is called. </p>
+<p>Automatically replenish credit for flow control up to <code>count</code> messages. </p>
+<p>The default is 10. Set to zero to disable automatic replenishment. </p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
index fa023e4..e87fef6 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1receiver__options.js
@@ -3,13 +3,13 @@ var classproton_1_1receiver__options =
     [ "receiver_options", "classproton_1_1receiver__options.html#a9e10a473b92db75e78a3ad8498f32c36", null ],
     [ "receiver_options", "classproton_1_1receiver__options.html#a09be031fe2c8df29e3f0f1b0f1c904c3", null ],
     [ "~receiver_options", "classproton_1_1receiver__options.html#ad8168a06620ae6844cb61451d065f4f3", null ],
+    [ "operator=", "classproton_1_1receiver__options.html#a815be8018205013b8ff011d4b62b7324", null ],
+    [ "update", "classproton_1_1receiver__options.html#a7bbed67f2faac1cd6a5c490dac90bda3", null ],
+    [ "handler", "classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df", null ],
+    [ "delivery_mode", "classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079", null ],
     [ "auto_accept", "classproton_1_1receiver__options.html#a9b9ad83418de47f87c6c7062eaefb5b6", null ],
     [ "auto_settle", "classproton_1_1receiver__options.html#af313abfa8d5b19e4b61c779907eb9980", null ],
-    [ "credit_window", "classproton_1_1receiver__options.html#a714a6a7dd1ea90c6046fe0460d2ce4f0", null ],
-    [ "delivery_mode", "classproton_1_1receiver__options.html#a582bced77754ed8a85f9597e2e457079", null ],
-    [ "handler", "classproton_1_1receiver__options.html#a84f38ac0f31f74011c9dc342e44a53df", null ],
-    [ "operator=", "classproton_1_1receiver__options.html#a815be8018205013b8ff011d4b62b7324", null ],
     [ "source", "classproton_1_1receiver__options.html#a7e2689fd52f88f551d11face38a4157b", null ],
     [ "target", "classproton_1_1receiver__options.html#a7823f6c72dc78481be578de1658b99eb", null ],
-    [ "update", "classproton_1_1receiver__options.html#a7bbed67f2faac1cd6a5c490dac90bda3", null ]
+    [ "credit_window", "classproton_1_1receiver__options.html#a714a6a7dd1ea90c6046fe0460d2ce4f0", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options-members.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options-members.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options-members.html
index 7eb911f..ae218f5 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options-members.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options-members.html
@@ -98,12 +98,13 @@ $(document).ready(function(){initNavTree('classproton_1_1reconnect__options.html
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a700d91bfa7a95ee851dd94eda092721b">delay</a>(duration)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a8456389a8174cf6d2ae2550e05e3e650">delay_multiplier</a>(float)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a7e6b1a75735da02638374a317a232428">max_attempts</a>(int)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a7840ff5254abe6996b44e3906cf1445b">max_delay</a>(duration)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#aea298c3d006e10b7da6608591949b270">operator=</a>(const reconnect_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#ac327dafeb06728192df6cb94dde35edc">reconnect_options</a>()</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#aef23a4a6b4f399f86ba458e855e0ca08">reconnect_options</a>(const reconnect_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~reconnect_options</b>() (defined in <a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a342bae3e139b785604e4ed0c7599a068">failover_urls</a>(const std::vector&lt; std::string &gt; &amp;conn_urls)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a7e6b1a75735da02638374a317a232428">max_attempts</a>(int)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#a7840ff5254abe6996b44e3906cf1445b">max_delay</a>(duration)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#aea298c3d006e10b7da6608591949b270">operator=</a>(const reconnect_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#ac327dafeb06728192df6cb94dde35edc">reconnect_options</a>()</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html#aef23a4a6b4f399f86ba458e855e0ca08">reconnect_options</a>(const reconnect_options &amp;)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~reconnect_options</b>() (defined in <a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a>)</td><td class="entry"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.html
index 6edb7d1..4fe2c2a 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.html
@@ -97,7 +97,7 @@ $(document).ready(function(){initNavTree('classproton_1_1reconnect__options.html
 </div><!--header-->
 <div class="contents">
 
-<p><b>Experimental</b> - Options that determine a series of delays to coordinate reconnection attempts.  
+<p><b>Unsettled API</b> - Options for reconnect and failover after connection loss.  
  <a href="classproton_1_1reconnect__options.html#details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="reconnect__options_8hpp_source.html">reconnect_options.hpp</a>&gt;</code></p>
@@ -116,28 +116,70 @@ Public Member Functions</h2></td></tr>
 <a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#aea298c3d006e10b7da6608591949b270">operator=</a> (const <a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;)</td></tr>
 <tr class="memdesc:aea298c3d006e10b7da6608591949b270"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy options. <br /></td></tr>
 <tr class="separator:aea298c3d006e10b7da6608591949b270"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a700d91bfa7a95ee851dd94eda092721b"><td class="memItemLeft" align="right" valign="top"><a id="a700d91bfa7a95ee851dd94eda092721b"></a>
-<a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a700d91bfa7a95ee851dd94eda092721b">delay</a> (<a class="el" href="classproton_1_1duration.html">duration</a>)</td></tr>
-<tr class="memdesc:a700d91bfa7a95ee851dd94eda092721b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Base value for recurring delay (default is 10 milliseconds). <br /></td></tr>
+<tr class="memitem:a700d91bfa7a95ee851dd94eda092721b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a700d91bfa7a95ee851dd94eda092721b">delay</a> (<a class="el" href="classproton_1_1duration.html">duration</a>)</td></tr>
+<tr class="memdesc:a700d91bfa7a95ee851dd94eda092721b"><td class="mdescLeft">&#160;</td><td class="mdescRight">The base value for recurring delays.  <a href="#a700d91bfa7a95ee851dd94eda092721b">More...</a><br /></td></tr>
 <tr class="separator:a700d91bfa7a95ee851dd94eda092721b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8456389a8174cf6d2ae2550e05e3e650"><td class="memItemLeft" align="right" valign="top"><a id="a8456389a8174cf6d2ae2550e05e3e650"></a>
-<a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a8456389a8174cf6d2ae2550e05e3e650">delay_multiplier</a> (float)</td></tr>
-<tr class="memdesc:a8456389a8174cf6d2ae2550e05e3e650"><td class="mdescLeft">&#160;</td><td class="mdescRight">Scaling multiplier for successive reconnect delays (default is 2.0) <br /></td></tr>
+<tr class="memitem:a8456389a8174cf6d2ae2550e05e3e650"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a8456389a8174cf6d2ae2550e05e3e650">delay_multiplier</a> (float)</td></tr>
+<tr class="memdesc:a8456389a8174cf6d2ae2550e05e3e650"><td class="mdescLeft">&#160;</td><td class="mdescRight">The scaling multiplier for successive reconnect delays.  <a href="#a8456389a8174cf6d2ae2550e05e3e650">More...</a><br /></td></tr>
 <tr class="separator:a8456389a8174cf6d2ae2550e05e3e650"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7840ff5254abe6996b44e3906cf1445b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a7840ff5254abe6996b44e3906cf1445b">max_delay</a> (<a class="el" href="classproton_1_1duration.html">duration</a>)</td></tr>
-<tr class="memdesc:a7840ff5254abe6996b44e3906cf1445b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Maximum delay between successive connect attempts (default <a class="el" href="classproton_1_1duration.html#acebdd3ee364870f89665ca128e97a4d7" title="Wait forever. ">duration::FOREVER</a>, i.e.  <a href="#a7840ff5254abe6996b44e3906cf1445b">More...</a><br /></td></tr>
+<tr class="memdesc:a7840ff5254abe6996b44e3906cf1445b"><td class="mdescLeft">&#160;</td><td class="mdescRight">The maximum delay between successive connect attempts.  <a href="#a7840ff5254abe6996b44e3906cf1445b">More...</a><br /></td></tr>
 <tr class="separator:a7840ff5254abe6996b44e3906cf1445b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7e6b1a75735da02638374a317a232428"><td class="memItemLeft" align="right" valign="top"><a id="a7e6b1a75735da02638374a317a232428"></a>
-<a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a7e6b1a75735da02638374a317a232428">max_attempts</a> (int)</td></tr>
-<tr class="memdesc:a7e6b1a75735da02638374a317a232428"><td class="mdescLeft">&#160;</td><td class="mdescRight">Maximum reconnect attempts (default 0, meaning no limit) <br /></td></tr>
+<tr class="memitem:a7e6b1a75735da02638374a317a232428"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a7e6b1a75735da02638374a317a232428">max_attempts</a> (int)</td></tr>
+<tr class="memdesc:a7e6b1a75735da02638374a317a232428"><td class="mdescLeft">&#160;</td><td class="mdescRight">The maximum number of reconnect attempts.  <a href="#a7e6b1a75735da02638374a317a232428">More...</a><br /></td></tr>
 <tr class="separator:a7e6b1a75735da02638374a317a232428"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a342bae3e139b785604e4ed0c7599a068"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classproton_1_1reconnect__options.html#a342bae3e139b785604e4ed0c7599a068">failover_urls</a> (const std::vector&lt; std::string &gt; &amp;conn_urls)</td></tr>
+<tr class="memdesc:a342bae3e139b785604e4ed0c7599a068"><td class="mdescLeft">&#160;</td><td class="mdescRight">Alternative connection URLs used for failover.  <a href="#a342bae3e139b785604e4ed0c7599a068">More...</a><br /></td></tr>
+<tr class="separator:a342bae3e139b785604e4ed0c7599a068"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p><b>Experimental</b> - Options that determine a series of delays to coordinate reconnection attempts. </p>
-<p>They may be open ended or limited in time. They may be evenly spaced or increasing at an exponential rate.</p>
-<p>Options can be "chained" (</p><dl class="section see"><dt>See also</dt><dd><a class="el" href="classproton_1_1connection__options.html" title="Options for creating a connection. ">proton::connection_options</a>).</dd></dl>
+<div class="textblock"><p><b>Unsettled API</b> - Options for reconnect and failover after connection loss. </p>
+<p>These options determine a series of delays to coordinate reconnection attempts. They may be open-ended or limited in time. They may be evenly spaced or increasing at an exponential rate.</p>
+<p>Options can be "chained". See <a class="el" href="classproton_1_1connection__options.html">proton::connection_options</a>.</p>
 <p>Normal value semantics: copy or assign creates a separate copy of the options. </p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
+<a id="a700d91bfa7a95ee851dd94eda092721b"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a700d91bfa7a95ee851dd94eda092721b">&#9670;&nbsp;</a></span>delay()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a>&amp; delay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classproton_1_1duration.html">duration</a>&#160;</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>The base value for recurring delays. </p>
+<p>The default is 10 milliseconds. </p>
+
+</div>
+</div>
+<a id="a8456389a8174cf6d2ae2550e05e3e650"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a8456389a8174cf6d2ae2550e05e3e650">&#9670;&nbsp;</a></span>delay_multiplier()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a>&amp; delay_multiplier </td>
+          <td>(</td>
+          <td class="paramtype">float&#160;</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>The scaling multiplier for successive reconnect delays. </p>
+<p>The default is 2.0. </p>
+
+</div>
+</div>
 <a id="a7840ff5254abe6996b44e3906cf1445b"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a7840ff5254abe6996b44e3906cf1445b">&#9670;&nbsp;</a></span>max_delay()</h2>
 
@@ -154,8 +196,50 @@ Public Member Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Maximum delay between successive connect attempts (default <a class="el" href="classproton_1_1duration.html#acebdd3ee364870f89665ca128e97a4d7" title="Wait forever. ">duration::FOREVER</a>, i.e. </p>
-<p>no limit) </p>
+<p>The maximum delay between successive connect attempts. </p>
+<p>The default <a class="el" href="classproton_1_1duration.html#acebdd3ee364870f89665ca128e97a4d7" title="Wait forever. ">duration::FOREVER</a>, meaning no limit. </p>
+
+</div>
+</div>
+<a id="a7e6b1a75735da02638374a317a232428"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a7e6b1a75735da02638374a317a232428">&#9670;&nbsp;</a></span>max_attempts()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a>&amp; max_attempts </td>
+          <td>(</td>
+          <td class="paramtype">int&#160;</td>
+          <td class="paramname"></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>The maximum number of reconnect attempts. </p>
+<p>The default is 0, meaning no limit. </p>
+
+</div>
+</div>
+<a id="a342bae3e139b785604e4ed0c7599a068"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a342bae3e139b785604e4ed0c7599a068">&#9670;&nbsp;</a></span>failover_urls()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classproton_1_1reconnect__options.html">reconnect_options</a>&amp; failover_urls </td>
+          <td>(</td>
+          <td class="paramtype">const std::vector&lt; std::string &gt; &amp;&#160;</td>
+          <td class="paramname"><em>conn_urls</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Alternative connection URLs used for failover. </p>
+<p>There are none by default. </p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.js
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.js b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.js
index 3141289..6fc8505 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.js
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1reconnect__options.js
@@ -3,9 +3,10 @@ var classproton_1_1reconnect__options =
     [ "reconnect_options", "classproton_1_1reconnect__options.html#ac327dafeb06728192df6cb94dde35edc", null ],
     [ "reconnect_options", "classproton_1_1reconnect__options.html#aef23a4a6b4f399f86ba458e855e0ca08", null ],
     [ "~reconnect_options", "classproton_1_1reconnect__options.html#ab6d4cad321fbb7a59efddecc0f36895d", null ],
+    [ "operator=", "classproton_1_1reconnect__options.html#aea298c3d006e10b7da6608591949b270", null ],
     [ "delay", "classproton_1_1reconnect__options.html#a700d91bfa7a95ee851dd94eda092721b", null ],
     [ "delay_multiplier", "classproton_1_1reconnect__options.html#a8456389a8174cf6d2ae2550e05e3e650", null ],
-    [ "max_attempts", "classproton_1_1reconnect__options.html#a7e6b1a75735da02638374a317a232428", null ],
     [ "max_delay", "classproton_1_1reconnect__options.html#a7840ff5254abe6996b44e3906cf1445b", null ],
-    [ "operator=", "classproton_1_1reconnect__options.html#aea298c3d006e10b7da6608591949b270", null ]
+    [ "max_attempts", "classproton_1_1reconnect__options.html#a7e6b1a75735da02638374a317a232428", null ],
+    [ "failover_urls", "classproton_1_1reconnect__options.html#a342bae3e139b785604e4ed0c7599a068", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/7437c595/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1returned.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1returned.html b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1returned.html
index 7043823..0266e46 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1returned.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1returned.html
@@ -97,7 +97,7 @@ $(document).ready(function(){initNavTree('classproton_1_1returned.html','');});
 </div><!--header-->
 <div class="contents">
 
-<p>Return type for container functions.  
+<p>A return type for container methods.  
  <a href="classproton_1_1returned.html#details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="returned_8hpp_source.html">returned.hpp</a>&gt;</code></p>
@@ -115,8 +115,8 @@ Public Member Functions</h2></td></tr>
 <div class="textblock"><h3>template&lt;class T&gt;<br />
 class proton::returned&lt; T &gt;</h3>
 
-<p>Return type for container functions. </p>
-<dl class="section note"><dt>Note</dt><dd>returned value is <em>thread-unsafe</em>. A single-threaded application can assign the returned&lt;T&gt; value to a plain T. A multi-threaded application <em>must</em> ignore the returned value, as it may already be invalid by the time the function returns. Multi-threaded applications can access the value in <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a> functions. </dd></dl>
+<p>A return type for container methods. </p>
+<p><b>Thread safety</b> - Container method return values are <em>thread-unsafe</em>. A single-threaded application can safely assign the <code>returned&lt;T&gt;</code> value to a plain <code>T</code>. A multithreaded application <em>must</em> ignore the returned value because it may already be invalid by the time the function returns. Multithreaded applications can safely access the value inside <a class="el" href="classproton_1_1messaging__handler.html">messaging_handler</a> functions. </p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a id="a7e6c2d7eb0ba9807a9fb9fee0f628508"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a7e6c2d7eb0ba9807a9fb9fee0f628508">&#9670;&nbsp;</a></span>returned()</h2>
@@ -135,7 +135,7 @@ class proton::returned&lt; T &gt;</h3>
 </div><div class="memdoc">
 
 <p>Copy operator required to return a value. </p>
-<dl class="section note"><dt>Note</dt><dd>thread safe </dd></dl>
+<dl class="section note"><dt>Note</dt><dd>Thread-safe </dd></dl>
 
 </div>
 </div>
@@ -156,7 +156,7 @@ class proton::returned&lt; T &gt;</h3>
 </div><div class="memdoc">
 
 <p>Convert to the proton::object. </p>
-<dl class="section note"><dt>Note</dt><dd><b>Thread unsafe</b> do not use in a multi-threaded application. </dd></dl>
+<dl class="section note"><dt>Note</dt><dd><b>Thread-unsafe</b> - Do not use in a multithreaded application. </dd></dl>
 
 </div>
 </div>


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