[fidldoc] Updating fidldocs
diff --git a/sdk/fidl/fuchsia.io2/README.md b/sdk/fidl/fuchsia.io2/README.md
index 4e73a5e..5c08d50 100644
--- a/sdk/fidl/fuchsia.io2/README.md
+++ b/sdk/fidl/fuchsia.io2/README.md
@@ -658,6 +658,11 @@
<table>
<tr><th>Name</th><th>Type</th></tr>
<tr>
+ <td><code>options</code></td>
+ <td>
+ <code><a class='link' href='#DirectoryEnumerateOptions'>DirectoryEnumerateOptions</a></code>
+ </td>
+ </tr><tr>
<td><code>iterator</code></td>
<td>
<code>request<<a class='link' href='#DirectoryIterator'>DirectoryIterator</a>></code>
@@ -2264,7 +2269,7 @@
### OpenMode {#OpenMode}
Type: <code>uint32</code>
-*Defined in [fuchsia.io2/directory.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory.fidl#131)*
+*Defined in [fuchsia.io2/directory.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory.fidl#132)*
<p>Options related to node creation during <a class='link' href='#Directory.Open'>Directory.Open</a>.</p>
@@ -2526,7 +2531,7 @@
<td>1</td>
<td><code>event</code></td>
<td>
- <code>handle<event></code>
+ <code>handle<eventpair></code>
</td>
<td><p>An optional event which transmits information about a device's state.</p>
<p>The <a class='link' href='#DeviceSignal'>DeviceSignal</a> values may be observed on this event.</p>
@@ -2547,7 +2552,7 @@
<td>1</td>
<td><code>event</code></td>
<td>
- <code>handle<event></code>
+ <code>handle<eventpair></code>
</td>
<td><p>An optional event which transmits information about a device's state.</p>
<p>The <a class='link' href='#DeviceSignal'>DeviceSignal</a> values may be observed on this event.</p>
@@ -2557,8 +2562,11 @@
### DirectoryEntry {#DirectoryEntry}
-*Defined in [fuchsia.io2/directory-entry.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory-entry.fidl#7)*
+*Defined in [fuchsia.io2/directory-entry.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory-entry.fidl#11)*
+<p>Information about an immediate child node of a directory.</p>
+<p>If a particular attribute is not applicable or not supported,
+implementations should leave the corresponding field absent.</p>
<table>
@@ -2569,7 +2577,7 @@
<td>
<code><a class='link' href='#Name'>Name</a></code>
</td>
- <td><p>Name of the entry.</p>
+ <td><p>Name of the node. This field must be present.</p>
</td>
</tr><tr>
<td>2</td>
@@ -2577,7 +2585,7 @@
<td>
<code><a class='link' href='#NodeProtocolSet'>NodeProtocolSet</a></code>
</td>
- <td><p>Describes the kinds of representations supported by the entry.</p>
+ <td><p>Describes the kinds of representations supported by the node.</p>
</td>
</tr><tr>
<td>3</td>
@@ -2585,10 +2593,31 @@
<td>
<code><a class='link' href='#Abilities'>Abilities</a></code>
</td>
- <td><p>Describes the kinds of operations supported by the entry.</p>
+ <td><p>Describes the kinds of operations supported by the node.</p>
+</td>
+ </tr><tr>
+ <td>4</td>
+ <td><code>id</code></td>
+ <td>
+ <code><a class='link' href='#Id'>Id</a></code>
+ </td>
+ <td><p>An ID for the node. See <a class='link' href='#Id'>Id</a>.
+This <code>id</code> should be unique among all entries of a directory.</p>
</td>
</tr></table>
+### DirectoryEnumerateOptions {#DirectoryEnumerateOptions}
+
+
+*Defined in [fuchsia.io2/directory-iterator.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory-iterator.fidl#33)*
+
+<p>Options to pass to <a class='link' href='#Directory.Enumerate'>Directory.Enumerate</a>.</p>
+
+
+<table>
+ <tr><th>Ordinal</th><th>Name</th><th>Type</th><th>Description</th></tr>
+ </table>
+
### DirectoryWatchOptions {#DirectoryWatchOptions}
@@ -2603,7 +2632,7 @@
### DirectoryInfo {#DirectoryInfo}
-*Defined in [fuchsia.io2/directory.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory.fidl#154)*
+*Defined in [fuchsia.io2/directory.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory.fidl#155)*
<p>Auxiliary data for the directory representation of a node.
The selection of this variant in <a class='link' href='#Representation'>Representation</a> implies that the
@@ -2767,6 +2796,16 @@
</td>
<td><p>Time of last modification in nanoseconds since the Unix epoch, UTC.</p>
</td>
+ </tr><tr>
+ <td>8</td>
+ <td><code>id</code></td>
+ <td>
+ <code><a class='link' href='#Id'>Id</a></code>
+ </td>
+ <td><p>An ID for the node. See <a class='link' href='#Id'>Id</a>.
+This <code>id</code> should be unique among all entries of a directory.</p>
+<p>This attribute is read-only.</p>
+</td>
</tr></table>
### PipeInfo {#PipeInfo}
@@ -3514,6 +3553,11 @@
<td>64</td>
<td><p>Requests <a class='link' href='#NodeAttributes.modification_time'>NodeAttributes.modification_time</a>.</p>
</td>
+ </tr><tr>
+ <td>ID</td>
+ <td>128</td>
+ <td><p>Requests <a class='link' href='#NodeAttributes.id'>NodeAttributes.id</a>.</p>
+</td>
</tr></table>
### Operations {#Operations}
@@ -3585,7 +3629,7 @@
<table>
<tr><th>Name</th><th>Value</th><th>Type</th><th>Description</th></tr><tr id="MAX_DIRECTORY_BATCH_SIZE">
- <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory-entry.fidl#20">MAX_DIRECTORY_BATCH_SIZE</a></td>
+ <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/directory-iterator.fidl#30">MAX_DIRECTORY_BATCH_SIZE</a></td>
<td>
<code>8192</code>
</td>
@@ -3679,6 +3723,25 @@
<td><p>The type to identify a connection to a node.
It represents a capability: a reference to a node with associated rights.</p>
</td>
+ </tr><tr id="Id">
+ <td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/io2.fidl#69">Id</a></td>
+ <td>
+ <code>uint64</code></td>
+ <td><p>The type to identify a node, if the implementation supports some notion of
+unique node ID.</p>
+<h2>Uniqueness Guarantees</h2>
+<p>A client is usually presented with a directory tree that is the result
+of composing together multiple backing implementation instances. An ID
+would be unique within the corresponding instance only.
+Their boundaries are rather implicit on Fuchsia, as a result of
+transparently-forwarding directory proxies. It could be common for a client
+to observe identical <code>Id</code>s when traversing a directory tree, when it
+encounters nodes from different backing instances. Therefore, the ID is best
+used for debugging and informational purposes.</p>
+<p>If the implementation also supports <a class='link' href='../fuchsia.fs/'>fuchsia.fs</a>/<a class='link' href='../fuchsia.fs/#Query'>Query</a>, the
+<a class='link' href='../fuchsia.fs/'>fuchsia.fs</a>/<a class='link' href='../fuchsia.fs/#FilesystemInfo.fs_id'>FilesystemInfo.fs_id</a> field may be used to disambiguate IDs
+from different backing instances.</p>
+</td>
</tr><tr id="Rights">
<td><a href="https://fuchsia.googlesource.com/fuchsia/+/master/zircon/system/fidl/fuchsia-io2/rights-abilities.fidl#74">Rights</a></td>
<td>