[fidldoc] Updating fidldocs
diff --git a/all/fidl/fuchsia.hardware.audio/README.md b/all/fidl/fuchsia.hardware.audio/README.md
index 6269e59..a8592d8 100644
--- a/all/fidl/fuchsia.hardware.audio/README.md
+++ b/all/fidl/fuchsia.hardware.audio/README.md
@@ -6,7 +6,7 @@
 ## **PROTOCOLS**
 
 ## Device {#Device}
-*Defined in [fuchsia.hardware.audio/audio.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.audio/audio.fidl#10)*
+*Defined in [fuchsia.hardware.audio/audio.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.audio/audio.fidl#9)*
 
 
 ### GetChannel {#GetChannel}
@@ -25,7 +25,7 @@
     <tr>
             <td><code>channel</code></td>
             <td>
-                <code>request&lt;<a class='link' href='#StreamConfig'>StreamConfig</a>&gt;</code>
+                <code><a class='link' href='#StreamConfig'>StreamConfig</a></code>
             </td>
         </tr></table>
 
diff --git a/all/fidl/fuchsia.hardware.thermal/README.md b/all/fidl/fuchsia.hardware.thermal/README.md
index 6c85121..6c49f3e 100644
--- a/all/fidl/fuchsia.hardware.thermal/README.md
+++ b/all/fidl/fuchsia.hardware.thermal/README.md
@@ -6,7 +6,7 @@
 ## **PROTOCOLS**
 
 ## Device {#Device}
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#98)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#98)*
 
 
 ### GetInfo {#GetInfo}
@@ -312,7 +312,7 @@
 ## **STRUCTS**
 
 ### OperatingPoint {#OperatingPoint}
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#31)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#31)*
 
 <p>scpi_opp_t is typedef'd to this.</p>
 
@@ -346,7 +346,7 @@
 </table>
 
 ### OperatingPointEntry {#OperatingPointEntry}
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#41)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#41)*
 
 <p>scpi_opp_entry_t is typedef'd to this.</p>
 
@@ -372,7 +372,7 @@
 </table>
 
 ### ThermalInfo {#ThermalInfo}
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#49)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#49)*
 
 <p>Temperature units are degrees Celsius.</p>
 
@@ -422,7 +422,7 @@
 </table>
 
 ### ThermalTemperatureInfo {#ThermalTemperatureInfo}
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#63)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#63)*
 
 <p>Temperature units are degrees Celsius.</p>
 
@@ -480,7 +480,7 @@
 </table>
 
 ### ThermalDeviceInfo {#ThermalDeviceInfo}
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#78)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#78)*
 
 
 
@@ -559,7 +559,7 @@
 ### PowerDomain {#PowerDomain}
 Type: <code>uint32</code>
 
-*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#25)*
+*Defined in [fuchsia.hardware.thermal/thermal.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#25)*
 
 <p>Devices with big-little architecture may have different operating points for each cluster.
 Other devices use <code>BIG_CLUSTER_POWER_DOMAIN</code> for getting/setting the operating point.</p>
@@ -588,7 +588,7 @@
 
 <table>
     <tr><th>Name</th><th>Value</th><th>Type</th><th>Description</th></tr><tr id="MAX_TRIP_POINTS">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#10">MAX_TRIP_POINTS</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#10">MAX_TRIP_POINTS</a></td>
             <td>
                     <code>16</code>
                 </td>
@@ -597,7 +597,7 @@
 </td>
         </tr>
     <tr id="MAX_DVFS_DOMAINS">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#14">MAX_DVFS_DOMAINS</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#14">MAX_DVFS_DOMAINS</a></td>
             <td>
                     <code>2</code>
                 </td>
@@ -607,7 +607,7 @@
 </td>
         </tr>
     <tr id="MAX_DVFS_OPPS">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#17">MAX_DVFS_OPPS</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#17">MAX_DVFS_OPPS</a></td>
             <td>
                     <code>16</code>
                 </td>
@@ -616,7 +616,7 @@
 </td>
         </tr>
     <tr id="THERMAL_STATE_NORMAL">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#20">THERMAL_STATE_NORMAL</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#20">THERMAL_STATE_NORMAL</a></td>
             <td>
                     <code>0</code>
                 </td>
@@ -625,7 +625,7 @@
 </td>
         </tr>
     <tr id="THERMAL_STATE_TRIP_VIOLATION">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-hardware-thermal/thermal.fidl#21">THERMAL_STATE_TRIP_VIOLATION</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.hardware.thermal/thermal.fidl#21">THERMAL_STATE_TRIP_VIOLATION</a></td>
             <td>
                     <code>1</code>
                 </td>
diff --git a/all/fidl/fuchsia.modular/README.md b/all/fidl/fuchsia.modular/README.md
index 8cebfee..79dfd89 100644
--- a/all/fidl/fuchsia.modular/README.md
+++ b/all/fidl/fuchsia.modular/README.md
@@ -1907,7 +1907,7 @@
 
 
 ## StoryShellContext {#StoryShellContext}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#135)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#138)*
 
 <p>This interface provides the StoryShell instance with everything it needs to
 know or be able to do about the Story. Not much right now, but we expect this
@@ -1965,7 +1965,7 @@
 
 
 ## StoryVisualStateWatcher {#StoryVisualStateWatcher}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#150)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#153)*
 
 <p>Implemented by StoryShell to get notified about visual state changes.</p>
 
@@ -3191,7 +3191,7 @@
 ### StoryVisualState {#StoryVisualState}
 Type: <code>uint32</code>
 
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#155)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#158)*
 
 <p>Defines the visual state of the Story shell.</p>
 
@@ -3674,6 +3674,14 @@
             <td><p>Collection of user-defined key-value attributes that describe this surface (module).</p>
 <p>The <code>Annotation.value</code> field of each <code>Annotation</code> is always set.</p>
 </td>
+        </tr><tr>
+            <td>6</td>
+            <td><code>view_ref</code></td>
+            <td>
+                <code><a class='link' href='../fuchsia.ui.views/'>fuchsia.ui.views</a>/<a class='link' href='../fuchsia.ui.views/#ViewRef'>ViewRef</a></code>
+            </td>
+            <td><p>The view ref associated with the surface, if one is present.</p>
+</td>
         </tr></table>
 
 
diff --git a/all/fidl/fuchsia.net.mdns/README.md b/all/fidl/fuchsia.net.mdns/README.md
index 8f87c8b..27c4306 100644
--- a/all/fidl/fuchsia.net.mdns/README.md
+++ b/all/fidl/fuchsia.net.mdns/README.md
@@ -100,7 +100,7 @@
 
 
 ## Publisher {#Publisher}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#81)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#83)*
 
 <p>Discoverable protocol for publishing service instances.</p>
 
@@ -199,7 +199,7 @@
         </tr></table>
 
 ## ServiceSubscriber {#ServiceSubscriber}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#130)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#134)*
 
 <p>Client-implemented interface for subscribers. Method replies are used to
 throttle traffic. The service won't necessarily wait for a reply before
@@ -272,7 +272,7 @@
     </table>
 
 ## ServiceSubscriber2 {#ServiceSubscriber2}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#145)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#149)*
 
 <p>Client-implemented interface for subscribers. Method replies are used to
 throttle traffic. The service won't necessarily wait for a reply before
@@ -365,7 +365,7 @@
     </table>
 
 ## PublicationResponder {#PublicationResponder}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#193)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#197)*
 
 <p>Client-supplied publication responder interface.</p>
 
@@ -439,7 +439,7 @@
     </table>
 
 ## PublicationResponder2 {#PublicationResponder2}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#217)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#221)*
 
 <p>Client-supplied publication responder interface.</p>
 
@@ -522,7 +522,7 @@
 ## **STRUCTS**
 
 ### Publisher_PublishServiceInstance_Response {#Publisher_PublishServiceInstance_Response}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#93)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#96)*
 
 
 
@@ -531,7 +531,7 @@
 </table>
 
 ### Publisher_PublishServiceInstance2_Response {#Publisher_PublishServiceInstance2_Response}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#106)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#110)*
 
 
 
@@ -540,7 +540,7 @@
 </table>
 
 ### ServiceInstance {#ServiceInstance}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#169)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#173)*
 
 <p>Describes a service instance.</p>
 
@@ -601,7 +601,7 @@
 </table>
 
 ### Publication {#Publication}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#247)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#251)*
 
 <p>Describes an initial instance announcement or query response. In typical
 use, the default SRV priority, SRV weight and TTL values should be used. TTL
@@ -679,7 +679,7 @@
 ### Error {#Error}
 Type: <code>int32</code>
 
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#110)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#114)*
 
 <p>Error values for instance publishing.</p>
 
@@ -713,7 +713,7 @@
 ### ResourceType {#ResourceType}
 Type: <code>uint32</code>
 
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#161)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#165)*
 
 <p>DNS resource types.</p>
 
@@ -738,7 +738,7 @@
 ## **UNIONS**
 
 ### Publisher_PublishServiceInstance_Result {#Publisher_PublishServiceInstance_Result}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#93)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#96)*
 
 
 <table>
@@ -757,7 +757,7 @@
         </tr></table>
 
 ### Publisher_PublishServiceInstance2_Result {#Publisher_PublishServiceInstance2_Result}
-*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#106)*
+*Defined in [fuchsia.net.mdns/mdns.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#110)*
 
 
 <table>
@@ -783,7 +783,7 @@
 
 <table>
     <tr><th>Name</th><th>Value</th><th>Type</th><th>Description</th></tr><tr id="DEFAULT_SRV_PRIORITY">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#272">DEFAULT_SRV_PRIORITY</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#276">DEFAULT_SRV_PRIORITY</a></td>
             <td>
                     <code>0</code>
                 </td>
@@ -791,7 +791,7 @@
             <td></td>
         </tr>
     <tr id="DEFAULT_SRV_WEIGHT">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#273">DEFAULT_SRV_WEIGHT</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#277">DEFAULT_SRV_WEIGHT</a></td>
             <td>
                     <code>0</code>
                 </td>
@@ -799,7 +799,7 @@
             <td></td>
         </tr>
     <tr id="DEFAULT_PTR_TTL">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#274">DEFAULT_PTR_TTL</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#278">DEFAULT_PTR_TTL</a></td>
             <td>
                     <code>4500000000000</code>
                 </td>
@@ -807,7 +807,7 @@
             <td></td>
         </tr>
     <tr id="DEFAULT_SRV_TTL">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#275">DEFAULT_SRV_TTL</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#279">DEFAULT_SRV_TTL</a></td>
             <td>
                     <code>120000000000</code>
                 </td>
@@ -815,7 +815,7 @@
             <td></td>
         </tr>
     <tr id="DEFAULT_TXT_TTL">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#276">DEFAULT_TXT_TTL</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#280">DEFAULT_TXT_TTL</a></td>
             <td>
                     <code>4500000000000</code>
                 </td>
@@ -823,7 +823,7 @@
             <td></td>
         </tr>
     <tr id="MAX_TEXT_STRINGS">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#277">MAX_TEXT_STRINGS</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#281">MAX_TEXT_STRINGS</a></td>
             <td>
                     <code>256</code>
                 </td>
@@ -831,7 +831,7 @@
             <td></td>
         </tr>
     <tr id="MAX_SUBTYPES">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#278">MAX_SUBTYPES</a></td>
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.net.mdns/mdns.fidl#282">MAX_SUBTYPES</a></td>
             <td>
                     <code>256</code>
                 </td>
diff --git a/all/fidl/fuchsia.sys2/README.md b/all/fidl/fuchsia.sys2/README.md
index 92e1ace..729b306 100644
--- a/all/fidl/fuchsia.sys2/README.md
+++ b/all/fidl/fuchsia.sys2/README.md
@@ -18,16 +18,16 @@
 <p>Errors:</p>
 <ul>
 <li><code>RESOURCE_UNAVAILABLE</code> when the component hasn't been granted the capability to subscribe
-to some event in the requested <code>event_types</code>.</li>
+to some event in the requested <code>events</code>.</li>
 </ul>
 
 #### Request
 <table>
     <tr><th>Name</th><th>Type</th></tr>
     <tr>
-            <td><code>event_types</code></td>
+            <td><code>events</code></td>
             <td>
-                <code>vector&lt;<a class='link' href='#EventType'>EventType</a>&gt;[8]</code>
+                <code>vector&lt;string&gt;[8]</code>
             </td>
         </tr><tr>
             <td><code>stream</code></td>
@@ -48,7 +48,7 @@
         </tr></table>
 
 ## BlockingEventSource {#BlockingEventSource}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#146)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#147)*
 
 <p>Subscribe to events in component manager.</p>
 
@@ -60,16 +60,16 @@
 <p>Errors:</p>
 <ul>
 <li><code>RESOURCE_UNAVAILABLE</code> when the component hasn't been granted the capability to subscribe
-to some event in the requested <code>event_types</code>.</li>
+to some event in the requested <code>events</code>.</li>
 </ul>
 
 #### Request
 <table>
     <tr><th>Name</th><th>Type</th></tr>
     <tr>
-            <td><code>event_types</code></td>
+            <td><code>events</code></td>
             <td>
-                <code>vector&lt;<a class='link' href='#EventType'>EventType</a>&gt;[8]</code>
+                <code>vector&lt;string&gt;[8]</code>
             </td>
         </tr><tr>
             <td><code>stream</code></td>
@@ -106,7 +106,7 @@
     </table>
 
 ## EventStream {#EventStream}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#156)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#157)*
 
 <p>Listener for events on the component hierarchy. The server won't wait for the client
 to handle the request before sending more events.</p>
@@ -127,7 +127,7 @@
 
 
 ## Handler {#Handler}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#161)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#162)*
 
 <p>Every Event supports this basic handler to allow resumption.</p>
 
@@ -147,7 +147,7 @@
     </table>
 
 ## RoutingProtocol {#RoutingProtocol}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#168)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#169)*
 
 <p>Allows injecting capabilities over FIDL.
 Used by RouteFrameworkCapability and RouteBuiltinCapability</p>
@@ -206,7 +206,7 @@
     </table>
 
 ## CapabilityProvider {#CapabilityProvider}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#188)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#189)*
 
 <p>A FIDL-based version of a CapabilityProvider</p>
 
@@ -825,7 +825,7 @@
 </table>
 
 ### EventSource_Subscribe_Response {#EventSource_Subscribe_Response}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#141)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#142)*
 
 
 
@@ -2578,7 +2578,7 @@
                 <code><a class='link' href='#Handler'>Handler</a></code>
             </td>
             <td><p>Handler for resuming from event
-This will not be available if this is an async event.</p>
+This will be absent if this is an async event.</p>
 </td>
         </tr><tr>
             <td>4</td>
@@ -2930,7 +2930,7 @@
         </tr></table>
 
 ### EventSource_Subscribe_Result {#EventSource_Subscribe_Result}
-*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#141)*
+*Defined in [fuchsia.sys2/events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#142)*
 
 
 <table>
@@ -3172,8 +3172,8 @@
 ## **CONSTANTS**
 
 <table>
-    <tr><th>Name</th><th>Value</th><th>Type</th><th>Description</th></tr><tr id="MAX_NUM_EVENT_TYPES_RECEIVED">
-            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#12">MAX_NUM_EVENT_TYPES_RECEIVED</a></td>
+    <tr><th>Name</th><th>Value</th><th>Type</th><th>Description</th></tr><tr id="MAX_NUM_EVENTS_RECEIVED">
+            <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.sys2/events.fidl#12">MAX_NUM_EVENTS_RECEIVED</a></td>
             <td>
                     <code>8</code>
                 </td>
diff --git a/all/fidl/llcpptest.protocol.test/README.md b/all/fidl/llcpptest.protocol.test/README.md
index 5e16a06..ee1869f 100644
--- a/all/fidl/llcpptest.protocol.test/README.md
+++ b/all/fidl/llcpptest.protocol.test/README.md
@@ -6,7 +6,7 @@
 ## **PROTOCOLS**
 
 ## ErrorMethods {#ErrorMethods}
-*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#16)*
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#32)*
 
 <p>Protocol for testing methods with error types.
 In the implementation, each method is hardcoded to return either the
@@ -62,7 +62,7 @@
         </tr></table>
 
 ## Frobinator {#Frobinator}
-*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#21)*
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#37)*
 
 
 ### Frob {#Frob}
@@ -119,12 +119,78 @@
             </td>
         </tr></table>
 
+## HandleProvider {#HandleProvider}
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#43)*
+
+
+### GetHandle {#GetHandle}
+
+
+#### Request
+<table>
+    <tr><th>Name</th><th>Type</th></tr>
+    </table>
+
+
+#### Response
+<table>
+    <tr><th>Name</th><th>Type</th></tr>
+    <tr>
+            <td><code>value</code></td>
+            <td>
+                <code><a class='link' href='#HandleStruct'>HandleStruct</a></code>
+            </td>
+        </tr></table>
+
+### GetHandleVector {#GetHandleVector}
+
+
+#### Request
+<table>
+    <tr><th>Name</th><th>Type</th></tr>
+    <tr>
+            <td><code>count</code></td>
+            <td>
+                <code>uint32</code>
+            </td>
+        </tr></table>
+
+
+#### Response
+<table>
+    <tr><th>Name</th><th>Type</th></tr>
+    <tr>
+            <td><code>value</code></td>
+            <td>
+                <code>vector&lt;<a class='link' href='#HandleStruct'>HandleStruct</a>&gt;</code>
+            </td>
+        </tr></table>
+
+### GetHandleUnion {#GetHandleUnion}
+
+
+#### Request
+<table>
+    <tr><th>Name</th><th>Type</th></tr>
+    </table>
+
+
+#### Response
+<table>
+    <tr><th>Name</th><th>Type</th></tr>
+    <tr>
+            <td><code>value</code></td>
+            <td>
+                <code><a class='link' href='#HandleUnionStruct'>HandleUnionStruct</a></code>
+            </td>
+        </tr></table>
+
 
 
 ## **STRUCTS**
 
 ### ErrorMethods_NoArgsPrimitiveError_Response {#ErrorMethods_NoArgsPrimitiveError_Response}
-*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#17)*
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#33)*
 
 
 
@@ -133,7 +199,7 @@
 </table>
 
 ### ErrorMethods_ManyArgsCustomError_Response {#ErrorMethods_ManyArgsCustomError_Response}
-*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#18)*
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#34)*
 
 
 
@@ -162,6 +228,54 @@
         </tr>
 </table>
 
+### HandleStruct {#HandleStruct}
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#12)*
+
+
+
+<table>
+    <tr><th>Name</th><th>Type</th><th>Description</th><th>Default</th></tr><tr>
+            <td><code>h</code></td>
+            <td>
+                <code>handle&lt;event&gt;</code>
+            </td>
+            <td></td>
+            <td>No default</td>
+        </tr>
+</table>
+
+### VectorStruct {#VectorStruct}
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#16)*
+
+
+
+<table>
+    <tr><th>Name</th><th>Type</th><th>Description</th><th>Default</th></tr><tr>
+            <td><code>v</code></td>
+            <td>
+                <code>vector&lt;<a class='link' href='#HandleStruct'>HandleStruct</a>&gt;</code>
+            </td>
+            <td></td>
+            <td>No default</td>
+        </tr>
+</table>
+
+### HandleUnionStruct {#HandleUnionStruct}
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#24)*
+
+
+
+<table>
+    <tr><th>Name</th><th>Type</th><th>Description</th><th>Default</th></tr><tr>
+            <td><code>u</code></td>
+            <td>
+                <code><a class='link' href='#HandleUnion'>HandleUnion</a></code>
+            </td>
+            <td></td>
+            <td>No default</td>
+        </tr>
+</table>
+
 
 
 ## **ENUMS**
@@ -191,7 +305,7 @@
 ## **UNIONS**
 
 ### ErrorMethods_NoArgsPrimitiveError_Result {#ErrorMethods_NoArgsPrimitiveError_Result}
-*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#17)*
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#33)*
 
 
 <table>
@@ -210,7 +324,7 @@
         </tr></table>
 
 ### ErrorMethods_ManyArgsCustomError_Result {#ErrorMethods_ManyArgsCustomError_Result}
-*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#18)*
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#34)*
 
 
 <table>
@@ -228,6 +342,19 @@
             <td></td>
         </tr></table>
 
+### HandleUnion {#HandleUnion}
+*Defined in [llcpptest.protocol.test/protocol.test.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/src/lib/fidl/llcpp/tests/protocol.test.fidl#20)*
+
+
+<table>
+    <tr><th>Name</th><th>Type</th><th>Description</th></tr><tr>
+            <td><code>h</code></td>
+            <td>
+                <code>handle&lt;event&gt;</code>
+            </td>
+            <td></td>
+        </tr></table>
+