http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target-members.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target-members.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target-members.html
index 20af243..7de49aa 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target-members.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target-members.html
@@ -97,22 +97,23 @@ 
$(document).ready(function(){initNavTree('classproton_1_1target.html','');});
 <p>This is the complete list of members for <a class="el" 
href="classproton_1_1target.html">target</a>, including all inherited 
members.</p>
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target.html#a4744eb217c976c199b678bb5a0d55acf">address</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da07731dff0bf77faf2dc60a19c925e3c4">CONFIGURATION</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebad1b07c50c2dc77892c0254442e206a23">CONNECTION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1target.html#a61db0571ab7d1a29ad77549ff99d6b3d">durability_mode</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8">proton::terminus::durability_mode</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#adcc4ef24adb8478230018c519aa636ec">dynamic</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target.html#a348690a43df146eca928a8c06034a1eb">expiry_policy</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#afc97dbb9b04812da5be8a41eb9434904">proton::terminus::expiry_policy</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba7201cfe403ee6d4b4b717d146e38bee1">LINK_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba3a267f9424d4d555780a8d26209c8118">NEVER</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8">node_properties</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3dafdced71ad3dc05c5221439eddc3573e8">NONDURABLE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebac028e516a1a662691a25993ab4f86c09">SESSION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1target.html#a1839bce0672e60129fb6c69534a027e6">target</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"><span 
class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>terminus</b>() 
(defined in <a class="el" 
href="classproton_1_1terminus.html">terminus</a>)</td><td class="entry"><a 
class="el" href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a16d54f985193a3ce6ac69ffe10e8dfb6">timeout</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da9a971a7b3eb61a4e22701f1f4099909f">UNSETTLED_STATE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a1c6bf68ea1dcbd3b2a0897adb628c1ee">capabilities</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da07731dff0bf77faf2dc60a19c925e3c4">CONFIGURATION</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebad1b07c50c2dc77892c0254442e206a23">CONNECTION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target.html#a61db0571ab7d1a29ad77549ff99d6b3d">durability_mode</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8">proton::terminus::durability_mode</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#adcc4ef24adb8478230018c519aa636ec">dynamic</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1target.html#a348690a43df146eca928a8c06034a1eb">expiry_policy</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#afc97dbb9b04812da5be8a41eb9434904">proton::terminus::expiry_policy</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba7201cfe403ee6d4b4b717d146e38bee1">LINK_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba3a267f9424d4d555780a8d26209c8118">NEVER</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8">node_properties</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3dafdced71ad3dc05c5221439eddc3573e8">NONDURABLE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebac028e516a1a662691a25993ab4f86c09">SESSION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target.html#a1839bce0672e60129fb6c69534a027e6">target</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1target.html">target</a></td><td class="entry"><span 
class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>terminus</b>() (defined in <a 
class="el" href="classproton_1_1terminus.html">terminus</a>)</td><td 
class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td class="entry"><span 
class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a16d54f985193a3ce6ac69ffe10e8dfb6">timeout</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da9a971a7b3eb61a4e22701f1f4099909f">UNSETTLED_STATE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</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/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.html 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.html
index 4f9f568..f73a187 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.html
@@ -149,6 +149,10 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a 
class="el" href="clas
 <tr class="memitem:ab503c82e36aa618e6c6fb34feaad57b8"><td class="memItemLeft" 
align="right" valign="top"><a class="el" 
href="classproton_1_1value.html">value</a>&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8">node_properties</a>
 () const</td></tr>
 <tr class="memdesc:ab503c82e36aa618e6c6fb34feaad57b8"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">Obtain a reference to the 
AMQP dynamic node properties for the terminus.  <a 
href="#ab503c82e36aa618e6c6fb34feaad57b8">More...</a><br /></td></tr>
 <tr class="separator:ab503c82e36aa618e6c6fb34feaad57b8"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1c6bf68ea1dcbd3b2a0897adb628c1ee"><td class="memItemLeft" 
align="right" valign="top"><a id="a1c6bf68ea1dcbd3b2a0897adb628c1ee"></a>
+std::vector&lt; <a class="el" href="classproton_1_1symbol.html">symbol</a> 
&gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1terminus.html#a1c6bf68ea1dcbd3b2a0897adb628c1ee">capabilities</a>
 () const</td></tr>
+<tr class="memdesc:a1c6bf68ea1dcbd3b2a0897adb628c1ee"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">Extension capabilities that 
are supported/requested. <br /></td></tr>
+<tr class="separator:a1c6bf68ea1dcbd3b2a0897adb628c1ee"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed 
Description</h2>
 <div class="textblock"><p>A destination for messages. </p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.js
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.js 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.js
index c1d8a6e..33d784e 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.js
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target.js
@@ -8,5 +8,6 @@ var classproton_1_1target =
     [ "expiry_policy", 
"classproton_1_1target.html#afc97dbb9b04812da5be8a41eb9434904", null ],
     [ "timeout", 
"classproton_1_1target.html#a16d54f985193a3ce6ac69ffe10e8dfb6", null ],
     [ "dynamic", 
"classproton_1_1target.html#adcc4ef24adb8478230018c519aa636ec", null ],
-    [ "node_properties", 
"classproton_1_1target.html#ab503c82e36aa618e6c6fb34feaad57b8", null ]
+    [ "node_properties", 
"classproton_1_1target.html#ab503c82e36aa618e6c6fb34feaad57b8", null ],
+    [ "capabilities", 
"classproton_1_1target.html#a1c6bf68ea1dcbd3b2a0897adb628c1ee", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options-members.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options-members.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options-members.html
index 9c1e848..9345b00 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options-members.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options-members.html
@@ -97,14 +97,15 @@ 
$(document).ready(function(){initNavTree('classproton_1_1target__options.html','
 <p>This is the complete list of members for <a class="el" 
href="classproton_1_1target__options.html">target_options</a>, including all 
inherited members.</p>
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a39a0acbf2c7de97e77df483ca9c4c6a9">address</a>(const
 std::string &amp;addr)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a8ebe0e28560c7873712674314ac9547d">durability_mode</a>(enum
 target::durability_mode)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#acc2d56132d2a7a0b644429b78ff00756">dynamic</a>(bool)</td><td
 class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a3ee55474d84d67e826dc56f40b848b5b">expiry_policy</a>(enum
 target::expiry_policy)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#aa7c2b9b076f3d98fa3bc67d3bd4fcffd">operator=</a>(const
 target_options &amp;)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#add127463954d31c61475058fe14aef52">target_options</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a19876222bb570ce8369d6024499faf05">target_options</a>(const
 target_options &amp;)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a14a86cafc12d543ad6f9c3be88fbd7b6">timeout</a>(duration)</td><td
 class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td 
class="entry"><b>~target_options</b>() (defined in <a class="el" 
href="classproton_1_1target__options.html">target_options</a>)</td><td 
class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#aec90fa88e34bccd5a121baa6c7e9e95a">capabilities</a>(const
 std::vector&lt; symbol &gt; &amp;)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a8ebe0e28560c7873712674314ac9547d">durability_mode</a>(enum
 target::durability_mode)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#acc2d56132d2a7a0b644429b78ff00756">dynamic</a>(bool)</td><td
 class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a3ee55474d84d67e826dc56f40b848b5b">expiry_policy</a>(enum
 target::expiry_policy)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#aa7c2b9b076f3d98fa3bc67d3bd4fcffd">operator=</a>(const
 target_options &amp;)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#add127463954d31c61475058fe14aef52">target_options</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a19876222bb570ce8369d6024499faf05">target_options</a>(const
 target_options &amp;)</td><td class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1target__options.html#a14a86cafc12d543ad6f9c3be88fbd7b6">timeout</a>(duration)</td><td
 class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_options</a></td><td 
class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>~target_options</b>() (defined in 
<a class="el" 
href="classproton_1_1target__options.html">target_options</a>)</td><td 
class="entry"><a class="el" 
href="classproton_1_1target__options.html">target_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/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.html
index c73316f..9d6e892 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.html
@@ -131,6 +131,10 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:a3ee55474d84d67e826dc56f40b848b5b"><td class="memItemLeft" 
align="right" valign="top"><a class="el" 
href="classproton_1_1target__options.html">target_options</a> 
&amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1target__options.html#a3ee55474d84d67e826dc56f40b848b5b">expiry_policy</a>
 (enum <a class="el" 
href="classproton_1_1target.html#a348690a43df146eca928a8c06034a1eb">target::expiry_policy</a>)</td></tr>
 <tr class="memdesc:a3ee55474d84d67e826dc56f40b848b5b"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">Control when the clock for 
expiration begins.  <a href="#a3ee55474d84d67e826dc56f40b848b5b">More...</a><br 
/></td></tr>
 <tr class="separator:a3ee55474d84d67e826dc56f40b848b5b"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aec90fa88e34bccd5a121baa6c7e9e95a"><td class="memItemLeft" 
align="right" valign="top"><a id="aec90fa88e34bccd5a121baa6c7e9e95a"></a>
+<a class="el" href="classproton_1_1target__options.html">target_options</a> 
&amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1target__options.html#aec90fa88e34bccd5a121baa6c7e9e95a">capabilities</a>
 (const std::vector&lt; <a class="el" 
href="classproton_1_1symbol.html">symbol</a> &gt; &amp;)</td></tr>
+<tr class="memdesc:aec90fa88e34bccd5a121baa6c7e9e95a"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">Extension capabilities that 
are supported/requested. <br /></td></tr>
+<tr class="separator:aec90fa88e34bccd5a121baa6c7e9e95a"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed 
Description</h2>
 <div class="textblock"><p>Options for creating a target node for a sender or 
receiver. </p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.js
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.js
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.js
index 1971161..13f0b6f 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.js
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1target__options.js
@@ -8,5 +8,6 @@ var classproton_1_1target__options =
     [ "dynamic", 
"classproton_1_1target__options.html#acc2d56132d2a7a0b644429b78ff00756", null ],
     [ "durability_mode", 
"classproton_1_1target__options.html#a8ebe0e28560c7873712674314ac9547d", null ],
     [ "timeout", 
"classproton_1_1target__options.html#a14a86cafc12d543ad6f9c3be88fbd7b6", null ],
-    [ "expiry_policy", 
"classproton_1_1target__options.html#a3ee55474d84d67e826dc56f40b848b5b", null ]
+    [ "expiry_policy", 
"classproton_1_1target__options.html#a3ee55474d84d67e826dc56f40b848b5b", null ],
+    [ "capabilities", 
"classproton_1_1target__options.html#aec90fa88e34bccd5a121baa6c7e9e95a", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus-members.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus-members.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus-members.html
index 49c0dda..c2c4a7c 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus-members.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus-members.html
@@ -96,21 +96,22 @@ 
$(document).ready(function(){initNavTree('classproton_1_1terminus.html','');});
 
 <p>This is the complete list of members for <a class="el" 
href="classproton_1_1terminus.html">terminus</a>, including all inherited 
members.</p>
 <table class="directory">
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da07731dff0bf77faf2dc60a19c925e3c4">CONFIGURATION</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebad1b07c50c2dc77892c0254442e206a23">CONNECTION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3d">durability_mode</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8">durability_mode</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#adcc4ef24adb8478230018c519aa636ec">dynamic</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eb">expiry_policy</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#afc97dbb9b04812da5be8a41eb9434904">expiry_policy</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba7201cfe403ee6d4b4b717d146e38bee1">LINK_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba3a267f9424d4d555780a8d26209c8118">NEVER</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8">node_properties</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3dafdced71ad3dc05c5221439eddc3573e8">NONDURABLE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebac028e516a1a662691a25993ab4f86c09">SESSION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>terminus</b>() 
(defined in <a class="el" 
href="classproton_1_1terminus.html">terminus</a>)</td><td class="entry"><a 
class="el" href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a16d54f985193a3ce6ac69ffe10e8dfb6">timeout</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da9a971a7b3eb61a4e22701f1f4099909f">UNSETTLED_STATE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a1c6bf68ea1dcbd3b2a0897adb628c1ee">capabilities</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da07731dff0bf77faf2dc60a19c925e3c4">CONFIGURATION</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebad1b07c50c2dc77892c0254442e206a23">CONNECTION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3d">durability_mode</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8">durability_mode</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#adcc4ef24adb8478230018c519aa636ec">dynamic</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eb">expiry_policy</a>
 enum name</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#afc97dbb9b04812da5be8a41eb9434904">expiry_policy</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba7201cfe403ee6d4b4b717d146e38bee1">LINK_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1eba3a267f9424d4d555780a8d26209c8118">NEVER</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8">node_properties</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3dafdced71ad3dc05c5221439eddc3573e8">NONDURABLE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a348690a43df146eca928a8c06034a1ebac028e516a1a662691a25993ab4f86c09">SESSION_CLOSE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>terminus</b>() (defined in <a 
class="el" href="classproton_1_1terminus.html">terminus</a>)</td><td 
class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td class="entry"><span 
class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a16d54f985193a3ce6ac69ffe10e8dfb6">timeout</a>()
 const</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1terminus.html#a61db0571ab7d1a29ad77549ff99d6b3da9a971a7b3eb61a4e22701f1f4099909f">UNSETTLED_STATE</a>
 enum value</td><td class="entry"><a class="el" 
href="classproton_1_1terminus.html">terminus</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/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.html
index a6780ea..42fcec7 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.html
@@ -149,6 +149,10 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a 
class="el" href="clas
 <tr class="memitem:ab503c82e36aa618e6c6fb34feaad57b8"><td class="memItemLeft" 
align="right" valign="top"><a class="el" 
href="classproton_1_1value.html">value</a>&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8">node_properties</a>
 () const</td></tr>
 <tr class="memdesc:ab503c82e36aa618e6c6fb34feaad57b8"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">Obtain a reference to the 
AMQP dynamic node properties for the terminus.  <a 
href="#ab503c82e36aa618e6c6fb34feaad57b8">More...</a><br /></td></tr>
 <tr class="separator:ab503c82e36aa618e6c6fb34feaad57b8"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1c6bf68ea1dcbd3b2a0897adb628c1ee"><td class="memItemLeft" 
align="right" valign="top"><a id="a1c6bf68ea1dcbd3b2a0897adb628c1ee"></a>
+std::vector&lt; <a class="el" href="classproton_1_1symbol.html">symbol</a> 
&gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1terminus.html#a1c6bf68ea1dcbd3b2a0897adb628c1ee">capabilities</a>
 () const</td></tr>
+<tr class="memdesc:a1c6bf68ea1dcbd3b2a0897adb628c1ee"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">Extension capabilities that 
are supported/requested. <br /></td></tr>
+<tr class="separator:a1c6bf68ea1dcbd3b2a0897adb628c1ee"><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>One end of a link, either a source or a target. </p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.js
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.js 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.js
index 7e6a0d0..3d914ac 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.js
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1terminus.js
@@ -16,5 +16,6 @@ var classproton_1_1terminus =
     [ "timeout", 
"classproton_1_1terminus.html#a16d54f985193a3ce6ac69ffe10e8dfb6", null ],
     [ "durability_mode", 
"classproton_1_1terminus.html#aeb6439d6ea5d274a59dd8e90d97f31d8", null ],
     [ "dynamic", 
"classproton_1_1terminus.html#adcc4ef24adb8478230018c519aa636ec", null ],
-    [ "node_properties", 
"classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8", null ]
+    [ "node_properties", 
"classproton_1_1terminus.html#ab503c82e36aa618e6c6fb34feaad57b8", null ],
+    [ "capabilities", 
"classproton_1_1terminus.html#a1c6bf68ea1dcbd3b2a0897adb628c1ee", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1tracker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1tracker.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1tracker.html
index 0c73ff6..7976793 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1tracker.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1tracker.html
@@ -170,7 +170,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a 
class="el" href="clas
 <div class="textblock"><p>A tracker for a sent message. </p>
 <p>Every tracker exists within the context of a sender.</p>
 <p>A delivery attempt can fail. As a result, a particular message may 
correspond to multiple trackers. </p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="direct_send_8cpp-example.html#_a13">direct_send.cpp</a>, <a class="el" 
href="helloworld_direct_8cpp-example.html#_a16">helloworld_direct.cpp</a>, <a 
class="el" href="service_bus_8cpp-example.html#_a28">service_bus.cpp</a>, and 
<a class="el" 
href="simple_send_8cpp-example.html#_a15">simple_send.cpp</a>.</dd>
+<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="direct_send_8cpp-example.html#_a12">direct_send.cpp</a>, <a class="el" 
href="service_bus_8cpp-example.html#_a31">service_bus.cpp</a>, and <a 
class="el" href="simple_send_8cpp-example.html#_a15">simple_send.cpp</a>.</dd>
 </dl></div><h2 class="groupheader">Member Enumeration Documentation</h2>
 <a id="adc6e5733fc3c22f0a7b2914188c49c90"></a>
 <h2 class="memtitle"><span class="permalink"><a 
href="#adc6e5733fc3c22f0a7b2914188c49c90">&#9670;&nbsp;</a></span>state</h2>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1transport.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1transport.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1transport.html
index f0a12b9..a6dda06 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1transport.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1transport.html
@@ -135,7 +135,7 @@ class <a class="el" 
href="classproton_1_1error__condition.html">error_condition<
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed 
Description</h2>
 <div class="textblock"><p>A network channel supporting an AMQP connection. </p>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="broker_8cpp-example.html#_a25">broker.cpp</a>, <a class="el" 
href="direct_send_8cpp-example.html#_a18">direct_send.cpp</a>, and <a 
class="el" href="simple_send_8cpp-example.html#_a19">simple_send.cpp</a>.</dd>
+<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="broker_8cpp-example.html#_a31">broker.cpp</a>, <a class="el" 
href="direct_send_8cpp-example.html#_a16">direct_send.cpp</a>, and <a 
class="el" href="simple_send_8cpp-example.html#_a19">simple_send.cpp</a>.</dd>
 </dl></div><hr/>The documentation for this class was generated from the 
following file:<ul>
 <li>proton/<a class="el" 
href="transport_8hpp_source.html">transport.hpp</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1url.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1url.html 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1url.html
index bd84449..c62ec94 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1url.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1url.html
@@ -186,8 +186,7 @@ std::string&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" hre
 <li>Port can be a number or a symbolic service name such as 
<code>amqp</code>.</li>
 <li>Path is normally used as a link source or target address. On a broker it 
typically corresponds to a queue or topic name. </li>
 </ul>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="helloworld_8cpp-example.html#_a1">helloworld.cpp</a>, and <a class="el" 
href="server_8cpp-example.html#_a1">server.cpp</a>.</dd>
-</dl></div><h2 class="groupheader">Constructor &amp; Destructor 
Documentation</h2>
+</div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a id="a2ac6e124f5c2a7a3c8464099b5c4fde7"></a>
 <h2 class="memtitle"><span class="permalink"><a 
href="#a2ac6e124f5c2a7a3c8464099b5c4fde7">&#9670;&nbsp;</a></span>url()</h2>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1uuid.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1uuid.html 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1uuid.html
index 1bd9c73..9099db6 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1uuid.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1uuid.html
@@ -152,7 +152,7 @@ typedef std::reverse_iterator&lt; const_iterator 
&gt;&#160;</td><td class="memIt
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a 
name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
 <tr class="memitem:ae9b08fca99a89639cd78a91152a64d5f"><td class="memItemLeft" 
align="right" valign="top">std::string&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1uuid.html#ae9b08fca99a89639cd78a91152a64d5f">str</a> () 
const</td></tr>
-<tr class="memdesc:ae9b08fca99a89639cd78a91152a64d5f"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">UUID standard string 
format: 8-4-4-4-12 (36 chars, 32 alphanumeric chars and 4 hypens).  <a 
href="#ae9b08fca99a89639cd78a91152a64d5f">More...</a><br /></td></tr>
+<tr class="memdesc:ae9b08fca99a89639cd78a91152a64d5f"><td 
class="mdescLeft">&#160;</td><td class="mdescRight">UUID standard string 
format: 8-4-4-4-12 (36 chars, 32 alphanumeric chars and 4 hyphens).  <a 
href="#ae9b08fca99a89639cd78a91152a64d5f">More...</a><br /></td></tr>
 <tr class="separator:ae9b08fca99a89639cd78a91152a64d5f"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">Array operators</div></td></tr>
 <tr class="memitem:a5cef60cb24e71a774ca7fd34a0299242"><td class="memItemLeft" 
align="right" valign="top"><a id="a5cef60cb24e71a774ca7fd34a0299242"></a>
@@ -267,7 +267,7 @@ static size_t&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" h
       </table>
 </div><div class="memdoc">
 
-<p>UUID standard string format: 8-4-4-4-12 (36 chars, 32 alphanumeric chars 
and 4 hypens). </p>
+<p>UUID standard string format: 8-4-4-4-12 (36 chars, 32 alphanumeric chars 
and 4 hyphens). </p>
 
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1value.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1value.html 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1value.html
index 000adb0..98deec9 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1value.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1value.html
@@ -272,7 +272,7 @@ Related Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="service_bus_8cpp-example.html#a17">service_bus.cpp</a>.</dd>
+<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="service_bus_8cpp-example.html#a19">service_bus.cpp</a>.</dd>
 </dl>
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue-members.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue-members.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue-members.html
index 08f5287..231455a 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue-members.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue-members.html
@@ -97,7 +97,9 @@ 
$(document).ready(function(){initNavTree('classproton_1_1work__queue.html','');}
 <p>This is the complete list of members for <a class="el" 
href="classproton_1_1work__queue.html">work_queue</a>, including all inherited 
members.</p>
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#a59dae2153455bc095477a3b66a0b681e">add</a>(work
 fn)</td><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601">schedule</a>(duration,
 work fn)</td><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#a7525d36e11cc3eb9d483e8e81713ab6d">add</a>(void_function0
 &amp;fn)</td><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601">schedule</a>(duration,
 work fn)</td><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#aee24365669f2a5d5906866d56c5b2a6e">schedule</a>(duration,
 void_function0 &amp;fn)</td><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#a1e7fdf3236c9477c0462214080c34689">work_queue</a>()</td><td
 class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
   <tr><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html#a689e0d941a552db276229a9fc312e143">work_queue</a>(container
 &amp;)</td><td class="entry"><a class="el" 
href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~work_queue</b>() 
(defined in <a class="el" 
href="classproton_1_1work__queue.html">work_queue</a>)</td><td class="entry"><a 
class="el" href="classproton_1_1work__queue.html">work_queue</a></td><td 
class="entry"></td></tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.html
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.html
index b108974..2fa237c 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.html
@@ -112,18 +112,26 @@ Public Member Functions</h2></td></tr>
 &#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#a689e0d941a552db276229a9fc312e143">work_queue</a>
 (<a class="el" href="classproton_1_1container.html">container</a> 
&amp;)</td></tr>
 <tr class="memdesc:a689e0d941a552db276229a9fc312e143"><td 
class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - 
Create a work queue backed by a container. <br /></td></tr>
 <tr class="separator:a689e0d941a552db276229a9fc312e143"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a59dae2153455bc095477a3b66a0b681e"><td class="memItemLeft" 
align="right" valign="top">bool&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#a59dae2153455bc095477a3b66a0b681e">add</a>
 (<a class="el" href="classproton_1_1work.html">work</a> fn)</td></tr>
+<tr class="memitem:a59dae2153455bc095477a3b66a0b681e"><td class="memItemLeft" 
align="right" valign="top">bool&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#a59dae2153455bc095477a3b66a0b681e">add</a>
 (work fn)</td></tr>
 <tr class="memdesc:a59dae2153455bc095477a3b66a0b681e"><td 
class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - Add 
work <code>fn</code> to the work queue.  <a 
href="#a59dae2153455bc095477a3b66a0b681e">More...</a><br /></td></tr>
 <tr class="separator:a59dae2153455bc095477a3b66a0b681e"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a214d82f5924296d6fddbb8b150f8b601"><td class="memItemLeft" 
align="right" valign="top">void&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601">schedule</a>
 (<a class="el" href="classproton_1_1duration.html">duration</a>, <a class="el" 
href="classproton_1_1work.html">work</a> fn)</td></tr>
+<tr class="memitem:a7525d36e11cc3eb9d483e8e81713ab6d"><td class="memItemLeft" 
align="right" valign="top"><a id="a7525d36e11cc3eb9d483e8e81713ab6d"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#a7525d36e11cc3eb9d483e8e81713ab6d">add</a>
 (void_function0 &amp;fn)</td></tr>
+<tr class="memdesc:a7525d36e11cc3eb9d483e8e81713ab6d"><td 
class="mdescLeft">&#160;</td><td class="mdescRight"><b>Deprecated</b> - Use 
<code><a class="el" 
href="classproton_1_1work__queue.html#a59dae2153455bc095477a3b66a0b681e" 
title="Unsettled API - Add work fn to the work queue. ">add(work)</a></code>. 
<br /></td></tr>
+<tr class="separator:a7525d36e11cc3eb9d483e8e81713ab6d"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a214d82f5924296d6fddbb8b150f8b601"><td class="memItemLeft" 
align="right" valign="top">void&#160;</td><td class="memItemRight" 
valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601">schedule</a>
 (<a class="el" href="classproton_1_1duration.html">duration</a>, work 
fn)</td></tr>
 <tr class="memdesc:a214d82f5924296d6fddbb8b150f8b601"><td 
class="mdescLeft">&#160;</td><td class="mdescRight"><b>Unsettled API</b> - Add 
work <code>fn</code> to the work queue after a duration.  <a 
href="#a214d82f5924296d6fddbb8b150f8b601">More...</a><br /></td></tr>
 <tr class="separator:a214d82f5924296d6fddbb8b150f8b601"><td 
class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aee24365669f2a5d5906866d56c5b2a6e"><td class="memItemLeft" 
align="right" valign="top"><a id="aee24365669f2a5d5906866d56c5b2a6e"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" 
href="classproton_1_1work__queue.html#aee24365669f2a5d5906866d56c5b2a6e">schedule</a>
 (<a class="el" href="classproton_1_1duration.html">duration</a>, 
void_function0 &amp;fn)</td></tr>
+<tr class="memdesc:aee24365669f2a5d5906866d56c5b2a6e"><td 
class="mdescLeft">&#160;</td><td class="mdescRight"><b>Deprecated</b> - Use 
<code><a class="el" 
href="classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601" 
title="Unsettled API - Add work fn to the work queue after a duration. 
">schedule(duration, work)</a></code>. <br /></td></tr>
+<tr class="separator:aee24365669f2a5d5906866d56c5b2a6e"><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>Unsettled API</b> - A context for thread-safe 
execution of work. </p>
-<p>Event-handler functions associated with a single <code><a class="el" 
href="classproton_1_1connection.html" title="A connection to a remote AMQP 
peer. ">proton::connection</a></code> are called in sequence. The connection's 
<code><a class="el" href="classproton_1_1work__queue.html" title="Unsettled API 
- A context for thread-safe execution of work. ">proton::work_queue</a></code> 
allows you to "inject" extra <a class="el" 
href="classproton_1_1work.html">work</a> from any thread and have it executed 
in the same sequence.</p>
+<p>Event-handler functions associated with a single <code><a class="el" 
href="classproton_1_1connection.html" title="A connection to a remote AMQP 
peer. ">proton::connection</a></code> are called in sequence. The connection's 
<code><a class="el" href="classproton_1_1work__queue.html" title="Unsettled API 
- A context for thread-safe execution of work. ">proton::work_queue</a></code> 
allows you to "inject" extra work from any thread and have it executed in the 
same sequence.</p>
 <p>You may also create arbitrary <code><a class="el" 
href="classproton_1_1work__queue.html" title="Unsettled API - A context for 
thread-safe execution of work. ">proton::work_queue</a></code> objects backed 
by a <a class="el" href="classproton_1_1container.html">container</a> that 
allow other objects to have their own serialised work queues that can have work 
injected safely from other threads. The <a class="el" 
href="classproton_1_1container.html">container</a> ensures that the work is 
correctly serialised.</p>
-<p>The <code><a class="el" href="classproton_1_1work.html" title="Unsettled 
API - A work item for a work queue. ">proton::work</a></code> class represents 
the work to be queued and can be created from a function that takes no 
parameters and returns no value. </p>
+<p>The <code>proton::work</code> class represents the work to be queued and 
can be created from a function that takes no parameters and returns no value. 
</p>
 <dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="broker_8cpp-example.html#_a2">broker.cpp</a>, <a class="el" 
href="multithreaded_client_8cpp-example.html#_a2">multithreaded_client.cpp</a>, 
<a class="el" 
href="multithreaded_client_flow_control_8cpp-example.html#_a2">multithreaded_client_flow_control.cpp</a>,
 <a class="el" 
href="scheduled_send_8cpp-example.html#_a3">scheduled_send.cpp</a>, and <a 
class="el" 
href="scheduled_send_03_8cpp-example.html#_a2">scheduled_send_03.cpp</a>.</dd>
 </dl></div><h2 class="groupheader">Member Function Documentation</h2>
 <a id="a59dae2153455bc095477a3b66a0b681e"></a>
@@ -135,7 +143,7 @@ Public Member Functions</h2></td></tr>
         <tr>
           <td class="memname">bool add </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" 
href="classproton_1_1work.html">work</a>&#160;</td>
+          <td class="paramtype">work&#160;</td>
           <td class="paramname"><em>fn</em></td><td>)</td>
           <td></td>
         </tr>
@@ -164,7 +172,7 @@ Public Member Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" 
href="classproton_1_1work.html">work</a>&#160;</td>
+          <td class="paramtype">work&#160;</td>
           <td class="paramname"><em>fn</em>&#160;</td>
         </tr>
         <tr>
@@ -179,7 +187,8 @@ Public Member Functions</h2></td></tr>
 <p>Scheduled execution is "best effort". It may not be possible to inject the 
work after the elapsed duration. There will be no indication of this.</p>
 <p>Work <code>fn</code> will be called serially with other work in the queue. 
The work may be deferred and executed in another thread.</p>
 <dl class="section return"><dt>Returns</dt><dd>true if <code>fn</code> has 
been or will be called; false if the event loops is ended or <code>fn</code> 
cannot be injected for any other reason. </dd></dl>
-
+<dl><dt><b>Examples: </b></dt><dd><a class="el" 
href="scheduled_send_03_8cpp-example.html#a10">scheduled_send_03.cpp</a>.</dd>
+</dl>
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following 
file:<ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.js
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.js
 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.js
index f716d1e..bc4ae11 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.js
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/classproton_1_1work__queue.js
@@ -4,5 +4,7 @@ var classproton_1_1work__queue =
     [ "work_queue", 
"classproton_1_1work__queue.html#a689e0d941a552db276229a9fc312e143", null ],
     [ "~work_queue", 
"classproton_1_1work__queue.html#a0fd2d5e5a7950505283203b9c17ed5e7", null ],
     [ "add", 
"classproton_1_1work__queue.html#a59dae2153455bc095477a3b66a0b681e", null ],
-    [ "schedule", 
"classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601", null ]
+    [ "add", 
"classproton_1_1work__queue.html#a7525d36e11cc3eb9d483e8e81713ab6d", null ],
+    [ "schedule", 
"classproton_1_1work__queue.html#a214d82f5924296d6fddbb8b150f8b601", null ],
+    [ "schedule", 
"classproton_1_1work__queue.html#aee24365669f2a5d5906866d56c5b2a6e", null ]
 ];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/701caf21/content/releases/qpid-proton-master/proton/cpp/api/client_8cpp-example.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-proton-master/proton/cpp/api/client_8cpp-example.html 
b/content/releases/qpid-proton-master/proton/cpp/api/client_8cpp-example.html
index 0e8da97..cf9b49a 100755
--- 
a/content/releases/qpid-proton-master/proton/cpp/api/client_8cpp-example.html
+++ 
b/content/releases/qpid-proton-master/proton/cpp/api/client_8cpp-example.html
@@ -94,7 +94,7 @@ 
$(document).ready(function(){initNavTree('client_8cpp-example.html','');});
 </div><!--header-->
 <div class="contents">
 <p>The client part of a request-response example. Sends requests and prints 
out responses. Requires an intermediary that supports the AMQP 1.0 dynamic 
nodes on which the responses are received. The requests are sent through the 
'examples' node.</p>
-<div class="fragment"><div class="line"><span 
class="comment">/*</span></div><div class="line"><span class="comment"> 
*</span></div><div class="line"><span class="comment"> * Licensed to the Apache 
Software Foundation (ASF) under one</span></div><div class="line"><span 
class="comment"> * or more contributor license agreements.  See the NOTICE 
file</span></div><div class="line"><span class="comment"> * distributed with 
this work for additional information</span></div><div class="line"><span 
class="comment"> * regarding copyright ownership.  The ASF licenses this 
file</span></div><div class="line"><span class="comment"> * to you under the 
Apache License, Version 2.0 (the</span></div><div class="line"><span 
class="comment"> * &quot;License&quot;); you may not use this file except in 
compliance</span></div><div class="line"><span class="comment"> * with the 
License.  You may obtain a copy of the License at</span></div><div 
class="line"><span class="comment"> *</span></div><div class="li
 ne"><span class="comment"> *   
http://www.apache.org/licenses/LICENSE-2.0</span></div><div class="line"><span 
class="comment"> *</span></div><div class="line"><span class="comment"> * 
Unless required by applicable law or agreed to in writing,</span></div><div 
class="line"><span class="comment"> * software distributed under the License is 
distributed on an</span></div><div class="line"><span class="comment"> * 
&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
ANY</span></div><div class="line"><span class="comment"> * KIND, either express 
or implied.  See the License for the</span></div><div class="line"><span 
class="comment"> * specific language governing permissions and 
limitations</span></div><div class="line"><span class="comment"> * under the 
License.</span></div><div class="line"><span class="comment"> 
*</span></div><div class="line"><span class="comment"> */</span></div><div 
class="line"></div><div class="line"><span class="preprocessor">#include 
&quot;options.hpp&qu
 ot;</span></div><div class="line"><span class="preprocessor">#include &lt;<a 
class="code" 
href="connection_8hpp.html">proton/connection.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="container_8hpp.html">proton/container.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="delivery_8hpp.html">proton/delivery.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="message_8hpp.html">proton/message.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="messaging__handler_8hpp.html">proton/messaging_handler.hpp</a>&gt;</span></div><div
 class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="receiver__options_8hpp.html">proton/receiver_options.hpp</a>&gt;</span></div><div
 class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="source__options_8hpp.
 html">proton/source_options.hpp</a>&gt;</span></div><div class="line"><span 
class="preprocessor">#include &lt;<a class="code" 
href="tracker_8hpp.html">proton/tracker.hpp</a>&gt;</span></div><div 
class="line"></div><div class="line"><span class="preprocessor">#include 
&lt;iostream&gt;</span></div><div class="line"><span 
class="preprocessor">#include &lt;vector&gt;</span></div><div 
class="line"></div><div class="line"><span class="preprocessor">#include 
&quot;fake_cpp11.hpp&quot;</span></div><div class="line"></div><div 
class="line"><span class="keyword">using</span> <a name="_a0"></a><a 
class="code" 
href="classproton_1_1receiver__options.html">proton::receiver_options</a>;</div><div
 class="line"><span class="keyword">using</span> <a name="_a1"></a><a 
class="code" 
href="classproton_1_1source__options.html">proton::source_options</a>;</div><div
 class="line"></div><div class="line"><span class="keyword">class </span>client 
: <span class="keyword">public</span> <a name="_a2"></a><a class
 ="code" 
href="classproton_1_1messaging__handler.html">proton::messaging_handler</a> 
{</div><div class="line">  <span class="keyword">private</span>:</div><div 
class="line">    std::string url;</div><div class="line">    
std::vector&lt;std::string&gt; requests;</div><div class="line">    <a 
name="_a3"></a><a class="code" 
href="classproton_1_1sender.html">proton::sender</a> sender;</div><div 
class="line">    <a name="_a4"></a><a class="code" 
href="classproton_1_1receiver.html">proton::receiver</a> receiver;</div><div 
class="line"></div><div class="line">  <span 
class="keyword">public</span>:</div><div class="line">    client(<span 
class="keyword">const</span> std::string &amp;u, <span 
class="keyword">const</span> std::vector&lt;std::string&gt;&amp; r) : url(u), 
requests(r) {}</div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> <a name="a5"></a><a class="code" 
href="classproton_1_1messaging__handler.html#a4949b0c93402fae0c07492d984688a25">on_contain
 er_start</a>(<a name="_a6"></a><a class="code" 
href="classproton_1_1container.html">proton::container</a> &amp;c) OVERRIDE 
{</div><div class="line">        sender = c.<a name="a7"></a><a class="code" 
href="classproton_1_1container.html#adfbfd13668611a525bb44328d7a3b1e8">open_sender</a>(url);</div><div
 class="line">        <span class="comment">// Create a receiver requesting a 
dynamically created queue</span></div><div class="line">        <span 
class="comment">// for the message source.</span></div><div class="line">       
 receiver_options opts = 
receiver_options().source(source_options().dynamic(<span 
class="keyword">true</span>));</div><div class="line">        receiver = 
sender.<a name="a8"></a><a class="code" 
href="classproton_1_1link.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a>().<a
 name="a9"></a><a class="code" 
href="classproton_1_1connection.html#aad60d14592ee9d34caca4c61214ecd27">open_receiver</a>(<span
 class="stringliteral">&quot;&quot;</span>, opts);</div><div 
 class="line">    }</div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> send_request() {</div><div class="line">        
<a name="_a10"></a><a class="code" 
href="classproton_1_1message.html">proton::message</a> req;</div><div 
class="line">        req.<a name="a11"></a><a class="code" 
href="classproton_1_1message.html#ae9af642f154a68ec0eb8e715ecaf95ae">body</a>(requests.front());</div><div
 class="line">        req.<a name="a12"></a><a class="code" 
href="classproton_1_1message.html#a4032b495d721bd6d29bfa33ebb8ac5fe">reply_to</a>(receiver.<a
 name="a13"></a><a class="code" 
href="classproton_1_1receiver.html#a91a9e8a9445b29d83dd0514cd76503ae">source</a>().<a
 name="a14"></a><a class="code" 
href="classproton_1_1source.html#a4744eb217c976c199b678bb5a0d55acf">address</a>());</div><div
 class="line">        sender.<a name="a15"></a><a class="code" 
href="classproton_1_1sender.html#a214eb30b24e6831d016a47b9dddda830">send</a>(req);</div><div
 class="line">    }</
 div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> <a name="a16"></a><a class="code" 
href="classproton_1_1messaging__handler.html#a768b0a50669aa1d512d12e9d68af14cd">on_receiver_open</a>(<a
 class="code" href="classproton_1_1receiver.html">proton::receiver</a> &amp;) 
OVERRIDE {</div><div class="line">        send_request();</div><div 
class="line">    }</div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> <a name="a17"></a><a class="code" 
href="classproton_1_1messaging__handler.html#a96879b0b0b7ade11f98d3f450abd4c46">on_message</a>(<a
 name="_a18"></a><a class="code" 
href="classproton_1_1delivery.html">proton::delivery</a> &amp;d, <a 
class="code" href="classproton_1_1message.html">proton::message</a> 
&amp;response) OVERRIDE {</div><div class="line">        <span 
class="keywordflow">if</span> (requests.empty()) <span 
class="keywordflow">return</span>; <span class="comment">// Spurious extra 
message!</span></div><div
  class="line"></div><div class="line">        std::cout &lt;&lt; 
requests.front() &lt;&lt; <span class="stringliteral">&quot; =&gt; 
&quot;</span> &lt;&lt; response.<a class="code" 
href="classproton_1_1message.html#ae9af642f154a68ec0eb8e715ecaf95ae">body</a>() 
&lt;&lt; std::endl;</div><div class="line">        
requests.erase(requests.begin());</div><div class="line"></div><div 
class="line">        <span class="keywordflow">if</span> (!requests.empty()) 
{</div><div class="line">            send_request();</div><div class="line">    
    } <span class="keywordflow">else</span> {</div><div class="line">           
 d.<a name="a19"></a><a class="code" 
href="classproton_1_1transfer.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a>().<a
 name="a20"></a><a class="code" 
href="classproton_1_1connection.html#a5ae591df94fc66ccb85cbb6565368bca">close</a>();</div><div
 class="line">        }</div><div class="line">    }</div><div 
class="line">};</div><div class="line"></div><div class="line"><sp
 an class="keywordtype">int</span> main(<span class="keywordtype">int</span> 
argc, <span class="keywordtype">char</span> **argv) {</div><div class="line">   
 std::string url(<span 
class="stringliteral">&quot;127.0.0.1:5672/examples&quot;</span>);</div><div 
class="line">    example::options opts(argc, argv);</div><div 
class="line"></div><div class="line">    opts.add_value(url, <span 
class="charliteral">&#39;a&#39;</span>, <span 
class="stringliteral">&quot;address&quot;</span>, <span 
class="stringliteral">&quot;connect and send to URL&quot;</span>, <span 
class="stringliteral">&quot;URL&quot;</span>);</div><div 
class="line"></div><div class="line">    <span class="keywordflow">try</span> 
{</div><div class="line">        opts.parse();</div><div 
class="line"></div><div class="line">        std::vector&lt;std::string&gt; 
requests;</div><div class="line">        requests.push_back(<span 
class="stringliteral">&quot;Twas brillig, and the slithy 
toves&quot;</span>);</div><div class="line">   
      requests.push_back(<span class="stringliteral">&quot;Did gire and gymble 
in the wabe.&quot;</span>);</div><div class="line">        
requests.push_back(<span class="stringliteral">&quot;All mimsy were the 
borogroves,&quot;</span>);</div><div class="line">        
requests.push_back(<span class="stringliteral">&quot;And the mome raths 
outgrabe.&quot;</span>);</div><div class="line"></div><div class="line">        
client c(url, requests);</div><div class="line">        <a class="code" 
href="classproton_1_1container.html">proton::container</a>(c).<a 
name="a21"></a><a class="code" 
href="classproton_1_1container.html#a13a43e6d814de94978c515cb084873b1">run</a>();</div><div
 class="line"></div><div class="line">        <span 
class="keywordflow">return</span> 0;</div><div class="line">    } <span 
class="keywordflow">catch</span> (<span class="keyword">const</span> 
example::bad_option&amp; e) {</div><div class="line">        std::cout &lt;&lt; 
opts &lt;&lt; std::endl &lt;&lt; e.what() &lt;
 &lt; std::endl;</div><div class="line">    } <span 
class="keywordflow">catch</span> (<span class="keyword">const</span> 
std::exception&amp; e) {</div><div class="line">        std::cerr &lt;&lt; 
e.what() &lt;&lt; std::endl;</div><div class="line">    }</div><div 
class="line"></div><div class="line">    <span 
class="keywordflow">return</span> 1;</div><div class="line">}</div></div><!-- 
fragment --> </div><!-- contents -->
+<div class="fragment"><div class="line"><span 
class="comment">/*</span></div><div class="line"><span class="comment"> 
*</span></div><div class="line"><span class="comment"> * Licensed to the Apache 
Software Foundation (ASF) under one</span></div><div class="line"><span 
class="comment"> * or more contributor license agreements.  See the NOTICE 
file</span></div><div class="line"><span class="comment"> * distributed with 
this work for additional information</span></div><div class="line"><span 
class="comment"> * regarding copyright ownership.  The ASF licenses this 
file</span></div><div class="line"><span class="comment"> * to you under the 
Apache License, Version 2.0 (the</span></div><div class="line"><span 
class="comment"> * &quot;License&quot;); you may not use this file except in 
compliance</span></div><div class="line"><span class="comment"> * with the 
License.  You may obtain a copy of the License at</span></div><div 
class="line"><span class="comment"> *</span></div><div class="li
 ne"><span class="comment"> *   
http://www.apache.org/licenses/LICENSE-2.0</span></div><div class="line"><span 
class="comment"> *</span></div><div class="line"><span class="comment"> * 
Unless required by applicable law or agreed to in writing,</span></div><div 
class="line"><span class="comment"> * software distributed under the License is 
distributed on an</span></div><div class="line"><span class="comment"> * 
&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
ANY</span></div><div class="line"><span class="comment"> * KIND, either express 
or implied.  See the License for the</span></div><div class="line"><span 
class="comment"> * specific language governing permissions and 
limitations</span></div><div class="line"><span class="comment"> * under the 
License.</span></div><div class="line"><span class="comment"> 
*</span></div><div class="line"><span class="comment"> */</span></div><div 
class="line"></div><div class="line"><span class="preprocessor">#include 
&quot;options.hpp&qu
 ot;</span></div><div class="line"><span class="preprocessor">#include &lt;<a 
class="code" 
href="connection_8hpp.html">proton/connection.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="container_8hpp.html">proton/container.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="delivery_8hpp.html">proton/delivery.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="message_8hpp.html">proton/message.hpp</a>&gt;</span></div><div 
class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="messaging__handler_8hpp.html">proton/messaging_handler.hpp</a>&gt;</span></div><div
 class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="receiver__options_8hpp.html">proton/receiver_options.hpp</a>&gt;</span></div><div
 class="line"><span class="preprocessor">#include &lt;<a class="code" 
href="source__options_8hpp.
 html">proton/source_options.hpp</a>&gt;</span></div><div class="line"><span 
class="preprocessor">#include &lt;<a class="code" 
href="tracker_8hpp.html">proton/tracker.hpp</a>&gt;</span></div><div 
class="line"></div><div class="line"><span class="preprocessor">#include 
&lt;iostream&gt;</span></div><div class="line"><span 
class="preprocessor">#include &lt;vector&gt;</span></div><div 
class="line"></div><div class="line"><span class="preprocessor">#include 
&quot;fake_cpp11.hpp&quot;</span></div><div class="line"></div><div 
class="line"><span class="keyword">using</span> <a name="_a0"></a><a 
class="code" 
href="classproton_1_1receiver__options.html">proton::receiver_options</a>;</div><div
 class="line"><span class="keyword">using</span> <a name="_a1"></a><a 
class="code" 
href="classproton_1_1source__options.html">proton::source_options</a>;</div><div
 class="line"></div><div class="line"><span class="keyword">class </span>client 
: <span class="keyword">public</span> <a name="_a2"></a><a class
 ="code" 
href="classproton_1_1messaging__handler.html">proton::messaging_handler</a> 
{</div><div class="line">  <span class="keyword">private</span>:</div><div 
class="line">    std::string url;</div><div class="line">    
std::vector&lt;std::string&gt; requests;</div><div class="line">    <a 
name="_a3"></a><a class="code" 
href="classproton_1_1sender.html">proton::sender</a> sender;</div><div 
class="line">    <a name="_a4"></a><a class="code" 
href="classproton_1_1receiver.html">proton::receiver</a> receiver;</div><div 
class="line"></div><div class="line">  <span 
class="keyword">public</span>:</div><div class="line">    client(<span 
class="keyword">const</span> std::string &amp;u, <span 
class="keyword">const</span> std::vector&lt;std::string&gt;&amp; r) : url(u), 
requests(r) {}</div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> <a name="a5"></a><a class="code" 
href="classproton_1_1messaging__handler.html#a9188622c33638e076d2214080129c824">on_contain
 er_start</a>(<a name="_a6"></a><a class="code" 
href="classproton_1_1container.html">proton::container</a> &amp;c) OVERRIDE 
{</div><div class="line">        sender = c.<a name="a7"></a><a class="code" 
href="classproton_1_1container.html#adfbfd13668611a525bb44328d7a3b1e8">open_sender</a>(url);</div><div
 class="line">        <span class="comment">// Create a receiver requesting a 
dynamically created queue</span></div><div class="line">        <span 
class="comment">// for the message source.</span></div><div class="line">       
 receiver_options opts = 
receiver_options().source(source_options().dynamic(<span 
class="keyword">true</span>));</div><div class="line">        receiver = 
sender.<a name="a8"></a><a class="code" 
href="classproton_1_1link.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a>().<a
 name="a9"></a><a class="code" 
href="classproton_1_1connection.html#aad60d14592ee9d34caca4c61214ecd27">open_receiver</a>(<span
 class="stringliteral">&quot;&quot;</span>, opts);</div><div 
 class="line">    }</div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> send_request() {</div><div class="line">        
<a name="_a10"></a><a class="code" 
href="classproton_1_1message.html">proton::message</a> req;</div><div 
class="line">        req.<a name="a11"></a><a class="code" 
href="classproton_1_1message.html#ae9af642f154a68ec0eb8e715ecaf95ae">body</a>(requests.front());</div><div
 class="line">        req.<a name="a12"></a><a class="code" 
href="classproton_1_1message.html#a4032b495d721bd6d29bfa33ebb8ac5fe">reply_to</a>(receiver.<a
 name="a13"></a><a class="code" 
href="classproton_1_1receiver.html#a91a9e8a9445b29d83dd0514cd76503ae">source</a>().<a
 name="a14"></a><a class="code" 
href="classproton_1_1source.html#a4744eb217c976c199b678bb5a0d55acf">address</a>());</div><div
 class="line">        sender.<a name="a15"></a><a class="code" 
href="classproton_1_1sender.html#a214eb30b24e6831d016a47b9dddda830">send</a>(req);</div><div
 class="line">    }</
 div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> <a name="a16"></a><a class="code" 
href="classproton_1_1messaging__handler.html#a77f7e38659ee43ccb764e417ad6dd401">on_receiver_open</a>(<a
 class="code" href="classproton_1_1receiver.html">proton::receiver</a> &amp;) 
OVERRIDE {</div><div class="line">        send_request();</div><div 
class="line">    }</div><div class="line"></div><div class="line">    <span 
class="keywordtype">void</span> <a name="a17"></a><a class="code" 
href="classproton_1_1messaging__handler.html#a584c9daeadf4322801f58e054017fecb">on_message</a>(<a
 name="_a18"></a><a class="code" 
href="classproton_1_1delivery.html">proton::delivery</a> &amp;d, <a 
class="code" href="classproton_1_1message.html">proton::message</a> 
&amp;response) OVERRIDE {</div><div class="line">        <span 
class="keywordflow">if</span> (requests.empty()) <span 
class="keywordflow">return</span>; <span class="comment">// Spurious extra 
message!</span></div><div
  class="line"></div><div class="line">        std::cout &lt;&lt; 
requests.front() &lt;&lt; <span class="stringliteral">&quot; =&gt; 
&quot;</span> &lt;&lt; response.<a class="code" 
href="classproton_1_1message.html#ae9af642f154a68ec0eb8e715ecaf95ae">body</a>() 
&lt;&lt; std::endl;</div><div class="line">        
requests.erase(requests.begin());</div><div class="line"></div><div 
class="line">        <span class="keywordflow">if</span> (!requests.empty()) 
{</div><div class="line">            send_request();</div><div class="line">    
    } <span class="keywordflow">else</span> {</div><div class="line">           
 d.<a name="a19"></a><a class="code" 
href="classproton_1_1transfer.html#aff302bb6016f2ae29f01bb4e07389a52">connection</a>().<a
 name="a20"></a><a class="code" 
href="classproton_1_1connection.html#a5ae591df94fc66ccb85cbb6565368bca">close</a>();</div><div
 class="line">        }</div><div class="line">    }</div><div 
class="line">};</div><div class="line"></div><div class="line"><sp
 an class="keywordtype">int</span> main(<span class="keywordtype">int</span> 
argc, <span class="keywordtype">char</span> **argv) {</div><div class="line">   
 std::string url(<span 
class="stringliteral">&quot;127.0.0.1:5672/examples&quot;</span>);</div><div 
class="line">    example::options opts(argc, argv);</div><div 
class="line"></div><div class="line">    opts.add_value(url, <span 
class="charliteral">&#39;a&#39;</span>, <span 
class="stringliteral">&quot;address&quot;</span>, <span 
class="stringliteral">&quot;connect and send to URL&quot;</span>, <span 
class="stringliteral">&quot;URL&quot;</span>);</div><div 
class="line"></div><div class="line">    <span class="keywordflow">try</span> 
{</div><div class="line">        opts.parse();</div><div 
class="line"></div><div class="line">        std::vector&lt;std::string&gt; 
requests;</div><div class="line">        requests.push_back(<span 
class="stringliteral">&quot;Twas brillig, and the slithy 
toves&quot;</span>);</div><div class="line">   
      requests.push_back(<span class="stringliteral">&quot;Did gire and gymble 
in the wabe.&quot;</span>);</div><div class="line">        
requests.push_back(<span class="stringliteral">&quot;All mimsy were the 
borogroves,&quot;</span>);</div><div class="line">        
requests.push_back(<span class="stringliteral">&quot;And the mome raths 
outgrabe.&quot;</span>);</div><div class="line"></div><div class="line">        
client c(url, requests);</div><div class="line">        <a class="code" 
href="classproton_1_1container.html">proton::container</a>(c).<a 
name="a21"></a><a class="code" 
href="classproton_1_1container.html#a13a43e6d814de94978c515cb084873b1">run</a>();</div><div
 class="line"></div><div class="line">        <span 
class="keywordflow">return</span> 0;</div><div class="line">    } <span 
class="keywordflow">catch</span> (<span class="keyword">const</span> 
example::bad_option&amp; e) {</div><div class="line">        std::cout &lt;&lt; 
opts &lt;&lt; std::endl &lt;&lt; e.what() &lt;
 &lt; std::endl;</div><div class="line">    } <span 
class="keywordflow">catch</span> (<span class="keyword">const</span> 
std::exception&amp; e) {</div><div class="line">        std::cerr &lt;&lt; 
e.what() &lt;&lt; std::endl;</div><div class="line">    }</div><div 
class="line"></div><div class="line">    <span 
class="keywordflow">return</span> 1;</div><div class="line">}</div></div><!-- 
fragment --> </div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->


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

Reply via email to