From aacbc2cef76d270c6e6b7aa31317e413e8f9a5f6 Mon Sep 17 00:00:00 2001
From: Yosh <github@yosh.is>
Date: Tue, 28 May 2024 14:09:28 +0200
Subject: [PATCH 1/4] Document per-item versions using `@since` gates

---
 wit/command.wit     |  3 +++
 wit/environment.wit |  4 ++++
 wit/exit.wit        |  2 ++
 wit/imports.wit     | 16 ++++++++++++++++
 wit/run.wit         |  2 ++
 wit/stdio.wit       |  6 ++++++
 wit/terminal.wit    | 10 ++++++++++
 7 files changed, 43 insertions(+)

diff --git a/wit/command.wit b/wit/command.wit
index d8005bd..0fc85e9 100644
--- a/wit/command.wit
+++ b/wit/command.wit
@@ -1,7 +1,10 @@
 package wasi:cli@0.2.0;
 
+@since(version = 0.2.0)
 world command {
+  @since(version = 0.2.0)
   include imports;
 
+  @since(version = 0.2.0)
   export run;
 }
diff --git a/wit/environment.wit b/wit/environment.wit
index 7006523..2f449bd 100644
--- a/wit/environment.wit
+++ b/wit/environment.wit
@@ -1,3 +1,4 @@
+@since(version = 0.2.0)
 interface environment {
   /// Get the POSIX-style environment variables.
   ///
@@ -7,12 +8,15 @@ interface environment {
   /// Morally, these are a value import, but until value imports are available
   /// in the component model, this import function should return the same
   /// values each time it is called.
+  @since(version = 0.2.0)
   get-environment: func() -> list<tuple<string, string>>;
 
   /// Get the POSIX-style arguments to the program.
+  @since(version = 0.2.0)
   get-arguments: func() -> list<string>;
 
   /// Return a path that programs should use as their initial current working
   /// directory, interpreting `.` as shorthand for this.
+  @since(version = 0.2.0)
   initial-cwd: func() -> option<string>;
 }
diff --git a/wit/exit.wit b/wit/exit.wit
index d0c2b82..357e670 100644
--- a/wit/exit.wit
+++ b/wit/exit.wit
@@ -1,4 +1,6 @@
+@since(version = 0.2.0)
 interface exit {
   /// Exit the current instance and any linked instances.
+  @since(version = 0.2.0)
   exit: func(status: result);
 }
diff --git a/wit/imports.wit b/wit/imports.wit
index 083b84a..cd59ba1 100644
--- a/wit/imports.wit
+++ b/wit/imports.wit
@@ -1,20 +1,36 @@
 package wasi:cli@0.2.0;
 
+@since(version = 0.2.0)
 world imports {
+  @since(version = 0.2.0)
   include wasi:clocks/imports@0.2.0;
+  @since(version = 0.2.0)
   include wasi:filesystem/imports@0.2.0;
+  @since(version = 0.2.0)
   include wasi:sockets/imports@0.2.0;
+  @since(version = 0.2.0)
   include wasi:random/imports@0.2.0;
+  @since(version = 0.2.0)
   include wasi:io/imports@0.2.0;
 
+  @since(version = 0.2.0)
   import environment;
+  @since(version = 0.2.0)
   import exit;
+  @since(version = 0.2.0)
   import stdin;
+  @since(version = 0.2.0)
   import stdout;
+  @since(version = 0.2.0)
   import stderr;
+  @since(version = 0.2.0)
   import terminal-input;
+  @since(version = 0.2.0)
   import terminal-output;
+  @since(version = 0.2.0)
   import terminal-stdin;
+  @since(version = 0.2.0)
   import terminal-stdout;
+  @since(version = 0.2.0)
   import terminal-stderr;
 }
diff --git a/wit/run.wit b/wit/run.wit
index a70ee8c..655346e 100644
--- a/wit/run.wit
+++ b/wit/run.wit
@@ -1,4 +1,6 @@
+@since(version = 0.2.0)
 interface run {
   /// Run the program.
+  @since(version = 0.2.0)
   run: func() -> result;
 }
diff --git a/wit/stdio.wit b/wit/stdio.wit
index 31ef35b..584b3e8 100644
--- a/wit/stdio.wit
+++ b/wit/stdio.wit
@@ -1,17 +1,23 @@
+@since(version = 0.2.0)
 interface stdin {
   use wasi:io/streams@0.2.0.{input-stream};
 
+  @since(version = 0.2.0)
   get-stdin: func() -> input-stream;
 }
 
+@since(version = 0.2.0)
 interface stdout {
   use wasi:io/streams@0.2.0.{output-stream};
 
+  @since(version = 0.2.0)
   get-stdout: func() -> output-stream;
 }
 
+@since(version = 0.2.0)
 interface stderr {
   use wasi:io/streams@0.2.0.{output-stream};
 
+  @since(version = 0.2.0)
   get-stderr: func() -> output-stream;
 }
diff --git a/wit/terminal.wit b/wit/terminal.wit
index 38c724e..c1d9c70 100644
--- a/wit/terminal.wit
+++ b/wit/terminal.wit
@@ -3,8 +3,10 @@
 /// In the future, this may include functions for disabling echoing,
 /// disabling input buffering so that keyboard events are sent through
 /// immediately, querying supported features, and so on.
+@since(version = 0.2.0)
 interface terminal-input {
     /// The input side of a terminal.
+    @since(version = 0.2.0)
     resource terminal-input;
 }
 
@@ -13,37 +15,45 @@ interface terminal-input {
 /// In the future, this may include functions for querying the terminal
 /// size, being notified of terminal size changes, querying supported
 /// features, and so on.
+@since(version = 0.2.0)
 interface terminal-output {
     /// The output side of a terminal.
+    @since(version = 0.2.0)
     resource terminal-output;
 }
 
 /// An interface providing an optional `terminal-input` for stdin as a
 /// link-time authority.
+@since(version = 0.2.0)
 interface terminal-stdin {
     use terminal-input.{terminal-input};
 
     /// If stdin is connected to a terminal, return a `terminal-input` handle
     /// allowing further interaction with it.
+    @since(version = 0.2.0)
     get-terminal-stdin: func() -> option<terminal-input>;
 }
 
 /// An interface providing an optional `terminal-output` for stdout as a
 /// link-time authority.
+@since(version = 0.2.0)
 interface terminal-stdout {
     use terminal-output.{terminal-output};
 
     /// If stdout is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
+    @since(version = 0.2.0)
     get-terminal-stdout: func() -> option<terminal-output>;
 }
 
 /// An interface providing an optional `terminal-output` for stderr as a
 /// link-time authority.
+@since(version = 0.2.0)
 interface terminal-stderr {
     use terminal-output.{terminal-output};
 
     /// If stderr is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
+    @since(version = 0.2.0)
     get-terminal-stderr: func() -> option<terminal-output>;
 }

From 737ba87d62526929ba7d7f0cadf2fe4cf2533f61 Mon Sep 17 00:00:00 2001
From: Yosh <github@yosh.is>
Date: Fri, 21 Jun 2024 02:09:09 +0200
Subject: [PATCH 2/4] annotate `use` statements

---
 wit/stdio.wit    | 3 +++
 wit/terminal.wit | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/wit/stdio.wit b/wit/stdio.wit
index 584b3e8..e9502a9 100644
--- a/wit/stdio.wit
+++ b/wit/stdio.wit
@@ -1,5 +1,6 @@
 @since(version = 0.2.0)
 interface stdin {
+  @since(version = 0.2.0)
   use wasi:io/streams@0.2.0.{input-stream};
 
   @since(version = 0.2.0)
@@ -8,6 +9,7 @@ interface stdin {
 
 @since(version = 0.2.0)
 interface stdout {
+  @since(version = 0.2.0)
   use wasi:io/streams@0.2.0.{output-stream};
 
   @since(version = 0.2.0)
@@ -16,6 +18,7 @@ interface stdout {
 
 @since(version = 0.2.0)
 interface stderr {
+  @since(version = 0.2.0)
   use wasi:io/streams@0.2.0.{output-stream};
 
   @since(version = 0.2.0)
diff --git a/wit/terminal.wit b/wit/terminal.wit
index c1d9c70..d305498 100644
--- a/wit/terminal.wit
+++ b/wit/terminal.wit
@@ -26,6 +26,7 @@ interface terminal-output {
 /// link-time authority.
 @since(version = 0.2.0)
 interface terminal-stdin {
+    @since(version = 0.2.0)
     use terminal-input.{terminal-input};
 
     /// If stdin is connected to a terminal, return a `terminal-input` handle
@@ -38,6 +39,7 @@ interface terminal-stdin {
 /// link-time authority.
 @since(version = 0.2.0)
 interface terminal-stdout {
+    @since(version = 0.2.0)
     use terminal-output.{terminal-output};
 
     /// If stdout is connected to a terminal, return a `terminal-output` handle
@@ -50,6 +52,7 @@ interface terminal-stdout {
 /// link-time authority.
 @since(version = 0.2.0)
 interface terminal-stderr {
+    @since(version = 0.2.0)
     use terminal-output.{terminal-output};
 
     /// If stderr is connected to a terminal, return a `terminal-output` handle

From 255012c3be90041e3939748bf76b606a1e8a7128 Mon Sep 17 00:00:00 2001
From: Yosh <github@yosh.is>
Date: Mon, 24 Jun 2024 02:56:25 +0200
Subject: [PATCH 3/4] update `wit-abi-up-to-date` to parse `@since` gates

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 767e091..a37194c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
         ./wit-deps lock
         git add -N wit/deps
         git diff --exit-code
-    - uses: WebAssembly/wit-abi-up-to-date@v17
+    - uses: WebAssembly/wit-abi-up-to-date@v21
       with:
         wit-bindgen: '0.16.0'
         worlds: "command imports"

From b2b47c162549c716e62e81d7e4c4c1a9645fb9ac Mon Sep 17 00:00:00 2001
From: Bailey Hayes <behayes2@gmail.com>
Date: Wed, 3 Jul 2024 16:31:00 -0400
Subject: [PATCH 4/4] wit-deps update

---
 .github/workflows/main.yml             |    1 -
 command.md                             | 1361 ++++++++++++------------
 imports.md                             | 1361 ++++++++++++------------
 wit/deps.lock                          |   20 +-
 wit/deps/clocks/monotonic-clock.wit    |   17 +-
 wit/deps/clocks/timezone.wit           |   55 +
 wit/deps/clocks/wall-clock.wit         |    4 +
 wit/deps/clocks/world.wit              |    5 +
 wit/deps/filesystem/preopens.wit       |    3 +
 wit/deps/filesystem/types.wit          |   44 +
 wit/deps/filesystem/world.wit          |    3 +
 wit/deps/io/error.wit                  |   16 +-
 wit/deps/io/poll.wit                   |   12 +-
 wit/deps/io/streams.wit                |   20 +
 wit/deps/io/world.wit                  |    4 +
 wit/deps/random/insecure-seed.wit      |    2 +
 wit/deps/random/insecure.wit           |    3 +
 wit/deps/random/random.wit             |    3 +
 wit/deps/random/world.wit              |    6 +
 wit/deps/sockets/instance-network.wit  |    4 +-
 wit/deps/sockets/ip-name-lookup.wit    |    9 +-
 wit/deps/sockets/network.wit           |   12 +-
 wit/deps/sockets/tcp-create-socket.wit |    5 +-
 wit/deps/sockets/tcp.wit               |   48 +-
 wit/deps/sockets/udp-create-socket.wit |    5 +-
 wit/deps/sockets/udp.wit               |   28 +-
 wit/deps/sockets/world.wit             |    8 +
 27 files changed, 1652 insertions(+), 1407 deletions(-)
 create mode 100644 wit/deps/clocks/timezone.wit

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a37194c..2864956 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,5 +20,4 @@ jobs:
         git diff --exit-code
     - uses: WebAssembly/wit-abi-up-to-date@v21
       with:
-        wit-bindgen: '0.16.0'
         worlds: "command imports"
diff --git a/command.md b/command.md
index 04dfb7b..cdd51c1 100644
--- a/command.md
+++ b/command.md
@@ -2,45 +2,45 @@
 <ul>
 <li>Imports:
 <ul>
-<li>interface <a href="#wasi:cli_environment_0.2.0"><code>wasi:cli/environment@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_exit_0.2.0"><code>wasi:cli/exit@0.2.0</code></a></li>
-<li>interface <a href="#wasi:io_error_0.2.0"><code>wasi:io/error@0.2.0</code></a></li>
-<li>interface <a href="#wasi:io_poll_0.2.0"><code>wasi:io/poll@0.2.0</code></a></li>
-<li>interface <a href="#wasi:io_streams_0.2.0"><code>wasi:io/streams@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_stdin_0.2.0"><code>wasi:cli/stdin@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_stdout_0.2.0"><code>wasi:cli/stdout@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_stderr_0.2.0"><code>wasi:cli/stderr@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_input_0.2.0"><code>wasi:cli/terminal-input@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_output_0.2.0"><code>wasi:cli/terminal-output@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_stdin_0.2.0"><code>wasi:cli/terminal-stdin@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_stdout_0.2.0"><code>wasi:cli/terminal-stdout@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_stderr_0.2.0"><code>wasi:cli/terminal-stderr@0.2.0</code></a></li>
-<li>interface <a href="#wasi:clocks_monotonic_clock_0.2.0"><code>wasi:clocks/monotonic-clock@0.2.0</code></a></li>
-<li>interface <a href="#wasi:clocks_wall_clock_0.2.0"><code>wasi:clocks/wall-clock@0.2.0</code></a></li>
-<li>interface <a href="#wasi:filesystem_types_0.2.0"><code>wasi:filesystem/types@0.2.0</code></a></li>
-<li>interface <a href="#wasi:filesystem_preopens_0.2.0"><code>wasi:filesystem/preopens@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_network_0.2.0"><code>wasi:sockets/network@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_instance_network_0.2.0"><code>wasi:sockets/instance-network@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_udp_0.2.0"><code>wasi:sockets/udp@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_udp_create_socket_0.2.0"><code>wasi:sockets/udp-create-socket@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_tcp_0.2.0"><code>wasi:sockets/tcp@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_tcp_create_socket_0.2.0"><code>wasi:sockets/tcp-create-socket@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_ip_name_lookup_0.2.0"><code>wasi:sockets/ip-name-lookup@0.2.0</code></a></li>
-<li>interface <a href="#wasi:random_random_0.2.0"><code>wasi:random/random@0.2.0</code></a></li>
-<li>interface <a href="#wasi:random_insecure_0.2.0"><code>wasi:random/insecure@0.2.0</code></a></li>
-<li>interface <a href="#wasi:random_insecure_seed_0.2.0"><code>wasi:random/insecure-seed@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_environment_0_2_0"><code>wasi:cli/environment@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_exit_0_2_0"><code>wasi:cli/exit@0.2.0</code></a></li>
+<li>interface <a href="#wasi_io_error_0_2_0"><code>wasi:io/error@0.2.0</code></a></li>
+<li>interface <a href="#wasi_io_poll_0_2_0"><code>wasi:io/poll@0.2.0</code></a></li>
+<li>interface <a href="#wasi_io_streams_0_2_0"><code>wasi:io/streams@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_stdin_0_2_0"><code>wasi:cli/stdin@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_stdout_0_2_0"><code>wasi:cli/stdout@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_stderr_0_2_0"><code>wasi:cli/stderr@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_input_0_2_0"><code>wasi:cli/terminal-input@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_output_0_2_0"><code>wasi:cli/terminal-output@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_stdin_0_2_0"><code>wasi:cli/terminal-stdin@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_stdout_0_2_0"><code>wasi:cli/terminal-stdout@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_stderr_0_2_0"><code>wasi:cli/terminal-stderr@0.2.0</code></a></li>
+<li>interface <a href="#wasi_clocks_monotonic_clock_0_2_0"><code>wasi:clocks/monotonic-clock@0.2.0</code></a></li>
+<li>interface <a href="#wasi_clocks_wall_clock_0_2_0"><code>wasi:clocks/wall-clock@0.2.0</code></a></li>
+<li>interface <a href="#wasi_filesystem_types_0_2_0"><code>wasi:filesystem/types@0.2.0</code></a></li>
+<li>interface <a href="#wasi_filesystem_preopens_0_2_0"><code>wasi:filesystem/preopens@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_network_0_2_0"><code>wasi:sockets/network@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_instance_network_0_2_0"><code>wasi:sockets/instance-network@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_udp_0_2_0"><code>wasi:sockets/udp@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_udp_create_socket_0_2_0"><code>wasi:sockets/udp-create-socket@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_tcp_0_2_0"><code>wasi:sockets/tcp@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_tcp_create_socket_0_2_0"><code>wasi:sockets/tcp-create-socket@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_ip_name_lookup_0_2_0"><code>wasi:sockets/ip-name-lookup@0.2.0</code></a></li>
+<li>interface <a href="#wasi_random_random_0_2_0"><code>wasi:random/random@0.2.0</code></a></li>
+<li>interface <a href="#wasi_random_insecure_0_2_0"><code>wasi:random/insecure@0.2.0</code></a></li>
+<li>interface <a href="#wasi_random_insecure_seed_0_2_0"><code>wasi:random/insecure-seed@0.2.0</code></a></li>
 </ul>
 </li>
 <li>Exports:
 <ul>
-<li>interface <a href="#wasi:cli_run_0.2.0"><code>wasi:cli/run@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_run_0_2_0"><code>wasi:cli/run@0.2.0</code></a></li>
 </ul>
 </li>
 </ul>
-<h2><a name="wasi:cli_environment_0.2.0">Import interface wasi:cli/environment@0.2.0</a></h2>
+<h2><a name="wasi_cli_environment_0_2_0"></a>Import interface wasi:cli/environment@0.2.0</h2>
 <hr />
 <h3>Functions</h3>
-<h4><a name="get_environment"><code>get-environment: func</code></a></h4>
+<h4><a name="get_environment"></a><code>get-environment: func</code></h4>
 <p>Get the POSIX-style environment variables.</p>
 <p>Each environment variable is provided as a pair of string variable names
 and string value.</p>
@@ -51,49 +51,47 @@ values each time it is called.</p>
 <ul>
 <li><a name="get_environment.0"></a> list&lt;(<code>string</code>, <code>string</code>)&gt;</li>
 </ul>
-<h4><a name="get_arguments"><code>get-arguments: func</code></a></h4>
+<h4><a name="get_arguments"></a><code>get-arguments: func</code></h4>
 <p>Get the POSIX-style arguments to the program.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_arguments.0"></a> list&lt;<code>string</code>&gt;</li>
 </ul>
-<h4><a name="initial_cwd"><code>initial-cwd: func</code></a></h4>
+<h4><a name="initial_cwd"></a><code>initial-cwd: func</code></h4>
 <p>Return a path that programs should use as their initial current working
 directory, interpreting <code>.</code> as shorthand for this.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="initial_cwd.0"></a> option&lt;<code>string</code>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_exit_0.2.0">Import interface wasi:cli/exit@0.2.0</a></h2>
+<h2><a name="wasi_cli_exit_0_2_0"></a>Import interface wasi:cli/exit@0.2.0</h2>
 <hr />
 <h3>Functions</h3>
-<h4><a name="exit"><code>exit: func</code></a></h4>
+<h4><a name="exit"></a><code>exit: func</code></h4>
 <p>Exit the current instance and any linked instances.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="exit.status"><code>status</code></a>: result</li>
+<li><a name="exit.status"></a><code>status</code>: result</li>
 </ul>
-<h2><a name="wasi:io_error_0.2.0">Import interface wasi:io/error@0.2.0</a></h2>
+<h2><a name="wasi_io_error_0_2_0"></a>Import interface wasi:io/error@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="error"><code>resource error</code></a></h4>
+<h4><a name="error"></a><code>resource error</code></h4>
 <p>A resource which represents some error information.</p>
 <p>The only method provided by this resource is <code>to-debug-string</code>,
 which provides some human-readable information about the error.</p>
 <p>In the <code>wasi:io</code> package, this resource is returned through the
 <code>wasi:io/streams/stream-error</code> type.</p>
 <p>To provide more specific error information, other interfaces may
-provide functions to further &quot;downcast&quot; this error into more specific
-error information. For example, <a href="#error"><code>error</code></a>s returned in streams derived
-from filesystem types to be described using the filesystem's own
-error-code type, using the function
-<code>wasi:filesystem/types/filesystem-error-code</code>, which takes a parameter
-<code>borrow&lt;error&gt;</code> and returns
-<code>option&lt;wasi:filesystem/types/error-code&gt;</code>.</p>
+offer functions to &quot;downcast&quot; this error into more specific types. For example,
+errors returned from streams derived from filesystem types can be described using
+the filesystem's own error-code type. This is done using the function
+<code>wasi:filesystem/types/filesystem-error-code</code>, which takes a <code>borrow&lt;error&gt;</code>
+parameter and returns an <code>option&lt;wasi:filesystem/types/error-code&gt;</code>.</p>
 <h2>The set of functions which can &quot;downcast&quot; an <a href="#error"><code>error</code></a> into a more
 concrete type is open.</h2>
 <h3>Functions</h3>
-<h4><a name="method_error.to_debug_string"><code>[method]error.to-debug-string: func</code></a></h4>
+<h4><a name="method_error_to_debug_string"></a><code>[method]error.to-debug-string: func</code></h4>
 <p>Returns a string that is suitable to assist humans in debugging
 this error.</p>
 <p>WARNING: The returned string should not be consumed mechanically!
@@ -102,92 +100,95 @@ details. Parsing this string is a major platform-compatibility
 hazard.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_error.to_debug_string.self"><code>self</code></a>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
+<li><a name="method_error_to_debug_string.self"></a><code>self</code>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_error.to_debug_string.0"></a> <code>string</code></li>
+<li><a name="method_error_to_debug_string.0"></a> <code>string</code></li>
 </ul>
-<h2><a name="wasi:io_poll_0.2.0">Import interface wasi:io/poll@0.2.0</a></h2>
+<h2><a name="wasi_io_poll_0_2_0"></a>Import interface wasi:io/poll@0.2.0</h2>
 <p>A poll API intended to let users wait for I/O events on multiple handles
 at once.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>resource pollable</code></a></h4>
+<h4><a name="pollable"></a><code>resource pollable</code></h4>
 <h2><a href="#pollable"><code>pollable</code></a> represents a single I/O event which may be ready, or not.</h2>
 <h3>Functions</h3>
-<h4><a name="method_pollable.ready"><code>[method]pollable.ready: func</code></a></h4>
+<h4><a name="method_pollable_ready"></a><code>[method]pollable.ready: func</code></h4>
 <p>Return the readiness of a pollable. This function never blocks.</p>
 <p>Returns <code>true</code> when the pollable is ready, and <code>false</code> otherwise.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_pollable.ready.self"><code>self</code></a>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_pollable_ready.self"></a><code>self</code>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_pollable.ready.0"></a> <code>bool</code></li>
+<li><a name="method_pollable_ready.0"></a> <code>bool</code></li>
 </ul>
-<h4><a name="method_pollable.block"><code>[method]pollable.block: func</code></a></h4>
+<h4><a name="method_pollable_block"></a><code>[method]pollable.block: func</code></h4>
 <p><code>block</code> returns immediately if the pollable is ready, and otherwise
 blocks until ready.</p>
 <p>This function is equivalent to calling <code>poll.poll</code> on a list
 containing only this pollable.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_pollable.block.self"><code>self</code></a>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_pollable_block.self"></a><code>self</code>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="poll"><code>poll: func</code></a></h4>
+<h4><a name="poll"></a><code>poll: func</code></h4>
 <p>Poll for completion on a set of pollables.</p>
 <p>This function takes a list of pollables, which identify I/O sources of
 interest, and waits until one or more of the events is ready for I/O.</p>
 <p>The result <code>list&lt;u32&gt;</code> contains one or more indices of handles in the
 argument list that is ready for I/O.</p>
-<p>If the list contains more elements than can be indexed with a <code>u32</code>
-value, this function traps.</p>
+<p>This function traps if either:</p>
+<ul>
+<li>the list is empty, or:</li>
+<li>the list contains more elements than can be indexed with a <code>u32</code> value.</li>
+</ul>
 <p>A timeout can be implemented by adding a pollable from the
 wasi-clocks API to the list.</p>
 <p>This function does not return a <code>result</code>; polling in itself does not
 do any I/O so it doesn't fail. If any of the I/O sources identified by
 the pollables has an error, it is indicated by marking the source as
-being reaedy for I/O.</p>
+being ready for I/O.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="poll.in"><code>in</code></a>: list&lt;borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;&gt;</li>
+<li><a name="poll.in"></a><code>in</code>: list&lt;borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="poll.0"></a> list&lt;<code>u32</code>&gt;</li>
 </ul>
-<h2><a name="wasi:io_streams_0.2.0">Import interface wasi:io/streams@0.2.0</a></h2>
+<h2><a name="wasi_io_streams_0_2_0"></a>Import interface wasi:io/streams@0.2.0</h2>
 <p>WASI I/O is an I/O abstraction API which is currently focused on providing
 stream types.</p>
 <p>In the future, the component model is expected to add built-in stream types;
 when it does, they are expected to subsume this API.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="error"><code>type error</code></a></h4>
+<h4><a name="error"></a><code>type error</code></h4>
 <p><a href="#error"><a href="#error"><code>error</code></a></a></p>
 <p>
-#### <a name="pollable">`type pollable`</a>
+#### <a name="pollable"></a>`type pollable`
 [`pollable`](#pollable)
 <p>
-#### <a name="stream_error">`variant stream-error`</a>
+#### <a name="stream_error"></a>`variant stream-error`
 <p>An error for input-stream and output-stream operations.</p>
 <h5>Variant Cases</h5>
 <ul>
 <li>
-<p><a name="stream_error.last_operation_failed"><code>last-operation-failed</code></a>: own&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</p>
+<p><a name="stream_error.last_operation_failed"></a><code>last-operation-failed</code>: own&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</p>
 <p>The last operation (a write or flush) failed before completion.
 <p>More information is available in the <a href="#error"><code>error</code></a> payload.</p>
 </li>
 <li>
-<p><a name="stream_error.closed"><code>closed</code></a></p>
+<p><a name="stream_error.closed"></a><code>closed</code></p>
 <p>The stream is closed: no more input will be accepted by the
 stream. A closed output-stream will return this error on all
 future operations.
 </li>
 </ul>
-<h4><a name="input_stream"><code>resource input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>resource input-stream</code></h4>
 <p>An input bytestream.</p>
 <p><a href="#input_stream"><code>input-stream</code></a>s are <em>non-blocking</em> to the extent practical on underlying
 platforms. I/O operations always return promptly; if fewer bytes are
@@ -195,7 +196,7 @@ promptly available than requested, they return the number of bytes promptly
 available, which could even be zero. To wait for data to be available,
 use the <code>subscribe</code> function to obtain a <a href="#pollable"><code>pollable</code></a> which can be polled
 for using <code>wasi:io/poll</code>.</p>
-<h4><a name="output_stream"><code>resource output-stream</code></a></h4>
+<h4><a name="output_stream"></a><code>resource output-stream</code></h4>
 <p>An output bytestream.</p>
 <h2><a href="#output_stream"><code>output-stream</code></a>s are <em>non-blocking</em> to the extent practical on
 underlying platforms. Except where specified otherwise, I/O operations also
@@ -204,7 +205,7 @@ promptly, which could even be zero. To wait for the stream to be ready to
 accept data, the <code>subscribe</code> function to obtain a <a href="#pollable"><code>pollable</code></a> which can be
 polled for using <code>wasi:io/poll</code>.</h2>
 <h3>Functions</h3>
-<h4><a name="method_input_stream.read"><code>[method]input-stream.read: func</code></a></h4>
+<h4><a name="method_input_stream_read"></a><code>[method]input-stream.read: func</code></h4>
 <p>Perform a non-blocking read from the stream.</p>
 <p>When the source of a <code>read</code> is binary data, the bytes from the source
 are returned verbatim. When the source of a <code>read</code> is known to the
@@ -228,51 +229,51 @@ as a return value by the callee. The callee may return a list of bytes
 less than <code>len</code> in size while more bytes are available for reading.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.read.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.read.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_read.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_read.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.blocking_read"><code>[method]input-stream.blocking-read: func</code></a></h4>
+<h4><a name="method_input_stream_blocking_read"></a><code>[method]input-stream.blocking-read: func</code></h4>
 <p>Read bytes from a stream, after blocking until at least one byte can
 be read. Except for blocking, behavior is identical to <code>read</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.blocking_read.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.blocking_read.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_blocking_read.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_read.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.blocking_read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.skip"><code>[method]input-stream.skip: func</code></a></h4>
+<h4><a name="method_input_stream_skip"></a><code>[method]input-stream.skip: func</code></h4>
 <p>Skip bytes from a stream. Returns number of bytes skipped.</p>
 <p>Behaves identical to <code>read</code>, except instead of returning a list
 of bytes, returns the number of bytes consumed from the stream.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.skip.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.skip.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_skip.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_skip.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.blocking_skip"><code>[method]input-stream.blocking-skip: func</code></a></h4>
+<h4><a name="method_input_stream_blocking_skip"></a><code>[method]input-stream.blocking-skip: func</code></h4>
 <p>Skip bytes from a stream, after blocking until at least one byte
 can be skipped. Except for blocking behavior, identical to <code>skip</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.blocking_skip.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.blocking_skip.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_blocking_skip.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_skip.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.blocking_skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.subscribe"><code>[method]input-stream.subscribe: func</code></a></h4>
+<h4><a name="method_input_stream_subscribe"></a><code>[method]input-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once either the specified stream
 has bytes available to read or the other end of the stream has been
 closed.
@@ -281,13 +282,13 @@ Implementations may trap if the <a href="#input_stream"><code>input-stream</code
 all derived <a href="#pollable"><code>pollable</code></a>s created with this function are dropped.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_input_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.check_write"><code>[method]output-stream.check-write: func</code></a></h4>
+<h4><a name="method_output_stream_check_write"></a><code>[method]output-stream.check-write: func</code></h4>
 <p>Check readiness for writing. This function never blocks.</p>
 <p>Returns the number of bytes permitted for the next call to <code>write</code>,
 or an error. Calling <code>write</code> with more bytes than this function has
@@ -297,13 +298,13 @@ become ready when this function will report at least 1 byte, or an
 error.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.check_write.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_check_write.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.check_write.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_check_write.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.write"><code>[method]output-stream.write: func</code></a></h4>
+<h4><a name="method_output_stream_write"></a><code>[method]output-stream.write: func</code></h4>
 <p>Perform a write. This function never blocks.</p>
 <p>When the destination of a <code>write</code> is binary data, the bytes from
 <code>contents</code> are written verbatim. When the destination of a <code>write</code> is
@@ -316,14 +317,14 @@ length of less than or equal to n. Otherwise, this function will trap.</p>
 the last call to check-write provided a permit.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.write.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.write.contents"><code>contents</code></a>: list&lt;<code>u8</code>&gt;</li>
+<li><a name="method_output_stream_write.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write.contents"></a><code>contents</code>: list&lt;<code>u8</code>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.write.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_write_and_flush"><code>[method]output-stream.blocking-write-and-flush: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_write_and_flush"></a><code>[method]output-stream.blocking-write-and-flush: func</code></h4>
 <p>Perform a write of up to 4096 bytes, and then flush the stream. Block
 until all of these operations are complete, or an error occurs.</p>
 <p>This is a convenience wrapper around the use of <code>check-write</code>,
@@ -347,14 +348,14 @@ let _ = this.check-write();         // eliding error handling
 </code></pre>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_and_flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_write_and_flush.contents"><code>contents</code></a>: list&lt;<code>u8</code>&gt;</li>
+<li><a name="method_output_stream_blocking_write_and_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_and_flush.contents"></a><code>contents</code>: list&lt;<code>u8</code>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.flush"><code>[method]output-stream.flush: func</code></a></h4>
+<h4><a name="method_output_stream_flush"></a><code>[method]output-stream.flush: func</code></h4>
 <p>Request to flush buffered output. This function never blocks.</p>
 <p>This tells the output-stream that the caller intends any buffered
 output to be flushed. the output which is expected to be flushed
@@ -365,24 +366,24 @@ completed. The <code>subscribe</code> pollable will become ready when the
 flush has completed and the stream can accept more writes.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_flush"><code>[method]output-stream.blocking-flush: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_flush"></a><code>[method]output-stream.blocking-flush: func</code></h4>
 <p>Request to flush buffered output, and block until flush completes
 and stream is ready for writing again.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.subscribe"><code>[method]output-stream.subscribe: func</code></a></h4>
+<h4><a name="method_output_stream_subscribe"></a><code>[method]output-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the output-stream
 is ready for more writing, or an error has occured. When this
 pollable is ready, <code>check-write</code> will return <code>ok(n)</code> with n&gt;0, or an
@@ -393,13 +394,13 @@ Implementations may trap if the <a href="#output_stream"><code>output-stream</co
 all derived <a href="#pollable"><code>pollable</code></a>s created with this function are dropped.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_output_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.write_zeroes"><code>[method]output-stream.write-zeroes: func</code></a></h4>
+<h4><a name="method_output_stream_write_zeroes"></a><code>[method]output-stream.write-zeroes: func</code></h4>
 <p>Write zeroes to a stream.</p>
 <p>This should be used precisely like <code>write</code> with the exact same
 preconditions (must use check-write first), but instead of
@@ -407,14 +408,14 @@ passing a list of bytes, you simply pass the number of zero-bytes
 that should be written.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.write_zeroes.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.write_zeroes.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_write_zeroes.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write_zeroes.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.write_zeroes.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write_zeroes.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_write_zeroes_and_flush"><code>[method]output-stream.blocking-write-zeroes-and-flush: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_write_zeroes_and_flush"></a><code>[method]output-stream.blocking-write-zeroes-and-flush: func</code></h4>
 <p>Perform a write of up to 4096 zeroes, and then flush the stream.
 Block until all of these operations are complete, or an error
 occurs.</p>
@@ -438,14 +439,14 @@ let _ = this.check-write();         // eliding error handling
 </code></pre>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_zeroes_and_flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_write_zeroes_and_flush.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_blocking_write_zeroes_and_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_zeroes_and_flush.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_zeroes_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_zeroes_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.splice"><code>[method]output-stream.splice: func</code></a></h4>
+<h4><a name="method_output_stream_splice"></a><code>[method]output-stream.splice: func</code></h4>
 <p>Read from one stream and write to another.</p>
 <p>The behavior of splice is equivelant to:</p>
 <ol>
@@ -460,161 +461,160 @@ let _ = this.check-write();         // eliding error handling
 than <code>len</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.splice.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.splice.src"><code>src</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.splice.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_splice.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_splice.src"></a><code>src</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_splice.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_splice"><code>[method]output-stream.blocking-splice: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_splice"></a><code>[method]output-stream.blocking-splice: func</code></h4>
 <p>Read from one stream and write to another, with blocking.</p>
 <p>This is similar to <code>splice</code>, except that it blocks until the
 <a href="#output_stream"><code>output-stream</code></a> is ready for writing, and the <a href="#input_stream"><code>input-stream</code></a>
 is ready for reading, before performing the <code>splice</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_splice.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_splice.src"><code>src</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_splice.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_blocking_splice.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_splice.src"></a><code>src</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_splice.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_stdin_0.2.0">Import interface wasi:cli/stdin@0.2.0</a></h2>
+<h2><a name="wasi_cli_stdin_0_2_0"></a>Import interface wasi:cli/stdin@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="input_stream"><code>type input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>type input-stream</code></h4>
 <p><a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_stdin"><code>get-stdin: func</code></a></h4>
+<h4><a name="get_stdin"></a><code>get-stdin: func</code></h4>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_stdin.0"></a> own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_stdout_0.2.0">Import interface wasi:cli/stdout@0.2.0</a></h2>
+<h2><a name="wasi_cli_stdout_0_2_0"></a>Import interface wasi:cli/stdout@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="output_stream"><code>type output-stream</code></a></h4>
+<h4><a name="output_stream"></a><code>type output-stream</code></h4>
 <p><a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_stdout"><code>get-stdout: func</code></a></h4>
+<h4><a name="get_stdout"></a><code>get-stdout: func</code></h4>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_stdout.0"></a> own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_stderr_0.2.0">Import interface wasi:cli/stderr@0.2.0</a></h2>
+<h2><a name="wasi_cli_stderr_0_2_0"></a>Import interface wasi:cli/stderr@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="output_stream"><code>type output-stream</code></a></h4>
+<h4><a name="output_stream"></a><code>type output-stream</code></h4>
 <p><a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_stderr"><code>get-stderr: func</code></a></h4>
+<h4><a name="get_stderr"></a><code>get-stderr: func</code></h4>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_stderr.0"></a> own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_terminal_input_0.2.0">Import interface wasi:cli/terminal-input@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_input_0_2_0"></a>Import interface wasi:cli/terminal-input@0.2.0</h2>
 <p>Terminal input.</p>
 <p>In the future, this may include functions for disabling echoing,
 disabling input buffering so that keyboard events are sent through
 immediately, querying supported features, and so on.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_input"><code>resource terminal-input</code></a></h4>
+<h4><a name="terminal_input"></a><code>resource terminal-input</code></h4>
 <p>The input side of a terminal.</p>
-<h2><a name="wasi:cli_terminal_output_0.2.0">Import interface wasi:cli/terminal-output@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_output_0_2_0"></a>Import interface wasi:cli/terminal-output@0.2.0</h2>
 <p>Terminal output.</p>
 <p>In the future, this may include functions for querying the terminal
 size, being notified of terminal size changes, querying supported
 features, and so on.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_output"><code>resource terminal-output</code></a></h4>
+<h4><a name="terminal_output"></a><code>resource terminal-output</code></h4>
 <p>The output side of a terminal.</p>
-<h2><a name="wasi:cli_terminal_stdin_0.2.0">Import interface wasi:cli/terminal-stdin@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_stdin_0_2_0"></a>Import interface wasi:cli/terminal-stdin@0.2.0</h2>
 <p>An interface providing an optional <a href="#terminal_input"><code>terminal-input</code></a> for stdin as a
 link-time authority.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_input"><code>type terminal-input</code></a></h4>
+<h4><a name="terminal_input"></a><code>type terminal-input</code></h4>
 <p><a href="#terminal_input"><a href="#terminal_input"><code>terminal-input</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_terminal_stdin"><code>get-terminal-stdin: func</code></a></h4>
+<h4><a name="get_terminal_stdin"></a><code>get-terminal-stdin: func</code></h4>
 <p>If stdin is connected to a terminal, return a <a href="#terminal_input"><code>terminal-input</code></a> handle
 allowing further interaction with it.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_terminal_stdin.0"></a> option&lt;own&lt;<a href="#terminal_input"><a href="#terminal_input"><code>terminal-input</code></a></a>&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:cli_terminal_stdout_0.2.0">Import interface wasi:cli/terminal-stdout@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_stdout_0_2_0"></a>Import interface wasi:cli/terminal-stdout@0.2.0</h2>
 <p>An interface providing an optional <a href="#terminal_output"><code>terminal-output</code></a> for stdout as a
 link-time authority.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_output"><code>type terminal-output</code></a></h4>
+<h4><a name="terminal_output"></a><code>type terminal-output</code></h4>
 <p><a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_terminal_stdout"><code>get-terminal-stdout: func</code></a></h4>
+<h4><a name="get_terminal_stdout"></a><code>get-terminal-stdout: func</code></h4>
 <p>If stdout is connected to a terminal, return a <a href="#terminal_output"><code>terminal-output</code></a> handle
 allowing further interaction with it.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_terminal_stdout.0"></a> option&lt;own&lt;<a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a>&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:cli_terminal_stderr_0.2.0">Import interface wasi:cli/terminal-stderr@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_stderr_0_2_0"></a>Import interface wasi:cli/terminal-stderr@0.2.0</h2>
 <p>An interface providing an optional <a href="#terminal_output"><code>terminal-output</code></a> for stderr as a
 link-time authority.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_output"><code>type terminal-output</code></a></h4>
+<h4><a name="terminal_output"></a><code>type terminal-output</code></h4>
 <p><a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_terminal_stderr"><code>get-terminal-stderr: func</code></a></h4>
+<h4><a name="get_terminal_stderr"></a><code>get-terminal-stderr: func</code></h4>
 <p>If stderr is connected to a terminal, return a <a href="#terminal_output"><code>terminal-output</code></a> handle
 allowing further interaction with it.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_terminal_stderr.0"></a> option&lt;own&lt;<a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a>&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:clocks_monotonic_clock_0.2.0">Import interface wasi:clocks/monotonic-clock@0.2.0</a></h2>
+<h2><a name="wasi_clocks_monotonic_clock_0_2_0"></a>Import interface wasi:clocks/monotonic-clock@0.2.0</h2>
 <p>WASI Monotonic Clock is a clock API intended to let users measure elapsed
 time.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <p>A monotonic clock is a clock which has an unspecified initial value, and
 successive reads of the clock will produce non-decreasing values.</p>
-<p>It is intended for measuring elapsed time.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>type pollable</code></a></h4>
+<h4><a name="pollable"></a><code>type pollable</code></h4>
 <p><a href="#pollable"><a href="#pollable"><code>pollable</code></a></a></p>
 <p>
-#### <a name="instant">`type instant`</a>
+#### <a name="instant"></a>`type instant`
 `u64`
 <p>An instant in time, in nanoseconds. An instant is relative to an
 unspecified initial value, and can only be compared to instances from
 the same monotonic-clock.
-<h4><a name="duration"><code>type duration</code></a></h4>
+<h4><a name="duration"></a><code>type duration</code></h4>
 <p><code>u64</code></p>
 <p>A duration of time, in nanoseconds.
 <hr />
 <h3>Functions</h3>
-<h4><a name="now"><code>now: func</code></a></h4>
+<h4><a name="now"></a><code>now: func</code></h4>
 <p>Read the current value of the clock.</p>
 <p>The clock is monotonic, therefore calling this function repeatedly will
 produce a sequence of non-decreasing values.</p>
@@ -622,37 +622,36 @@ produce a sequence of non-decreasing values.</p>
 <ul>
 <li><a name="now.0"></a> <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
 </ul>
-<h4><a name="resolution"><code>resolution: func</code></a></h4>
+<h4><a name="resolution"></a><code>resolution: func</code></h4>
 <p>Query the resolution of the clock. Returns the duration of time
 corresponding to a clock tick.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="resolution.0"></a> <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
-<h4><a name="subscribe_instant"><code>subscribe-instant: func</code></a></h4>
+<h4><a name="subscribe_instant"></a><code>subscribe-instant: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the specified instant
-occured.</p>
+has occured.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="subscribe_instant.when"><code>when</code></a>: <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
+<li><a name="subscribe_instant.when"></a><code>when</code>: <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="subscribe_instant.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="subscribe_duration"><code>subscribe-duration: func</code></a></h4>
-<p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the given duration has
-elapsed, starting at the time at which this function was called.
-occured.</p>
+<h4><a name="subscribe_duration"></a><code>subscribe-duration: func</code></h4>
+<p>Create a <a href="#pollable"><code>pollable</code></a> that will resolve after the specified duration has
+elapsed from the time this function is invoked.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="subscribe_duration.when"><code>when</code></a>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
+<li><a name="subscribe_duration.when"></a><code>when</code>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="subscribe_duration.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:clocks_wall_clock_0.2.0">Import interface wasi:clocks/wall-clock@0.2.0</a></h2>
+<h2><a name="wasi_clocks_wall_clock_0_2_0"></a>Import interface wasi:clocks/wall-clock@0.2.0</h2>
 <p>WASI Wall Clock is a clock API intended to let users query the current
 time. The name &quot;wall&quot; makes an analogy to a &quot;clock on the wall&quot;, which
 is not necessarily monotonic as it may be reset.</p>
@@ -665,16 +664,16 @@ monotonic, making it unsuitable for measuring elapsed time.</p>
 <p>It is intended for reporting the current date and time for humans.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="datetime"><code>record datetime</code></a></h4>
+<h4><a name="datetime"></a><code>record datetime</code></h4>
 <p>A time and date in seconds plus nanoseconds.</p>
 <h5>Record Fields</h5>
 <ul>
-<li><a name="datetime.seconds"><code>seconds</code></a>: <code>u64</code></li>
-<li><a name="datetime.nanoseconds"><code>nanoseconds</code></a>: <code>u32</code></li>
+<li><a name="datetime.seconds"></a><code>seconds</code>: <code>u64</code></li>
+<li><a name="datetime.nanoseconds"></a><code>nanoseconds</code>: <code>u32</code></li>
 </ul>
 <hr />
 <h3>Functions</h3>
-<h4><a name="now"><code>now: func</code></a></h4>
+<h4><a name="now"></a><code>now: func</code></h4>
 <p>Read the current value of the clock.</p>
 <p>This clock is not monotonic, therefore calling this function repeatedly
 will not necessarily produce a sequence of non-decreasing values.</p>
@@ -686,14 +685,14 @@ also known as <a href="https://en.wikipedia.org/wiki/Unix_time">Unix Time</a>.</
 <ul>
 <li><a name="now.0"></a> <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
-<h4><a name="resolution"><code>resolution: func</code></a></h4>
+<h4><a name="resolution"></a><code>resolution: func</code></h4>
 <p>Query the resolution of the clock.</p>
 <p>The nanoseconds field of the output is always less than 1000000000.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="resolution.0"></a> <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
-<h2><a name="wasi:filesystem_types_0.2.0">Import interface wasi:filesystem/types@0.2.0</a></h2>
+<h2><a name="wasi_filesystem_types_0_2_0"></a>Import interface wasi:filesystem/types@0.2.0</h2>
 <p>WASI filesystem is a filesystem API primarily intended to let users run WASI
 programs that access their files on their existing filesystems, without
 significant overhead.</p>
@@ -713,75 +712,75 @@ underlying filesystem, the function fails with <a href="#error_code.not_permitte
 <a href="https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md">WASI filesystem path resolution</a>.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="input_stream"><code>type input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>type input-stream</code></h4>
 <p><a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a></p>
 <p>
-#### <a name="output_stream">`type output-stream`</a>
+#### <a name="output_stream"></a>`type output-stream`
 [`output-stream`](#output_stream)
 <p>
-#### <a name="error">`type error`</a>
+#### <a name="error"></a>`type error`
 [`error`](#error)
 <p>
-#### <a name="datetime">`type datetime`</a>
+#### <a name="datetime"></a>`type datetime`
 [`datetime`](#datetime)
 <p>
-#### <a name="filesize">`type filesize`</a>
+#### <a name="filesize"></a>`type filesize`
 `u64`
 <p>File size or length of a region within a file.
-<h4><a name="descriptor_type"><code>enum descriptor-type</code></a></h4>
+<h4><a name="descriptor_type"></a><code>enum descriptor-type</code></h4>
 <p>The type of a filesystem object referenced by a descriptor.</p>
 <p>Note: This was called <code>filetype</code> in earlier versions of WASI.</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="descriptor_type.unknown"><code>unknown</code></a></p>
+<p><a name="descriptor_type.unknown"></a><code>unknown</code></p>
 <p>The type of the descriptor or file is unknown or is different from
 any of the other types specified.
 </li>
 <li>
-<p><a name="descriptor_type.block_device"><code>block-device</code></a></p>
+<p><a name="descriptor_type.block_device"></a><code>block-device</code></p>
 <p>The descriptor refers to a block device inode.
 </li>
 <li>
-<p><a name="descriptor_type.character_device"><code>character-device</code></a></p>
+<p><a name="descriptor_type.character_device"></a><code>character-device</code></p>
 <p>The descriptor refers to a character device inode.
 </li>
 <li>
-<p><a name="descriptor_type.directory"><code>directory</code></a></p>
+<p><a name="descriptor_type.directory"></a><code>directory</code></p>
 <p>The descriptor refers to a directory inode.
 </li>
 <li>
-<p><a name="descriptor_type.fifo"><code>fifo</code></a></p>
+<p><a name="descriptor_type.fifo"></a><code>fifo</code></p>
 <p>The descriptor refers to a named pipe.
 </li>
 <li>
-<p><a name="descriptor_type.symbolic_link"><code>symbolic-link</code></a></p>
+<p><a name="descriptor_type.symbolic_link"></a><code>symbolic-link</code></p>
 <p>The file refers to a symbolic link inode.
 </li>
 <li>
-<p><a name="descriptor_type.regular_file"><code>regular-file</code></a></p>
+<p><a name="descriptor_type.regular_file"></a><code>regular-file</code></p>
 <p>The descriptor refers to a regular file inode.
 </li>
 <li>
-<p><a name="descriptor_type.socket"><code>socket</code></a></p>
+<p><a name="descriptor_type.socket"></a><code>socket</code></p>
 <p>The descriptor refers to a socket.
 </li>
 </ul>
-<h4><a name="descriptor_flags"><code>flags descriptor-flags</code></a></h4>
+<h4><a name="descriptor_flags"></a><code>flags descriptor-flags</code></h4>
 <p>Descriptor flags.</p>
 <p>Note: This was called <code>fdflags</code> in earlier versions of WASI.</p>
 <h5>Flags members</h5>
 <ul>
 <li>
-<p><a name="descriptor_flags.read"><code>read</code></a>: </p>
+<p><a name="descriptor_flags.read"></a><code>read</code>: </p>
 <p>Read mode: Data can be read.
 </li>
 <li>
-<p><a name="descriptor_flags.write"><code>write</code></a>: </p>
+<p><a name="descriptor_flags.write"></a><code>write</code>: </p>
 <p>Write mode: Data can be written to.
 </li>
 <li>
-<p><a name="descriptor_flags.file_integrity_sync"><code>file-integrity-sync</code></a>: </p>
+<p><a name="descriptor_flags.file_integrity_sync"></a><code>file-integrity-sync</code>: </p>
 <p>Request that writes be performed according to synchronized I/O file
 integrity completion. The data stored in the file and the file's
 metadata are synchronized. This is similar to `O_SYNC` in POSIX.
@@ -790,7 +789,7 @@ WASI. At this time, it should be interpreted as a request, and not a
 requirement.</p>
 </li>
 <li>
-<p><a name="descriptor_flags.data_integrity_sync"><code>data-integrity-sync</code></a>: </p>
+<p><a name="descriptor_flags.data_integrity_sync"></a><code>data-integrity-sync</code>: </p>
 <p>Request that writes be performed according to synchronized I/O data
 integrity completion. Only the data stored in the file is
 synchronized. This is similar to `O_DSYNC` in POSIX.
@@ -799,7 +798,7 @@ WASI. At this time, it should be interpreted as a request, and not a
 requirement.</p>
 </li>
 <li>
-<p><a name="descriptor_flags.requested_write_sync"><code>requested-write-sync</code></a>: </p>
+<p><a name="descriptor_flags.requested_write_sync"></a><code>requested-write-sync</code>: </p>
 <p>Requests that reads be performed at the same level of integrety
 requested for writes. This is similar to `O_RSYNC` in POSIX.
 <p>The precise semantics of this operation have not yet been defined for
@@ -807,7 +806,7 @@ WASI. At this time, it should be interpreted as a request, and not a
 requirement.</p>
 </li>
 <li>
-<p><a name="descriptor_flags.mutate_directory"><code>mutate-directory</code></a>: </p>
+<p><a name="descriptor_flags.mutate_directory"></a><code>mutate-directory</code>: </p>
 <p>Mutating directories mode: Directory contents may be mutated.
 <p>When this flag is unset on a descriptor, operations using the
 descriptor which would create, rename, delete, modify the data or
@@ -817,107 +816,107 @@ they would otherwise succeed.</p>
 <p>This may only be set on directories.</p>
 </li>
 </ul>
-<h4><a name="path_flags"><code>flags path-flags</code></a></h4>
+<h4><a name="path_flags"></a><code>flags path-flags</code></h4>
 <p>Flags determining the method of how paths are resolved.</p>
 <h5>Flags members</h5>
 <ul>
-<li><a name="path_flags.symlink_follow"><code>symlink-follow</code></a>: <p>As long as the resolved path corresponds to a symbolic link, it is
+<li><a name="path_flags.symlink_follow"></a><code>symlink-follow</code>: <p>As long as the resolved path corresponds to a symbolic link, it is
 expanded.
 </li>
 </ul>
-<h4><a name="open_flags"><code>flags open-flags</code></a></h4>
+<h4><a name="open_flags"></a><code>flags open-flags</code></h4>
 <p>Open flags used by <code>open-at</code>.</p>
 <h5>Flags members</h5>
 <ul>
 <li>
-<p><a name="open_flags.create"><code>create</code></a>: </p>
+<p><a name="open_flags.create"></a><code>create</code>: </p>
 <p>Create file if it does not exist, similar to `O_CREAT` in POSIX.
 </li>
 <li>
-<p><a name="open_flags.directory"><code>directory</code></a>: </p>
+<p><a name="open_flags.directory"></a><code>directory</code>: </p>
 <p>Fail if not a directory, similar to `O_DIRECTORY` in POSIX.
 </li>
 <li>
-<p><a name="open_flags.exclusive"><code>exclusive</code></a>: </p>
+<p><a name="open_flags.exclusive"></a><code>exclusive</code>: </p>
 <p>Fail if file already exists, similar to `O_EXCL` in POSIX.
 </li>
 <li>
-<p><a name="open_flags.truncate"><code>truncate</code></a>: </p>
+<p><a name="open_flags.truncate"></a><code>truncate</code>: </p>
 <p>Truncate file to size 0, similar to `O_TRUNC` in POSIX.
 </li>
 </ul>
-<h4><a name="link_count"><code>type link-count</code></a></h4>
+<h4><a name="link_count"></a><code>type link-count</code></h4>
 <p><code>u64</code></p>
 <p>Number of hard links to an inode.
-<h4><a name="descriptor_stat"><code>record descriptor-stat</code></a></h4>
+<h4><a name="descriptor_stat"></a><code>record descriptor-stat</code></h4>
 <p>File attributes.</p>
 <p>Note: This was called <code>filestat</code> in earlier versions of WASI.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="descriptor_stat.type"><code>type</code></a>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
+<p><a name="descriptor_stat.type"></a><code>type</code>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
 <p>File type.
 </li>
 <li>
-<p><a name="descriptor_stat.link_count"><a href="#link_count"><code>link-count</code></a></a>: <a href="#link_count"><a href="#link_count"><code>link-count</code></a></a></p>
+<p><a name="descriptor_stat.link_count"></a><a href="#link_count"><code>link-count</code></a>: <a href="#link_count"><a href="#link_count"><code>link-count</code></a></a></p>
 <p>Number of hard links to the file.
 </li>
 <li>
-<p><a name="descriptor_stat.size"><code>size</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></p>
+<p><a name="descriptor_stat.size"></a><code>size</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></p>
 <p>For regular files, the file size in bytes. For symbolic links, the
 length in bytes of the pathname contained in the symbolic link.
 </li>
 <li>
-<p><a name="descriptor_stat.data_access_timestamp"><code>data-access-timestamp</code></a>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
+<p><a name="descriptor_stat.data_access_timestamp"></a><code>data-access-timestamp</code>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
 <p>Last data access timestamp.
 <p>If the <code>option</code> is none, the platform doesn't maintain an access
 timestamp for this file.</p>
 </li>
 <li>
-<p><a name="descriptor_stat.data_modification_timestamp"><code>data-modification-timestamp</code></a>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
+<p><a name="descriptor_stat.data_modification_timestamp"></a><code>data-modification-timestamp</code>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
 <p>Last data modification timestamp.
 <p>If the <code>option</code> is none, the platform doesn't maintain a
 modification timestamp for this file.</p>
 </li>
 <li>
-<p><a name="descriptor_stat.status_change_timestamp"><code>status-change-timestamp</code></a>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
+<p><a name="descriptor_stat.status_change_timestamp"></a><code>status-change-timestamp</code>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
 <p>Last file status-change timestamp.
 <p>If the <code>option</code> is none, the platform doesn't maintain a
 status-change timestamp for this file.</p>
 </li>
 </ul>
-<h4><a name="new_timestamp"><code>variant new-timestamp</code></a></h4>
+<h4><a name="new_timestamp"></a><code>variant new-timestamp</code></h4>
 <p>When setting a timestamp, this gives the value to set it to.</p>
 <h5>Variant Cases</h5>
 <ul>
 <li>
-<p><a name="new_timestamp.no_change"><code>no-change</code></a></p>
+<p><a name="new_timestamp.no_change"></a><code>no-change</code></p>
 <p>Leave the timestamp set to its previous value.
 </li>
 <li>
-<p><a name="new_timestamp.now"><a href="#now"><code>now</code></a></a></p>
+<p><a name="new_timestamp.now"></a><a href="#now"><code>now</code></a></p>
 <p>Set the timestamp to the current time of the system clock associated
 with the filesystem.
 </li>
 <li>
-<p><a name="new_timestamp.timestamp"><code>timestamp</code></a>: <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></p>
+<p><a name="new_timestamp.timestamp"></a><code>timestamp</code>: <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></p>
 <p>Set the timestamp to the given value.
 </li>
 </ul>
-<h4><a name="directory_entry"><code>record directory-entry</code></a></h4>
+<h4><a name="directory_entry"></a><code>record directory-entry</code></h4>
 <p>A directory entry.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="directory_entry.type"><code>type</code></a>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
+<p><a name="directory_entry.type"></a><code>type</code>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
 <p>The type of the file referred to by this directory entry.
 </li>
 <li>
-<p><a name="directory_entry.name"><code>name</code></a>: <code>string</code></p>
+<p><a name="directory_entry.name"></a><code>name</code>: <code>string</code></p>
 <p>The name of the object.
 </li>
 </ul>
-<h4><a name="error_code"><code>enum error-code</code></a></h4>
+<h4><a name="error_code"></a><code>enum error-code</code></h4>
 <p>Error codes returned by functions, similar to <code>errno</code> in POSIX.
 Not all of these error codes are returned by the functions provided by this
 API; some are used in higher-level library layers, and others are provided
@@ -925,211 +924,211 @@ merely for alignment with POSIX.</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="error_code.access"><code>access</code></a></p>
+<p><a name="error_code.access"></a><code>access</code></p>
 <p>Permission denied, similar to `EACCES` in POSIX.
 </li>
 <li>
-<p><a name="error_code.would_block"><code>would-block</code></a></p>
+<p><a name="error_code.would_block"></a><code>would-block</code></p>
 <p>Resource unavailable, or operation would block, similar to `EAGAIN` and `EWOULDBLOCK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.already"><code>already</code></a></p>
+<p><a name="error_code.already"></a><code>already</code></p>
 <p>Connection already in progress, similar to `EALREADY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.bad_descriptor"><code>bad-descriptor</code></a></p>
+<p><a name="error_code.bad_descriptor"></a><code>bad-descriptor</code></p>
 <p>Bad descriptor, similar to `EBADF` in POSIX.
 </li>
 <li>
-<p><a name="error_code.busy"><code>busy</code></a></p>
+<p><a name="error_code.busy"></a><code>busy</code></p>
 <p>Device or resource busy, similar to `EBUSY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.deadlock"><code>deadlock</code></a></p>
+<p><a name="error_code.deadlock"></a><code>deadlock</code></p>
 <p>Resource deadlock would occur, similar to `EDEADLK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.quota"><code>quota</code></a></p>
+<p><a name="error_code.quota"></a><code>quota</code></p>
 <p>Storage quota exceeded, similar to `EDQUOT` in POSIX.
 </li>
 <li>
-<p><a name="error_code.exist"><code>exist</code></a></p>
+<p><a name="error_code.exist"></a><code>exist</code></p>
 <p>File exists, similar to `EEXIST` in POSIX.
 </li>
 <li>
-<p><a name="error_code.file_too_large"><code>file-too-large</code></a></p>
+<p><a name="error_code.file_too_large"></a><code>file-too-large</code></p>
 <p>File too large, similar to `EFBIG` in POSIX.
 </li>
 <li>
-<p><a name="error_code.illegal_byte_sequence"><code>illegal-byte-sequence</code></a></p>
+<p><a name="error_code.illegal_byte_sequence"></a><code>illegal-byte-sequence</code></p>
 <p>Illegal byte sequence, similar to `EILSEQ` in POSIX.
 </li>
 <li>
-<p><a name="error_code.in_progress"><code>in-progress</code></a></p>
+<p><a name="error_code.in_progress"></a><code>in-progress</code></p>
 <p>Operation in progress, similar to `EINPROGRESS` in POSIX.
 </li>
 <li>
-<p><a name="error_code.interrupted"><code>interrupted</code></a></p>
+<p><a name="error_code.interrupted"></a><code>interrupted</code></p>
 <p>Interrupted function, similar to `EINTR` in POSIX.
 </li>
 <li>
-<p><a name="error_code.invalid"><code>invalid</code></a></p>
+<p><a name="error_code.invalid"></a><code>invalid</code></p>
 <p>Invalid argument, similar to `EINVAL` in POSIX.
 </li>
 <li>
-<p><a name="error_code.io"><code>io</code></a></p>
+<p><a name="error_code.io"></a><code>io</code></p>
 <p>I/O error, similar to `EIO` in POSIX.
 </li>
 <li>
-<p><a name="error_code.is_directory"><code>is-directory</code></a></p>
+<p><a name="error_code.is_directory"></a><code>is-directory</code></p>
 <p>Is a directory, similar to `EISDIR` in POSIX.
 </li>
 <li>
-<p><a name="error_code.loop"><code>loop</code></a></p>
+<p><a name="error_code.loop"></a><code>loop</code></p>
 <p>Too many levels of symbolic links, similar to `ELOOP` in POSIX.
 </li>
 <li>
-<p><a name="error_code.too_many_links"><code>too-many-links</code></a></p>
+<p><a name="error_code.too_many_links"></a><code>too-many-links</code></p>
 <p>Too many links, similar to `EMLINK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.message_size"><code>message-size</code></a></p>
+<p><a name="error_code.message_size"></a><code>message-size</code></p>
 <p>Message too large, similar to `EMSGSIZE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.name_too_long"><code>name-too-long</code></a></p>
+<p><a name="error_code.name_too_long"></a><code>name-too-long</code></p>
 <p>Filename too long, similar to `ENAMETOOLONG` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_device"><code>no-device</code></a></p>
+<p><a name="error_code.no_device"></a><code>no-device</code></p>
 <p>No such device, similar to `ENODEV` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_entry"><code>no-entry</code></a></p>
+<p><a name="error_code.no_entry"></a><code>no-entry</code></p>
 <p>No such file or directory, similar to `ENOENT` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_lock"><code>no-lock</code></a></p>
+<p><a name="error_code.no_lock"></a><code>no-lock</code></p>
 <p>No locks available, similar to `ENOLCK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.insufficient_memory"><code>insufficient-memory</code></a></p>
+<p><a name="error_code.insufficient_memory"></a><code>insufficient-memory</code></p>
 <p>Not enough space, similar to `ENOMEM` in POSIX.
 </li>
 <li>
-<p><a name="error_code.insufficient_space"><code>insufficient-space</code></a></p>
+<p><a name="error_code.insufficient_space"></a><code>insufficient-space</code></p>
 <p>No space left on device, similar to `ENOSPC` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_directory"><code>not-directory</code></a></p>
+<p><a name="error_code.not_directory"></a><code>not-directory</code></p>
 <p>Not a directory or a symbolic link to a directory, similar to `ENOTDIR` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_empty"><code>not-empty</code></a></p>
+<p><a name="error_code.not_empty"></a><code>not-empty</code></p>
 <p>Directory not empty, similar to `ENOTEMPTY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_recoverable"><code>not-recoverable</code></a></p>
+<p><a name="error_code.not_recoverable"></a><code>not-recoverable</code></p>
 <p>State not recoverable, similar to `ENOTRECOVERABLE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.unsupported"><code>unsupported</code></a></p>
+<p><a name="error_code.unsupported"></a><code>unsupported</code></p>
 <p>Not supported, similar to `ENOTSUP` and `ENOSYS` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_tty"><code>no-tty</code></a></p>
+<p><a name="error_code.no_tty"></a><code>no-tty</code></p>
 <p>Inappropriate I/O control operation, similar to `ENOTTY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_such_device"><code>no-such-device</code></a></p>
+<p><a name="error_code.no_such_device"></a><code>no-such-device</code></p>
 <p>No such device or address, similar to `ENXIO` in POSIX.
 </li>
 <li>
-<p><a name="error_code.overflow"><code>overflow</code></a></p>
+<p><a name="error_code.overflow"></a><code>overflow</code></p>
 <p>Value too large to be stored in data type, similar to `EOVERFLOW` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_permitted"><code>not-permitted</code></a></p>
+<p><a name="error_code.not_permitted"></a><code>not-permitted</code></p>
 <p>Operation not permitted, similar to `EPERM` in POSIX.
 </li>
 <li>
-<p><a name="error_code.pipe"><code>pipe</code></a></p>
+<p><a name="error_code.pipe"></a><code>pipe</code></p>
 <p>Broken pipe, similar to `EPIPE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.read_only"><code>read-only</code></a></p>
+<p><a name="error_code.read_only"></a><code>read-only</code></p>
 <p>Read-only file system, similar to `EROFS` in POSIX.
 </li>
 <li>
-<p><a name="error_code.invalid_seek"><code>invalid-seek</code></a></p>
+<p><a name="error_code.invalid_seek"></a><code>invalid-seek</code></p>
 <p>Invalid seek, similar to `ESPIPE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.text_file_busy"><code>text-file-busy</code></a></p>
+<p><a name="error_code.text_file_busy"></a><code>text-file-busy</code></p>
 <p>Text file busy, similar to `ETXTBSY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.cross_device"><code>cross-device</code></a></p>
+<p><a name="error_code.cross_device"></a><code>cross-device</code></p>
 <p>Cross-device link, similar to `EXDEV` in POSIX.
 </li>
 </ul>
-<h4><a name="advice"><code>enum advice</code></a></h4>
+<h4><a name="advice"></a><code>enum advice</code></h4>
 <p>File or memory access pattern advisory information.</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="advice.normal"><code>normal</code></a></p>
+<p><a name="advice.normal"></a><code>normal</code></p>
 <p>The application has no advice to give on its behavior with respect
 to the specified data.
 </li>
 <li>
-<p><a name="advice.sequential"><code>sequential</code></a></p>
+<p><a name="advice.sequential"></a><code>sequential</code></p>
 <p>The application expects to access the specified data sequentially
 from lower offsets to higher offsets.
 </li>
 <li>
-<p><a name="advice.random"><code>random</code></a></p>
+<p><a name="advice.random"></a><code>random</code></p>
 <p>The application expects to access the specified data in a random
 order.
 </li>
 <li>
-<p><a name="advice.will_need"><code>will-need</code></a></p>
+<p><a name="advice.will_need"></a><code>will-need</code></p>
 <p>The application expects to access the specified data in the near
 future.
 </li>
 <li>
-<p><a name="advice.dont_need"><code>dont-need</code></a></p>
+<p><a name="advice.dont_need"></a><code>dont-need</code></p>
 <p>The application expects that it will not access the specified data
 in the near future.
 </li>
 <li>
-<p><a name="advice.no_reuse"><code>no-reuse</code></a></p>
+<p><a name="advice.no_reuse"></a><code>no-reuse</code></p>
 <p>The application expects to access the specified data once and then
 not reuse it thereafter.
 </li>
 </ul>
-<h4><a name="metadata_hash_value"><code>record metadata-hash-value</code></a></h4>
+<h4><a name="metadata_hash_value"></a><code>record metadata-hash-value</code></h4>
 <p>A 128-bit hash value, split into parts because wasm doesn't have a
 128-bit integer type.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="metadata_hash_value.lower"><code>lower</code></a>: <code>u64</code></p>
+<p><a name="metadata_hash_value.lower"></a><code>lower</code>: <code>u64</code></p>
 <p>64 bits of a 128-bit hash value.
 </li>
 <li>
-<p><a name="metadata_hash_value.upper"><code>upper</code></a>: <code>u64</code></p>
+<p><a name="metadata_hash_value.upper"></a><code>upper</code>: <code>u64</code></p>
 <p>Another 64 bits of a 128-bit hash value.
 </li>
 </ul>
-<h4><a name="descriptor"><code>resource descriptor</code></a></h4>
+<h4><a name="descriptor"></a><code>resource descriptor</code></h4>
 <p>A descriptor is a reference to a filesystem object, which may be a file,
 directory, named pipe, special file, or other object on which filesystem
 calls may be made.</p>
-<h4><a name="directory_entry_stream"><code>resource directory-entry-stream</code></a></h4>
+<h4><a name="directory_entry_stream"></a><code>resource directory-entry-stream</code></h4>
 <h2>A stream of directory entries.</h2>
 <h3>Functions</h3>
-<h4><a name="method_descriptor.read_via_stream"><code>[method]descriptor.read-via-stream: func</code></a></h4>
+<h4><a name="method_descriptor_read_via_stream"></a><code>[method]descriptor.read-via-stream: func</code></h4>
 <p>Return a stream for reading from a file, if available.</p>
 <p>May fail with an error-code describing why the file cannot be read.</p>
 <p>Multiple read, write, and append streams may be active on the same open
@@ -1137,81 +1136,81 @@ file and they do not interfere with each other.</p>
 <p>Note: This allows using <code>read-stream</code>, which is similar to <code>read</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.read_via_stream.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.read_via_stream.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_read_via_stream.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_via_stream.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.read_via_stream.0"></a> result&lt;own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_via_stream.0"></a> result&lt;own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.write_via_stream"><code>[method]descriptor.write-via-stream: func</code></a></h4>
+<h4><a name="method_descriptor_write_via_stream"></a><code>[method]descriptor.write-via-stream: func</code></h4>
 <p>Return a stream for writing to a file, if available.</p>
 <p>May fail with an error-code describing why the file cannot be written.</p>
 <p>Note: This allows using <code>write-stream</code>, which is similar to <code>write</code> in
 POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.write_via_stream.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.write_via_stream.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_write_via_stream.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write_via_stream.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.write_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.append_via_stream"><code>[method]descriptor.append-via-stream: func</code></a></h4>
+<h4><a name="method_descriptor_append_via_stream"></a><code>[method]descriptor.append-via-stream: func</code></h4>
 <p>Return a stream for appending to a file, if available.</p>
 <p>May fail with an error-code describing why the file cannot be appended.</p>
 <p>Note: This allows using <code>write-stream</code>, which is similar to <code>write</code> with
 <code>O_APPEND</code> in in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.append_via_stream.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_append_via_stream.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.append_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_append_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.advise"><code>[method]descriptor.advise: func</code></a></h4>
+<h4><a name="method_descriptor_advise"></a><code>[method]descriptor.advise: func</code></h4>
 <p>Provide file advisory information on a descriptor.</p>
 <p>This is similar to <code>posix_fadvise</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.advise.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.advise.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
-<li><a name="method_descriptor.advise.length"><code>length</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
-<li><a name="method_descriptor.advise.advice"><a href="#advice"><code>advice</code></a></a>: <a href="#advice"><a href="#advice"><code>advice</code></a></a></li>
+<li><a name="method_descriptor_advise.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_advise.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_advise.length"></a><code>length</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_advise.advice"></a><a href="#advice"><code>advice</code></a>: <a href="#advice"><a href="#advice"><code>advice</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.advise.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_advise.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.sync_data"><code>[method]descriptor.sync-data: func</code></a></h4>
+<h4><a name="method_descriptor_sync_data"></a><code>[method]descriptor.sync-data: func</code></h4>
 <p>Synchronize the data of a file to disk.</p>
 <p>This function succeeds with no effect if the file descriptor is not
 opened for writing.</p>
 <p>Note: This is similar to <code>fdatasync</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.sync_data.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync_data.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.sync_data.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync_data.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.get_flags"><code>[method]descriptor.get-flags: func</code></a></h4>
+<h4><a name="method_descriptor_get_flags"></a><code>[method]descriptor.get-flags: func</code></h4>
 <p>Get flags associated with a descriptor.</p>
 <p>Note: This returns similar flags to <code>fcntl(fd, F_GETFL)</code> in POSIX.</p>
 <p>Note: This returns the value that was the <code>fs_flags</code> value returned
 from <code>fdstat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.get_flags.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_flags.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.get_flags.0"></a> result&lt;<a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_flags.0"></a> result&lt;<a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.get_type"><code>[method]descriptor.get-type: func</code></a></h4>
+<h4><a name="method_descriptor_get_type"></a><code>[method]descriptor.get-type: func</code></h4>
 <p>Get the dynamic type of a descriptor.</p>
 <p>Note: This returns the same value as the <code>type</code> field of the <code>fd-stat</code>
 returned by <code>stat</code>, <code>stat-at</code> and similar.</p>
@@ -1221,40 +1220,40 @@ by <code>fstat</code> in POSIX.</p>
 from <code>fdstat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.get_type.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_type.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.get_type.0"></a> result&lt;<a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_type.0"></a> result&lt;<a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.set_size"><code>[method]descriptor.set-size: func</code></a></h4>
+<h4><a name="method_descriptor_set_size"></a><code>[method]descriptor.set-size: func</code></h4>
 <p>Adjust the size of an open file. If this increases the file's size, the
 extra bytes are filled with zeros.</p>
 <p>Note: This was called <code>fd_filestat_set_size</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.set_size.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.set_size.size"><code>size</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_set_size.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_size.size"></a><code>size</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.set_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.set_times"><code>[method]descriptor.set-times: func</code></a></h4>
+<h4><a name="method_descriptor_set_times"></a><code>[method]descriptor.set-times: func</code></h4>
 <p>Adjust the timestamps of an open file or directory.</p>
 <p>Note: This is similar to <code>futimens</code> in POSIX.</p>
 <p>Note: This was called <code>fd_filestat_set_times</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.set_times.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.set_times.data_access_timestamp"><code>data-access-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
-<li><a name="method_descriptor.set_times.data_modification_timestamp"><code>data-modification-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times.data_access_timestamp"></a><code>data-access-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times.data_modification_timestamp"></a><code>data-modification-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.set_times.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.read"><code>[method]descriptor.read: func</code></a></h4>
+<h4><a name="method_descriptor_read"></a><code>[method]descriptor.read: func</code></h4>
 <p>Read from a descriptor, without using and updating the descriptor's offset.</p>
 <p>This function returns a list of bytes containing the data that was
 read, along with a bool which, when true, indicates that the end of the
@@ -1265,15 +1264,15 @@ if the I/O operation is interrupted.</p>
 <p>Note: This is similar to <code>pread</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.read.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.read.length"><code>length</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
-<li><a name="method_descriptor.read.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_read.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read.length"></a><code>length</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_read.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.read.0"></a> result&lt;(list&lt;<code>u8</code>&gt;, <code>bool</code>), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read.0"></a> result&lt;(list&lt;<code>u8</code>&gt;, <code>bool</code>), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.write"><code>[method]descriptor.write: func</code></a></h4>
+<h4><a name="method_descriptor_write"></a><code>[method]descriptor.write: func</code></h4>
 <p>Write to a descriptor, without using and updating the descriptor's offset.</p>
 <p>It is valid to write past the end of a file; the file is extended to the
 extent of the write, with bytes between the previous end and the start of
@@ -1282,15 +1281,15 @@ the write set to zero.</p>
 <p>Note: This is similar to <code>pwrite</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.write.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.write.buffer"><code>buffer</code></a>: list&lt;<code>u8</code>&gt;</li>
-<li><a name="method_descriptor.write.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_write.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write.buffer"></a><code>buffer</code>: list&lt;<code>u8</code>&gt;</li>
+<li><a name="method_descriptor_write.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.write.0"></a> result&lt;<a href="#filesize"><a href="#filesize"><code>filesize</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write.0"></a> result&lt;<a href="#filesize"><a href="#filesize"><code>filesize</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.read_directory"><code>[method]descriptor.read-directory: func</code></a></h4>
+<h4><a name="method_descriptor_read_directory"></a><code>[method]descriptor.read-directory: func</code></h4>
 <p>Read directory entries from a directory.</p>
 <p>On filesystems where directories contain entries referring to themselves
 and their parents, often named <code>.</code> and <code>..</code> respectively, these entries
@@ -1300,38 +1299,38 @@ directory. Multiple streams may be active on the same directory, and they
 do not interfere with each other.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.read_directory.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_directory.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.read_directory.0"></a> result&lt;own&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_directory.0"></a> result&lt;own&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.sync"><code>[method]descriptor.sync: func</code></a></h4>
+<h4><a name="method_descriptor_sync"></a><code>[method]descriptor.sync: func</code></h4>
 <p>Synchronize the data and metadata of a file to disk.</p>
 <p>This function succeeds with no effect if the file descriptor is not
 opened for writing.</p>
 <p>Note: This is similar to <code>fsync</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.sync.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.sync.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.create_directory_at"><code>[method]descriptor.create-directory-at: func</code></a></h4>
+<h4><a name="method_descriptor_create_directory_at"></a><code>[method]descriptor.create-directory-at: func</code></h4>
 <p>Create a directory.</p>
 <p>Note: This is similar to <code>mkdirat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.create_directory_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.create_directory_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_create_directory_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_create_directory_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.create_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_create_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.stat"><code>[method]descriptor.stat: func</code></a></h4>
+<h4><a name="method_descriptor_stat"></a><code>[method]descriptor.stat: func</code></h4>
 <p>Return the attributes of an open file or directory.</p>
 <p>Note: This is similar to <code>fstat</code> in POSIX, except that it does not return
 device and inode information. For testing whether two descriptors refer to
@@ -1341,13 +1340,13 @@ modified, use <code>metadata-hash</code>.</p>
 <p>Note: This was called <code>fd_filestat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.stat.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.stat.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.stat_at"><code>[method]descriptor.stat-at: func</code></a></h4>
+<h4><a name="method_descriptor_stat_at"></a><code>[method]descriptor.stat-at: func</code></h4>
 <p>Return the attributes of a file or directory.</p>
 <p>Note: This is similar to <code>fstatat</code> in POSIX, except that it does not
 return device and inode information. See the <code>stat</code> description for a
@@ -1355,47 +1354,47 @@ discussion of alternatives.</p>
 <p>Note: This was called <code>path_filestat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.stat_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.stat_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.stat_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_stat_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_stat_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.stat_at.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat_at.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.set_times_at"><code>[method]descriptor.set-times-at: func</code></a></h4>
+<h4><a name="method_descriptor_set_times_at"></a><code>[method]descriptor.set-times-at: func</code></h4>
 <p>Adjust the timestamps of a file or directory.</p>
 <p>Note: This is similar to <code>utimensat</code> in POSIX.</p>
 <p>Note: This was called <code>path_filestat_set_times</code> in earlier versions of
 WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.set_times_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.set_times_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.set_times_at.path"><code>path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.set_times_at.data_access_timestamp"><code>data-access-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
-<li><a name="method_descriptor.set_times_at.data_modification_timestamp"><code>data-modification-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_set_times_at.path"></a><code>path</code>: <code>string</code></li>
+<li><a name="method_descriptor_set_times_at.data_access_timestamp"></a><code>data-access-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times_at.data_modification_timestamp"></a><code>data-modification-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.set_times_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.link_at"><code>[method]descriptor.link-at: func</code></a></h4>
+<h4><a name="method_descriptor_link_at"></a><code>[method]descriptor.link-at: func</code></h4>
 <p>Create a hard link.</p>
 <p>Note: This is similar to <code>linkat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.link_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.link_at.old_path_flags"><code>old-path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.link_at.old_path"><code>old-path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.link_at.new_descriptor"><code>new-descriptor</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.link_at.new_path"><code>new-path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_link_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_link_at.old_path_flags"></a><code>old-path-flags</code>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_link_at.old_path"></a><code>old-path</code>: <code>string</code></li>
+<li><a name="method_descriptor_link_at.new_descriptor"></a><code>new-descriptor</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_link_at.new_path"></a><code>new-path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.link_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_link_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.open_at"><code>[method]descriptor.open-at: func</code></a></h4>
+<h4><a name="method_descriptor_open_at"></a><code>[method]descriptor.open-at: func</code></h4>
 <p>Open a file or directory.</p>
 <p>The returned descriptor is not guaranteed to be the lowest-numbered
 descriptor not currently open/ it is randomized to prevent applications
@@ -1412,86 +1411,86 @@ contains <code>truncate</code> or <code>create</code>, and the base descriptor d
 <p>Note: This is similar to <code>openat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.open_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.open_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.open_at.path"><code>path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.open_at.open_flags"><a href="#open_flags"><code>open-flags</code></a></a>: <a href="#open_flags"><a href="#open_flags"><code>open-flags</code></a></a></li>
-<li><a name="method_descriptor.open_at.flags"><code>flags</code></a>: <a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a></li>
+<li><a name="method_descriptor_open_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_open_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_open_at.path"></a><code>path</code>: <code>string</code></li>
+<li><a name="method_descriptor_open_at.open_flags"></a><a href="#open_flags"><code>open-flags</code></a>: <a href="#open_flags"><a href="#open_flags"><code>open-flags</code></a></a></li>
+<li><a name="method_descriptor_open_at.flags"></a><code>flags</code>: <a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.open_at.0"></a> result&lt;own&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_open_at.0"></a> result&lt;own&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.readlink_at"><code>[method]descriptor.readlink-at: func</code></a></h4>
+<h4><a name="method_descriptor_readlink_at"></a><code>[method]descriptor.readlink-at: func</code></h4>
 <p>Read the contents of a symbolic link.</p>
 <p>If the contents contain an absolute or rooted path in the underlying
 filesystem, this function fails with <a href="#error_code.not_permitted"><code>error-code::not-permitted</code></a>.</p>
 <p>Note: This is similar to <code>readlinkat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.readlink_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.readlink_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_readlink_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_readlink_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.readlink_at.0"></a> result&lt;<code>string</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_readlink_at.0"></a> result&lt;<code>string</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.remove_directory_at"><code>[method]descriptor.remove-directory-at: func</code></a></h4>
+<h4><a name="method_descriptor_remove_directory_at"></a><code>[method]descriptor.remove-directory-at: func</code></h4>
 <p>Remove a directory.</p>
 <p>Return <a href="#error_code.not_empty"><code>error-code::not-empty</code></a> if the directory is not empty.</p>
 <p>Note: This is similar to <code>unlinkat(fd, path, AT_REMOVEDIR)</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.remove_directory_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.remove_directory_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_remove_directory_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_remove_directory_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.remove_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_remove_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.rename_at"><code>[method]descriptor.rename-at: func</code></a></h4>
+<h4><a name="method_descriptor_rename_at"></a><code>[method]descriptor.rename-at: func</code></h4>
 <p>Rename a filesystem object.</p>
 <p>Note: This is similar to <code>renameat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.rename_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.rename_at.old_path"><code>old-path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.rename_at.new_descriptor"><code>new-descriptor</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.rename_at.new_path"><code>new-path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_rename_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_rename_at.old_path"></a><code>old-path</code>: <code>string</code></li>
+<li><a name="method_descriptor_rename_at.new_descriptor"></a><code>new-descriptor</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_rename_at.new_path"></a><code>new-path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.rename_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_rename_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.symlink_at"><code>[method]descriptor.symlink-at: func</code></a></h4>
+<h4><a name="method_descriptor_symlink_at"></a><code>[method]descriptor.symlink-at: func</code></h4>
 <p>Create a symbolic link (also known as a &quot;symlink&quot;).</p>
 <p>If <code>old-path</code> starts with <code>/</code>, the function fails with
 <a href="#error_code.not_permitted"><code>error-code::not-permitted</code></a>.</p>
 <p>Note: This is similar to <code>symlinkat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.symlink_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.symlink_at.old_path"><code>old-path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.symlink_at.new_path"><code>new-path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_symlink_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_symlink_at.old_path"></a><code>old-path</code>: <code>string</code></li>
+<li><a name="method_descriptor_symlink_at.new_path"></a><code>new-path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.symlink_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_symlink_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.unlink_file_at"><code>[method]descriptor.unlink-file-at: func</code></a></h4>
+<h4><a name="method_descriptor_unlink_file_at"></a><code>[method]descriptor.unlink-file-at: func</code></h4>
 <p>Unlink a filesystem object that is not a directory.</p>
 <p>Return <a href="#error_code.is_directory"><code>error-code::is-directory</code></a> if the path refers to a directory.
 Note: This is similar to <code>unlinkat(fd, path, 0)</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.unlink_file_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.unlink_file_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_unlink_file_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_unlink_file_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.unlink_file_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_unlink_file_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.is_same_object"><code>[method]descriptor.is-same-object: func</code></a></h4>
+<h4><a name="method_descriptor_is_same_object"></a><code>[method]descriptor.is-same-object: func</code></h4>
 <p>Test whether two descriptors refer to the same filesystem object.</p>
 <p>In POSIX, this corresponds to testing whether the two descriptors have the
 same device (<code>st_dev</code>) and inode (<code>st_ino</code> or <code>d_ino</code>) numbers.
@@ -1499,14 +1498,14 @@ wasi-filesystem does not expose device and inode numbers, so this function
 may be used instead.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.is_same_object.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.is_same_object.other"><code>other</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_is_same_object.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_is_same_object.other"></a><code>other</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.is_same_object.0"></a> <code>bool</code></li>
+<li><a name="method_descriptor_is_same_object.0"></a> <code>bool</code></li>
 </ul>
-<h4><a name="method_descriptor.metadata_hash"><code>[method]descriptor.metadata-hash: func</code></a></h4>
+<h4><a name="method_descriptor_metadata_hash"></a><code>[method]descriptor.metadata-hash: func</code></h4>
 <p>Return a hash of the metadata associated with a filesystem object referred
 to by a descriptor.</p>
 <p>This returns a hash of the last-modification timestamp and file size, and
@@ -1526,37 +1525,37 @@ computed hash.</li>
 <p>However, none of these is required.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.metadata_hash_at"><code>[method]descriptor.metadata-hash-at: func</code></a></h4>
+<h4><a name="method_descriptor_metadata_hash_at"></a><code>[method]descriptor.metadata-hash-at: func</code></h4>
 <p>Return a hash of the metadata associated with a filesystem object referred
 to by a directory descriptor and a relative path.</p>
 <p>This performs the same hash computation as <code>metadata-hash</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.metadata_hash_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.metadata_hash_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_metadata_hash_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_metadata_hash_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash_at.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash_at.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_directory_entry_stream.read_directory_entry"><code>[method]directory-entry-stream.read-directory-entry: func</code></a></h4>
+<h4><a name="method_directory_entry_stream_read_directory_entry"></a><code>[method]directory-entry-stream.read-directory-entry: func</code></h4>
 <p>Read a single directory entry from a <a href="#directory_entry_stream"><code>directory-entry-stream</code></a>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_directory_entry_stream.read_directory_entry.self"><code>self</code></a>: borrow&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;</li>
+<li><a name="method_directory_entry_stream_read_directory_entry.self"></a><code>self</code>: borrow&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_directory_entry_stream.read_directory_entry.0"></a> result&lt;option&lt;<a href="#directory_entry"><a href="#directory_entry"><code>directory-entry</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_directory_entry_stream_read_directory_entry.0"></a> result&lt;option&lt;<a href="#directory_entry"><a href="#directory_entry"><code>directory-entry</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="filesystem_error_code"><code>filesystem-error-code: func</code></a></h4>
+<h4><a name="filesystem_error_code"></a><code>filesystem-error-code: func</code></h4>
 <p>Attempts to extract a filesystem-related <a href="#error_code"><code>error-code</code></a> from the stream
 <a href="#error"><code>error</code></a> provided.</p>
 <p>Stream operations which return <a href="#stream_error.last_operation_failed"><code>stream-error::last-operation-failed</code></a>
@@ -1567,34 +1566,34 @@ filesystem-related information about the error to return.</p>
 errors are filesystem-related errors.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="filesystem_error_code.err"><code>err</code></a>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
+<li><a name="filesystem_error_code.err"></a><code>err</code>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="filesystem_error_code.0"></a> option&lt;<a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:filesystem_preopens_0.2.0">Import interface wasi:filesystem/preopens@0.2.0</a></h2>
+<h2><a name="wasi_filesystem_preopens_0_2_0"></a>Import interface wasi:filesystem/preopens@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="descriptor"><code>type descriptor</code></a></h4>
+<h4><a name="descriptor"></a><code>type descriptor</code></h4>
 <p><a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_directories"><code>get-directories: func</code></a></h4>
+<h4><a name="get_directories"></a><code>get-directories: func</code></h4>
 <p>Return the set of preopened directories, and their path.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_directories.0"></a> list&lt;(own&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;, <code>string</code>)&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_network_0.2.0">Import interface wasi:sockets/network@0.2.0</a></h2>
+<h2><a name="wasi_sockets_network_0_2_0"></a>Import interface wasi:sockets/network@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>resource network</code></a></h4>
+<h4><a name="network"></a><code>resource network</code></h4>
 <p>An opaque resource that represents access to (a subset of) the network.
 This enables context-based security for networking.
 There is no need for this to map 1:1 to a physical network interface.</p>
-<h4><a name="error_code"><code>enum error-code</code></a></h4>
+<h4><a name="error_code"></a><code>enum error-code</code></h4>
 <p>Error codes.</p>
 <p>In theory, every API can return any error code.
 In practice, API's typically only return the errors documented per API
@@ -1610,235 +1609,235 @@ combined with a couple of errors that are always possible:</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="error_code.unknown"><code>unknown</code></a></p>
+<p><a name="error_code.unknown"></a><code>unknown</code></p>
 <p>Unknown error
 </li>
 <li>
-<p><a name="error_code.access_denied"><code>access-denied</code></a></p>
+<p><a name="error_code.access_denied"></a><code>access-denied</code></p>
 <p>Access denied.
 <p>POSIX equivalent: EACCES, EPERM</p>
 </li>
 <li>
-<p><a name="error_code.not_supported"><code>not-supported</code></a></p>
+<p><a name="error_code.not_supported"></a><code>not-supported</code></p>
 <p>The operation is not supported.
 <p>POSIX equivalent: EOPNOTSUPP</p>
 </li>
 <li>
-<p><a name="error_code.invalid_argument"><code>invalid-argument</code></a></p>
+<p><a name="error_code.invalid_argument"></a><code>invalid-argument</code></p>
 <p>One of the arguments is invalid.
 <p>POSIX equivalent: EINVAL</p>
 </li>
 <li>
-<p><a name="error_code.out_of_memory"><code>out-of-memory</code></a></p>
+<p><a name="error_code.out_of_memory"></a><code>out-of-memory</code></p>
 <p>Not enough memory to complete the operation.
 <p>POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY</p>
 </li>
 <li>
-<p><a name="error_code.timeout"><code>timeout</code></a></p>
+<p><a name="error_code.timeout"></a><code>timeout</code></p>
 <p>The operation timed out before it could finish completely.
 </li>
 <li>
-<p><a name="error_code.concurrency_conflict"><code>concurrency-conflict</code></a></p>
+<p><a name="error_code.concurrency_conflict"></a><code>concurrency-conflict</code></p>
 <p>This operation is incompatible with another asynchronous operation that is already in progress.
 <p>POSIX equivalent: EALREADY</p>
 </li>
 <li>
-<p><a name="error_code.not_in_progress"><code>not-in-progress</code></a></p>
+<p><a name="error_code.not_in_progress"></a><code>not-in-progress</code></p>
 <p>Trying to finish an asynchronous operation that:
 - has not been started yet, or:
 - was already finished by a previous `finish-*` call.
 <p>Note: this is scheduled to be removed when <code>future</code>s are natively supported.</p>
 </li>
 <li>
-<p><a name="error_code.would_block"><code>would-block</code></a></p>
+<p><a name="error_code.would_block"></a><code>would-block</code></p>
 <p>The operation has been aborted because it could not be completed immediately.
 <p>Note: this is scheduled to be removed when <code>future</code>s are natively supported.</p>
 </li>
 <li>
-<p><a name="error_code.invalid_state"><code>invalid-state</code></a></p>
+<p><a name="error_code.invalid_state"></a><code>invalid-state</code></p>
 <p>The operation is not valid in the socket's current state.
 </li>
 <li>
-<p><a name="error_code.new_socket_limit"><code>new-socket-limit</code></a></p>
+<p><a name="error_code.new_socket_limit"></a><code>new-socket-limit</code></p>
 <p>A new socket resource could not be created because of a system limit.
 </li>
 <li>
-<p><a name="error_code.address_not_bindable"><code>address-not-bindable</code></a></p>
+<p><a name="error_code.address_not_bindable"></a><code>address-not-bindable</code></p>
 <p>A bind operation failed because the provided address is not an address that the `network` can bind to.
 </li>
 <li>
-<p><a name="error_code.address_in_use"><code>address-in-use</code></a></p>
+<p><a name="error_code.address_in_use"></a><code>address-in-use</code></p>
 <p>A bind operation failed because the provided address is already in use or because there are no ephemeral ports available.
 </li>
 <li>
-<p><a name="error_code.remote_unreachable"><code>remote-unreachable</code></a></p>
+<p><a name="error_code.remote_unreachable"></a><code>remote-unreachable</code></p>
 <p>The remote address is not reachable
 </li>
 <li>
-<p><a name="error_code.connection_refused"><code>connection-refused</code></a></p>
+<p><a name="error_code.connection_refused"></a><code>connection-refused</code></p>
 <p>The TCP connection was forcefully rejected
 </li>
 <li>
-<p><a name="error_code.connection_reset"><code>connection-reset</code></a></p>
+<p><a name="error_code.connection_reset"></a><code>connection-reset</code></p>
 <p>The TCP connection was reset.
 </li>
 <li>
-<p><a name="error_code.connection_aborted"><code>connection-aborted</code></a></p>
+<p><a name="error_code.connection_aborted"></a><code>connection-aborted</code></p>
 <p>A TCP connection was aborted.
 </li>
 <li>
-<p><a name="error_code.datagram_too_large"><code>datagram-too-large</code></a></p>
+<p><a name="error_code.datagram_too_large"></a><code>datagram-too-large</code></p>
 <p>The size of a datagram sent to a UDP socket exceeded the maximum
 supported size.
 </li>
 <li>
-<p><a name="error_code.name_unresolvable"><code>name-unresolvable</code></a></p>
+<p><a name="error_code.name_unresolvable"></a><code>name-unresolvable</code></p>
 <p>Name does not exist or has no suitable associated IP addresses.
 </li>
 <li>
-<p><a name="error_code.temporary_resolver_failure"><code>temporary-resolver-failure</code></a></p>
+<p><a name="error_code.temporary_resolver_failure"></a><code>temporary-resolver-failure</code></p>
 <p>A temporary failure in name resolution occurred.
 </li>
 <li>
-<p><a name="error_code.permanent_resolver_failure"><code>permanent-resolver-failure</code></a></p>
+<p><a name="error_code.permanent_resolver_failure"></a><code>permanent-resolver-failure</code></p>
 <p>A permanent failure in name resolution occurred.
 </li>
 </ul>
-<h4><a name="ip_address_family"><code>enum ip-address-family</code></a></h4>
+<h4><a name="ip_address_family"></a><code>enum ip-address-family</code></h4>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="ip_address_family.ipv4"><code>ipv4</code></a></p>
+<p><a name="ip_address_family.ipv4"></a><code>ipv4</code></p>
 <p>Similar to `AF_INET` in POSIX.
 </li>
 <li>
-<p><a name="ip_address_family.ipv6"><code>ipv6</code></a></p>
+<p><a name="ip_address_family.ipv6"></a><code>ipv6</code></p>
 <p>Similar to `AF_INET6` in POSIX.
 </li>
 </ul>
-<h4><a name="ipv4_address"><code>tuple ipv4-address</code></a></h4>
+<h4><a name="ipv4_address"></a><code>tuple ipv4-address</code></h4>
 <h5>Tuple Fields</h5>
 <ul>
-<li><a name="ipv4_address.0"><code>0</code></a>: <code>u8</code></li>
-<li><a name="ipv4_address.1"><code>1</code></a>: <code>u8</code></li>
-<li><a name="ipv4_address.2"><code>2</code></a>: <code>u8</code></li>
-<li><a name="ipv4_address.3"><code>3</code></a>: <code>u8</code></li>
+<li><a name="ipv4_address.0"></a><code>0</code>: <code>u8</code></li>
+<li><a name="ipv4_address.1"></a><code>1</code>: <code>u8</code></li>
+<li><a name="ipv4_address.2"></a><code>2</code>: <code>u8</code></li>
+<li><a name="ipv4_address.3"></a><code>3</code>: <code>u8</code></li>
 </ul>
-<h4><a name="ipv6_address"><code>tuple ipv6-address</code></a></h4>
+<h4><a name="ipv6_address"></a><code>tuple ipv6-address</code></h4>
 <h5>Tuple Fields</h5>
 <ul>
-<li><a name="ipv6_address.0"><code>0</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.1"><code>1</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.2"><code>2</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.3"><code>3</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.4"><code>4</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.5"><code>5</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.6"><code>6</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.7"><code>7</code></a>: <code>u16</code></li>
+<li><a name="ipv6_address.0"></a><code>0</code>: <code>u16</code></li>
+<li><a name="ipv6_address.1"></a><code>1</code>: <code>u16</code></li>
+<li><a name="ipv6_address.2"></a><code>2</code>: <code>u16</code></li>
+<li><a name="ipv6_address.3"></a><code>3</code>: <code>u16</code></li>
+<li><a name="ipv6_address.4"></a><code>4</code>: <code>u16</code></li>
+<li><a name="ipv6_address.5"></a><code>5</code>: <code>u16</code></li>
+<li><a name="ipv6_address.6"></a><code>6</code>: <code>u16</code></li>
+<li><a name="ipv6_address.7"></a><code>7</code>: <code>u16</code></li>
 </ul>
-<h4><a name="ip_address"><code>variant ip-address</code></a></h4>
+<h4><a name="ip_address"></a><code>variant ip-address</code></h4>
 <h5>Variant Cases</h5>
 <ul>
-<li><a name="ip_address.ipv4"><code>ipv4</code></a>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></li>
-<li><a name="ip_address.ipv6"><code>ipv6</code></a>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></li>
+<li><a name="ip_address.ipv4"></a><code>ipv4</code>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></li>
+<li><a name="ip_address.ipv6"></a><code>ipv6</code>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></li>
 </ul>
-<h4><a name="ipv4_socket_address"><code>record ipv4-socket-address</code></a></h4>
+<h4><a name="ipv4_socket_address"></a><code>record ipv4-socket-address</code></h4>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="ipv4_socket_address.port"><code>port</code></a>: <code>u16</code></p>
+<p><a name="ipv4_socket_address.port"></a><code>port</code>: <code>u16</code></p>
 <p>sin_port
 </li>
 <li>
-<p><a name="ipv4_socket_address.address"><code>address</code></a>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></p>
+<p><a name="ipv4_socket_address.address"></a><code>address</code>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></p>
 <p>sin_addr
 </li>
 </ul>
-<h4><a name="ipv6_socket_address"><code>record ipv6-socket-address</code></a></h4>
+<h4><a name="ipv6_socket_address"></a><code>record ipv6-socket-address</code></h4>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="ipv6_socket_address.port"><code>port</code></a>: <code>u16</code></p>
+<p><a name="ipv6_socket_address.port"></a><code>port</code>: <code>u16</code></p>
 <p>sin6_port
 </li>
 <li>
-<p><a name="ipv6_socket_address.flow_info"><code>flow-info</code></a>: <code>u32</code></p>
+<p><a name="ipv6_socket_address.flow_info"></a><code>flow-info</code>: <code>u32</code></p>
 <p>sin6_flowinfo
 </li>
 <li>
-<p><a name="ipv6_socket_address.address"><code>address</code></a>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></p>
+<p><a name="ipv6_socket_address.address"></a><code>address</code>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></p>
 <p>sin6_addr
 </li>
 <li>
-<p><a name="ipv6_socket_address.scope_id"><code>scope-id</code></a>: <code>u32</code></p>
+<p><a name="ipv6_socket_address.scope_id"></a><code>scope-id</code>: <code>u32</code></p>
 <p>sin6_scope_id
 </li>
 </ul>
-<h4><a name="ip_socket_address"><code>variant ip-socket-address</code></a></h4>
+<h4><a name="ip_socket_address"></a><code>variant ip-socket-address</code></h4>
 <h5>Variant Cases</h5>
 <ul>
-<li><a name="ip_socket_address.ipv4"><code>ipv4</code></a>: <a href="#ipv4_socket_address"><a href="#ipv4_socket_address"><code>ipv4-socket-address</code></a></a></li>
-<li><a name="ip_socket_address.ipv6"><code>ipv6</code></a>: <a href="#ipv6_socket_address"><a href="#ipv6_socket_address"><code>ipv6-socket-address</code></a></a></li>
+<li><a name="ip_socket_address.ipv4"></a><code>ipv4</code>: <a href="#ipv4_socket_address"><a href="#ipv4_socket_address"><code>ipv4-socket-address</code></a></a></li>
+<li><a name="ip_socket_address.ipv6"></a><code>ipv6</code>: <a href="#ipv6_socket_address"><a href="#ipv6_socket_address"><code>ipv6-socket-address</code></a></a></li>
 </ul>
-<h2><a name="wasi:sockets_instance_network_0.2.0">Import interface wasi:sockets/instance-network@0.2.0</a></h2>
+<h2><a name="wasi_sockets_instance_network_0_2_0"></a>Import interface wasi:sockets/instance-network@0.2.0</h2>
 <p>This interface provides a value-export of the default network handle..</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>type network</code></a></h4>
+<h4><a name="network"></a><code>type network</code></h4>
 <p><a href="#network"><a href="#network"><code>network</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="instance_network"><code>instance-network: func</code></a></h4>
+<h4><a name="instance_network"></a><code>instance-network: func</code></h4>
 <p>Get a handle to the default network.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="instance_network.0"></a> own&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_udp_0.2.0">Import interface wasi:sockets/udp@0.2.0</a></h2>
+<h2><a name="wasi_sockets_udp_0_2_0"></a>Import interface wasi:sockets/udp@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>type pollable</code></a></h4>
+<h4><a name="pollable"></a><code>type pollable</code></h4>
 <p><a href="#pollable"><a href="#pollable"><code>pollable</code></a></a></p>
 <p>
-#### <a name="network">`type network`</a>
+#### <a name="network"></a>`type network`
 [`network`](#network)
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_socket_address">`type ip-socket-address`</a>
+#### <a name="ip_socket_address"></a>`type ip-socket-address`
 [`ip-socket-address`](#ip_socket_address)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="incoming_datagram">`record incoming-datagram`</a>
+#### <a name="incoming_datagram"></a>`record incoming-datagram`
 <p>A received datagram.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="incoming_datagram.data"><code>data</code></a>: list&lt;<code>u8</code>&gt;</p>
+<p><a name="incoming_datagram.data"></a><code>data</code>: list&lt;<code>u8</code>&gt;</p>
 <p>The payload.
 <p>Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes.</p>
 </li>
 <li>
-<p><a name="incoming_datagram.remote_address"><code>remote-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></p>
+<p><a name="incoming_datagram.remote_address"></a><code>remote-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></p>
 <p>The source address.
 <p>This field is guaranteed to match the remote address the stream was initialized with, if any.</p>
 <p>Equivalent to the <code>src_addr</code> out parameter of <code>recvfrom</code>.</p>
 </li>
 </ul>
-<h4><a name="outgoing_datagram"><code>record outgoing-datagram</code></a></h4>
+<h4><a name="outgoing_datagram"></a><code>record outgoing-datagram</code></h4>
 <p>A datagram to be sent out.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="outgoing_datagram.data"><code>data</code></a>: list&lt;<code>u8</code>&gt;</p>
+<p><a name="outgoing_datagram.data"></a><code>data</code>: list&lt;<code>u8</code>&gt;</p>
 <p>The payload.
 </li>
 <li>
-<p><a name="outgoing_datagram.remote_address"><code>remote-address</code></a>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</p>
+<p><a name="outgoing_datagram.remote_address"></a><code>remote-address</code>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</p>
 <p>The destination address.
 <p>The requirements on this field depend on how the stream was initialized:</p>
 <ul>
@@ -1848,13 +1847,13 @@ supported size.
 <p>If this value is None, the send operation is equivalent to <code>send</code> in POSIX. Otherwise it is equivalent to <code>sendto</code>.</p>
 </li>
 </ul>
-<h4><a name="udp_socket"><code>resource udp-socket</code></a></h4>
+<h4><a name="udp_socket"></a><code>resource udp-socket</code></h4>
 <p>A UDP socket handle.</p>
-<h4><a name="incoming_datagram_stream"><code>resource incoming-datagram-stream</code></a></h4>
-<h4><a name="outgoing_datagram_stream"><code>resource outgoing-datagram-stream</code></a></h4>
+<h4><a name="incoming_datagram_stream"></a><code>resource incoming-datagram-stream</code></h4>
+<h4><a name="outgoing_datagram_stream"></a><code>resource outgoing-datagram-stream</code></h4>
 <hr />
 <h3>Functions</h3>
-<h4><a name="method_udp_socket.start_bind"><code>[method]udp-socket.start-bind: func</code></a></h4>
+<h4><a name="method_udp_socket_start_bind"></a><code>[method]udp-socket.start-bind: func</code></h4>
 <p>Bind the socket to a specific network on the provided IP address and port.</p>
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
@@ -1883,24 +1882,24 @@ don't want to make use of this ability can simply call the native
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.start_bind.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.start_bind.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.start_bind.local_address"><code>local-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
+<li><a name="method_udp_socket_start_bind.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_start_bind.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_start_bind.local_address"></a><code>local-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.finish_bind"><code>[method]udp-socket.finish-bind: func</code></a></h4>
+<h4><a name="method_udp_socket_finish_bind"></a><code>[method]udp-socket.finish-bind: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.finish_bind.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_finish_bind.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.stream"><code>[method]udp-socket.stream: func</code></a></h4>
+<h4><a name="method_udp_socket_stream"></a><code>[method]udp-socket.stream: func</code></h4>
 <p>Set up inbound &amp; outbound communication channels, optionally to a specific peer.</p>
 <p>This function only changes the local socket configuration and does not generate any network traffic.
 On success, the <code>remote-address</code> of the socket is updated. The <code>local-address</code> may be updated as well,
@@ -1941,14 +1940,14 @@ if (remote_address is Some) {
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.stream.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.stream.remote_address"><code>remote-address</code></a>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_stream.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_stream.remote_address"></a><code>remote-address</code>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.stream.0"></a> result&lt;(own&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;, own&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_stream.0"></a> result&lt;(own&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;, own&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.local_address"><code>[method]udp-socket.local-address: func</code></a></h4>
+<h4><a name="method_udp_socket_local_address"></a><code>[method]udp-socket.local-address: func</code></h4>
 <p>Get the current bound address.</p>
 <p>POSIX mentions:</p>
 <blockquote>
@@ -1969,13 +1968,13 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.local_address.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_local_address.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.remote_address"><code>[method]udp-socket.remote-address: func</code></a></h4>
+<h4><a name="method_udp_socket_remote_address"></a><code>[method]udp-socket.remote-address: func</code></h4>
 <p>Get the address the socket is currently streaming to.</p>
 <h1>Typical errors</h1>
 <ul>
@@ -1990,24 +1989,24 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.remote_address.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_remote_address.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.address_family"><code>[method]udp-socket.address-family: func</code></a></h4>
+<h4><a name="method_udp_socket_address_family"></a><code>[method]udp-socket.address-family: func</code></h4>
 <p>Whether this is a IPv4 or IPv6 socket.</p>
 <p>Equivalent to the SO_DOMAIN socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.address_family.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_address_family.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="method_udp_socket_address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
-<h4><a name="method_udp_socket.unicast_hop_limit"><code>[method]udp-socket.unicast-hop-limit: func</code></a></h4>
+<h4><a name="method_udp_socket_unicast_hop_limit"></a><code>[method]udp-socket.unicast-hop-limit: func</code></h4>
 <p>Equivalent to the IP_TTL &amp; IPV6_UNICAST_HOPS socket options.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.</p>
 <h1>Typical errors</h1>
@@ -2016,23 +2015,23 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.unicast_hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_unicast_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.unicast_hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_unicast_hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.set_unicast_hop_limit"><code>[method]udp-socket.set-unicast-hop-limit: func</code></a></h4>
+<h4><a name="method_udp_socket_set_unicast_hop_limit"></a><code>[method]udp-socket.set-unicast-hop-limit: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.set_unicast_hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.set_unicast_hop_limit.value"><code>value</code></a>: <code>u8</code></li>
+<li><a name="method_udp_socket_set_unicast_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_unicast_hop_limit.value"></a><code>value</code>: <code>u8</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.set_unicast_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_unicast_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.receive_buffer_size"><code>[method]udp-socket.receive-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_receive_buffer_size"></a><code>[method]udp-socket.receive-buffer-size: func</code></h4>
 <p>The kernel buffer space reserved for sends/receives on this socket.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2044,54 +2043,54 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.set_receive_buffer_size"><code>[method]udp-socket.set-receive-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_set_receive_buffer_size"></a><code>[method]udp-socket.set-receive-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.set_receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.set_receive_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_udp_socket_set_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_receive_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.send_buffer_size"><code>[method]udp-socket.send-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_send_buffer_size"></a><code>[method]udp-socket.send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.set_send_buffer_size"><code>[method]udp-socket.set-send-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_set_send_buffer_size"></a><code>[method]udp-socket.set-send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.set_send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.set_send_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_udp_socket_set_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_send_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.subscribe"><code>[method]udp-socket.subscribe: func</code></a></h4>
+<h4><a name="method_udp_socket_subscribe"></a><code>[method]udp-socket.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the socket is ready for I/O.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_incoming_datagram_stream.receive"><code>[method]incoming-datagram-stream.receive: func</code></a></h4>
+<h4><a name="method_incoming_datagram_stream_receive"></a><code>[method]incoming-datagram-stream.receive: func</code></h4>
 <p>Receive messages on the socket.</p>
 <p>This function attempts to receive up to <code>max-results</code> datagrams on the socket without blocking.
 The returned list may contain fewer elements than requested, but never more.</p>
@@ -2119,26 +2118,26 @@ This function never returns <code>error(would-block)</code>.</li>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.receive.self"><code>self</code></a>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
-<li><a name="method_incoming_datagram_stream.receive.max_results"><code>max-results</code></a>: <code>u64</code></li>
+<li><a name="method_incoming_datagram_stream_receive.self"></a><code>self</code>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_receive.max_results"></a><code>max-results</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.receive.0"></a> result&lt;list&lt;<a href="#incoming_datagram"><a href="#incoming_datagram"><code>incoming-datagram</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_receive.0"></a> result&lt;list&lt;<a href="#incoming_datagram"><a href="#incoming_datagram"><code>incoming-datagram</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_incoming_datagram_stream.subscribe"><code>[method]incoming-datagram-stream.subscribe: func</code></a></h4>
+<h4><a name="method_incoming_datagram_stream_subscribe"></a><code>[method]incoming-datagram-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the stream is ready to receive again.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_outgoing_datagram_stream.check_send"><code>[method]outgoing-datagram-stream.check-send: func</code></a></h4>
+<h4><a name="method_outgoing_datagram_stream_check_send"></a><code>[method]outgoing-datagram-stream.check-send: func</code></h4>
 <p>Check readiness for sending. This function never blocks.</p>
 <p>Returns the number of datagrams permitted for the next call to <code>send</code>,
 or an error. Calling <code>send</code> with more datagrams than this function has
@@ -2149,13 +2148,13 @@ error.</p>
 <p>Never returns <code>would-block</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.check_send.self"><code>self</code></a>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_check_send.self"></a><code>self</code>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.check_send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_check_send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_outgoing_datagram_stream.send"><code>[method]outgoing-datagram-stream.send: func</code></a></h4>
+<h4><a name="method_outgoing_datagram_stream_send"></a><code>[method]outgoing-datagram-stream.send: func</code></h4>
 <p>Send messages on the socket.</p>
 <p>This function attempts to send all provided <code>datagrams</code> on the socket without blocking and
 returns how many messages were actually sent (or queued for sending). This function never
@@ -2190,43 +2189,43 @@ either <code>check-send</code> was not called or <code>datagrams</code> contains
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.send.self"><code>self</code></a>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
-<li><a name="method_outgoing_datagram_stream.send.datagrams"><code>datagrams</code></a>: list&lt;<a href="#outgoing_datagram"><a href="#outgoing_datagram"><code>outgoing-datagram</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_send.self"></a><code>self</code>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_send.datagrams"></a><code>datagrams</code>: list&lt;<a href="#outgoing_datagram"><a href="#outgoing_datagram"><code>outgoing-datagram</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_outgoing_datagram_stream.subscribe"><code>[method]outgoing-datagram-stream.subscribe: func</code></a></h4>
+<h4><a name="method_outgoing_datagram_stream_subscribe"></a><code>[method]outgoing-datagram-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the stream is ready to send again.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_udp_create_socket_0.2.0">Import interface wasi:sockets/udp-create-socket@0.2.0</a></h2>
+<h2><a name="wasi_sockets_udp_create_socket_0_2_0"></a>Import interface wasi:sockets/udp-create-socket@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>type network</code></a></h4>
+<h4><a name="network"></a><code>type network</code></h4>
 <p><a href="#network"><a href="#network"><code>network</code></a></a></p>
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="udp_socket">`type udp-socket`</a>
+#### <a name="udp_socket"></a>`type udp-socket`
 [`udp-socket`](#udp_socket)
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="create_udp_socket"><code>create-udp-socket: func</code></a></h4>
+<h4><a name="create_udp_socket"></a><code>create-udp-socket: func</code></h4>
 <p>Create a new UDP socket.</p>
 <p>Similar to <code>socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)</code> in POSIX.
 On IPv6 sockets, IPV6_V6ONLY is enabled by default and can't be configured otherwise.</p>
@@ -2248,56 +2247,56 @@ the socket is effectively an in-memory configuration object, unable to communica
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="create_udp_socket.address_family"><code>address-family</code></a>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="create_udp_socket.address_family"></a><code>address-family</code>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="create_udp_socket.0"></a> result&lt;own&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_tcp_0.2.0">Import interface wasi:sockets/tcp@0.2.0</a></h2>
+<h2><a name="wasi_sockets_tcp_0_2_0"></a>Import interface wasi:sockets/tcp@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="input_stream"><code>type input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>type input-stream</code></h4>
 <p><a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a></p>
 <p>
-#### <a name="output_stream">`type output-stream`</a>
+#### <a name="output_stream"></a>`type output-stream`
 [`output-stream`](#output_stream)
 <p>
-#### <a name="pollable">`type pollable`</a>
+#### <a name="pollable"></a>`type pollable`
 [`pollable`](#pollable)
 <p>
-#### <a name="duration">`type duration`</a>
+#### <a name="duration"></a>`type duration`
 [`duration`](#duration)
 <p>
-#### <a name="network">`type network`</a>
+#### <a name="network"></a>`type network`
 [`network`](#network)
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_socket_address">`type ip-socket-address`</a>
+#### <a name="ip_socket_address"></a>`type ip-socket-address`
 [`ip-socket-address`](#ip_socket_address)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="shutdown_type">`enum shutdown-type`</a>
+#### <a name="shutdown_type"></a>`enum shutdown-type`
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="shutdown_type.receive"><code>receive</code></a></p>
+<p><a name="shutdown_type.receive"></a><code>receive</code></p>
 <p>Similar to `SHUT_RD` in POSIX.
 </li>
 <li>
-<p><a name="shutdown_type.send"><code>send</code></a></p>
+<p><a name="shutdown_type.send"></a><code>send</code></p>
 <p>Similar to `SHUT_WR` in POSIX.
 </li>
 <li>
-<p><a name="shutdown_type.both"><code>both</code></a></p>
+<p><a name="shutdown_type.both"></a><code>both</code></p>
 <p>Similar to `SHUT_RDWR` in POSIX.
 </li>
 </ul>
-<h4><a name="tcp_socket"><code>resource tcp-socket</code></a></h4>
+<h4><a name="tcp_socket"></a><code>resource tcp-socket</code></h4>
 <p>A TCP socket resource.</p>
 <p>The socket can be in one of the following states:</p>
 <ul>
@@ -2309,8 +2308,8 @@ the socket is effectively an in-memory configuration object, unable to communica
 <li><code>connect-in-progress</code></li>
 <li><code>connected</code></li>
 <li><code>closed</code>
-See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md</a>
-for a more information.</li>
+See <a href="https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md">https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md</a>
+for more information.</li>
 </ul>
 <p>Note: Except where explicitly mentioned, whenever this documentation uses
 the term &quot;bound&quot; without backticks it actually means: in the <code>bound</code> state <em>or higher</em>.
@@ -2319,7 +2318,7 @@ the term &quot;bound&quot; without backticks it actually means: in the <code>bou
 <code>network::error-code</code> type, TCP socket methods may always return
 <code>error(invalid-state)</code> when in the <code>closed</code> state.</h2>
 <h3>Functions</h3>
-<h4><a name="method_tcp_socket.start_bind"><code>[method]tcp-socket.start-bind: func</code></a></h4>
+<h4><a name="method_tcp_socket_start_bind"></a><code>[method]tcp-socket.start-bind: func</code></h4>
 <p>Bind the socket to a specific network on the provided IP address and port.</p>
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
@@ -2358,28 +2357,28 @@ don't want to make use of this ability can simply call the native
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.start_bind.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_bind.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_bind.local_address"><code>local-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
+<li><a name="method_tcp_socket_start_bind.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_bind.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_bind.local_address"></a><code>local-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.finish_bind"><code>[method]tcp-socket.finish-bind: func</code></a></h4>
+<h4><a name="method_tcp_socket_finish_bind"></a><code>[method]tcp-socket.finish-bind: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_bind.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_bind.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.start_connect"><code>[method]tcp-socket.start-connect: func</code></a></h4>
+<h4><a name="method_tcp_socket_start_connect"></a><code>[method]tcp-socket.start-connect: func</code></h4>
 <p>Connect to a remote endpoint.</p>
 <p>On success:</p>
 <ul>
-<li>the socket is transitioned into the <code>connection</code> state.</li>
+<li>the socket is transitioned into the <code>connected</code> state.</li>
 <li>a pair of streams is returned that can be used to read &amp; write to the connection</li>
 </ul>
 <p>After a failed connection attempt, the socket will be in the <code>closed</code>
@@ -2420,24 +2419,24 @@ the <code>SO_ERROR</code> socket option, in case the poll signaled readiness.</p
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.start_connect.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_connect.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_connect.remote_address"><code>remote-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
+<li><a name="method_tcp_socket_start_connect.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_connect.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_connect.remote_address"></a><code>remote-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.start_connect.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_connect.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.finish_connect"><code>[method]tcp-socket.finish-connect: func</code></a></h4>
+<h4><a name="method_tcp_socket_finish_connect"></a><code>[method]tcp-socket.finish-connect: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_connect.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_connect.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_connect.0"></a> result&lt;(own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_connect.0"></a> result&lt;(own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.start_listen"><code>[method]tcp-socket.start-listen: func</code></a></h4>
+<h4><a name="method_tcp_socket_start_listen"></a><code>[method]tcp-socket.start-listen: func</code></h4>
 <p>Start listening for new connections.</p>
 <p>Transitions the socket into the <code>listening</code> state.</p>
 <p>Unlike POSIX, the socket must already be explicitly bound.</p>
@@ -2464,22 +2463,22 @@ don't want to make use of this ability can simply call the native
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.start_listen.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_listen.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.start_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.finish_listen"><code>[method]tcp-socket.finish-listen: func</code></a></h4>
+<h4><a name="method_tcp_socket_finish_listen"></a><code>[method]tcp-socket.finish-listen: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_listen.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_listen.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.accept"><code>[method]tcp-socket.accept: func</code></a></h4>
+<h4><a name="method_tcp_socket_accept"></a><code>[method]tcp-socket.accept: func</code></h4>
 <p>Accept a new client socket.</p>
 <p>The returned socket is bound and in the <code>connected</code> state. The following properties are inherited from the listener socket:</p>
 <ul>
@@ -2510,13 +2509,13 @@ a pair of streams that can be used to read &amp; write to the connection.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.accept.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_accept.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.accept.0"></a> result&lt;(own&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;, own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_accept.0"></a> result&lt;(own&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;, own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.local_address"><code>[method]tcp-socket.local-address: func</code></a></h4>
+<h4><a name="method_tcp_socket_local_address"></a><code>[method]tcp-socket.local-address: func</code></h4>
 <p>Get the bound local address.</p>
 <p>POSIX mentions:</p>
 <blockquote>
@@ -2537,13 +2536,13 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.local_address.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_local_address.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.remote_address"><code>[method]tcp-socket.remote-address: func</code></a></h4>
+<h4><a name="method_tcp_socket_remote_address"></a><code>[method]tcp-socket.remote-address: func</code></h4>
 <p>Get the remote address.</p>
 <h1>Typical errors</h1>
 <ul>
@@ -2558,35 +2557,35 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.remote_address.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_remote_address.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.is_listening"><code>[method]tcp-socket.is-listening: func</code></a></h4>
+<h4><a name="method_tcp_socket_is_listening"></a><code>[method]tcp-socket.is-listening: func</code></h4>
 <p>Whether the socket is in the <code>listening</code> state.</p>
 <p>Equivalent to the SO_ACCEPTCONN socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.is_listening.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_is_listening.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.is_listening.0"></a> <code>bool</code></li>
+<li><a name="method_tcp_socket_is_listening.0"></a> <code>bool</code></li>
 </ul>
-<h4><a name="method_tcp_socket.address_family"><code>[method]tcp-socket.address-family: func</code></a></h4>
+<h4><a name="method_tcp_socket_address_family"></a><code>[method]tcp-socket.address-family: func</code></h4>
 <p>Whether this is a IPv4 or IPv6 socket.</p>
 <p>Equivalent to the SO_DOMAIN socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.address_family.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_address_family.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="method_tcp_socket_address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
-<h4><a name="method_tcp_socket.set_listen_backlog_size"><code>[method]tcp-socket.set-listen-backlog-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_listen_backlog_size"></a><code>[method]tcp-socket.set-listen-backlog-size: func</code></h4>
 <p>Hints the desired listen queue size. Implementations are free to ignore this.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.</p>
@@ -2598,14 +2597,14 @@ Any other value will never cause an error, but it might be silently clamped and/
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_listen_backlog_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_listen_backlog_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_tcp_socket_set_listen_backlog_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_listen_backlog_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_listen_backlog_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_listen_backlog_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_enabled"><code>[method]tcp-socket.keep-alive-enabled: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_enabled"></a><code>[method]tcp-socket.keep-alive-enabled: func</code></h4>
 <p>Enables or disables keepalive.</p>
 <p>The keepalive behavior can be adjusted using:</p>
 <ul>
@@ -2617,23 +2616,23 @@ These properties can be configured while <code>keep-alive-enabled</code> is fals
 <p>Equivalent to the SO_KEEPALIVE socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_enabled.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_enabled.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_enabled.0"></a> result&lt;<code>bool</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_enabled.0"></a> result&lt;<code>bool</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_enabled"><code>[method]tcp-socket.set-keep-alive-enabled: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_enabled"></a><code>[method]tcp-socket.set-keep-alive-enabled: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_enabled.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_enabled.value"><code>value</code></a>: <code>bool</code></li>
+<li><a name="method_tcp_socket_set_keep_alive_enabled.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_enabled.value"></a><code>value</code>: <code>bool</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_enabled.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_enabled.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_idle_time"><code>[method]tcp-socket.keep-alive-idle-time: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_idle_time"></a><code>[method]tcp-socket.keep-alive-idle-time: func</code></h4>
 <p>Amount of time the connection has to be idle before TCP starts sending keepalive packets.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2645,23 +2644,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_idle_time.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_idle_time.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_idle_time.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_idle_time.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_idle_time"><code>[method]tcp-socket.set-keep-alive-idle-time: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_idle_time"></a><code>[method]tcp-socket.set-keep-alive-idle-time: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_idle_time.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_idle_time.value"><code>value</code></a>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
+<li><a name="method_tcp_socket_set_keep_alive_idle_time.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_idle_time.value"></a><code>value</code>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_idle_time.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_idle_time.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_interval"><code>[method]tcp-socket.keep-alive-interval: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_interval"></a><code>[method]tcp-socket.keep-alive-interval: func</code></h4>
 <p>The time between keepalive packets.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2673,23 +2672,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_interval.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_interval.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_interval.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_interval.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_interval"><code>[method]tcp-socket.set-keep-alive-interval: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_interval"></a><code>[method]tcp-socket.set-keep-alive-interval: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_interval.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_interval.value"><code>value</code></a>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
+<li><a name="method_tcp_socket_set_keep_alive_interval.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_interval.value"></a><code>value</code>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_interval.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_interval.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_count"><code>[method]tcp-socket.keep-alive-count: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_count"></a><code>[method]tcp-socket.keep-alive-count: func</code></h4>
 <p>The maximum amount of keepalive packets TCP should send before aborting the connection.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2701,23 +2700,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_count.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_count.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_count.0"></a> result&lt;<code>u32</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_count.0"></a> result&lt;<code>u32</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_count"><code>[method]tcp-socket.set-keep-alive-count: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_count"></a><code>[method]tcp-socket.set-keep-alive-count: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_count.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_count.value"><code>value</code></a>: <code>u32</code></li>
+<li><a name="method_tcp_socket_set_keep_alive_count.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_count.value"></a><code>value</code>: <code>u32</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_count.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_count.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.hop_limit"><code>[method]tcp-socket.hop-limit: func</code></a></h4>
+<h4><a name="method_tcp_socket_hop_limit"></a><code>[method]tcp-socket.hop-limit: func</code></h4>
 <p>Equivalent to the IP_TTL &amp; IPV6_UNICAST_HOPS socket options.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.</p>
 <h1>Typical errors</h1>
@@ -2726,23 +2725,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_hop_limit"><code>[method]tcp-socket.set-hop-limit: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_hop_limit"></a><code>[method]tcp-socket.set-hop-limit: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_hop_limit.value"><code>value</code></a>: <code>u8</code></li>
+<li><a name="method_tcp_socket_set_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_hop_limit.value"></a><code>value</code>: <code>u8</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.receive_buffer_size"><code>[method]tcp-socket.receive-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_receive_buffer_size"></a><code>[method]tcp-socket.receive-buffer-size: func</code></h4>
 <p>The kernel buffer space reserved for sends/receives on this socket.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2754,42 +2753,42 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_receive_buffer_size"><code>[method]tcp-socket.set-receive-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_receive_buffer_size"></a><code>[method]tcp-socket.set-receive-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_receive_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_tcp_socket_set_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_receive_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.send_buffer_size"><code>[method]tcp-socket.send-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_send_buffer_size"></a><code>[method]tcp-socket.send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_send_buffer_size"><code>[method]tcp-socket.set-send-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_send_buffer_size"></a><code>[method]tcp-socket.set-send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_send_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_tcp_socket_set_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_send_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.subscribe"><code>[method]tcp-socket.subscribe: func</code></a></h4>
+<h4><a name="method_tcp_socket_subscribe"></a><code>[method]tcp-socket.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which can be used to poll for, or block on,
 completion of any of the asynchronous operations of this socket.</p>
 <p>When <code>finish-bind</code>, <code>finish-listen</code>, <code>finish-connect</code> or <code>accept</code>
@@ -2799,19 +2798,19 @@ their success or failure, after which the method can be retried.</p>
 in progress at the time of calling <code>subscribe</code> (if any). Theoretically,
 <code>subscribe</code> only has to be called once per socket and can then be
 (re)used for the remainder of the socket's lifetime.</p>
-<p>See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness</a>
-for a more information.</p>
+<p>See <a href="https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md#pollable-readiness">https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md#pollable-readiness</a>
+for more information.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.shutdown"><code>[method]tcp-socket.shutdown: func</code></a></h4>
+<h4><a name="method_tcp_socket_shutdown"></a><code>[method]tcp-socket.shutdown: func</code></h4>
 <p>Initiate a graceful shutdown.</p>
 <ul>
 <li><code>receive</code>: The socket is not expecting to receive any data from
@@ -2822,7 +2821,7 @@ this method will be discarded.</li>
 associated with this socket will be closed and a FIN packet will be sent.</li>
 <li><code>both</code>: Same effect as <code>receive</code> &amp; <code>send</code> combined.</li>
 </ul>
-<p>This function is idempotent. Shutting a down a direction more than once
+<p>This function is idempotent; shutting down a direction more than once
 has no effect and returns <code>ok</code>.</p>
 <p>The shutdown function does not close (drop) the socket.</p>
 <h1>Typical errors</h1>
@@ -2838,31 +2837,31 @@ has no effect and returns <code>ok</code>.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.shutdown.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.shutdown.shutdown_type"><a href="#shutdown_type"><code>shutdown-type</code></a></a>: <a href="#shutdown_type"><a href="#shutdown_type"><code>shutdown-type</code></a></a></li>
+<li><a name="method_tcp_socket_shutdown.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_shutdown.shutdown_type"></a><a href="#shutdown_type"><code>shutdown-type</code></a>: <a href="#shutdown_type"><a href="#shutdown_type"><code>shutdown-type</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.shutdown.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_shutdown.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_tcp_create_socket_0.2.0">Import interface wasi:sockets/tcp-create-socket@0.2.0</a></h2>
+<h2><a name="wasi_sockets_tcp_create_socket_0_2_0"></a>Import interface wasi:sockets/tcp-create-socket@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>type network</code></a></h4>
+<h4><a name="network"></a><code>type network</code></h4>
 <p><a href="#network"><a href="#network"><code>network</code></a></a></p>
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="tcp_socket">`type tcp-socket`</a>
+#### <a name="tcp_socket"></a>`type tcp-socket`
 [`tcp-socket`](#tcp_socket)
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="create_tcp_socket"><code>create-tcp-socket: func</code></a></h4>
+<h4><a name="create_tcp_socket"></a><code>create-tcp-socket: func</code></h4>
 <p>Create a new TCP socket.</p>
 <p>Similar to <code>socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)</code> in POSIX.
 On IPv6 sockets, IPV6_V6ONLY is enabled by default and can't be configured otherwise.</p>
@@ -2884,31 +2883,31 @@ is called, the socket is effectively an in-memory configuration object, unable t
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="create_tcp_socket.address_family"><code>address-family</code></a>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="create_tcp_socket.address_family"></a><code>address-family</code>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="create_tcp_socket.0"></a> result&lt;own&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_ip_name_lookup_0.2.0">Import interface wasi:sockets/ip-name-lookup@0.2.0</a></h2>
+<h2><a name="wasi_sockets_ip_name_lookup_0_2_0"></a>Import interface wasi:sockets/ip-name-lookup@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>type pollable</code></a></h4>
+<h4><a name="pollable"></a><code>type pollable</code></h4>
 <p><a href="#pollable"><a href="#pollable"><code>pollable</code></a></a></p>
 <p>
-#### <a name="network">`type network`</a>
+#### <a name="network"></a>`type network`
 [`network`](#network)
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_address">`type ip-address`</a>
+#### <a name="ip_address"></a>`type ip-address`
 [`ip-address`](#ip_address)
 <p>
-#### <a name="resolve_address_stream">`resource resolve-address-stream`</a>
+#### <a name="resolve_address_stream"></a>`resource resolve-address-stream`
 <hr />
 <h3>Functions</h3>
-<h4><a name="resolve_addresses"><code>resolve-addresses: func</code></a></h4>
+<h4><a name="resolve_addresses"></a><code>resolve-addresses: func</code></h4>
 <p>Resolve an internet host name to a list of IP addresses.</p>
 <p>Unicode domain names are automatically converted to ASCII using IDNA encoding.
 If the input is an IP address string, the address is parsed and returned
@@ -2930,14 +2929,14 @@ to (asynchronously) fetch the results.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="resolve_addresses.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="resolve_addresses.name"><code>name</code></a>: <code>string</code></li>
+<li><a name="resolve_addresses.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="resolve_addresses.name"></a><code>name</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="resolve_addresses.0"></a> result&lt;own&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_resolve_address_stream.resolve_next_address"><code>[method]resolve-address-stream.resolve-next-address: func</code></a></h4>
+<h4><a name="method_resolve_address_stream_resolve_next_address"></a><code>[method]resolve-address-stream.resolve-next-address: func</code></h4>
 <p>Returns the next address from the resolver.</p>
 <p>This function should be called multiple times. On each call, it will
 return the next address in connection order preference. If all
@@ -2952,31 +2951,31 @@ addresses have been exhausted, this function returns <code>none</code>.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_resolve_address_stream.resolve_next_address.self"><code>self</code></a>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_resolve_next_address.self"></a><code>self</code>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_resolve_address_stream.resolve_next_address.0"></a> result&lt;option&lt;<a href="#ip_address"><a href="#ip_address"><code>ip-address</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_resolve_next_address.0"></a> result&lt;option&lt;<a href="#ip_address"><a href="#ip_address"><code>ip-address</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_resolve_address_stream.subscribe"><code>[method]resolve-address-stream.subscribe: func</code></a></h4>
+<h4><a name="method_resolve_address_stream_subscribe"></a><code>[method]resolve-address-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the stream is ready for I/O.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_resolve_address_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_resolve_address_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:random_random_0.2.0">Import interface wasi:random/random@0.2.0</a></h2>
+<h2><a name="wasi_random_random_0_2_0"></a>Import interface wasi:random/random@0.2.0</h2>
 <p>WASI Random is a random data API.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="get_random_bytes"><code>get-random-bytes: func</code></a></h4>
+<h4><a name="get_random_bytes"></a><code>get-random-bytes: func</code></h4>
 <p>Return <code>len</code> cryptographically-secure random or pseudo-random bytes.</p>
 <p>This function must produce data at least as cryptographically secure and
 fast as an adequately seeded cryptographically-secure pseudo-random
@@ -2989,13 +2988,13 @@ must omit this function, rather than implementing it with deterministic
 data.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="get_random_bytes.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="get_random_bytes.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_random_bytes.0"></a> list&lt;<code>u8</code>&gt;</li>
 </ul>
-<h4><a name="get_random_u64"><code>get-random-u64: func</code></a></h4>
+<h4><a name="get_random_u64"></a><code>get-random-u64: func</code></h4>
 <p>Return a cryptographically-secure random or pseudo-random <code>u64</code> value.</p>
 <p>This function returns the same type of data as <a href="#get_random_bytes"><code>get-random-bytes</code></a>,
 represented as a <code>u64</code>.</p>
@@ -3003,13 +3002,13 @@ represented as a <code>u64</code>.</p>
 <ul>
 <li><a name="get_random_u64.0"></a> <code>u64</code></li>
 </ul>
-<h2><a name="wasi:random_insecure_0.2.0">Import interface wasi:random/insecure@0.2.0</a></h2>
+<h2><a name="wasi_random_insecure_0_2_0"></a>Import interface wasi:random/insecure@0.2.0</h2>
 <p>The insecure interface for insecure pseudo-random numbers.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="get_insecure_random_bytes"><code>get-insecure-random-bytes: func</code></a></h4>
+<h4><a name="get_insecure_random_bytes"></a><code>get-insecure-random-bytes: func</code></h4>
 <p>Return <code>len</code> insecure pseudo-random bytes.</p>
 <p>This function is not cryptographically secure. Do not use it for
 anything related to security.</p>
@@ -3018,13 +3017,13 @@ implementations are encouraged to return evenly distributed values with
 a long period.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="get_insecure_random_bytes.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="get_insecure_random_bytes.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_insecure_random_bytes.0"></a> list&lt;<code>u8</code>&gt;</li>
 </ul>
-<h4><a name="get_insecure_random_u64"><code>get-insecure-random-u64: func</code></a></h4>
+<h4><a name="get_insecure_random_u64"></a><code>get-insecure-random-u64: func</code></h4>
 <p>Return an insecure pseudo-random <code>u64</code> value.</p>
 <p>This function returns the same type of pseudo-random data as
 <a href="#get_insecure_random_bytes"><code>get-insecure-random-bytes</code></a>, represented as a <code>u64</code>.</p>
@@ -3032,13 +3031,13 @@ a long period.</p>
 <ul>
 <li><a name="get_insecure_random_u64.0"></a> <code>u64</code></li>
 </ul>
-<h2><a name="wasi:random_insecure_seed_0.2.0">Import interface wasi:random/insecure-seed@0.2.0</a></h2>
+<h2><a name="wasi_random_insecure_seed_0_2_0"></a>Import interface wasi:random/insecure-seed@0.2.0</h2>
 <p>The insecure-seed interface for seeding hash-map DoS resistance.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="insecure_seed"><code>insecure-seed: func</code></a></h4>
+<h4><a name="insecure_seed"></a><code>insecure-seed: func</code></h4>
 <p>Return a 128-bit value that may contain a pseudo-random value.</p>
 <p>The returned value is not required to be computed from a CSPRNG, and may
 even be entirely deterministic. Host implementations are encouraged to
@@ -3056,10 +3055,10 @@ protection.</p>
 <ul>
 <li><a name="insecure_seed.0"></a> (<code>u64</code>, <code>u64</code>)</li>
 </ul>
-<h2><a name="wasi:cli_run_0.2.0">Export interface wasi:cli/run@0.2.0</a></h2>
+<h2><a name="wasi_cli_run_0_2_0"></a>Export interface wasi:cli/run@0.2.0</h2>
 <hr />
 <h3>Functions</h3>
-<h4><a name="run"><code>run: func</code></a></h4>
+<h4><a name="run"></a><code>run: func</code></h4>
 <p>Run the program.</p>
 <h5>Return values</h5>
 <ul>
diff --git a/imports.md b/imports.md
index 02f8f93..93e32c3 100644
--- a/imports.md
+++ b/imports.md
@@ -2,40 +2,40 @@
 <ul>
 <li>Imports:
 <ul>
-<li>interface <a href="#wasi:cli_environment_0.2.0"><code>wasi:cli/environment@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_exit_0.2.0"><code>wasi:cli/exit@0.2.0</code></a></li>
-<li>interface <a href="#wasi:io_error_0.2.0"><code>wasi:io/error@0.2.0</code></a></li>
-<li>interface <a href="#wasi:io_poll_0.2.0"><code>wasi:io/poll@0.2.0</code></a></li>
-<li>interface <a href="#wasi:io_streams_0.2.0"><code>wasi:io/streams@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_stdin_0.2.0"><code>wasi:cli/stdin@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_stdout_0.2.0"><code>wasi:cli/stdout@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_stderr_0.2.0"><code>wasi:cli/stderr@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_input_0.2.0"><code>wasi:cli/terminal-input@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_output_0.2.0"><code>wasi:cli/terminal-output@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_stdin_0.2.0"><code>wasi:cli/terminal-stdin@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_stdout_0.2.0"><code>wasi:cli/terminal-stdout@0.2.0</code></a></li>
-<li>interface <a href="#wasi:cli_terminal_stderr_0.2.0"><code>wasi:cli/terminal-stderr@0.2.0</code></a></li>
-<li>interface <a href="#wasi:clocks_monotonic_clock_0.2.0"><code>wasi:clocks/monotonic-clock@0.2.0</code></a></li>
-<li>interface <a href="#wasi:clocks_wall_clock_0.2.0"><code>wasi:clocks/wall-clock@0.2.0</code></a></li>
-<li>interface <a href="#wasi:filesystem_types_0.2.0"><code>wasi:filesystem/types@0.2.0</code></a></li>
-<li>interface <a href="#wasi:filesystem_preopens_0.2.0"><code>wasi:filesystem/preopens@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_network_0.2.0"><code>wasi:sockets/network@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_instance_network_0.2.0"><code>wasi:sockets/instance-network@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_udp_0.2.0"><code>wasi:sockets/udp@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_udp_create_socket_0.2.0"><code>wasi:sockets/udp-create-socket@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_tcp_0.2.0"><code>wasi:sockets/tcp@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_tcp_create_socket_0.2.0"><code>wasi:sockets/tcp-create-socket@0.2.0</code></a></li>
-<li>interface <a href="#wasi:sockets_ip_name_lookup_0.2.0"><code>wasi:sockets/ip-name-lookup@0.2.0</code></a></li>
-<li>interface <a href="#wasi:random_random_0.2.0"><code>wasi:random/random@0.2.0</code></a></li>
-<li>interface <a href="#wasi:random_insecure_0.2.0"><code>wasi:random/insecure@0.2.0</code></a></li>
-<li>interface <a href="#wasi:random_insecure_seed_0.2.0"><code>wasi:random/insecure-seed@0.2.0</code></a></li>
-</ul>
-</li>
-</ul>
-<h2><a name="wasi:cli_environment_0.2.0">Import interface wasi:cli/environment@0.2.0</a></h2>
+<li>interface <a href="#wasi_cli_environment_0_2_0"><code>wasi:cli/environment@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_exit_0_2_0"><code>wasi:cli/exit@0.2.0</code></a></li>
+<li>interface <a href="#wasi_io_error_0_2_0"><code>wasi:io/error@0.2.0</code></a></li>
+<li>interface <a href="#wasi_io_poll_0_2_0"><code>wasi:io/poll@0.2.0</code></a></li>
+<li>interface <a href="#wasi_io_streams_0_2_0"><code>wasi:io/streams@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_stdin_0_2_0"><code>wasi:cli/stdin@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_stdout_0_2_0"><code>wasi:cli/stdout@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_stderr_0_2_0"><code>wasi:cli/stderr@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_input_0_2_0"><code>wasi:cli/terminal-input@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_output_0_2_0"><code>wasi:cli/terminal-output@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_stdin_0_2_0"><code>wasi:cli/terminal-stdin@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_stdout_0_2_0"><code>wasi:cli/terminal-stdout@0.2.0</code></a></li>
+<li>interface <a href="#wasi_cli_terminal_stderr_0_2_0"><code>wasi:cli/terminal-stderr@0.2.0</code></a></li>
+<li>interface <a href="#wasi_clocks_monotonic_clock_0_2_0"><code>wasi:clocks/monotonic-clock@0.2.0</code></a></li>
+<li>interface <a href="#wasi_clocks_wall_clock_0_2_0"><code>wasi:clocks/wall-clock@0.2.0</code></a></li>
+<li>interface <a href="#wasi_filesystem_types_0_2_0"><code>wasi:filesystem/types@0.2.0</code></a></li>
+<li>interface <a href="#wasi_filesystem_preopens_0_2_0"><code>wasi:filesystem/preopens@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_network_0_2_0"><code>wasi:sockets/network@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_instance_network_0_2_0"><code>wasi:sockets/instance-network@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_udp_0_2_0"><code>wasi:sockets/udp@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_udp_create_socket_0_2_0"><code>wasi:sockets/udp-create-socket@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_tcp_0_2_0"><code>wasi:sockets/tcp@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_tcp_create_socket_0_2_0"><code>wasi:sockets/tcp-create-socket@0.2.0</code></a></li>
+<li>interface <a href="#wasi_sockets_ip_name_lookup_0_2_0"><code>wasi:sockets/ip-name-lookup@0.2.0</code></a></li>
+<li>interface <a href="#wasi_random_random_0_2_0"><code>wasi:random/random@0.2.0</code></a></li>
+<li>interface <a href="#wasi_random_insecure_0_2_0"><code>wasi:random/insecure@0.2.0</code></a></li>
+<li>interface <a href="#wasi_random_insecure_seed_0_2_0"><code>wasi:random/insecure-seed@0.2.0</code></a></li>
+</ul>
+</li>
+</ul>
+<h2><a name="wasi_cli_environment_0_2_0"></a>Import interface wasi:cli/environment@0.2.0</h2>
 <hr />
 <h3>Functions</h3>
-<h4><a name="get_environment"><code>get-environment: func</code></a></h4>
+<h4><a name="get_environment"></a><code>get-environment: func</code></h4>
 <p>Get the POSIX-style environment variables.</p>
 <p>Each environment variable is provided as a pair of string variable names
 and string value.</p>
@@ -46,49 +46,47 @@ values each time it is called.</p>
 <ul>
 <li><a name="get_environment.0"></a> list&lt;(<code>string</code>, <code>string</code>)&gt;</li>
 </ul>
-<h4><a name="get_arguments"><code>get-arguments: func</code></a></h4>
+<h4><a name="get_arguments"></a><code>get-arguments: func</code></h4>
 <p>Get the POSIX-style arguments to the program.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_arguments.0"></a> list&lt;<code>string</code>&gt;</li>
 </ul>
-<h4><a name="initial_cwd"><code>initial-cwd: func</code></a></h4>
+<h4><a name="initial_cwd"></a><code>initial-cwd: func</code></h4>
 <p>Return a path that programs should use as their initial current working
 directory, interpreting <code>.</code> as shorthand for this.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="initial_cwd.0"></a> option&lt;<code>string</code>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_exit_0.2.0">Import interface wasi:cli/exit@0.2.0</a></h2>
+<h2><a name="wasi_cli_exit_0_2_0"></a>Import interface wasi:cli/exit@0.2.0</h2>
 <hr />
 <h3>Functions</h3>
-<h4><a name="exit"><code>exit: func</code></a></h4>
+<h4><a name="exit"></a><code>exit: func</code></h4>
 <p>Exit the current instance and any linked instances.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="exit.status"><code>status</code></a>: result</li>
+<li><a name="exit.status"></a><code>status</code>: result</li>
 </ul>
-<h2><a name="wasi:io_error_0.2.0">Import interface wasi:io/error@0.2.0</a></h2>
+<h2><a name="wasi_io_error_0_2_0"></a>Import interface wasi:io/error@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="error"><code>resource error</code></a></h4>
+<h4><a name="error"></a><code>resource error</code></h4>
 <p>A resource which represents some error information.</p>
 <p>The only method provided by this resource is <code>to-debug-string</code>,
 which provides some human-readable information about the error.</p>
 <p>In the <code>wasi:io</code> package, this resource is returned through the
 <code>wasi:io/streams/stream-error</code> type.</p>
 <p>To provide more specific error information, other interfaces may
-provide functions to further &quot;downcast&quot; this error into more specific
-error information. For example, <a href="#error"><code>error</code></a>s returned in streams derived
-from filesystem types to be described using the filesystem's own
-error-code type, using the function
-<code>wasi:filesystem/types/filesystem-error-code</code>, which takes a parameter
-<code>borrow&lt;error&gt;</code> and returns
-<code>option&lt;wasi:filesystem/types/error-code&gt;</code>.</p>
+offer functions to &quot;downcast&quot; this error into more specific types. For example,
+errors returned from streams derived from filesystem types can be described using
+the filesystem's own error-code type. This is done using the function
+<code>wasi:filesystem/types/filesystem-error-code</code>, which takes a <code>borrow&lt;error&gt;</code>
+parameter and returns an <code>option&lt;wasi:filesystem/types/error-code&gt;</code>.</p>
 <h2>The set of functions which can &quot;downcast&quot; an <a href="#error"><code>error</code></a> into a more
 concrete type is open.</h2>
 <h3>Functions</h3>
-<h4><a name="method_error.to_debug_string"><code>[method]error.to-debug-string: func</code></a></h4>
+<h4><a name="method_error_to_debug_string"></a><code>[method]error.to-debug-string: func</code></h4>
 <p>Returns a string that is suitable to assist humans in debugging
 this error.</p>
 <p>WARNING: The returned string should not be consumed mechanically!
@@ -97,92 +95,95 @@ details. Parsing this string is a major platform-compatibility
 hazard.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_error.to_debug_string.self"><code>self</code></a>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
+<li><a name="method_error_to_debug_string.self"></a><code>self</code>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_error.to_debug_string.0"></a> <code>string</code></li>
+<li><a name="method_error_to_debug_string.0"></a> <code>string</code></li>
 </ul>
-<h2><a name="wasi:io_poll_0.2.0">Import interface wasi:io/poll@0.2.0</a></h2>
+<h2><a name="wasi_io_poll_0_2_0"></a>Import interface wasi:io/poll@0.2.0</h2>
 <p>A poll API intended to let users wait for I/O events on multiple handles
 at once.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>resource pollable</code></a></h4>
+<h4><a name="pollable"></a><code>resource pollable</code></h4>
 <h2><a href="#pollable"><code>pollable</code></a> represents a single I/O event which may be ready, or not.</h2>
 <h3>Functions</h3>
-<h4><a name="method_pollable.ready"><code>[method]pollable.ready: func</code></a></h4>
+<h4><a name="method_pollable_ready"></a><code>[method]pollable.ready: func</code></h4>
 <p>Return the readiness of a pollable. This function never blocks.</p>
 <p>Returns <code>true</code> when the pollable is ready, and <code>false</code> otherwise.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_pollable.ready.self"><code>self</code></a>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_pollable_ready.self"></a><code>self</code>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_pollable.ready.0"></a> <code>bool</code></li>
+<li><a name="method_pollable_ready.0"></a> <code>bool</code></li>
 </ul>
-<h4><a name="method_pollable.block"><code>[method]pollable.block: func</code></a></h4>
+<h4><a name="method_pollable_block"></a><code>[method]pollable.block: func</code></h4>
 <p><code>block</code> returns immediately if the pollable is ready, and otherwise
 blocks until ready.</p>
 <p>This function is equivalent to calling <code>poll.poll</code> on a list
 containing only this pollable.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_pollable.block.self"><code>self</code></a>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_pollable_block.self"></a><code>self</code>: borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="poll"><code>poll: func</code></a></h4>
+<h4><a name="poll"></a><code>poll: func</code></h4>
 <p>Poll for completion on a set of pollables.</p>
 <p>This function takes a list of pollables, which identify I/O sources of
 interest, and waits until one or more of the events is ready for I/O.</p>
 <p>The result <code>list&lt;u32&gt;</code> contains one or more indices of handles in the
 argument list that is ready for I/O.</p>
-<p>If the list contains more elements than can be indexed with a <code>u32</code>
-value, this function traps.</p>
+<p>This function traps if either:</p>
+<ul>
+<li>the list is empty, or:</li>
+<li>the list contains more elements than can be indexed with a <code>u32</code> value.</li>
+</ul>
 <p>A timeout can be implemented by adding a pollable from the
 wasi-clocks API to the list.</p>
 <p>This function does not return a <code>result</code>; polling in itself does not
 do any I/O so it doesn't fail. If any of the I/O sources identified by
 the pollables has an error, it is indicated by marking the source as
-being reaedy for I/O.</p>
+being ready for I/O.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="poll.in"><code>in</code></a>: list&lt;borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;&gt;</li>
+<li><a name="poll.in"></a><code>in</code>: list&lt;borrow&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="poll.0"></a> list&lt;<code>u32</code>&gt;</li>
 </ul>
-<h2><a name="wasi:io_streams_0.2.0">Import interface wasi:io/streams@0.2.0</a></h2>
+<h2><a name="wasi_io_streams_0_2_0"></a>Import interface wasi:io/streams@0.2.0</h2>
 <p>WASI I/O is an I/O abstraction API which is currently focused on providing
 stream types.</p>
 <p>In the future, the component model is expected to add built-in stream types;
 when it does, they are expected to subsume this API.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="error"><code>type error</code></a></h4>
+<h4><a name="error"></a><code>type error</code></h4>
 <p><a href="#error"><a href="#error"><code>error</code></a></a></p>
 <p>
-#### <a name="pollable">`type pollable`</a>
+#### <a name="pollable"></a>`type pollable`
 [`pollable`](#pollable)
 <p>
-#### <a name="stream_error">`variant stream-error`</a>
+#### <a name="stream_error"></a>`variant stream-error`
 <p>An error for input-stream and output-stream operations.</p>
 <h5>Variant Cases</h5>
 <ul>
 <li>
-<p><a name="stream_error.last_operation_failed"><code>last-operation-failed</code></a>: own&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</p>
+<p><a name="stream_error.last_operation_failed"></a><code>last-operation-failed</code>: own&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</p>
 <p>The last operation (a write or flush) failed before completion.
 <p>More information is available in the <a href="#error"><code>error</code></a> payload.</p>
 </li>
 <li>
-<p><a name="stream_error.closed"><code>closed</code></a></p>
+<p><a name="stream_error.closed"></a><code>closed</code></p>
 <p>The stream is closed: no more input will be accepted by the
 stream. A closed output-stream will return this error on all
 future operations.
 </li>
 </ul>
-<h4><a name="input_stream"><code>resource input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>resource input-stream</code></h4>
 <p>An input bytestream.</p>
 <p><a href="#input_stream"><code>input-stream</code></a>s are <em>non-blocking</em> to the extent practical on underlying
 platforms. I/O operations always return promptly; if fewer bytes are
@@ -190,7 +191,7 @@ promptly available than requested, they return the number of bytes promptly
 available, which could even be zero. To wait for data to be available,
 use the <code>subscribe</code> function to obtain a <a href="#pollable"><code>pollable</code></a> which can be polled
 for using <code>wasi:io/poll</code>.</p>
-<h4><a name="output_stream"><code>resource output-stream</code></a></h4>
+<h4><a name="output_stream"></a><code>resource output-stream</code></h4>
 <p>An output bytestream.</p>
 <h2><a href="#output_stream"><code>output-stream</code></a>s are <em>non-blocking</em> to the extent practical on
 underlying platforms. Except where specified otherwise, I/O operations also
@@ -199,7 +200,7 @@ promptly, which could even be zero. To wait for the stream to be ready to
 accept data, the <code>subscribe</code> function to obtain a <a href="#pollable"><code>pollable</code></a> which can be
 polled for using <code>wasi:io/poll</code>.</h2>
 <h3>Functions</h3>
-<h4><a name="method_input_stream.read"><code>[method]input-stream.read: func</code></a></h4>
+<h4><a name="method_input_stream_read"></a><code>[method]input-stream.read: func</code></h4>
 <p>Perform a non-blocking read from the stream.</p>
 <p>When the source of a <code>read</code> is binary data, the bytes from the source
 are returned verbatim. When the source of a <code>read</code> is known to the
@@ -223,51 +224,51 @@ as a return value by the callee. The callee may return a list of bytes
 less than <code>len</code> in size while more bytes are available for reading.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.read.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.read.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_read.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_read.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.blocking_read"><code>[method]input-stream.blocking-read: func</code></a></h4>
+<h4><a name="method_input_stream_blocking_read"></a><code>[method]input-stream.blocking-read: func</code></h4>
 <p>Read bytes from a stream, after blocking until at least one byte can
 be read. Except for blocking, behavior is identical to <code>read</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.blocking_read.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.blocking_read.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_blocking_read.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_read.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.blocking_read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_read.0"></a> result&lt;list&lt;<code>u8</code>&gt;, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.skip"><code>[method]input-stream.skip: func</code></a></h4>
+<h4><a name="method_input_stream_skip"></a><code>[method]input-stream.skip: func</code></h4>
 <p>Skip bytes from a stream. Returns number of bytes skipped.</p>
 <p>Behaves identical to <code>read</code>, except instead of returning a list
 of bytes, returns the number of bytes consumed from the stream.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.skip.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.skip.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_skip.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_skip.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.blocking_skip"><code>[method]input-stream.blocking-skip: func</code></a></h4>
+<h4><a name="method_input_stream_blocking_skip"></a><code>[method]input-stream.blocking-skip: func</code></h4>
 <p>Skip bytes from a stream, after blocking until at least one byte
 can be skipped. Except for blocking behavior, identical to <code>skip</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.blocking_skip.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_input_stream.blocking_skip.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_input_stream_blocking_skip.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_skip.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.blocking_skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_input_stream_blocking_skip.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_input_stream.subscribe"><code>[method]input-stream.subscribe: func</code></a></h4>
+<h4><a name="method_input_stream_subscribe"></a><code>[method]input-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once either the specified stream
 has bytes available to read or the other end of the stream has been
 closed.
@@ -276,13 +277,13 @@ Implementations may trap if the <a href="#input_stream"><code>input-stream</code
 all derived <a href="#pollable"><code>pollable</code></a>s created with this function are dropped.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_input_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_input_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_input_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_input_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.check_write"><code>[method]output-stream.check-write: func</code></a></h4>
+<h4><a name="method_output_stream_check_write"></a><code>[method]output-stream.check-write: func</code></h4>
 <p>Check readiness for writing. This function never blocks.</p>
 <p>Returns the number of bytes permitted for the next call to <code>write</code>,
 or an error. Calling <code>write</code> with more bytes than this function has
@@ -292,13 +293,13 @@ become ready when this function will report at least 1 byte, or an
 error.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.check_write.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_check_write.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.check_write.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_check_write.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.write"><code>[method]output-stream.write: func</code></a></h4>
+<h4><a name="method_output_stream_write"></a><code>[method]output-stream.write: func</code></h4>
 <p>Perform a write. This function never blocks.</p>
 <p>When the destination of a <code>write</code> is binary data, the bytes from
 <code>contents</code> are written verbatim. When the destination of a <code>write</code> is
@@ -311,14 +312,14 @@ length of less than or equal to n. Otherwise, this function will trap.</p>
 the last call to check-write provided a permit.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.write.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.write.contents"><code>contents</code></a>: list&lt;<code>u8</code>&gt;</li>
+<li><a name="method_output_stream_write.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write.contents"></a><code>contents</code>: list&lt;<code>u8</code>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.write.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_write_and_flush"><code>[method]output-stream.blocking-write-and-flush: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_write_and_flush"></a><code>[method]output-stream.blocking-write-and-flush: func</code></h4>
 <p>Perform a write of up to 4096 bytes, and then flush the stream. Block
 until all of these operations are complete, or an error occurs.</p>
 <p>This is a convenience wrapper around the use of <code>check-write</code>,
@@ -342,14 +343,14 @@ let _ = this.check-write();         // eliding error handling
 </code></pre>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_and_flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_write_and_flush.contents"><code>contents</code></a>: list&lt;<code>u8</code>&gt;</li>
+<li><a name="method_output_stream_blocking_write_and_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_and_flush.contents"></a><code>contents</code>: list&lt;<code>u8</code>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.flush"><code>[method]output-stream.flush: func</code></a></h4>
+<h4><a name="method_output_stream_flush"></a><code>[method]output-stream.flush: func</code></h4>
 <p>Request to flush buffered output. This function never blocks.</p>
 <p>This tells the output-stream that the caller intends any buffered
 output to be flushed. the output which is expected to be flushed
@@ -360,24 +361,24 @@ completed. The <code>subscribe</code> pollable will become ready when the
 flush has completed and the stream can accept more writes.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_flush"><code>[method]output-stream.blocking-flush: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_flush"></a><code>[method]output-stream.blocking-flush: func</code></h4>
 <p>Request to flush buffered output, and block until flush completes
 and stream is ready for writing again.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.subscribe"><code>[method]output-stream.subscribe: func</code></a></h4>
+<h4><a name="method_output_stream_subscribe"></a><code>[method]output-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the output-stream
 is ready for more writing, or an error has occured. When this
 pollable is ready, <code>check-write</code> will return <code>ok(n)</code> with n&gt;0, or an
@@ -388,13 +389,13 @@ Implementations may trap if the <a href="#output_stream"><code>output-stream</co
 all derived <a href="#pollable"><code>pollable</code></a>s created with this function are dropped.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_output_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.write_zeroes"><code>[method]output-stream.write-zeroes: func</code></a></h4>
+<h4><a name="method_output_stream_write_zeroes"></a><code>[method]output-stream.write-zeroes: func</code></h4>
 <p>Write zeroes to a stream.</p>
 <p>This should be used precisely like <code>write</code> with the exact same
 preconditions (must use check-write first), but instead of
@@ -402,14 +403,14 @@ passing a list of bytes, you simply pass the number of zero-bytes
 that should be written.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.write_zeroes.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.write_zeroes.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_write_zeroes.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write_zeroes.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.write_zeroes.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_write_zeroes.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_write_zeroes_and_flush"><code>[method]output-stream.blocking-write-zeroes-and-flush: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_write_zeroes_and_flush"></a><code>[method]output-stream.blocking-write-zeroes-and-flush: func</code></h4>
 <p>Perform a write of up to 4096 zeroes, and then flush the stream.
 Block until all of these operations are complete, or an error
 occurs.</p>
@@ -433,14 +434,14 @@ let _ = this.check-write();         // eliding error handling
 </code></pre>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_zeroes_and_flush.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_write_zeroes_and_flush.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_blocking_write_zeroes_and_flush.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_zeroes_and_flush.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_write_zeroes_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_write_zeroes_and_flush.0"></a> result&lt;_, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.splice"><code>[method]output-stream.splice: func</code></a></h4>
+<h4><a name="method_output_stream_splice"></a><code>[method]output-stream.splice: func</code></h4>
 <p>Read from one stream and write to another.</p>
 <p>The behavior of splice is equivelant to:</p>
 <ol>
@@ -455,161 +456,160 @@ let _ = this.check-write();         // eliding error handling
 than <code>len</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.splice.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.splice.src"><code>src</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.splice.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_splice.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_splice.src"></a><code>src</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_splice.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_output_stream.blocking_splice"><code>[method]output-stream.blocking-splice: func</code></a></h4>
+<h4><a name="method_output_stream_blocking_splice"></a><code>[method]output-stream.blocking-splice: func</code></h4>
 <p>Read from one stream and write to another, with blocking.</p>
 <p>This is similar to <code>splice</code>, except that it blocks until the
 <a href="#output_stream"><code>output-stream</code></a> is ready for writing, and the <a href="#input_stream"><code>input-stream</code></a>
 is ready for reading, before performing the <code>splice</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_output_stream.blocking_splice.self"><code>self</code></a>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_splice.src"><code>src</code></a>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
-<li><a name="method_output_stream.blocking_splice.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="method_output_stream_blocking_splice.self"></a><code>self</code>: borrow&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_splice.src"></a><code>src</code>: borrow&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_splice.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_output_stream.blocking_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
+<li><a name="method_output_stream_blocking_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_stdin_0.2.0">Import interface wasi:cli/stdin@0.2.0</a></h2>
+<h2><a name="wasi_cli_stdin_0_2_0"></a>Import interface wasi:cli/stdin@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="input_stream"><code>type input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>type input-stream</code></h4>
 <p><a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_stdin"><code>get-stdin: func</code></a></h4>
+<h4><a name="get_stdin"></a><code>get-stdin: func</code></h4>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_stdin.0"></a> own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_stdout_0.2.0">Import interface wasi:cli/stdout@0.2.0</a></h2>
+<h2><a name="wasi_cli_stdout_0_2_0"></a>Import interface wasi:cli/stdout@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="output_stream"><code>type output-stream</code></a></h4>
+<h4><a name="output_stream"></a><code>type output-stream</code></h4>
 <p><a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_stdout"><code>get-stdout: func</code></a></h4>
+<h4><a name="get_stdout"></a><code>get-stdout: func</code></h4>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_stdout.0"></a> own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_stderr_0.2.0">Import interface wasi:cli/stderr@0.2.0</a></h2>
+<h2><a name="wasi_cli_stderr_0_2_0"></a>Import interface wasi:cli/stderr@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="output_stream"><code>type output-stream</code></a></h4>
+<h4><a name="output_stream"></a><code>type output-stream</code></h4>
 <p><a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_stderr"><code>get-stderr: func</code></a></h4>
+<h4><a name="get_stderr"></a><code>get-stderr: func</code></h4>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_stderr.0"></a> own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:cli_terminal_input_0.2.0">Import interface wasi:cli/terminal-input@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_input_0_2_0"></a>Import interface wasi:cli/terminal-input@0.2.0</h2>
 <p>Terminal input.</p>
 <p>In the future, this may include functions for disabling echoing,
 disabling input buffering so that keyboard events are sent through
 immediately, querying supported features, and so on.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_input"><code>resource terminal-input</code></a></h4>
+<h4><a name="terminal_input"></a><code>resource terminal-input</code></h4>
 <p>The input side of a terminal.</p>
-<h2><a name="wasi:cli_terminal_output_0.2.0">Import interface wasi:cli/terminal-output@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_output_0_2_0"></a>Import interface wasi:cli/terminal-output@0.2.0</h2>
 <p>Terminal output.</p>
 <p>In the future, this may include functions for querying the terminal
 size, being notified of terminal size changes, querying supported
 features, and so on.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_output"><code>resource terminal-output</code></a></h4>
+<h4><a name="terminal_output"></a><code>resource terminal-output</code></h4>
 <p>The output side of a terminal.</p>
-<h2><a name="wasi:cli_terminal_stdin_0.2.0">Import interface wasi:cli/terminal-stdin@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_stdin_0_2_0"></a>Import interface wasi:cli/terminal-stdin@0.2.0</h2>
 <p>An interface providing an optional <a href="#terminal_input"><code>terminal-input</code></a> for stdin as a
 link-time authority.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_input"><code>type terminal-input</code></a></h4>
+<h4><a name="terminal_input"></a><code>type terminal-input</code></h4>
 <p><a href="#terminal_input"><a href="#terminal_input"><code>terminal-input</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_terminal_stdin"><code>get-terminal-stdin: func</code></a></h4>
+<h4><a name="get_terminal_stdin"></a><code>get-terminal-stdin: func</code></h4>
 <p>If stdin is connected to a terminal, return a <a href="#terminal_input"><code>terminal-input</code></a> handle
 allowing further interaction with it.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_terminal_stdin.0"></a> option&lt;own&lt;<a href="#terminal_input"><a href="#terminal_input"><code>terminal-input</code></a></a>&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:cli_terminal_stdout_0.2.0">Import interface wasi:cli/terminal-stdout@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_stdout_0_2_0"></a>Import interface wasi:cli/terminal-stdout@0.2.0</h2>
 <p>An interface providing an optional <a href="#terminal_output"><code>terminal-output</code></a> for stdout as a
 link-time authority.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_output"><code>type terminal-output</code></a></h4>
+<h4><a name="terminal_output"></a><code>type terminal-output</code></h4>
 <p><a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_terminal_stdout"><code>get-terminal-stdout: func</code></a></h4>
+<h4><a name="get_terminal_stdout"></a><code>get-terminal-stdout: func</code></h4>
 <p>If stdout is connected to a terminal, return a <a href="#terminal_output"><code>terminal-output</code></a> handle
 allowing further interaction with it.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_terminal_stdout.0"></a> option&lt;own&lt;<a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a>&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:cli_terminal_stderr_0.2.0">Import interface wasi:cli/terminal-stderr@0.2.0</a></h2>
+<h2><a name="wasi_cli_terminal_stderr_0_2_0"></a>Import interface wasi:cli/terminal-stderr@0.2.0</h2>
 <p>An interface providing an optional <a href="#terminal_output"><code>terminal-output</code></a> for stderr as a
 link-time authority.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="terminal_output"><code>type terminal-output</code></a></h4>
+<h4><a name="terminal_output"></a><code>type terminal-output</code></h4>
 <p><a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_terminal_stderr"><code>get-terminal-stderr: func</code></a></h4>
+<h4><a name="get_terminal_stderr"></a><code>get-terminal-stderr: func</code></h4>
 <p>If stderr is connected to a terminal, return a <a href="#terminal_output"><code>terminal-output</code></a> handle
 allowing further interaction with it.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_terminal_stderr.0"></a> option&lt;own&lt;<a href="#terminal_output"><a href="#terminal_output"><code>terminal-output</code></a></a>&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:clocks_monotonic_clock_0.2.0">Import interface wasi:clocks/monotonic-clock@0.2.0</a></h2>
+<h2><a name="wasi_clocks_monotonic_clock_0_2_0"></a>Import interface wasi:clocks/monotonic-clock@0.2.0</h2>
 <p>WASI Monotonic Clock is a clock API intended to let users measure elapsed
 time.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <p>A monotonic clock is a clock which has an unspecified initial value, and
 successive reads of the clock will produce non-decreasing values.</p>
-<p>It is intended for measuring elapsed time.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>type pollable</code></a></h4>
+<h4><a name="pollable"></a><code>type pollable</code></h4>
 <p><a href="#pollable"><a href="#pollable"><code>pollable</code></a></a></p>
 <p>
-#### <a name="instant">`type instant`</a>
+#### <a name="instant"></a>`type instant`
 `u64`
 <p>An instant in time, in nanoseconds. An instant is relative to an
 unspecified initial value, and can only be compared to instances from
 the same monotonic-clock.
-<h4><a name="duration"><code>type duration</code></a></h4>
+<h4><a name="duration"></a><code>type duration</code></h4>
 <p><code>u64</code></p>
 <p>A duration of time, in nanoseconds.
 <hr />
 <h3>Functions</h3>
-<h4><a name="now"><code>now: func</code></a></h4>
+<h4><a name="now"></a><code>now: func</code></h4>
 <p>Read the current value of the clock.</p>
 <p>The clock is monotonic, therefore calling this function repeatedly will
 produce a sequence of non-decreasing values.</p>
@@ -617,37 +617,36 @@ produce a sequence of non-decreasing values.</p>
 <ul>
 <li><a name="now.0"></a> <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
 </ul>
-<h4><a name="resolution"><code>resolution: func</code></a></h4>
+<h4><a name="resolution"></a><code>resolution: func</code></h4>
 <p>Query the resolution of the clock. Returns the duration of time
 corresponding to a clock tick.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="resolution.0"></a> <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
-<h4><a name="subscribe_instant"><code>subscribe-instant: func</code></a></h4>
+<h4><a name="subscribe_instant"></a><code>subscribe-instant: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the specified instant
-occured.</p>
+has occured.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="subscribe_instant.when"><code>when</code></a>: <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
+<li><a name="subscribe_instant.when"></a><code>when</code>: <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="subscribe_instant.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="subscribe_duration"><code>subscribe-duration: func</code></a></h4>
-<p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the given duration has
-elapsed, starting at the time at which this function was called.
-occured.</p>
+<h4><a name="subscribe_duration"></a><code>subscribe-duration: func</code></h4>
+<p>Create a <a href="#pollable"><code>pollable</code></a> that will resolve after the specified duration has
+elapsed from the time this function is invoked.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="subscribe_duration.when"><code>when</code></a>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
+<li><a name="subscribe_duration.when"></a><code>when</code>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="subscribe_duration.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:clocks_wall_clock_0.2.0">Import interface wasi:clocks/wall-clock@0.2.0</a></h2>
+<h2><a name="wasi_clocks_wall_clock_0_2_0"></a>Import interface wasi:clocks/wall-clock@0.2.0</h2>
 <p>WASI Wall Clock is a clock API intended to let users query the current
 time. The name &quot;wall&quot; makes an analogy to a &quot;clock on the wall&quot;, which
 is not necessarily monotonic as it may be reset.</p>
@@ -660,16 +659,16 @@ monotonic, making it unsuitable for measuring elapsed time.</p>
 <p>It is intended for reporting the current date and time for humans.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="datetime"><code>record datetime</code></a></h4>
+<h4><a name="datetime"></a><code>record datetime</code></h4>
 <p>A time and date in seconds plus nanoseconds.</p>
 <h5>Record Fields</h5>
 <ul>
-<li><a name="datetime.seconds"><code>seconds</code></a>: <code>u64</code></li>
-<li><a name="datetime.nanoseconds"><code>nanoseconds</code></a>: <code>u32</code></li>
+<li><a name="datetime.seconds"></a><code>seconds</code>: <code>u64</code></li>
+<li><a name="datetime.nanoseconds"></a><code>nanoseconds</code>: <code>u32</code></li>
 </ul>
 <hr />
 <h3>Functions</h3>
-<h4><a name="now"><code>now: func</code></a></h4>
+<h4><a name="now"></a><code>now: func</code></h4>
 <p>Read the current value of the clock.</p>
 <p>This clock is not monotonic, therefore calling this function repeatedly
 will not necessarily produce a sequence of non-decreasing values.</p>
@@ -681,14 +680,14 @@ also known as <a href="https://en.wikipedia.org/wiki/Unix_time">Unix Time</a>.</
 <ul>
 <li><a name="now.0"></a> <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
-<h4><a name="resolution"><code>resolution: func</code></a></h4>
+<h4><a name="resolution"></a><code>resolution: func</code></h4>
 <p>Query the resolution of the clock.</p>
 <p>The nanoseconds field of the output is always less than 1000000000.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="resolution.0"></a> <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
-<h2><a name="wasi:filesystem_types_0.2.0">Import interface wasi:filesystem/types@0.2.0</a></h2>
+<h2><a name="wasi_filesystem_types_0_2_0"></a>Import interface wasi:filesystem/types@0.2.0</h2>
 <p>WASI filesystem is a filesystem API primarily intended to let users run WASI
 programs that access their files on their existing filesystems, without
 significant overhead.</p>
@@ -708,75 +707,75 @@ underlying filesystem, the function fails with <a href="#error_code.not_permitte
 <a href="https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md">WASI filesystem path resolution</a>.</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="input_stream"><code>type input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>type input-stream</code></h4>
 <p><a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a></p>
 <p>
-#### <a name="output_stream">`type output-stream`</a>
+#### <a name="output_stream"></a>`type output-stream`
 [`output-stream`](#output_stream)
 <p>
-#### <a name="error">`type error`</a>
+#### <a name="error"></a>`type error`
 [`error`](#error)
 <p>
-#### <a name="datetime">`type datetime`</a>
+#### <a name="datetime"></a>`type datetime`
 [`datetime`](#datetime)
 <p>
-#### <a name="filesize">`type filesize`</a>
+#### <a name="filesize"></a>`type filesize`
 `u64`
 <p>File size or length of a region within a file.
-<h4><a name="descriptor_type"><code>enum descriptor-type</code></a></h4>
+<h4><a name="descriptor_type"></a><code>enum descriptor-type</code></h4>
 <p>The type of a filesystem object referenced by a descriptor.</p>
 <p>Note: This was called <code>filetype</code> in earlier versions of WASI.</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="descriptor_type.unknown"><code>unknown</code></a></p>
+<p><a name="descriptor_type.unknown"></a><code>unknown</code></p>
 <p>The type of the descriptor or file is unknown or is different from
 any of the other types specified.
 </li>
 <li>
-<p><a name="descriptor_type.block_device"><code>block-device</code></a></p>
+<p><a name="descriptor_type.block_device"></a><code>block-device</code></p>
 <p>The descriptor refers to a block device inode.
 </li>
 <li>
-<p><a name="descriptor_type.character_device"><code>character-device</code></a></p>
+<p><a name="descriptor_type.character_device"></a><code>character-device</code></p>
 <p>The descriptor refers to a character device inode.
 </li>
 <li>
-<p><a name="descriptor_type.directory"><code>directory</code></a></p>
+<p><a name="descriptor_type.directory"></a><code>directory</code></p>
 <p>The descriptor refers to a directory inode.
 </li>
 <li>
-<p><a name="descriptor_type.fifo"><code>fifo</code></a></p>
+<p><a name="descriptor_type.fifo"></a><code>fifo</code></p>
 <p>The descriptor refers to a named pipe.
 </li>
 <li>
-<p><a name="descriptor_type.symbolic_link"><code>symbolic-link</code></a></p>
+<p><a name="descriptor_type.symbolic_link"></a><code>symbolic-link</code></p>
 <p>The file refers to a symbolic link inode.
 </li>
 <li>
-<p><a name="descriptor_type.regular_file"><code>regular-file</code></a></p>
+<p><a name="descriptor_type.regular_file"></a><code>regular-file</code></p>
 <p>The descriptor refers to a regular file inode.
 </li>
 <li>
-<p><a name="descriptor_type.socket"><code>socket</code></a></p>
+<p><a name="descriptor_type.socket"></a><code>socket</code></p>
 <p>The descriptor refers to a socket.
 </li>
 </ul>
-<h4><a name="descriptor_flags"><code>flags descriptor-flags</code></a></h4>
+<h4><a name="descriptor_flags"></a><code>flags descriptor-flags</code></h4>
 <p>Descriptor flags.</p>
 <p>Note: This was called <code>fdflags</code> in earlier versions of WASI.</p>
 <h5>Flags members</h5>
 <ul>
 <li>
-<p><a name="descriptor_flags.read"><code>read</code></a>: </p>
+<p><a name="descriptor_flags.read"></a><code>read</code>: </p>
 <p>Read mode: Data can be read.
 </li>
 <li>
-<p><a name="descriptor_flags.write"><code>write</code></a>: </p>
+<p><a name="descriptor_flags.write"></a><code>write</code>: </p>
 <p>Write mode: Data can be written to.
 </li>
 <li>
-<p><a name="descriptor_flags.file_integrity_sync"><code>file-integrity-sync</code></a>: </p>
+<p><a name="descriptor_flags.file_integrity_sync"></a><code>file-integrity-sync</code>: </p>
 <p>Request that writes be performed according to synchronized I/O file
 integrity completion. The data stored in the file and the file's
 metadata are synchronized. This is similar to `O_SYNC` in POSIX.
@@ -785,7 +784,7 @@ WASI. At this time, it should be interpreted as a request, and not a
 requirement.</p>
 </li>
 <li>
-<p><a name="descriptor_flags.data_integrity_sync"><code>data-integrity-sync</code></a>: </p>
+<p><a name="descriptor_flags.data_integrity_sync"></a><code>data-integrity-sync</code>: </p>
 <p>Request that writes be performed according to synchronized I/O data
 integrity completion. Only the data stored in the file is
 synchronized. This is similar to `O_DSYNC` in POSIX.
@@ -794,7 +793,7 @@ WASI. At this time, it should be interpreted as a request, and not a
 requirement.</p>
 </li>
 <li>
-<p><a name="descriptor_flags.requested_write_sync"><code>requested-write-sync</code></a>: </p>
+<p><a name="descriptor_flags.requested_write_sync"></a><code>requested-write-sync</code>: </p>
 <p>Requests that reads be performed at the same level of integrety
 requested for writes. This is similar to `O_RSYNC` in POSIX.
 <p>The precise semantics of this operation have not yet been defined for
@@ -802,7 +801,7 @@ WASI. At this time, it should be interpreted as a request, and not a
 requirement.</p>
 </li>
 <li>
-<p><a name="descriptor_flags.mutate_directory"><code>mutate-directory</code></a>: </p>
+<p><a name="descriptor_flags.mutate_directory"></a><code>mutate-directory</code>: </p>
 <p>Mutating directories mode: Directory contents may be mutated.
 <p>When this flag is unset on a descriptor, operations using the
 descriptor which would create, rename, delete, modify the data or
@@ -812,107 +811,107 @@ they would otherwise succeed.</p>
 <p>This may only be set on directories.</p>
 </li>
 </ul>
-<h4><a name="path_flags"><code>flags path-flags</code></a></h4>
+<h4><a name="path_flags"></a><code>flags path-flags</code></h4>
 <p>Flags determining the method of how paths are resolved.</p>
 <h5>Flags members</h5>
 <ul>
-<li><a name="path_flags.symlink_follow"><code>symlink-follow</code></a>: <p>As long as the resolved path corresponds to a symbolic link, it is
+<li><a name="path_flags.symlink_follow"></a><code>symlink-follow</code>: <p>As long as the resolved path corresponds to a symbolic link, it is
 expanded.
 </li>
 </ul>
-<h4><a name="open_flags"><code>flags open-flags</code></a></h4>
+<h4><a name="open_flags"></a><code>flags open-flags</code></h4>
 <p>Open flags used by <code>open-at</code>.</p>
 <h5>Flags members</h5>
 <ul>
 <li>
-<p><a name="open_flags.create"><code>create</code></a>: </p>
+<p><a name="open_flags.create"></a><code>create</code>: </p>
 <p>Create file if it does not exist, similar to `O_CREAT` in POSIX.
 </li>
 <li>
-<p><a name="open_flags.directory"><code>directory</code></a>: </p>
+<p><a name="open_flags.directory"></a><code>directory</code>: </p>
 <p>Fail if not a directory, similar to `O_DIRECTORY` in POSIX.
 </li>
 <li>
-<p><a name="open_flags.exclusive"><code>exclusive</code></a>: </p>
+<p><a name="open_flags.exclusive"></a><code>exclusive</code>: </p>
 <p>Fail if file already exists, similar to `O_EXCL` in POSIX.
 </li>
 <li>
-<p><a name="open_flags.truncate"><code>truncate</code></a>: </p>
+<p><a name="open_flags.truncate"></a><code>truncate</code>: </p>
 <p>Truncate file to size 0, similar to `O_TRUNC` in POSIX.
 </li>
 </ul>
-<h4><a name="link_count"><code>type link-count</code></a></h4>
+<h4><a name="link_count"></a><code>type link-count</code></h4>
 <p><code>u64</code></p>
 <p>Number of hard links to an inode.
-<h4><a name="descriptor_stat"><code>record descriptor-stat</code></a></h4>
+<h4><a name="descriptor_stat"></a><code>record descriptor-stat</code></h4>
 <p>File attributes.</p>
 <p>Note: This was called <code>filestat</code> in earlier versions of WASI.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="descriptor_stat.type"><code>type</code></a>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
+<p><a name="descriptor_stat.type"></a><code>type</code>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
 <p>File type.
 </li>
 <li>
-<p><a name="descriptor_stat.link_count"><a href="#link_count"><code>link-count</code></a></a>: <a href="#link_count"><a href="#link_count"><code>link-count</code></a></a></p>
+<p><a name="descriptor_stat.link_count"></a><a href="#link_count"><code>link-count</code></a>: <a href="#link_count"><a href="#link_count"><code>link-count</code></a></a></p>
 <p>Number of hard links to the file.
 </li>
 <li>
-<p><a name="descriptor_stat.size"><code>size</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></p>
+<p><a name="descriptor_stat.size"></a><code>size</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></p>
 <p>For regular files, the file size in bytes. For symbolic links, the
 length in bytes of the pathname contained in the symbolic link.
 </li>
 <li>
-<p><a name="descriptor_stat.data_access_timestamp"><code>data-access-timestamp</code></a>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
+<p><a name="descriptor_stat.data_access_timestamp"></a><code>data-access-timestamp</code>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
 <p>Last data access timestamp.
 <p>If the <code>option</code> is none, the platform doesn't maintain an access
 timestamp for this file.</p>
 </li>
 <li>
-<p><a name="descriptor_stat.data_modification_timestamp"><code>data-modification-timestamp</code></a>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
+<p><a name="descriptor_stat.data_modification_timestamp"></a><code>data-modification-timestamp</code>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
 <p>Last data modification timestamp.
 <p>If the <code>option</code> is none, the platform doesn't maintain a
 modification timestamp for this file.</p>
 </li>
 <li>
-<p><a name="descriptor_stat.status_change_timestamp"><code>status-change-timestamp</code></a>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
+<p><a name="descriptor_stat.status_change_timestamp"></a><code>status-change-timestamp</code>: option&lt;<a href="#datetime"><a href="#datetime"><code>datetime</code></a></a>&gt;</p>
 <p>Last file status-change timestamp.
 <p>If the <code>option</code> is none, the platform doesn't maintain a
 status-change timestamp for this file.</p>
 </li>
 </ul>
-<h4><a name="new_timestamp"><code>variant new-timestamp</code></a></h4>
+<h4><a name="new_timestamp"></a><code>variant new-timestamp</code></h4>
 <p>When setting a timestamp, this gives the value to set it to.</p>
 <h5>Variant Cases</h5>
 <ul>
 <li>
-<p><a name="new_timestamp.no_change"><code>no-change</code></a></p>
+<p><a name="new_timestamp.no_change"></a><code>no-change</code></p>
 <p>Leave the timestamp set to its previous value.
 </li>
 <li>
-<p><a name="new_timestamp.now"><a href="#now"><code>now</code></a></a></p>
+<p><a name="new_timestamp.now"></a><a href="#now"><code>now</code></a></p>
 <p>Set the timestamp to the current time of the system clock associated
 with the filesystem.
 </li>
 <li>
-<p><a name="new_timestamp.timestamp"><code>timestamp</code></a>: <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></p>
+<p><a name="new_timestamp.timestamp"></a><code>timestamp</code>: <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></p>
 <p>Set the timestamp to the given value.
 </li>
 </ul>
-<h4><a name="directory_entry"><code>record directory-entry</code></a></h4>
+<h4><a name="directory_entry"></a><code>record directory-entry</code></h4>
 <p>A directory entry.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="directory_entry.type"><code>type</code></a>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
+<p><a name="directory_entry.type"></a><code>type</code>: <a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a></p>
 <p>The type of the file referred to by this directory entry.
 </li>
 <li>
-<p><a name="directory_entry.name"><code>name</code></a>: <code>string</code></p>
+<p><a name="directory_entry.name"></a><code>name</code>: <code>string</code></p>
 <p>The name of the object.
 </li>
 </ul>
-<h4><a name="error_code"><code>enum error-code</code></a></h4>
+<h4><a name="error_code"></a><code>enum error-code</code></h4>
 <p>Error codes returned by functions, similar to <code>errno</code> in POSIX.
 Not all of these error codes are returned by the functions provided by this
 API; some are used in higher-level library layers, and others are provided
@@ -920,211 +919,211 @@ merely for alignment with POSIX.</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="error_code.access"><code>access</code></a></p>
+<p><a name="error_code.access"></a><code>access</code></p>
 <p>Permission denied, similar to `EACCES` in POSIX.
 </li>
 <li>
-<p><a name="error_code.would_block"><code>would-block</code></a></p>
+<p><a name="error_code.would_block"></a><code>would-block</code></p>
 <p>Resource unavailable, or operation would block, similar to `EAGAIN` and `EWOULDBLOCK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.already"><code>already</code></a></p>
+<p><a name="error_code.already"></a><code>already</code></p>
 <p>Connection already in progress, similar to `EALREADY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.bad_descriptor"><code>bad-descriptor</code></a></p>
+<p><a name="error_code.bad_descriptor"></a><code>bad-descriptor</code></p>
 <p>Bad descriptor, similar to `EBADF` in POSIX.
 </li>
 <li>
-<p><a name="error_code.busy"><code>busy</code></a></p>
+<p><a name="error_code.busy"></a><code>busy</code></p>
 <p>Device or resource busy, similar to `EBUSY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.deadlock"><code>deadlock</code></a></p>
+<p><a name="error_code.deadlock"></a><code>deadlock</code></p>
 <p>Resource deadlock would occur, similar to `EDEADLK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.quota"><code>quota</code></a></p>
+<p><a name="error_code.quota"></a><code>quota</code></p>
 <p>Storage quota exceeded, similar to `EDQUOT` in POSIX.
 </li>
 <li>
-<p><a name="error_code.exist"><code>exist</code></a></p>
+<p><a name="error_code.exist"></a><code>exist</code></p>
 <p>File exists, similar to `EEXIST` in POSIX.
 </li>
 <li>
-<p><a name="error_code.file_too_large"><code>file-too-large</code></a></p>
+<p><a name="error_code.file_too_large"></a><code>file-too-large</code></p>
 <p>File too large, similar to `EFBIG` in POSIX.
 </li>
 <li>
-<p><a name="error_code.illegal_byte_sequence"><code>illegal-byte-sequence</code></a></p>
+<p><a name="error_code.illegal_byte_sequence"></a><code>illegal-byte-sequence</code></p>
 <p>Illegal byte sequence, similar to `EILSEQ` in POSIX.
 </li>
 <li>
-<p><a name="error_code.in_progress"><code>in-progress</code></a></p>
+<p><a name="error_code.in_progress"></a><code>in-progress</code></p>
 <p>Operation in progress, similar to `EINPROGRESS` in POSIX.
 </li>
 <li>
-<p><a name="error_code.interrupted"><code>interrupted</code></a></p>
+<p><a name="error_code.interrupted"></a><code>interrupted</code></p>
 <p>Interrupted function, similar to `EINTR` in POSIX.
 </li>
 <li>
-<p><a name="error_code.invalid"><code>invalid</code></a></p>
+<p><a name="error_code.invalid"></a><code>invalid</code></p>
 <p>Invalid argument, similar to `EINVAL` in POSIX.
 </li>
 <li>
-<p><a name="error_code.io"><code>io</code></a></p>
+<p><a name="error_code.io"></a><code>io</code></p>
 <p>I/O error, similar to `EIO` in POSIX.
 </li>
 <li>
-<p><a name="error_code.is_directory"><code>is-directory</code></a></p>
+<p><a name="error_code.is_directory"></a><code>is-directory</code></p>
 <p>Is a directory, similar to `EISDIR` in POSIX.
 </li>
 <li>
-<p><a name="error_code.loop"><code>loop</code></a></p>
+<p><a name="error_code.loop"></a><code>loop</code></p>
 <p>Too many levels of symbolic links, similar to `ELOOP` in POSIX.
 </li>
 <li>
-<p><a name="error_code.too_many_links"><code>too-many-links</code></a></p>
+<p><a name="error_code.too_many_links"></a><code>too-many-links</code></p>
 <p>Too many links, similar to `EMLINK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.message_size"><code>message-size</code></a></p>
+<p><a name="error_code.message_size"></a><code>message-size</code></p>
 <p>Message too large, similar to `EMSGSIZE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.name_too_long"><code>name-too-long</code></a></p>
+<p><a name="error_code.name_too_long"></a><code>name-too-long</code></p>
 <p>Filename too long, similar to `ENAMETOOLONG` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_device"><code>no-device</code></a></p>
+<p><a name="error_code.no_device"></a><code>no-device</code></p>
 <p>No such device, similar to `ENODEV` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_entry"><code>no-entry</code></a></p>
+<p><a name="error_code.no_entry"></a><code>no-entry</code></p>
 <p>No such file or directory, similar to `ENOENT` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_lock"><code>no-lock</code></a></p>
+<p><a name="error_code.no_lock"></a><code>no-lock</code></p>
 <p>No locks available, similar to `ENOLCK` in POSIX.
 </li>
 <li>
-<p><a name="error_code.insufficient_memory"><code>insufficient-memory</code></a></p>
+<p><a name="error_code.insufficient_memory"></a><code>insufficient-memory</code></p>
 <p>Not enough space, similar to `ENOMEM` in POSIX.
 </li>
 <li>
-<p><a name="error_code.insufficient_space"><code>insufficient-space</code></a></p>
+<p><a name="error_code.insufficient_space"></a><code>insufficient-space</code></p>
 <p>No space left on device, similar to `ENOSPC` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_directory"><code>not-directory</code></a></p>
+<p><a name="error_code.not_directory"></a><code>not-directory</code></p>
 <p>Not a directory or a symbolic link to a directory, similar to `ENOTDIR` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_empty"><code>not-empty</code></a></p>
+<p><a name="error_code.not_empty"></a><code>not-empty</code></p>
 <p>Directory not empty, similar to `ENOTEMPTY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_recoverable"><code>not-recoverable</code></a></p>
+<p><a name="error_code.not_recoverable"></a><code>not-recoverable</code></p>
 <p>State not recoverable, similar to `ENOTRECOVERABLE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.unsupported"><code>unsupported</code></a></p>
+<p><a name="error_code.unsupported"></a><code>unsupported</code></p>
 <p>Not supported, similar to `ENOTSUP` and `ENOSYS` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_tty"><code>no-tty</code></a></p>
+<p><a name="error_code.no_tty"></a><code>no-tty</code></p>
 <p>Inappropriate I/O control operation, similar to `ENOTTY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.no_such_device"><code>no-such-device</code></a></p>
+<p><a name="error_code.no_such_device"></a><code>no-such-device</code></p>
 <p>No such device or address, similar to `ENXIO` in POSIX.
 </li>
 <li>
-<p><a name="error_code.overflow"><code>overflow</code></a></p>
+<p><a name="error_code.overflow"></a><code>overflow</code></p>
 <p>Value too large to be stored in data type, similar to `EOVERFLOW` in POSIX.
 </li>
 <li>
-<p><a name="error_code.not_permitted"><code>not-permitted</code></a></p>
+<p><a name="error_code.not_permitted"></a><code>not-permitted</code></p>
 <p>Operation not permitted, similar to `EPERM` in POSIX.
 </li>
 <li>
-<p><a name="error_code.pipe"><code>pipe</code></a></p>
+<p><a name="error_code.pipe"></a><code>pipe</code></p>
 <p>Broken pipe, similar to `EPIPE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.read_only"><code>read-only</code></a></p>
+<p><a name="error_code.read_only"></a><code>read-only</code></p>
 <p>Read-only file system, similar to `EROFS` in POSIX.
 </li>
 <li>
-<p><a name="error_code.invalid_seek"><code>invalid-seek</code></a></p>
+<p><a name="error_code.invalid_seek"></a><code>invalid-seek</code></p>
 <p>Invalid seek, similar to `ESPIPE` in POSIX.
 </li>
 <li>
-<p><a name="error_code.text_file_busy"><code>text-file-busy</code></a></p>
+<p><a name="error_code.text_file_busy"></a><code>text-file-busy</code></p>
 <p>Text file busy, similar to `ETXTBSY` in POSIX.
 </li>
 <li>
-<p><a name="error_code.cross_device"><code>cross-device</code></a></p>
+<p><a name="error_code.cross_device"></a><code>cross-device</code></p>
 <p>Cross-device link, similar to `EXDEV` in POSIX.
 </li>
 </ul>
-<h4><a name="advice"><code>enum advice</code></a></h4>
+<h4><a name="advice"></a><code>enum advice</code></h4>
 <p>File or memory access pattern advisory information.</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="advice.normal"><code>normal</code></a></p>
+<p><a name="advice.normal"></a><code>normal</code></p>
 <p>The application has no advice to give on its behavior with respect
 to the specified data.
 </li>
 <li>
-<p><a name="advice.sequential"><code>sequential</code></a></p>
+<p><a name="advice.sequential"></a><code>sequential</code></p>
 <p>The application expects to access the specified data sequentially
 from lower offsets to higher offsets.
 </li>
 <li>
-<p><a name="advice.random"><code>random</code></a></p>
+<p><a name="advice.random"></a><code>random</code></p>
 <p>The application expects to access the specified data in a random
 order.
 </li>
 <li>
-<p><a name="advice.will_need"><code>will-need</code></a></p>
+<p><a name="advice.will_need"></a><code>will-need</code></p>
 <p>The application expects to access the specified data in the near
 future.
 </li>
 <li>
-<p><a name="advice.dont_need"><code>dont-need</code></a></p>
+<p><a name="advice.dont_need"></a><code>dont-need</code></p>
 <p>The application expects that it will not access the specified data
 in the near future.
 </li>
 <li>
-<p><a name="advice.no_reuse"><code>no-reuse</code></a></p>
+<p><a name="advice.no_reuse"></a><code>no-reuse</code></p>
 <p>The application expects to access the specified data once and then
 not reuse it thereafter.
 </li>
 </ul>
-<h4><a name="metadata_hash_value"><code>record metadata-hash-value</code></a></h4>
+<h4><a name="metadata_hash_value"></a><code>record metadata-hash-value</code></h4>
 <p>A 128-bit hash value, split into parts because wasm doesn't have a
 128-bit integer type.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="metadata_hash_value.lower"><code>lower</code></a>: <code>u64</code></p>
+<p><a name="metadata_hash_value.lower"></a><code>lower</code>: <code>u64</code></p>
 <p>64 bits of a 128-bit hash value.
 </li>
 <li>
-<p><a name="metadata_hash_value.upper"><code>upper</code></a>: <code>u64</code></p>
+<p><a name="metadata_hash_value.upper"></a><code>upper</code>: <code>u64</code></p>
 <p>Another 64 bits of a 128-bit hash value.
 </li>
 </ul>
-<h4><a name="descriptor"><code>resource descriptor</code></a></h4>
+<h4><a name="descriptor"></a><code>resource descriptor</code></h4>
 <p>A descriptor is a reference to a filesystem object, which may be a file,
 directory, named pipe, special file, or other object on which filesystem
 calls may be made.</p>
-<h4><a name="directory_entry_stream"><code>resource directory-entry-stream</code></a></h4>
+<h4><a name="directory_entry_stream"></a><code>resource directory-entry-stream</code></h4>
 <h2>A stream of directory entries.</h2>
 <h3>Functions</h3>
-<h4><a name="method_descriptor.read_via_stream"><code>[method]descriptor.read-via-stream: func</code></a></h4>
+<h4><a name="method_descriptor_read_via_stream"></a><code>[method]descriptor.read-via-stream: func</code></h4>
 <p>Return a stream for reading from a file, if available.</p>
 <p>May fail with an error-code describing why the file cannot be read.</p>
 <p>Multiple read, write, and append streams may be active on the same open
@@ -1132,81 +1131,81 @@ file and they do not interfere with each other.</p>
 <p>Note: This allows using <code>read-stream</code>, which is similar to <code>read</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.read_via_stream.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.read_via_stream.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_read_via_stream.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_via_stream.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.read_via_stream.0"></a> result&lt;own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_via_stream.0"></a> result&lt;own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.write_via_stream"><code>[method]descriptor.write-via-stream: func</code></a></h4>
+<h4><a name="method_descriptor_write_via_stream"></a><code>[method]descriptor.write-via-stream: func</code></h4>
 <p>Return a stream for writing to a file, if available.</p>
 <p>May fail with an error-code describing why the file cannot be written.</p>
 <p>Note: This allows using <code>write-stream</code>, which is similar to <code>write</code> in
 POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.write_via_stream.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.write_via_stream.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_write_via_stream.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write_via_stream.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.write_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.append_via_stream"><code>[method]descriptor.append-via-stream: func</code></a></h4>
+<h4><a name="method_descriptor_append_via_stream"></a><code>[method]descriptor.append-via-stream: func</code></h4>
 <p>Return a stream for appending to a file, if available.</p>
 <p>May fail with an error-code describing why the file cannot be appended.</p>
 <p>Note: This allows using <code>write-stream</code>, which is similar to <code>write</code> with
 <code>O_APPEND</code> in in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.append_via_stream.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_append_via_stream.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.append_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_append_via_stream.0"></a> result&lt;own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.advise"><code>[method]descriptor.advise: func</code></a></h4>
+<h4><a name="method_descriptor_advise"></a><code>[method]descriptor.advise: func</code></h4>
 <p>Provide file advisory information on a descriptor.</p>
 <p>This is similar to <code>posix_fadvise</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.advise.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.advise.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
-<li><a name="method_descriptor.advise.length"><code>length</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
-<li><a name="method_descriptor.advise.advice"><a href="#advice"><code>advice</code></a></a>: <a href="#advice"><a href="#advice"><code>advice</code></a></a></li>
+<li><a name="method_descriptor_advise.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_advise.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_advise.length"></a><code>length</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_advise.advice"></a><a href="#advice"><code>advice</code></a>: <a href="#advice"><a href="#advice"><code>advice</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.advise.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_advise.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.sync_data"><code>[method]descriptor.sync-data: func</code></a></h4>
+<h4><a name="method_descriptor_sync_data"></a><code>[method]descriptor.sync-data: func</code></h4>
 <p>Synchronize the data of a file to disk.</p>
 <p>This function succeeds with no effect if the file descriptor is not
 opened for writing.</p>
 <p>Note: This is similar to <code>fdatasync</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.sync_data.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync_data.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.sync_data.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync_data.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.get_flags"><code>[method]descriptor.get-flags: func</code></a></h4>
+<h4><a name="method_descriptor_get_flags"></a><code>[method]descriptor.get-flags: func</code></h4>
 <p>Get flags associated with a descriptor.</p>
 <p>Note: This returns similar flags to <code>fcntl(fd, F_GETFL)</code> in POSIX.</p>
 <p>Note: This returns the value that was the <code>fs_flags</code> value returned
 from <code>fdstat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.get_flags.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_flags.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.get_flags.0"></a> result&lt;<a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_flags.0"></a> result&lt;<a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.get_type"><code>[method]descriptor.get-type: func</code></a></h4>
+<h4><a name="method_descriptor_get_type"></a><code>[method]descriptor.get-type: func</code></h4>
 <p>Get the dynamic type of a descriptor.</p>
 <p>Note: This returns the same value as the <code>type</code> field of the <code>fd-stat</code>
 returned by <code>stat</code>, <code>stat-at</code> and similar.</p>
@@ -1216,40 +1215,40 @@ by <code>fstat</code> in POSIX.</p>
 from <code>fdstat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.get_type.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_type.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.get_type.0"></a> result&lt;<a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_get_type.0"></a> result&lt;<a href="#descriptor_type"><a href="#descriptor_type"><code>descriptor-type</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.set_size"><code>[method]descriptor.set-size: func</code></a></h4>
+<h4><a name="method_descriptor_set_size"></a><code>[method]descriptor.set-size: func</code></h4>
 <p>Adjust the size of an open file. If this increases the file's size, the
 extra bytes are filled with zeros.</p>
 <p>Note: This was called <code>fd_filestat_set_size</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.set_size.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.set_size.size"><code>size</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_set_size.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_size.size"></a><code>size</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.set_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.set_times"><code>[method]descriptor.set-times: func</code></a></h4>
+<h4><a name="method_descriptor_set_times"></a><code>[method]descriptor.set-times: func</code></h4>
 <p>Adjust the timestamps of an open file or directory.</p>
 <p>Note: This is similar to <code>futimens</code> in POSIX.</p>
 <p>Note: This was called <code>fd_filestat_set_times</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.set_times.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.set_times.data_access_timestamp"><code>data-access-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
-<li><a name="method_descriptor.set_times.data_modification_timestamp"><code>data-modification-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times.data_access_timestamp"></a><code>data-access-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times.data_modification_timestamp"></a><code>data-modification-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.set_times.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.read"><code>[method]descriptor.read: func</code></a></h4>
+<h4><a name="method_descriptor_read"></a><code>[method]descriptor.read: func</code></h4>
 <p>Read from a descriptor, without using and updating the descriptor's offset.</p>
 <p>This function returns a list of bytes containing the data that was
 read, along with a bool which, when true, indicates that the end of the
@@ -1260,15 +1259,15 @@ if the I/O operation is interrupted.</p>
 <p>Note: This is similar to <code>pread</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.read.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.read.length"><code>length</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
-<li><a name="method_descriptor.read.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_read.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read.length"></a><code>length</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_read.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.read.0"></a> result&lt;(list&lt;<code>u8</code>&gt;, <code>bool</code>), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read.0"></a> result&lt;(list&lt;<code>u8</code>&gt;, <code>bool</code>), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.write"><code>[method]descriptor.write: func</code></a></h4>
+<h4><a name="method_descriptor_write"></a><code>[method]descriptor.write: func</code></h4>
 <p>Write to a descriptor, without using and updating the descriptor's offset.</p>
 <p>It is valid to write past the end of a file; the file is extended to the
 extent of the write, with bytes between the previous end and the start of
@@ -1277,15 +1276,15 @@ the write set to zero.</p>
 <p>Note: This is similar to <code>pwrite</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.write.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.write.buffer"><code>buffer</code></a>: list&lt;<code>u8</code>&gt;</li>
-<li><a name="method_descriptor.write.offset"><code>offset</code></a>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
+<li><a name="method_descriptor_write.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write.buffer"></a><code>buffer</code>: list&lt;<code>u8</code>&gt;</li>
+<li><a name="method_descriptor_write.offset"></a><code>offset</code>: <a href="#filesize"><a href="#filesize"><code>filesize</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.write.0"></a> result&lt;<a href="#filesize"><a href="#filesize"><code>filesize</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_write.0"></a> result&lt;<a href="#filesize"><a href="#filesize"><code>filesize</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.read_directory"><code>[method]descriptor.read-directory: func</code></a></h4>
+<h4><a name="method_descriptor_read_directory"></a><code>[method]descriptor.read-directory: func</code></h4>
 <p>Read directory entries from a directory.</p>
 <p>On filesystems where directories contain entries referring to themselves
 and their parents, often named <code>.</code> and <code>..</code> respectively, these entries
@@ -1295,38 +1294,38 @@ directory. Multiple streams may be active on the same directory, and they
 do not interfere with each other.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.read_directory.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_directory.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.read_directory.0"></a> result&lt;own&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_read_directory.0"></a> result&lt;own&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.sync"><code>[method]descriptor.sync: func</code></a></h4>
+<h4><a name="method_descriptor_sync"></a><code>[method]descriptor.sync: func</code></h4>
 <p>Synchronize the data and metadata of a file to disk.</p>
 <p>This function succeeds with no effect if the file descriptor is not
 opened for writing.</p>
 <p>Note: This is similar to <code>fsync</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.sync.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.sync.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_sync.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.create_directory_at"><code>[method]descriptor.create-directory-at: func</code></a></h4>
+<h4><a name="method_descriptor_create_directory_at"></a><code>[method]descriptor.create-directory-at: func</code></h4>
 <p>Create a directory.</p>
 <p>Note: This is similar to <code>mkdirat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.create_directory_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.create_directory_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_create_directory_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_create_directory_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.create_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_create_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.stat"><code>[method]descriptor.stat: func</code></a></h4>
+<h4><a name="method_descriptor_stat"></a><code>[method]descriptor.stat: func</code></h4>
 <p>Return the attributes of an open file or directory.</p>
 <p>Note: This is similar to <code>fstat</code> in POSIX, except that it does not return
 device and inode information. For testing whether two descriptors refer to
@@ -1336,13 +1335,13 @@ modified, use <code>metadata-hash</code>.</p>
 <p>Note: This was called <code>fd_filestat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.stat.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.stat.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.stat_at"><code>[method]descriptor.stat-at: func</code></a></h4>
+<h4><a name="method_descriptor_stat_at"></a><code>[method]descriptor.stat-at: func</code></h4>
 <p>Return the attributes of a file or directory.</p>
 <p>Note: This is similar to <code>fstatat</code> in POSIX, except that it does not
 return device and inode information. See the <code>stat</code> description for a
@@ -1350,47 +1349,47 @@ discussion of alternatives.</p>
 <p>Note: This was called <code>path_filestat_get</code> in earlier versions of WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.stat_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.stat_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.stat_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_stat_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_stat_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.stat_at.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_stat_at.0"></a> result&lt;<a href="#descriptor_stat"><a href="#descriptor_stat"><code>descriptor-stat</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.set_times_at"><code>[method]descriptor.set-times-at: func</code></a></h4>
+<h4><a name="method_descriptor_set_times_at"></a><code>[method]descriptor.set-times-at: func</code></h4>
 <p>Adjust the timestamps of a file or directory.</p>
 <p>Note: This is similar to <code>utimensat</code> in POSIX.</p>
 <p>Note: This was called <code>path_filestat_set_times</code> in earlier versions of
 WASI.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.set_times_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.set_times_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.set_times_at.path"><code>path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.set_times_at.data_access_timestamp"><code>data-access-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
-<li><a name="method_descriptor.set_times_at.data_modification_timestamp"><code>data-modification-timestamp</code></a>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_set_times_at.path"></a><code>path</code>: <code>string</code></li>
+<li><a name="method_descriptor_set_times_at.data_access_timestamp"></a><code>data-access-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
+<li><a name="method_descriptor_set_times_at.data_modification_timestamp"></a><code>data-modification-timestamp</code>: <a href="#new_timestamp"><a href="#new_timestamp"><code>new-timestamp</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.set_times_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_set_times_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.link_at"><code>[method]descriptor.link-at: func</code></a></h4>
+<h4><a name="method_descriptor_link_at"></a><code>[method]descriptor.link-at: func</code></h4>
 <p>Create a hard link.</p>
 <p>Note: This is similar to <code>linkat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.link_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.link_at.old_path_flags"><code>old-path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.link_at.old_path"><code>old-path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.link_at.new_descriptor"><code>new-descriptor</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.link_at.new_path"><code>new-path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_link_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_link_at.old_path_flags"></a><code>old-path-flags</code>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_link_at.old_path"></a><code>old-path</code>: <code>string</code></li>
+<li><a name="method_descriptor_link_at.new_descriptor"></a><code>new-descriptor</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_link_at.new_path"></a><code>new-path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.link_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_link_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.open_at"><code>[method]descriptor.open-at: func</code></a></h4>
+<h4><a name="method_descriptor_open_at"></a><code>[method]descriptor.open-at: func</code></h4>
 <p>Open a file or directory.</p>
 <p>The returned descriptor is not guaranteed to be the lowest-numbered
 descriptor not currently open/ it is randomized to prevent applications
@@ -1407,86 +1406,86 @@ contains <code>truncate</code> or <code>create</code>, and the base descriptor d
 <p>Note: This is similar to <code>openat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.open_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.open_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.open_at.path"><code>path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.open_at.open_flags"><a href="#open_flags"><code>open-flags</code></a></a>: <a href="#open_flags"><a href="#open_flags"><code>open-flags</code></a></a></li>
-<li><a name="method_descriptor.open_at.flags"><code>flags</code></a>: <a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a></li>
+<li><a name="method_descriptor_open_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_open_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_open_at.path"></a><code>path</code>: <code>string</code></li>
+<li><a name="method_descriptor_open_at.open_flags"></a><a href="#open_flags"><code>open-flags</code></a>: <a href="#open_flags"><a href="#open_flags"><code>open-flags</code></a></a></li>
+<li><a name="method_descriptor_open_at.flags"></a><code>flags</code>: <a href="#descriptor_flags"><a href="#descriptor_flags"><code>descriptor-flags</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.open_at.0"></a> result&lt;own&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_open_at.0"></a> result&lt;own&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.readlink_at"><code>[method]descriptor.readlink-at: func</code></a></h4>
+<h4><a name="method_descriptor_readlink_at"></a><code>[method]descriptor.readlink-at: func</code></h4>
 <p>Read the contents of a symbolic link.</p>
 <p>If the contents contain an absolute or rooted path in the underlying
 filesystem, this function fails with <a href="#error_code.not_permitted"><code>error-code::not-permitted</code></a>.</p>
 <p>Note: This is similar to <code>readlinkat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.readlink_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.readlink_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_readlink_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_readlink_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.readlink_at.0"></a> result&lt;<code>string</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_readlink_at.0"></a> result&lt;<code>string</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.remove_directory_at"><code>[method]descriptor.remove-directory-at: func</code></a></h4>
+<h4><a name="method_descriptor_remove_directory_at"></a><code>[method]descriptor.remove-directory-at: func</code></h4>
 <p>Remove a directory.</p>
 <p>Return <a href="#error_code.not_empty"><code>error-code::not-empty</code></a> if the directory is not empty.</p>
 <p>Note: This is similar to <code>unlinkat(fd, path, AT_REMOVEDIR)</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.remove_directory_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.remove_directory_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_remove_directory_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_remove_directory_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.remove_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_remove_directory_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.rename_at"><code>[method]descriptor.rename-at: func</code></a></h4>
+<h4><a name="method_descriptor_rename_at"></a><code>[method]descriptor.rename-at: func</code></h4>
 <p>Rename a filesystem object.</p>
 <p>Note: This is similar to <code>renameat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.rename_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.rename_at.old_path"><code>old-path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.rename_at.new_descriptor"><code>new-descriptor</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.rename_at.new_path"><code>new-path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_rename_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_rename_at.old_path"></a><code>old-path</code>: <code>string</code></li>
+<li><a name="method_descriptor_rename_at.new_descriptor"></a><code>new-descriptor</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_rename_at.new_path"></a><code>new-path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.rename_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_rename_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.symlink_at"><code>[method]descriptor.symlink-at: func</code></a></h4>
+<h4><a name="method_descriptor_symlink_at"></a><code>[method]descriptor.symlink-at: func</code></h4>
 <p>Create a symbolic link (also known as a &quot;symlink&quot;).</p>
 <p>If <code>old-path</code> starts with <code>/</code>, the function fails with
 <a href="#error_code.not_permitted"><code>error-code::not-permitted</code></a>.</p>
 <p>Note: This is similar to <code>symlinkat</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.symlink_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.symlink_at.old_path"><code>old-path</code></a>: <code>string</code></li>
-<li><a name="method_descriptor.symlink_at.new_path"><code>new-path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_symlink_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_symlink_at.old_path"></a><code>old-path</code>: <code>string</code></li>
+<li><a name="method_descriptor_symlink_at.new_path"></a><code>new-path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.symlink_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_symlink_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.unlink_file_at"><code>[method]descriptor.unlink-file-at: func</code></a></h4>
+<h4><a name="method_descriptor_unlink_file_at"></a><code>[method]descriptor.unlink-file-at: func</code></h4>
 <p>Unlink a filesystem object that is not a directory.</p>
 <p>Return <a href="#error_code.is_directory"><code>error-code::is-directory</code></a> if the path refers to a directory.
 Note: This is similar to <code>unlinkat(fd, path, 0)</code> in POSIX.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.unlink_file_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.unlink_file_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_unlink_file_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_unlink_file_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.unlink_file_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_unlink_file_at.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.is_same_object"><code>[method]descriptor.is-same-object: func</code></a></h4>
+<h4><a name="method_descriptor_is_same_object"></a><code>[method]descriptor.is-same-object: func</code></h4>
 <p>Test whether two descriptors refer to the same filesystem object.</p>
 <p>In POSIX, this corresponds to testing whether the two descriptors have the
 same device (<code>st_dev</code>) and inode (<code>st_ino</code> or <code>d_ino</code>) numbers.
@@ -1494,14 +1493,14 @@ wasi-filesystem does not expose device and inode numbers, so this function
 may be used instead.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.is_same_object.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.is_same_object.other"><code>other</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_is_same_object.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_is_same_object.other"></a><code>other</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.is_same_object.0"></a> <code>bool</code></li>
+<li><a name="method_descriptor_is_same_object.0"></a> <code>bool</code></li>
 </ul>
-<h4><a name="method_descriptor.metadata_hash"><code>[method]descriptor.metadata-hash: func</code></a></h4>
+<h4><a name="method_descriptor_metadata_hash"></a><code>[method]descriptor.metadata-hash: func</code></h4>
 <p>Return a hash of the metadata associated with a filesystem object referred
 to by a descriptor.</p>
 <p>This returns a hash of the last-modification timestamp and file size, and
@@ -1521,37 +1520,37 @@ computed hash.</li>
 <p>However, none of these is required.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_descriptor.metadata_hash_at"><code>[method]descriptor.metadata-hash-at: func</code></a></h4>
+<h4><a name="method_descriptor_metadata_hash_at"></a><code>[method]descriptor.metadata-hash-at: func</code></h4>
 <p>Return a hash of the metadata associated with a filesystem object referred
 to by a directory descriptor and a relative path.</p>
 <p>This performs the same hash computation as <code>metadata-hash</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash_at.self"><code>self</code></a>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
-<li><a name="method_descriptor.metadata_hash_at.path_flags"><a href="#path_flags"><code>path-flags</code></a></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
-<li><a name="method_descriptor.metadata_hash_at.path"><code>path</code></a>: <code>string</code></li>
+<li><a name="method_descriptor_metadata_hash_at.self"></a><code>self</code>: borrow&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash_at.path_flags"></a><a href="#path_flags"><code>path-flags</code></a>: <a href="#path_flags"><a href="#path_flags"><code>path-flags</code></a></a></li>
+<li><a name="method_descriptor_metadata_hash_at.path"></a><code>path</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_descriptor.metadata_hash_at.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_descriptor_metadata_hash_at.0"></a> result&lt;<a href="#metadata_hash_value"><a href="#metadata_hash_value"><code>metadata-hash-value</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_directory_entry_stream.read_directory_entry"><code>[method]directory-entry-stream.read-directory-entry: func</code></a></h4>
+<h4><a name="method_directory_entry_stream_read_directory_entry"></a><code>[method]directory-entry-stream.read-directory-entry: func</code></h4>
 <p>Read a single directory entry from a <a href="#directory_entry_stream"><code>directory-entry-stream</code></a>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_directory_entry_stream.read_directory_entry.self"><code>self</code></a>: borrow&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;</li>
+<li><a name="method_directory_entry_stream_read_directory_entry.self"></a><code>self</code>: borrow&lt;<a href="#directory_entry_stream"><a href="#directory_entry_stream"><code>directory-entry-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_directory_entry_stream.read_directory_entry.0"></a> result&lt;option&lt;<a href="#directory_entry"><a href="#directory_entry"><code>directory-entry</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_directory_entry_stream_read_directory_entry.0"></a> result&lt;option&lt;<a href="#directory_entry"><a href="#directory_entry"><code>directory-entry</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="filesystem_error_code"><code>filesystem-error-code: func</code></a></h4>
+<h4><a name="filesystem_error_code"></a><code>filesystem-error-code: func</code></h4>
 <p>Attempts to extract a filesystem-related <a href="#error_code"><code>error-code</code></a> from the stream
 <a href="#error"><code>error</code></a> provided.</p>
 <p>Stream operations which return <a href="#stream_error.last_operation_failed"><code>stream-error::last-operation-failed</code></a>
@@ -1562,34 +1561,34 @@ filesystem-related information about the error to return.</p>
 errors are filesystem-related errors.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="filesystem_error_code.err"><code>err</code></a>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
+<li><a name="filesystem_error_code.err"></a><code>err</code>: borrow&lt;<a href="#error"><a href="#error"><code>error</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="filesystem_error_code.0"></a> option&lt;<a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:filesystem_preopens_0.2.0">Import interface wasi:filesystem/preopens@0.2.0</a></h2>
+<h2><a name="wasi_filesystem_preopens_0_2_0"></a>Import interface wasi:filesystem/preopens@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="descriptor"><code>type descriptor</code></a></h4>
+<h4><a name="descriptor"></a><code>type descriptor</code></h4>
 <p><a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="get_directories"><code>get-directories: func</code></a></h4>
+<h4><a name="get_directories"></a><code>get-directories: func</code></h4>
 <p>Return the set of preopened directories, and their path.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_directories.0"></a> list&lt;(own&lt;<a href="#descriptor"><a href="#descriptor"><code>descriptor</code></a></a>&gt;, <code>string</code>)&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_network_0.2.0">Import interface wasi:sockets/network@0.2.0</a></h2>
+<h2><a name="wasi_sockets_network_0_2_0"></a>Import interface wasi:sockets/network@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>resource network</code></a></h4>
+<h4><a name="network"></a><code>resource network</code></h4>
 <p>An opaque resource that represents access to (a subset of) the network.
 This enables context-based security for networking.
 There is no need for this to map 1:1 to a physical network interface.</p>
-<h4><a name="error_code"><code>enum error-code</code></a></h4>
+<h4><a name="error_code"></a><code>enum error-code</code></h4>
 <p>Error codes.</p>
 <p>In theory, every API can return any error code.
 In practice, API's typically only return the errors documented per API
@@ -1605,235 +1604,235 @@ combined with a couple of errors that are always possible:</p>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="error_code.unknown"><code>unknown</code></a></p>
+<p><a name="error_code.unknown"></a><code>unknown</code></p>
 <p>Unknown error
 </li>
 <li>
-<p><a name="error_code.access_denied"><code>access-denied</code></a></p>
+<p><a name="error_code.access_denied"></a><code>access-denied</code></p>
 <p>Access denied.
 <p>POSIX equivalent: EACCES, EPERM</p>
 </li>
 <li>
-<p><a name="error_code.not_supported"><code>not-supported</code></a></p>
+<p><a name="error_code.not_supported"></a><code>not-supported</code></p>
 <p>The operation is not supported.
 <p>POSIX equivalent: EOPNOTSUPP</p>
 </li>
 <li>
-<p><a name="error_code.invalid_argument"><code>invalid-argument</code></a></p>
+<p><a name="error_code.invalid_argument"></a><code>invalid-argument</code></p>
 <p>One of the arguments is invalid.
 <p>POSIX equivalent: EINVAL</p>
 </li>
 <li>
-<p><a name="error_code.out_of_memory"><code>out-of-memory</code></a></p>
+<p><a name="error_code.out_of_memory"></a><code>out-of-memory</code></p>
 <p>Not enough memory to complete the operation.
 <p>POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY</p>
 </li>
 <li>
-<p><a name="error_code.timeout"><code>timeout</code></a></p>
+<p><a name="error_code.timeout"></a><code>timeout</code></p>
 <p>The operation timed out before it could finish completely.
 </li>
 <li>
-<p><a name="error_code.concurrency_conflict"><code>concurrency-conflict</code></a></p>
+<p><a name="error_code.concurrency_conflict"></a><code>concurrency-conflict</code></p>
 <p>This operation is incompatible with another asynchronous operation that is already in progress.
 <p>POSIX equivalent: EALREADY</p>
 </li>
 <li>
-<p><a name="error_code.not_in_progress"><code>not-in-progress</code></a></p>
+<p><a name="error_code.not_in_progress"></a><code>not-in-progress</code></p>
 <p>Trying to finish an asynchronous operation that:
 - has not been started yet, or:
 - was already finished by a previous `finish-*` call.
 <p>Note: this is scheduled to be removed when <code>future</code>s are natively supported.</p>
 </li>
 <li>
-<p><a name="error_code.would_block"><code>would-block</code></a></p>
+<p><a name="error_code.would_block"></a><code>would-block</code></p>
 <p>The operation has been aborted because it could not be completed immediately.
 <p>Note: this is scheduled to be removed when <code>future</code>s are natively supported.</p>
 </li>
 <li>
-<p><a name="error_code.invalid_state"><code>invalid-state</code></a></p>
+<p><a name="error_code.invalid_state"></a><code>invalid-state</code></p>
 <p>The operation is not valid in the socket's current state.
 </li>
 <li>
-<p><a name="error_code.new_socket_limit"><code>new-socket-limit</code></a></p>
+<p><a name="error_code.new_socket_limit"></a><code>new-socket-limit</code></p>
 <p>A new socket resource could not be created because of a system limit.
 </li>
 <li>
-<p><a name="error_code.address_not_bindable"><code>address-not-bindable</code></a></p>
+<p><a name="error_code.address_not_bindable"></a><code>address-not-bindable</code></p>
 <p>A bind operation failed because the provided address is not an address that the `network` can bind to.
 </li>
 <li>
-<p><a name="error_code.address_in_use"><code>address-in-use</code></a></p>
+<p><a name="error_code.address_in_use"></a><code>address-in-use</code></p>
 <p>A bind operation failed because the provided address is already in use or because there are no ephemeral ports available.
 </li>
 <li>
-<p><a name="error_code.remote_unreachable"><code>remote-unreachable</code></a></p>
+<p><a name="error_code.remote_unreachable"></a><code>remote-unreachable</code></p>
 <p>The remote address is not reachable
 </li>
 <li>
-<p><a name="error_code.connection_refused"><code>connection-refused</code></a></p>
+<p><a name="error_code.connection_refused"></a><code>connection-refused</code></p>
 <p>The TCP connection was forcefully rejected
 </li>
 <li>
-<p><a name="error_code.connection_reset"><code>connection-reset</code></a></p>
+<p><a name="error_code.connection_reset"></a><code>connection-reset</code></p>
 <p>The TCP connection was reset.
 </li>
 <li>
-<p><a name="error_code.connection_aborted"><code>connection-aborted</code></a></p>
+<p><a name="error_code.connection_aborted"></a><code>connection-aborted</code></p>
 <p>A TCP connection was aborted.
 </li>
 <li>
-<p><a name="error_code.datagram_too_large"><code>datagram-too-large</code></a></p>
+<p><a name="error_code.datagram_too_large"></a><code>datagram-too-large</code></p>
 <p>The size of a datagram sent to a UDP socket exceeded the maximum
 supported size.
 </li>
 <li>
-<p><a name="error_code.name_unresolvable"><code>name-unresolvable</code></a></p>
+<p><a name="error_code.name_unresolvable"></a><code>name-unresolvable</code></p>
 <p>Name does not exist or has no suitable associated IP addresses.
 </li>
 <li>
-<p><a name="error_code.temporary_resolver_failure"><code>temporary-resolver-failure</code></a></p>
+<p><a name="error_code.temporary_resolver_failure"></a><code>temporary-resolver-failure</code></p>
 <p>A temporary failure in name resolution occurred.
 </li>
 <li>
-<p><a name="error_code.permanent_resolver_failure"><code>permanent-resolver-failure</code></a></p>
+<p><a name="error_code.permanent_resolver_failure"></a><code>permanent-resolver-failure</code></p>
 <p>A permanent failure in name resolution occurred.
 </li>
 </ul>
-<h4><a name="ip_address_family"><code>enum ip-address-family</code></a></h4>
+<h4><a name="ip_address_family"></a><code>enum ip-address-family</code></h4>
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="ip_address_family.ipv4"><code>ipv4</code></a></p>
+<p><a name="ip_address_family.ipv4"></a><code>ipv4</code></p>
 <p>Similar to `AF_INET` in POSIX.
 </li>
 <li>
-<p><a name="ip_address_family.ipv6"><code>ipv6</code></a></p>
+<p><a name="ip_address_family.ipv6"></a><code>ipv6</code></p>
 <p>Similar to `AF_INET6` in POSIX.
 </li>
 </ul>
-<h4><a name="ipv4_address"><code>tuple ipv4-address</code></a></h4>
+<h4><a name="ipv4_address"></a><code>tuple ipv4-address</code></h4>
 <h5>Tuple Fields</h5>
 <ul>
-<li><a name="ipv4_address.0"><code>0</code></a>: <code>u8</code></li>
-<li><a name="ipv4_address.1"><code>1</code></a>: <code>u8</code></li>
-<li><a name="ipv4_address.2"><code>2</code></a>: <code>u8</code></li>
-<li><a name="ipv4_address.3"><code>3</code></a>: <code>u8</code></li>
+<li><a name="ipv4_address.0"></a><code>0</code>: <code>u8</code></li>
+<li><a name="ipv4_address.1"></a><code>1</code>: <code>u8</code></li>
+<li><a name="ipv4_address.2"></a><code>2</code>: <code>u8</code></li>
+<li><a name="ipv4_address.3"></a><code>3</code>: <code>u8</code></li>
 </ul>
-<h4><a name="ipv6_address"><code>tuple ipv6-address</code></a></h4>
+<h4><a name="ipv6_address"></a><code>tuple ipv6-address</code></h4>
 <h5>Tuple Fields</h5>
 <ul>
-<li><a name="ipv6_address.0"><code>0</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.1"><code>1</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.2"><code>2</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.3"><code>3</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.4"><code>4</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.5"><code>5</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.6"><code>6</code></a>: <code>u16</code></li>
-<li><a name="ipv6_address.7"><code>7</code></a>: <code>u16</code></li>
+<li><a name="ipv6_address.0"></a><code>0</code>: <code>u16</code></li>
+<li><a name="ipv6_address.1"></a><code>1</code>: <code>u16</code></li>
+<li><a name="ipv6_address.2"></a><code>2</code>: <code>u16</code></li>
+<li><a name="ipv6_address.3"></a><code>3</code>: <code>u16</code></li>
+<li><a name="ipv6_address.4"></a><code>4</code>: <code>u16</code></li>
+<li><a name="ipv6_address.5"></a><code>5</code>: <code>u16</code></li>
+<li><a name="ipv6_address.6"></a><code>6</code>: <code>u16</code></li>
+<li><a name="ipv6_address.7"></a><code>7</code>: <code>u16</code></li>
 </ul>
-<h4><a name="ip_address"><code>variant ip-address</code></a></h4>
+<h4><a name="ip_address"></a><code>variant ip-address</code></h4>
 <h5>Variant Cases</h5>
 <ul>
-<li><a name="ip_address.ipv4"><code>ipv4</code></a>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></li>
-<li><a name="ip_address.ipv6"><code>ipv6</code></a>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></li>
+<li><a name="ip_address.ipv4"></a><code>ipv4</code>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></li>
+<li><a name="ip_address.ipv6"></a><code>ipv6</code>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></li>
 </ul>
-<h4><a name="ipv4_socket_address"><code>record ipv4-socket-address</code></a></h4>
+<h4><a name="ipv4_socket_address"></a><code>record ipv4-socket-address</code></h4>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="ipv4_socket_address.port"><code>port</code></a>: <code>u16</code></p>
+<p><a name="ipv4_socket_address.port"></a><code>port</code>: <code>u16</code></p>
 <p>sin_port
 </li>
 <li>
-<p><a name="ipv4_socket_address.address"><code>address</code></a>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></p>
+<p><a name="ipv4_socket_address.address"></a><code>address</code>: <a href="#ipv4_address"><a href="#ipv4_address"><code>ipv4-address</code></a></a></p>
 <p>sin_addr
 </li>
 </ul>
-<h4><a name="ipv6_socket_address"><code>record ipv6-socket-address</code></a></h4>
+<h4><a name="ipv6_socket_address"></a><code>record ipv6-socket-address</code></h4>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="ipv6_socket_address.port"><code>port</code></a>: <code>u16</code></p>
+<p><a name="ipv6_socket_address.port"></a><code>port</code>: <code>u16</code></p>
 <p>sin6_port
 </li>
 <li>
-<p><a name="ipv6_socket_address.flow_info"><code>flow-info</code></a>: <code>u32</code></p>
+<p><a name="ipv6_socket_address.flow_info"></a><code>flow-info</code>: <code>u32</code></p>
 <p>sin6_flowinfo
 </li>
 <li>
-<p><a name="ipv6_socket_address.address"><code>address</code></a>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></p>
+<p><a name="ipv6_socket_address.address"></a><code>address</code>: <a href="#ipv6_address"><a href="#ipv6_address"><code>ipv6-address</code></a></a></p>
 <p>sin6_addr
 </li>
 <li>
-<p><a name="ipv6_socket_address.scope_id"><code>scope-id</code></a>: <code>u32</code></p>
+<p><a name="ipv6_socket_address.scope_id"></a><code>scope-id</code>: <code>u32</code></p>
 <p>sin6_scope_id
 </li>
 </ul>
-<h4><a name="ip_socket_address"><code>variant ip-socket-address</code></a></h4>
+<h4><a name="ip_socket_address"></a><code>variant ip-socket-address</code></h4>
 <h5>Variant Cases</h5>
 <ul>
-<li><a name="ip_socket_address.ipv4"><code>ipv4</code></a>: <a href="#ipv4_socket_address"><a href="#ipv4_socket_address"><code>ipv4-socket-address</code></a></a></li>
-<li><a name="ip_socket_address.ipv6"><code>ipv6</code></a>: <a href="#ipv6_socket_address"><a href="#ipv6_socket_address"><code>ipv6-socket-address</code></a></a></li>
+<li><a name="ip_socket_address.ipv4"></a><code>ipv4</code>: <a href="#ipv4_socket_address"><a href="#ipv4_socket_address"><code>ipv4-socket-address</code></a></a></li>
+<li><a name="ip_socket_address.ipv6"></a><code>ipv6</code>: <a href="#ipv6_socket_address"><a href="#ipv6_socket_address"><code>ipv6-socket-address</code></a></a></li>
 </ul>
-<h2><a name="wasi:sockets_instance_network_0.2.0">Import interface wasi:sockets/instance-network@0.2.0</a></h2>
+<h2><a name="wasi_sockets_instance_network_0_2_0"></a>Import interface wasi:sockets/instance-network@0.2.0</h2>
 <p>This interface provides a value-export of the default network handle..</p>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>type network</code></a></h4>
+<h4><a name="network"></a><code>type network</code></h4>
 <p><a href="#network"><a href="#network"><code>network</code></a></a></p>
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="instance_network"><code>instance-network: func</code></a></h4>
+<h4><a name="instance_network"></a><code>instance-network: func</code></h4>
 <p>Get a handle to the default network.</p>
 <h5>Return values</h5>
 <ul>
 <li><a name="instance_network.0"></a> own&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_udp_0.2.0">Import interface wasi:sockets/udp@0.2.0</a></h2>
+<h2><a name="wasi_sockets_udp_0_2_0"></a>Import interface wasi:sockets/udp@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>type pollable</code></a></h4>
+<h4><a name="pollable"></a><code>type pollable</code></h4>
 <p><a href="#pollable"><a href="#pollable"><code>pollable</code></a></a></p>
 <p>
-#### <a name="network">`type network`</a>
+#### <a name="network"></a>`type network`
 [`network`](#network)
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_socket_address">`type ip-socket-address`</a>
+#### <a name="ip_socket_address"></a>`type ip-socket-address`
 [`ip-socket-address`](#ip_socket_address)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="incoming_datagram">`record incoming-datagram`</a>
+#### <a name="incoming_datagram"></a>`record incoming-datagram`
 <p>A received datagram.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="incoming_datagram.data"><code>data</code></a>: list&lt;<code>u8</code>&gt;</p>
+<p><a name="incoming_datagram.data"></a><code>data</code>: list&lt;<code>u8</code>&gt;</p>
 <p>The payload.
 <p>Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes.</p>
 </li>
 <li>
-<p><a name="incoming_datagram.remote_address"><code>remote-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></p>
+<p><a name="incoming_datagram.remote_address"></a><code>remote-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></p>
 <p>The source address.
 <p>This field is guaranteed to match the remote address the stream was initialized with, if any.</p>
 <p>Equivalent to the <code>src_addr</code> out parameter of <code>recvfrom</code>.</p>
 </li>
 </ul>
-<h4><a name="outgoing_datagram"><code>record outgoing-datagram</code></a></h4>
+<h4><a name="outgoing_datagram"></a><code>record outgoing-datagram</code></h4>
 <p>A datagram to be sent out.</p>
 <h5>Record Fields</h5>
 <ul>
 <li>
-<p><a name="outgoing_datagram.data"><code>data</code></a>: list&lt;<code>u8</code>&gt;</p>
+<p><a name="outgoing_datagram.data"></a><code>data</code>: list&lt;<code>u8</code>&gt;</p>
 <p>The payload.
 </li>
 <li>
-<p><a name="outgoing_datagram.remote_address"><code>remote-address</code></a>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</p>
+<p><a name="outgoing_datagram.remote_address"></a><code>remote-address</code>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</p>
 <p>The destination address.
 <p>The requirements on this field depend on how the stream was initialized:</p>
 <ul>
@@ -1843,13 +1842,13 @@ supported size.
 <p>If this value is None, the send operation is equivalent to <code>send</code> in POSIX. Otherwise it is equivalent to <code>sendto</code>.</p>
 </li>
 </ul>
-<h4><a name="udp_socket"><code>resource udp-socket</code></a></h4>
+<h4><a name="udp_socket"></a><code>resource udp-socket</code></h4>
 <p>A UDP socket handle.</p>
-<h4><a name="incoming_datagram_stream"><code>resource incoming-datagram-stream</code></a></h4>
-<h4><a name="outgoing_datagram_stream"><code>resource outgoing-datagram-stream</code></a></h4>
+<h4><a name="incoming_datagram_stream"></a><code>resource incoming-datagram-stream</code></h4>
+<h4><a name="outgoing_datagram_stream"></a><code>resource outgoing-datagram-stream</code></h4>
 <hr />
 <h3>Functions</h3>
-<h4><a name="method_udp_socket.start_bind"><code>[method]udp-socket.start-bind: func</code></a></h4>
+<h4><a name="method_udp_socket_start_bind"></a><code>[method]udp-socket.start-bind: func</code></h4>
 <p>Bind the socket to a specific network on the provided IP address and port.</p>
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
@@ -1878,24 +1877,24 @@ don't want to make use of this ability can simply call the native
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.start_bind.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.start_bind.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.start_bind.local_address"><code>local-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
+<li><a name="method_udp_socket_start_bind.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_start_bind.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_start_bind.local_address"></a><code>local-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.finish_bind"><code>[method]udp-socket.finish-bind: func</code></a></h4>
+<h4><a name="method_udp_socket_finish_bind"></a><code>[method]udp-socket.finish-bind: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.finish_bind.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_finish_bind.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.stream"><code>[method]udp-socket.stream: func</code></a></h4>
+<h4><a name="method_udp_socket_stream"></a><code>[method]udp-socket.stream: func</code></h4>
 <p>Set up inbound &amp; outbound communication channels, optionally to a specific peer.</p>
 <p>This function only changes the local socket configuration and does not generate any network traffic.
 On success, the <code>remote-address</code> of the socket is updated. The <code>local-address</code> may be updated as well,
@@ -1936,14 +1935,14 @@ if (remote_address is Some) {
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.stream.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.stream.remote_address"><code>remote-address</code></a>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_stream.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_stream.remote_address"></a><code>remote-address</code>: option&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.stream.0"></a> result&lt;(own&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;, own&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_stream.0"></a> result&lt;(own&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;, own&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.local_address"><code>[method]udp-socket.local-address: func</code></a></h4>
+<h4><a name="method_udp_socket_local_address"></a><code>[method]udp-socket.local-address: func</code></h4>
 <p>Get the current bound address.</p>
 <p>POSIX mentions:</p>
 <blockquote>
@@ -1964,13 +1963,13 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.local_address.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_local_address.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.remote_address"><code>[method]udp-socket.remote-address: func</code></a></h4>
+<h4><a name="method_udp_socket_remote_address"></a><code>[method]udp-socket.remote-address: func</code></h4>
 <p>Get the address the socket is currently streaming to.</p>
 <h1>Typical errors</h1>
 <ul>
@@ -1985,24 +1984,24 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.remote_address.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_remote_address.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.address_family"><code>[method]udp-socket.address-family: func</code></a></h4>
+<h4><a name="method_udp_socket_address_family"></a><code>[method]udp-socket.address-family: func</code></h4>
 <p>Whether this is a IPv4 or IPv6 socket.</p>
 <p>Equivalent to the SO_DOMAIN socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.address_family.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_address_family.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="method_udp_socket_address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
-<h4><a name="method_udp_socket.unicast_hop_limit"><code>[method]udp-socket.unicast-hop-limit: func</code></a></h4>
+<h4><a name="method_udp_socket_unicast_hop_limit"></a><code>[method]udp-socket.unicast-hop-limit: func</code></h4>
 <p>Equivalent to the IP_TTL &amp; IPV6_UNICAST_HOPS socket options.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.</p>
 <h1>Typical errors</h1>
@@ -2011,23 +2010,23 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.unicast_hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_unicast_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.unicast_hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_unicast_hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.set_unicast_hop_limit"><code>[method]udp-socket.set-unicast-hop-limit: func</code></a></h4>
+<h4><a name="method_udp_socket_set_unicast_hop_limit"></a><code>[method]udp-socket.set-unicast-hop-limit: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.set_unicast_hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.set_unicast_hop_limit.value"><code>value</code></a>: <code>u8</code></li>
+<li><a name="method_udp_socket_set_unicast_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_unicast_hop_limit.value"></a><code>value</code>: <code>u8</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.set_unicast_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_unicast_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.receive_buffer_size"><code>[method]udp-socket.receive-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_receive_buffer_size"></a><code>[method]udp-socket.receive-buffer-size: func</code></h4>
 <p>The kernel buffer space reserved for sends/receives on this socket.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2039,54 +2038,54 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.set_receive_buffer_size"><code>[method]udp-socket.set-receive-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_set_receive_buffer_size"></a><code>[method]udp-socket.set-receive-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.set_receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.set_receive_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_udp_socket_set_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_receive_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.send_buffer_size"><code>[method]udp-socket.send-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_send_buffer_size"></a><code>[method]udp-socket.send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.set_send_buffer_size"><code>[method]udp-socket.set-send-buffer-size: func</code></a></h4>
+<h4><a name="method_udp_socket_set_send_buffer_size"></a><code>[method]udp-socket.set-send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.set_send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
-<li><a name="method_udp_socket.set_send_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_udp_socket_set_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_send_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_udp_socket.subscribe"><code>[method]udp-socket.subscribe: func</code></a></h4>
+<h4><a name="method_udp_socket_subscribe"></a><code>[method]udp-socket.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the socket is ready for I/O.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_udp_socket.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_udp_socket.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_udp_socket_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_incoming_datagram_stream.receive"><code>[method]incoming-datagram-stream.receive: func</code></a></h4>
+<h4><a name="method_incoming_datagram_stream_receive"></a><code>[method]incoming-datagram-stream.receive: func</code></h4>
 <p>Receive messages on the socket.</p>
 <p>This function attempts to receive up to <code>max-results</code> datagrams on the socket without blocking.
 The returned list may contain fewer elements than requested, but never more.</p>
@@ -2114,26 +2113,26 @@ This function never returns <code>error(would-block)</code>.</li>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.receive.self"><code>self</code></a>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
-<li><a name="method_incoming_datagram_stream.receive.max_results"><code>max-results</code></a>: <code>u64</code></li>
+<li><a name="method_incoming_datagram_stream_receive.self"></a><code>self</code>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_receive.max_results"></a><code>max-results</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.receive.0"></a> result&lt;list&lt;<a href="#incoming_datagram"><a href="#incoming_datagram"><code>incoming-datagram</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_receive.0"></a> result&lt;list&lt;<a href="#incoming_datagram"><a href="#incoming_datagram"><code>incoming-datagram</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_incoming_datagram_stream.subscribe"><code>[method]incoming-datagram-stream.subscribe: func</code></a></h4>
+<h4><a name="method_incoming_datagram_stream_subscribe"></a><code>[method]incoming-datagram-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the stream is ready to receive again.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#incoming_datagram_stream"><a href="#incoming_datagram_stream"><code>incoming-datagram-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_incoming_datagram_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_incoming_datagram_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_outgoing_datagram_stream.check_send"><code>[method]outgoing-datagram-stream.check-send: func</code></a></h4>
+<h4><a name="method_outgoing_datagram_stream_check_send"></a><code>[method]outgoing-datagram-stream.check-send: func</code></h4>
 <p>Check readiness for sending. This function never blocks.</p>
 <p>Returns the number of datagrams permitted for the next call to <code>send</code>,
 or an error. Calling <code>send</code> with more datagrams than this function has
@@ -2144,13 +2143,13 @@ error.</p>
 <p>Never returns <code>would-block</code>.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.check_send.self"><code>self</code></a>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_check_send.self"></a><code>self</code>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.check_send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_check_send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_outgoing_datagram_stream.send"><code>[method]outgoing-datagram-stream.send: func</code></a></h4>
+<h4><a name="method_outgoing_datagram_stream_send"></a><code>[method]outgoing-datagram-stream.send: func</code></h4>
 <p>Send messages on the socket.</p>
 <p>This function attempts to send all provided <code>datagrams</code> on the socket without blocking and
 returns how many messages were actually sent (or queued for sending). This function never
@@ -2185,43 +2184,43 @@ either <code>check-send</code> was not called or <code>datagrams</code> contains
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.send.self"><code>self</code></a>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
-<li><a name="method_outgoing_datagram_stream.send.datagrams"><code>datagrams</code></a>: list&lt;<a href="#outgoing_datagram"><a href="#outgoing_datagram"><code>outgoing-datagram</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_send.self"></a><code>self</code>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_send.datagrams"></a><code>datagrams</code>: list&lt;<a href="#outgoing_datagram"><a href="#outgoing_datagram"><code>outgoing-datagram</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_send.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_outgoing_datagram_stream.subscribe"><code>[method]outgoing-datagram-stream.subscribe: func</code></a></h4>
+<h4><a name="method_outgoing_datagram_stream_subscribe"></a><code>[method]outgoing-datagram-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the stream is ready to send again.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#outgoing_datagram_stream"><a href="#outgoing_datagram_stream"><code>outgoing-datagram-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_outgoing_datagram_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_outgoing_datagram_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_udp_create_socket_0.2.0">Import interface wasi:sockets/udp-create-socket@0.2.0</a></h2>
+<h2><a name="wasi_sockets_udp_create_socket_0_2_0"></a>Import interface wasi:sockets/udp-create-socket@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>type network</code></a></h4>
+<h4><a name="network"></a><code>type network</code></h4>
 <p><a href="#network"><a href="#network"><code>network</code></a></a></p>
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="udp_socket">`type udp-socket`</a>
+#### <a name="udp_socket"></a>`type udp-socket`
 [`udp-socket`](#udp_socket)
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="create_udp_socket"><code>create-udp-socket: func</code></a></h4>
+<h4><a name="create_udp_socket"></a><code>create-udp-socket: func</code></h4>
 <p>Create a new UDP socket.</p>
 <p>Similar to <code>socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)</code> in POSIX.
 On IPv6 sockets, IPV6_V6ONLY is enabled by default and can't be configured otherwise.</p>
@@ -2243,56 +2242,56 @@ the socket is effectively an in-memory configuration object, unable to communica
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="create_udp_socket.address_family"><code>address-family</code></a>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="create_udp_socket.address_family"></a><code>address-family</code>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="create_udp_socket.0"></a> result&lt;own&lt;<a href="#udp_socket"><a href="#udp_socket"><code>udp-socket</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_tcp_0.2.0">Import interface wasi:sockets/tcp@0.2.0</a></h2>
+<h2><a name="wasi_sockets_tcp_0_2_0"></a>Import interface wasi:sockets/tcp@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="input_stream"><code>type input-stream</code></a></h4>
+<h4><a name="input_stream"></a><code>type input-stream</code></h4>
 <p><a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a></p>
 <p>
-#### <a name="output_stream">`type output-stream`</a>
+#### <a name="output_stream"></a>`type output-stream`
 [`output-stream`](#output_stream)
 <p>
-#### <a name="pollable">`type pollable`</a>
+#### <a name="pollable"></a>`type pollable`
 [`pollable`](#pollable)
 <p>
-#### <a name="duration">`type duration`</a>
+#### <a name="duration"></a>`type duration`
 [`duration`](#duration)
 <p>
-#### <a name="network">`type network`</a>
+#### <a name="network"></a>`type network`
 [`network`](#network)
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_socket_address">`type ip-socket-address`</a>
+#### <a name="ip_socket_address"></a>`type ip-socket-address`
 [`ip-socket-address`](#ip_socket_address)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="shutdown_type">`enum shutdown-type`</a>
+#### <a name="shutdown_type"></a>`enum shutdown-type`
 <h5>Enum Cases</h5>
 <ul>
 <li>
-<p><a name="shutdown_type.receive"><code>receive</code></a></p>
+<p><a name="shutdown_type.receive"></a><code>receive</code></p>
 <p>Similar to `SHUT_RD` in POSIX.
 </li>
 <li>
-<p><a name="shutdown_type.send"><code>send</code></a></p>
+<p><a name="shutdown_type.send"></a><code>send</code></p>
 <p>Similar to `SHUT_WR` in POSIX.
 </li>
 <li>
-<p><a name="shutdown_type.both"><code>both</code></a></p>
+<p><a name="shutdown_type.both"></a><code>both</code></p>
 <p>Similar to `SHUT_RDWR` in POSIX.
 </li>
 </ul>
-<h4><a name="tcp_socket"><code>resource tcp-socket</code></a></h4>
+<h4><a name="tcp_socket"></a><code>resource tcp-socket</code></h4>
 <p>A TCP socket resource.</p>
 <p>The socket can be in one of the following states:</p>
 <ul>
@@ -2304,8 +2303,8 @@ the socket is effectively an in-memory configuration object, unable to communica
 <li><code>connect-in-progress</code></li>
 <li><code>connected</code></li>
 <li><code>closed</code>
-See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md</a>
-for a more information.</li>
+See <a href="https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md">https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md</a>
+for more information.</li>
 </ul>
 <p>Note: Except where explicitly mentioned, whenever this documentation uses
 the term &quot;bound&quot; without backticks it actually means: in the <code>bound</code> state <em>or higher</em>.
@@ -2314,7 +2313,7 @@ the term &quot;bound&quot; without backticks it actually means: in the <code>bou
 <code>network::error-code</code> type, TCP socket methods may always return
 <code>error(invalid-state)</code> when in the <code>closed</code> state.</h2>
 <h3>Functions</h3>
-<h4><a name="method_tcp_socket.start_bind"><code>[method]tcp-socket.start-bind: func</code></a></h4>
+<h4><a name="method_tcp_socket_start_bind"></a><code>[method]tcp-socket.start-bind: func</code></h4>
 <p>Bind the socket to a specific network on the provided IP address and port.</p>
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
@@ -2353,28 +2352,28 @@ don't want to make use of this ability can simply call the native
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.start_bind.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_bind.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_bind.local_address"><code>local-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
+<li><a name="method_tcp_socket_start_bind.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_bind.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_bind.local_address"></a><code>local-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.finish_bind"><code>[method]tcp-socket.finish-bind: func</code></a></h4>
+<h4><a name="method_tcp_socket_finish_bind"></a><code>[method]tcp-socket.finish-bind: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_bind.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_bind.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_bind.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.start_connect"><code>[method]tcp-socket.start-connect: func</code></a></h4>
+<h4><a name="method_tcp_socket_start_connect"></a><code>[method]tcp-socket.start-connect: func</code></h4>
 <p>Connect to a remote endpoint.</p>
 <p>On success:</p>
 <ul>
-<li>the socket is transitioned into the <code>connection</code> state.</li>
+<li>the socket is transitioned into the <code>connected</code> state.</li>
 <li>a pair of streams is returned that can be used to read &amp; write to the connection</li>
 </ul>
 <p>After a failed connection attempt, the socket will be in the <code>closed</code>
@@ -2415,24 +2414,24 @@ the <code>SO_ERROR</code> socket option, in case the poll signaled readiness.</p
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.start_connect.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_connect.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.start_connect.remote_address"><code>remote-address</code></a>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
+<li><a name="method_tcp_socket_start_connect.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_connect.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_connect.remote_address"></a><code>remote-address</code>: <a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.start_connect.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_connect.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.finish_connect"><code>[method]tcp-socket.finish-connect: func</code></a></h4>
+<h4><a name="method_tcp_socket_finish_connect"></a><code>[method]tcp-socket.finish-connect: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_connect.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_connect.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_connect.0"></a> result&lt;(own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_connect.0"></a> result&lt;(own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.start_listen"><code>[method]tcp-socket.start-listen: func</code></a></h4>
+<h4><a name="method_tcp_socket_start_listen"></a><code>[method]tcp-socket.start-listen: func</code></h4>
 <p>Start listening for new connections.</p>
 <p>Transitions the socket into the <code>listening</code> state.</p>
 <p>Unlike POSIX, the socket must already be explicitly bound.</p>
@@ -2459,22 +2458,22 @@ don't want to make use of this ability can simply call the native
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.start_listen.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_listen.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.start_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_start_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.finish_listen"><code>[method]tcp-socket.finish-listen: func</code></a></h4>
+<h4><a name="method_tcp_socket_finish_listen"></a><code>[method]tcp-socket.finish-listen: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_listen.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_listen.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.finish_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_finish_listen.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.accept"><code>[method]tcp-socket.accept: func</code></a></h4>
+<h4><a name="method_tcp_socket_accept"></a><code>[method]tcp-socket.accept: func</code></h4>
 <p>Accept a new client socket.</p>
 <p>The returned socket is bound and in the <code>connected</code> state. The following properties are inherited from the listener socket:</p>
 <ul>
@@ -2505,13 +2504,13 @@ a pair of streams that can be used to read &amp; write to the connection.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.accept.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_accept.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.accept.0"></a> result&lt;(own&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;, own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_accept.0"></a> result&lt;(own&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;, own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;, own&lt;<a href="#output_stream"><a href="#output_stream"><code>output-stream</code></a></a>&gt;), <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.local_address"><code>[method]tcp-socket.local-address: func</code></a></h4>
+<h4><a name="method_tcp_socket_local_address"></a><code>[method]tcp-socket.local-address: func</code></h4>
 <p>Get the bound local address.</p>
 <p>POSIX mentions:</p>
 <blockquote>
@@ -2532,13 +2531,13 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.local_address.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_local_address.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_local_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.remote_address"><code>[method]tcp-socket.remote-address: func</code></a></h4>
+<h4><a name="method_tcp_socket_remote_address"></a><code>[method]tcp-socket.remote-address: func</code></h4>
 <p>Get the remote address.</p>
 <h1>Typical errors</h1>
 <ul>
@@ -2553,35 +2552,35 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.remote_address.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_remote_address.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.is_listening"><code>[method]tcp-socket.is-listening: func</code></a></h4>
+<h4><a name="method_tcp_socket_is_listening"></a><code>[method]tcp-socket.is-listening: func</code></h4>
 <p>Whether the socket is in the <code>listening</code> state.</p>
 <p>Equivalent to the SO_ACCEPTCONN socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.is_listening.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_is_listening.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.is_listening.0"></a> <code>bool</code></li>
+<li><a name="method_tcp_socket_is_listening.0"></a> <code>bool</code></li>
 </ul>
-<h4><a name="method_tcp_socket.address_family"><code>[method]tcp-socket.address-family: func</code></a></h4>
+<h4><a name="method_tcp_socket_address_family"></a><code>[method]tcp-socket.address-family: func</code></h4>
 <p>Whether this is a IPv4 or IPv6 socket.</p>
 <p>Equivalent to the SO_DOMAIN socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.address_family.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_address_family.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="method_tcp_socket_address_family.0"></a> <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
-<h4><a name="method_tcp_socket.set_listen_backlog_size"><code>[method]tcp-socket.set-listen-backlog-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_listen_backlog_size"></a><code>[method]tcp-socket.set-listen-backlog-size: func</code></h4>
 <p>Hints the desired listen queue size. Implementations are free to ignore this.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.</p>
@@ -2593,14 +2592,14 @@ Any other value will never cause an error, but it might be silently clamped and/
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_listen_backlog_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_listen_backlog_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_tcp_socket_set_listen_backlog_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_listen_backlog_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_listen_backlog_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_listen_backlog_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_enabled"><code>[method]tcp-socket.keep-alive-enabled: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_enabled"></a><code>[method]tcp-socket.keep-alive-enabled: func</code></h4>
 <p>Enables or disables keepalive.</p>
 <p>The keepalive behavior can be adjusted using:</p>
 <ul>
@@ -2612,23 +2611,23 @@ These properties can be configured while <code>keep-alive-enabled</code> is fals
 <p>Equivalent to the SO_KEEPALIVE socket option.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_enabled.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_enabled.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_enabled.0"></a> result&lt;<code>bool</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_enabled.0"></a> result&lt;<code>bool</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_enabled"><code>[method]tcp-socket.set-keep-alive-enabled: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_enabled"></a><code>[method]tcp-socket.set-keep-alive-enabled: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_enabled.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_enabled.value"><code>value</code></a>: <code>bool</code></li>
+<li><a name="method_tcp_socket_set_keep_alive_enabled.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_enabled.value"></a><code>value</code>: <code>bool</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_enabled.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_enabled.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_idle_time"><code>[method]tcp-socket.keep-alive-idle-time: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_idle_time"></a><code>[method]tcp-socket.keep-alive-idle-time: func</code></h4>
 <p>Amount of time the connection has to be idle before TCP starts sending keepalive packets.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2640,23 +2639,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_idle_time.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_idle_time.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_idle_time.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_idle_time.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_idle_time"><code>[method]tcp-socket.set-keep-alive-idle-time: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_idle_time"></a><code>[method]tcp-socket.set-keep-alive-idle-time: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_idle_time.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_idle_time.value"><code>value</code></a>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
+<li><a name="method_tcp_socket_set_keep_alive_idle_time.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_idle_time.value"></a><code>value</code>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_idle_time.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_idle_time.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_interval"><code>[method]tcp-socket.keep-alive-interval: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_interval"></a><code>[method]tcp-socket.keep-alive-interval: func</code></h4>
 <p>The time between keepalive packets.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2668,23 +2667,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_interval.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_interval.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_interval.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_interval.0"></a> result&lt;<a href="#duration"><a href="#duration"><code>duration</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_interval"><code>[method]tcp-socket.set-keep-alive-interval: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_interval"></a><code>[method]tcp-socket.set-keep-alive-interval: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_interval.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_interval.value"><code>value</code></a>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
+<li><a name="method_tcp_socket_set_keep_alive_interval.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_interval.value"></a><code>value</code>: <a href="#duration"><a href="#duration"><code>duration</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_interval.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_interval.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.keep_alive_count"><code>[method]tcp-socket.keep-alive-count: func</code></a></h4>
+<h4><a name="method_tcp_socket_keep_alive_count"></a><code>[method]tcp-socket.keep-alive-count: func</code></h4>
 <p>The maximum amount of keepalive packets TCP should send before aborting the connection.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2696,23 +2695,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_count.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_count.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.keep_alive_count.0"></a> result&lt;<code>u32</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_keep_alive_count.0"></a> result&lt;<code>u32</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_keep_alive_count"><code>[method]tcp-socket.set-keep-alive-count: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_keep_alive_count"></a><code>[method]tcp-socket.set-keep-alive-count: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_count.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_keep_alive_count.value"><code>value</code></a>: <code>u32</code></li>
+<li><a name="method_tcp_socket_set_keep_alive_count.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_count.value"></a><code>value</code>: <code>u32</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_keep_alive_count.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_keep_alive_count.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.hop_limit"><code>[method]tcp-socket.hop-limit: func</code></a></h4>
+<h4><a name="method_tcp_socket_hop_limit"></a><code>[method]tcp-socket.hop-limit: func</code></h4>
 <p>Equivalent to the IP_TTL &amp; IPV6_UNICAST_HOPS socket options.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.</p>
 <h1>Typical errors</h1>
@@ -2721,23 +2720,23 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_hop_limit.0"></a> result&lt;<code>u8</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_hop_limit"><code>[method]tcp-socket.set-hop-limit: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_hop_limit"></a><code>[method]tcp-socket.set-hop-limit: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_hop_limit.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_hop_limit.value"><code>value</code></a>: <code>u8</code></li>
+<li><a name="method_tcp_socket_set_hop_limit.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_hop_limit.value"></a><code>value</code>: <code>u8</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_hop_limit.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.receive_buffer_size"><code>[method]tcp-socket.receive-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_receive_buffer_size"></a><code>[method]tcp-socket.receive-buffer-size: func</code></h4>
 <p>The kernel buffer space reserved for sends/receives on this socket.</p>
 <p>If the provided value is 0, an <code>invalid-argument</code> error is returned.
 Any other value will never cause an error, but it might be silently clamped and/or rounded.
@@ -2749,42 +2748,42 @@ I.e. after setting a value, reading the same setting back may return a different
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_receive_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_receive_buffer_size"><code>[method]tcp-socket.set-receive-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_receive_buffer_size"></a><code>[method]tcp-socket.set-receive-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_receive_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_receive_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_tcp_socket_set_receive_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_receive_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_receive_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.send_buffer_size"><code>[method]tcp-socket.send-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_send_buffer_size"></a><code>[method]tcp-socket.send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_send_buffer_size.0"></a> result&lt;<code>u64</code>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.set_send_buffer_size"><code>[method]tcp-socket.set-send-buffer-size: func</code></a></h4>
+<h4><a name="method_tcp_socket_set_send_buffer_size"></a><code>[method]tcp-socket.set-send-buffer-size: func</code></h4>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.set_send_buffer_size.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.set_send_buffer_size.value"><code>value</code></a>: <code>u64</code></li>
+<li><a name="method_tcp_socket_set_send_buffer_size.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_send_buffer_size.value"></a><code>value</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.subscribe"><code>[method]tcp-socket.subscribe: func</code></a></h4>
+<h4><a name="method_tcp_socket_subscribe"></a><code>[method]tcp-socket.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which can be used to poll for, or block on,
 completion of any of the asynchronous operations of this socket.</p>
 <p>When <code>finish-bind</code>, <code>finish-listen</code>, <code>finish-connect</code> or <code>accept</code>
@@ -2794,19 +2793,19 @@ their success or failure, after which the method can be retried.</p>
 in progress at the time of calling <code>subscribe</code> (if any). Theoretically,
 <code>subscribe</code> only has to be called once per socket and can then be
 (re)used for the remainder of the socket's lifetime.</p>
-<p>See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness</a>
-for a more information.</p>
+<p>See <a href="https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md#pollable-readiness">https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md#pollable-readiness</a>
+for more information.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_tcp_socket.shutdown"><code>[method]tcp-socket.shutdown: func</code></a></h4>
+<h4><a name="method_tcp_socket_shutdown"></a><code>[method]tcp-socket.shutdown: func</code></h4>
 <p>Initiate a graceful shutdown.</p>
 <ul>
 <li><code>receive</code>: The socket is not expecting to receive any data from
@@ -2817,7 +2816,7 @@ this method will be discarded.</li>
 associated with this socket will be closed and a FIN packet will be sent.</li>
 <li><code>both</code>: Same effect as <code>receive</code> &amp; <code>send</code> combined.</li>
 </ul>
-<p>This function is idempotent. Shutting a down a direction more than once
+<p>This function is idempotent; shutting down a direction more than once
 has no effect and returns <code>ok</code>.</p>
 <p>The shutdown function does not close (drop) the socket.</p>
 <h1>Typical errors</h1>
@@ -2833,31 +2832,31 @@ has no effect and returns <code>ok</code>.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_tcp_socket.shutdown.self"><code>self</code></a>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
-<li><a name="method_tcp_socket.shutdown.shutdown_type"><a href="#shutdown_type"><code>shutdown-type</code></a></a>: <a href="#shutdown_type"><a href="#shutdown_type"><code>shutdown-type</code></a></a></li>
+<li><a name="method_tcp_socket_shutdown.self"></a><code>self</code>: borrow&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_shutdown.shutdown_type"></a><a href="#shutdown_type"><code>shutdown-type</code></a>: <a href="#shutdown_type"><a href="#shutdown_type"><code>shutdown-type</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_tcp_socket.shutdown.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_tcp_socket_shutdown.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_tcp_create_socket_0.2.0">Import interface wasi:sockets/tcp-create-socket@0.2.0</a></h2>
+<h2><a name="wasi_sockets_tcp_create_socket_0_2_0"></a>Import interface wasi:sockets/tcp-create-socket@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="network"><code>type network</code></a></h4>
+<h4><a name="network"></a><code>type network</code></h4>
 <p><a href="#network"><a href="#network"><code>network</code></a></a></p>
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_address_family">`type ip-address-family`</a>
+#### <a name="ip_address_family"></a>`type ip-address-family`
 [`ip-address-family`](#ip_address_family)
 <p>
-#### <a name="tcp_socket">`type tcp-socket`</a>
+#### <a name="tcp_socket"></a>`type tcp-socket`
 [`tcp-socket`](#tcp_socket)
 <p>
 ----
 <h3>Functions</h3>
-<h4><a name="create_tcp_socket"><code>create-tcp-socket: func</code></a></h4>
+<h4><a name="create_tcp_socket"></a><code>create-tcp-socket: func</code></h4>
 <p>Create a new TCP socket.</p>
 <p>Similar to <code>socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)</code> in POSIX.
 On IPv6 sockets, IPV6_V6ONLY is enabled by default and can't be configured otherwise.</p>
@@ -2879,31 +2878,31 @@ is called, the socket is effectively an in-memory configuration object, unable t
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="create_tcp_socket.address_family"><code>address-family</code></a>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
+<li><a name="create_tcp_socket.address_family"></a><code>address-family</code>: <a href="#ip_address_family"><a href="#ip_address_family"><code>ip-address-family</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="create_tcp_socket.0"></a> result&lt;own&lt;<a href="#tcp_socket"><a href="#tcp_socket"><code>tcp-socket</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:sockets_ip_name_lookup_0.2.0">Import interface wasi:sockets/ip-name-lookup@0.2.0</a></h2>
+<h2><a name="wasi_sockets_ip_name_lookup_0_2_0"></a>Import interface wasi:sockets/ip-name-lookup@0.2.0</h2>
 <hr />
 <h3>Types</h3>
-<h4><a name="pollable"><code>type pollable</code></a></h4>
+<h4><a name="pollable"></a><code>type pollable</code></h4>
 <p><a href="#pollable"><a href="#pollable"><code>pollable</code></a></a></p>
 <p>
-#### <a name="network">`type network`</a>
+#### <a name="network"></a>`type network`
 [`network`](#network)
 <p>
-#### <a name="error_code">`type error-code`</a>
+#### <a name="error_code"></a>`type error-code`
 [`error-code`](#error_code)
 <p>
-#### <a name="ip_address">`type ip-address`</a>
+#### <a name="ip_address"></a>`type ip-address`
 [`ip-address`](#ip_address)
 <p>
-#### <a name="resolve_address_stream">`resource resolve-address-stream`</a>
+#### <a name="resolve_address_stream"></a>`resource resolve-address-stream`
 <hr />
 <h3>Functions</h3>
-<h4><a name="resolve_addresses"><code>resolve-addresses: func</code></a></h4>
+<h4><a name="resolve_addresses"></a><code>resolve-addresses: func</code></h4>
 <p>Resolve an internet host name to a list of IP addresses.</p>
 <p>Unicode domain names are automatically converted to ASCII using IDNA encoding.
 If the input is an IP address string, the address is parsed and returned
@@ -2925,14 +2924,14 @@ to (asynchronously) fetch the results.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="resolve_addresses.network"><a href="#network"><code>network</code></a></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
-<li><a name="resolve_addresses.name"><code>name</code></a>: <code>string</code></li>
+<li><a name="resolve_addresses.network"></a><a href="#network"><code>network</code></a>: borrow&lt;<a href="#network"><a href="#network"><code>network</code></a></a>&gt;</li>
+<li><a name="resolve_addresses.name"></a><code>name</code>: <code>string</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="resolve_addresses.0"></a> result&lt;own&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_resolve_address_stream.resolve_next_address"><code>[method]resolve-address-stream.resolve-next-address: func</code></a></h4>
+<h4><a name="method_resolve_address_stream_resolve_next_address"></a><code>[method]resolve-address-stream.resolve-next-address: func</code></h4>
 <p>Returns the next address from the resolver.</p>
 <p>This function should be called multiple times. On each call, it will
 return the next address in connection order preference. If all
@@ -2947,31 +2946,31 @@ addresses have been exhausted, this function returns <code>none</code>.</p>
 </ul>
 <h5>Params</h5>
 <ul>
-<li><a name="method_resolve_address_stream.resolve_next_address.self"><code>self</code></a>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_resolve_next_address.self"></a><code>self</code>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_resolve_address_stream.resolve_next_address.0"></a> result&lt;option&lt;<a href="#ip_address"><a href="#ip_address"><code>ip-address</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_resolve_next_address.0"></a> result&lt;option&lt;<a href="#ip_address"><a href="#ip_address"><code>ip-address</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
-<h4><a name="method_resolve_address_stream.subscribe"><code>[method]resolve-address-stream.subscribe: func</code></a></h4>
+<h4><a name="method_resolve_address_stream_subscribe"></a><code>[method]resolve-address-stream.subscribe: func</code></h4>
 <p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the stream is ready for I/O.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="method_resolve_address_stream.subscribe.self"><code>self</code></a>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_subscribe.self"></a><code>self</code>: borrow&lt;<a href="#resolve_address_stream"><a href="#resolve_address_stream"><code>resolve-address-stream</code></a></a>&gt;</li>
 </ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="method_resolve_address_stream.subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
+<li><a name="method_resolve_address_stream_subscribe.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:random_random_0.2.0">Import interface wasi:random/random@0.2.0</a></h2>
+<h2><a name="wasi_random_random_0_2_0"></a>Import interface wasi:random/random@0.2.0</h2>
 <p>WASI Random is a random data API.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="get_random_bytes"><code>get-random-bytes: func</code></a></h4>
+<h4><a name="get_random_bytes"></a><code>get-random-bytes: func</code></h4>
 <p>Return <code>len</code> cryptographically-secure random or pseudo-random bytes.</p>
 <p>This function must produce data at least as cryptographically secure and
 fast as an adequately seeded cryptographically-secure pseudo-random
@@ -2984,13 +2983,13 @@ must omit this function, rather than implementing it with deterministic
 data.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="get_random_bytes.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="get_random_bytes.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_random_bytes.0"></a> list&lt;<code>u8</code>&gt;</li>
 </ul>
-<h4><a name="get_random_u64"><code>get-random-u64: func</code></a></h4>
+<h4><a name="get_random_u64"></a><code>get-random-u64: func</code></h4>
 <p>Return a cryptographically-secure random or pseudo-random <code>u64</code> value.</p>
 <p>This function returns the same type of data as <a href="#get_random_bytes"><code>get-random-bytes</code></a>,
 represented as a <code>u64</code>.</p>
@@ -2998,13 +2997,13 @@ represented as a <code>u64</code>.</p>
 <ul>
 <li><a name="get_random_u64.0"></a> <code>u64</code></li>
 </ul>
-<h2><a name="wasi:random_insecure_0.2.0">Import interface wasi:random/insecure@0.2.0</a></h2>
+<h2><a name="wasi_random_insecure_0_2_0"></a>Import interface wasi:random/insecure@0.2.0</h2>
 <p>The insecure interface for insecure pseudo-random numbers.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="get_insecure_random_bytes"><code>get-insecure-random-bytes: func</code></a></h4>
+<h4><a name="get_insecure_random_bytes"></a><code>get-insecure-random-bytes: func</code></h4>
 <p>Return <code>len</code> insecure pseudo-random bytes.</p>
 <p>This function is not cryptographically secure. Do not use it for
 anything related to security.</p>
@@ -3013,13 +3012,13 @@ implementations are encouraged to return evenly distributed values with
 a long period.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="get_insecure_random_bytes.len"><code>len</code></a>: <code>u64</code></li>
+<li><a name="get_insecure_random_bytes.len"></a><code>len</code>: <code>u64</code></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="get_insecure_random_bytes.0"></a> list&lt;<code>u8</code>&gt;</li>
 </ul>
-<h4><a name="get_insecure_random_u64"><code>get-insecure-random-u64: func</code></a></h4>
+<h4><a name="get_insecure_random_u64"></a><code>get-insecure-random-u64: func</code></h4>
 <p>Return an insecure pseudo-random <code>u64</code> value.</p>
 <p>This function returns the same type of pseudo-random data as
 <a href="#get_insecure_random_bytes"><code>get-insecure-random-bytes</code></a>, represented as a <code>u64</code>.</p>
@@ -3027,13 +3026,13 @@ a long period.</p>
 <ul>
 <li><a name="get_insecure_random_u64.0"></a> <code>u64</code></li>
 </ul>
-<h2><a name="wasi:random_insecure_seed_0.2.0">Import interface wasi:random/insecure-seed@0.2.0</a></h2>
+<h2><a name="wasi_random_insecure_seed_0_2_0"></a>Import interface wasi:random/insecure-seed@0.2.0</h2>
 <p>The insecure-seed interface for seeding hash-map DoS resistance.</p>
 <p>It is intended to be portable at least between Unix-family platforms and
 Windows.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="insecure_seed"><code>insecure-seed: func</code></a></h4>
+<h4><a name="insecure_seed"></a><code>insecure-seed: func</code></h4>
 <p>Return a 128-bit value that may contain a pseudo-random value.</p>
 <p>The returned value is not required to be computed from a CSPRNG, and may
 even be entirely deterministic. Host implementations are encouraged to
diff --git a/wit/deps.lock b/wit/deps.lock
index 704339a..8660c85 100644
--- a/wit/deps.lock
+++ b/wit/deps.lock
@@ -1,24 +1,24 @@
 [clocks]
 url = "https://github.com/WebAssembly/wasi-clocks/archive/main.tar.gz"
-sha256 = "468b4d12892fe926b8eb5d398dbf579d566c93231fa44f415440572c695b7613"
-sha512 = "e6b53a07221f1413953c9797c68f08b815fdaebf66419bbc1ea3e8b7dece73731062693634731f311a03957b268cf9cc509c518bd15e513c318aa04a8459b93a"
+sha256 = "f27a857de70c1b0dfbabda35812a8de1253089623b1a84ddd066183c6ffac5f8"
+sha512 = "9df1b0be1e4925f671fda65d433217798404f8e2e4fa60ff8bfdfd257f0b6d212ea350c141f308cf4cc57fb0b44899b14af1f9af97a05dcd6f8ae00a7594de8d"
 
 [filesystem]
 url = "https://github.com/WebAssembly/wasi-filesystem/archive/main.tar.gz"
-sha256 = "498c465cfd04587db40f970fff2185daa597d074c20b68a8bcbae558f261499b"
-sha512 = "ead452f9b7bfb88593a502ec00d76d4228003d51c40fd0408aebc32d35c94673551b00230d730873361567cc209ec218c41fb4e95bad194268592c49e7964347"
+sha256 = "e37bda5e27222621771ba07d2e9daf862a728c31f91024badfc4f9a42c9ae8ee"
+sha512 = "81e92f5e4eca0c8f9606f26a1c4eebb3c53a708b57d3f7e7c60e97aa3c18794b72a44c39212de566442e25313b5ccb5b0b7c9070f3600f0c7c584ea9db91e207"
 
 [io]
 url = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"
-sha256 = "7210e5653539a15478f894d4da24cc69d61924cbcba21d2804d69314a88e5a4c"
-sha512 = "49184a1b0945a889abd52d25271172ed3dc2db6968fcdddb1bab7ee0081f4a3eeee0977ad2291126a37631c0d86eeea75d822fa8af224c422134500bf9f0f2bb"
+sha256 = "f3e976740ed9512674c627c6588864c477a9ff539bb7e55c7b9ceab222399b52"
+sha512 = "c785122b4c04e2297e3fa37ae76c149b0a681444da106758cf673023923b69a6b2c65624ffbb6ad31edef02f9fbc677b05c89525f07b1159fe0c997a8c6b1a8f"
 
 [random]
 url = "https://github.com/WebAssembly/wasi-random/archive/main.tar.gz"
-sha256 = "7371d03c037d924caba2587fb2e7c5773a0d3c5fcecbf7971e0e0ba57973c53d"
-sha512 = "964c4e8925a53078e4d94ba907b54f89a0b7e154f46823a505391471466c17f53c8692682e5c85771712acd88b348686173fc07c53a3cfe3d301b8cd8ddd0de4"
+sha256 = "2f0014e946e38947afe120836b17cdcfa608be993d38d55b81cc2d31e7e70b16"
+sha512 = "51ee623509040de77b0ba236e29589102538aacd3dd67168b06a09bf6ae469c762818fc07b5039d2a8b1838f4b5a5965a7c81ed0e2d47b142bece9d1ab8b93a6"
 
 [sockets]
 url = "https://github.com/WebAssembly/wasi-sockets/archive/main.tar.gz"
-sha256 = "622bd28bbeb43736375dc02bd003fd3a016ff8ee91e14bab488325c6b38bf966"
-sha512 = "5a63c1f36de0c4548e1d2297bdbededb28721cbad94ef7825c469eae29d7451c97e00b4c1d6730ee1ec0c4a5aac922961a2795762d4a0c3bb54e30a391a84bae"
+sha256 = "5321ba37115d503bfe0880349e99ecbd26ee812708fa83d2b276ec8ee7571443"
+sha512 = "c3d71c2afa1475bf10d86b1e0623e2292e5dd407cf54103ad0d05c07fa95323bff9ad06e929d508b318a0a99a67132793fb9a04c17585843e24f090f5ee91367"
diff --git a/wit/deps/clocks/monotonic-clock.wit b/wit/deps/clocks/monotonic-clock.wit
index 4e4dc3a..cae2363 100644
--- a/wit/deps/clocks/monotonic-clock.wit
+++ b/wit/deps/clocks/monotonic-clock.wit
@@ -7,38 +7,43 @@ package wasi:clocks@0.2.0;
 ///
 /// A monotonic clock is a clock which has an unspecified initial value, and
 /// successive reads of the clock will produce non-decreasing values.
-///
-/// It is intended for measuring elapsed time.
+@since(version = 0.2.0)
 interface monotonic-clock {
+    @since(version = 0.2.0)
     use wasi:io/poll@0.2.0.{pollable};
 
     /// An instant in time, in nanoseconds. An instant is relative to an
     /// unspecified initial value, and can only be compared to instances from
     /// the same monotonic-clock.
+    @since(version = 0.2.0)
     type instant = u64;
 
     /// A duration of time, in nanoseconds.
+    @since(version = 0.2.0)
     type duration = u64;
 
     /// Read the current value of the clock.
     ///
     /// The clock is monotonic, therefore calling this function repeatedly will
     /// produce a sequence of non-decreasing values.
+    @since(version = 0.2.0)
     now: func() -> instant;
 
     /// Query the resolution of the clock. Returns the duration of time
     /// corresponding to a clock tick.
+    @since(version = 0.2.0)
     resolution: func() -> duration;
 
     /// Create a `pollable` which will resolve once the specified instant
-    /// occured.
+    /// has occured.
+    @since(version = 0.2.0)
     subscribe-instant: func(
         when: instant,
     ) -> pollable;
 
-    /// Create a `pollable` which will resolve once the given duration has
-    /// elapsed, starting at the time at which this function was called.
-    /// occured.
+    /// Create a `pollable` that will resolve after the specified duration has
+    /// elapsed from the time this function is invoked.
+    @since(version = 0.2.0)
     subscribe-duration: func(
         when: duration,
     ) -> pollable;
diff --git a/wit/deps/clocks/timezone.wit b/wit/deps/clocks/timezone.wit
new file mode 100644
index 0000000..3c28688
--- /dev/null
+++ b/wit/deps/clocks/timezone.wit
@@ -0,0 +1,55 @@
+package wasi:clocks@0.2.0;
+
+@unstable(feature = clocks-timezone)
+interface timezone {
+    @unstable(feature = clocks-timezone)
+    use wall-clock.{datetime};
+
+    /// Return information needed to display the given `datetime`. This includes
+    /// the UTC offset, the time zone name, and a flag indicating whether
+    /// daylight saving time is active.
+    ///
+    /// If the timezone cannot be determined for the given `datetime`, return a
+    /// `timezone-display` for `UTC` with a `utc-offset` of 0 and no daylight
+    /// saving time.
+    @unstable(feature = clocks-timezone)
+    display: func(when: datetime) -> timezone-display;
+
+    /// The same as `display`, but only return the UTC offset.
+    @unstable(feature = clocks-timezone)
+    utc-offset: func(when: datetime) -> s32;
+
+    /// Information useful for displaying the timezone of a specific `datetime`.
+    ///
+    /// This information may vary within a single `timezone` to reflect daylight
+    /// saving time adjustments.
+    @unstable(feature = clocks-timezone)
+    record timezone-display {
+        /// The number of seconds difference between UTC time and the local
+        /// time of the timezone.
+        ///
+        /// The returned value will always be less than 86400 which is the
+        /// number of seconds in a day (24*60*60).
+        ///
+        /// In implementations that do not expose an actual time zone, this
+        /// should return 0.
+        utc-offset: s32,
+
+        /// The abbreviated name of the timezone to display to a user. The name
+        /// `UTC` indicates Coordinated Universal Time. Otherwise, this should
+        /// reference local standards for the name of the time zone.
+        ///
+        /// In implementations that do not expose an actual time zone, this
+        /// should be the string `UTC`.
+        ///
+        /// In time zones that do not have an applicable name, a formatted
+        /// representation of the UTC offset may be returned, such as `-04:00`.
+        name: string,
+
+        /// Whether daylight saving time is active.
+        ///
+        /// In implementations that do not expose an actual time zone, this
+        /// should return false.
+        in-daylight-saving-time: bool,
+    }
+}
diff --git a/wit/deps/clocks/wall-clock.wit b/wit/deps/clocks/wall-clock.wit
index 440ca0f..4b08d71 100644
--- a/wit/deps/clocks/wall-clock.wit
+++ b/wit/deps/clocks/wall-clock.wit
@@ -13,8 +13,10 @@ package wasi:clocks@0.2.0;
 /// monotonic, making it unsuitable for measuring elapsed time.
 ///
 /// It is intended for reporting the current date and time for humans.
+@since(version = 0.2.0)
 interface wall-clock {
     /// A time and date in seconds plus nanoseconds.
+    @since(version = 0.2.0)
     record datetime {
         seconds: u64,
         nanoseconds: u32,
@@ -33,10 +35,12 @@ interface wall-clock {
     ///
     /// [POSIX's Seconds Since the Epoch]: https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xbd_chap04.html#tag_21_04_16
     /// [Unix Time]: https://en.wikipedia.org/wiki/Unix_time
+    @since(version = 0.2.0)
     now: func() -> datetime;
 
     /// Query the resolution of the clock.
     ///
     /// The nanoseconds field of the output is always less than 1000000000.
+    @since(version = 0.2.0)
     resolution: func() -> datetime;
 }
diff --git a/wit/deps/clocks/world.wit b/wit/deps/clocks/world.wit
index c022457..76a9206 100644
--- a/wit/deps/clocks/world.wit
+++ b/wit/deps/clocks/world.wit
@@ -1,6 +1,11 @@
 package wasi:clocks@0.2.0;
 
+@since(version = 0.2.0)
 world imports {
+    @since(version = 0.2.0)
     import monotonic-clock;
+    @since(version = 0.2.0)
     import wall-clock;
+    @unstable(feature = clocks-timezone)
+    import timezone;
 }
diff --git a/wit/deps/filesystem/preopens.wit b/wit/deps/filesystem/preopens.wit
index da801f6..08094ab 100644
--- a/wit/deps/filesystem/preopens.wit
+++ b/wit/deps/filesystem/preopens.wit
@@ -1,8 +1,11 @@
 package wasi:filesystem@0.2.0;
 
+@since(version = 0.2.0)
 interface preopens {
+    @since(version = 0.2.0)
     use types.{descriptor};
 
     /// Return the set of preopened directories, and their path.
+    @since(version = 0.2.0)
     get-directories: func() -> list<tuple<descriptor, string>>;
 }
diff --git a/wit/deps/filesystem/types.wit b/wit/deps/filesystem/types.wit
index 11108fc..4900ae2 100644
--- a/wit/deps/filesystem/types.wit
+++ b/wit/deps/filesystem/types.wit
@@ -23,16 +23,21 @@ package wasi:filesystem@0.2.0;
 /// [WASI filesystem path resolution].
 ///
 /// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md
+@since(version = 0.2.0)
 interface types {
+    @since(version = 0.2.0)
     use wasi:io/streams@0.2.0.{input-stream, output-stream, error};
+    @since(version = 0.2.0)
     use wasi:clocks/wall-clock@0.2.0.{datetime};
 
     /// File size or length of a region within a file.
+    @since(version = 0.2.0)
     type filesize = u64;
 
     /// The type of a filesystem object referenced by a descriptor.
     ///
     /// Note: This was called `filetype` in earlier versions of WASI.
+    @since(version = 0.2.0)
     enum descriptor-type {
         /// The type of the descriptor or file is unknown or is different from
         /// any of the other types specified.
@@ -56,6 +61,7 @@ interface types {
     /// Descriptor flags.
     ///
     /// Note: This was called `fdflags` in earlier versions of WASI.
+    @since(version = 0.2.0)
     flags descriptor-flags {
         /// Read mode: Data can be read.
         read,
@@ -99,6 +105,7 @@ interface types {
     /// File attributes.
     ///
     /// Note: This was called `filestat` in earlier versions of WASI.
+    @since(version = 0.2.0)
     record descriptor-stat {
         /// File type.
         %type: descriptor-type,
@@ -125,6 +132,7 @@ interface types {
     }
 
     /// Flags determining the method of how paths are resolved.
+    @since(version = 0.2.0)
     flags path-flags {
         /// As long as the resolved path corresponds to a symbolic link, it is
         /// expanded.
@@ -132,6 +140,7 @@ interface types {
     }
 
     /// Open flags used by `open-at`.
+    @since(version = 0.2.0)
     flags open-flags {
         /// Create file if it does not exist, similar to `O_CREAT` in POSIX.
         create,
@@ -144,9 +153,11 @@ interface types {
     }
 
     /// Number of hard links to an inode.
+    @since(version = 0.2.0)
     type link-count = u64;
 
     /// When setting a timestamp, this gives the value to set it to.
+    @since(version = 0.2.0)
     variant new-timestamp {
         /// Leave the timestamp set to its previous value.
         no-change,
@@ -248,6 +259,7 @@ interface types {
     }
 
     /// File or memory access pattern advisory information.
+    @since(version = 0.2.0)
     enum advice {
         /// The application has no advice to give on its behavior with respect
         /// to the specified data.
@@ -271,6 +283,7 @@ interface types {
 
     /// A 128-bit hash value, split into parts because wasm doesn't have a
     /// 128-bit integer type.
+    @since(version = 0.2.0)
     record metadata-hash-value {
        /// 64 bits of a 128-bit hash value.
        lower: u64,
@@ -281,6 +294,7 @@ interface types {
     /// A descriptor is a reference to a filesystem object, which may be a file,
     /// directory, named pipe, special file, or other object on which filesystem
     /// calls may be made.
+    @since(version = 0.2.0)
     resource descriptor {
         /// Return a stream for reading from a file, if available.
         ///
@@ -290,6 +304,7 @@ interface types {
         /// file and they do not interfere with each other.
         ///
         /// Note: This allows using `read-stream`, which is similar to `read` in POSIX.
+        @since(version = 0.2.0)
         read-via-stream: func(
             /// The offset within the file at which to start reading.
             offset: filesize,
@@ -301,6 +316,7 @@ interface types {
         ///
         /// Note: This allows using `write-stream`, which is similar to `write` in
         /// POSIX.
+        @since(version = 0.2.0)
         write-via-stream: func(
             /// The offset within the file at which to start writing.
             offset: filesize,
@@ -312,11 +328,13 @@ interface types {
         ///
         /// Note: This allows using `write-stream`, which is similar to `write` with
         /// `O_APPEND` in in POSIX.
+        @since(version = 0.2.0)
         append-via-stream: func() -> result<output-stream, error-code>;
 
         /// Provide file advisory information on a descriptor.
         ///
         /// This is similar to `posix_fadvise` in POSIX.
+        @since(version = 0.2.0)
         advise: func(
             /// The offset within the file to which the advisory applies.
             offset: filesize,
@@ -332,6 +350,7 @@ interface types {
         /// opened for writing.
         ///
         /// Note: This is similar to `fdatasync` in POSIX.
+        @since(version = 0.2.0)
         sync-data: func() -> result<_, error-code>;
 
         /// Get flags associated with a descriptor.
@@ -340,6 +359,7 @@ interface types {
         ///
         /// Note: This returns the value that was the `fs_flags` value returned
         /// from `fdstat_get` in earlier versions of WASI.
+        @since(version = 0.2.0)
         get-flags: func() -> result<descriptor-flags, error-code>;
 
         /// Get the dynamic type of a descriptor.
@@ -352,12 +372,14 @@ interface types {
         ///
         /// Note: This returns the value that was the `fs_filetype` value returned
         /// from `fdstat_get` in earlier versions of WASI.
+        @since(version = 0.2.0)
         get-type: func() -> result<descriptor-type, error-code>;
 
         /// Adjust the size of an open file. If this increases the file's size, the
         /// extra bytes are filled with zeros.
         ///
         /// Note: This was called `fd_filestat_set_size` in earlier versions of WASI.
+        @since(version = 0.2.0)
         set-size: func(size: filesize) -> result<_, error-code>;
 
         /// Adjust the timestamps of an open file or directory.
@@ -365,6 +387,7 @@ interface types {
         /// Note: This is similar to `futimens` in POSIX.
         ///
         /// Note: This was called `fd_filestat_set_times` in earlier versions of WASI.
+        @since(version = 0.2.0)
         set-times: func(
             /// The desired values of the data access timestamp.
             data-access-timestamp: new-timestamp,
@@ -383,6 +406,7 @@ interface types {
         /// In the future, this may change to return a `stream<u8, error-code>`.
         ///
         /// Note: This is similar to `pread` in POSIX.
+        @since(version = 0.2.0)
         read: func(
             /// The maximum number of bytes to read.
             length: filesize,
@@ -399,6 +423,7 @@ interface types {
         /// In the future, this may change to take a `stream<u8, error-code>`.
         ///
         /// Note: This is similar to `pwrite` in POSIX.
+        @since(version = 0.2.0)
         write: func(
             /// Data to write
             buffer: list<u8>,
@@ -415,6 +440,7 @@ interface types {
         /// This always returns a new stream which starts at the beginning of the
         /// directory. Multiple streams may be active on the same directory, and they
         /// do not interfere with each other.
+        @since(version = 0.2.0)
         read-directory: func() -> result<directory-entry-stream, error-code>;
 
         /// Synchronize the data and metadata of a file to disk.
@@ -423,11 +449,13 @@ interface types {
         /// opened for writing.
         ///
         /// Note: This is similar to `fsync` in POSIX.
+        @since(version = 0.2.0)
         sync: func() -> result<_, error-code>;
 
         /// Create a directory.
         ///
         /// Note: This is similar to `mkdirat` in POSIX.
+        @since(version = 0.2.0)
         create-directory-at: func(
             /// The relative path at which to create the directory.
             path: string,
@@ -442,6 +470,7 @@ interface types {
         /// modified, use `metadata-hash`.
         ///
         /// Note: This was called `fd_filestat_get` in earlier versions of WASI.
+        @since(version = 0.2.0)
         stat: func() -> result<descriptor-stat, error-code>;
 
         /// Return the attributes of a file or directory.
@@ -451,6 +480,7 @@ interface types {
         /// discussion of alternatives.
         ///
         /// Note: This was called `path_filestat_get` in earlier versions of WASI.
+        @since(version = 0.2.0)
         stat-at: func(
             /// Flags determining the method of how the path is resolved.
             path-flags: path-flags,
@@ -464,6 +494,7 @@ interface types {
         ///
         /// Note: This was called `path_filestat_set_times` in earlier versions of
         /// WASI.
+        @since(version = 0.2.0)
         set-times-at: func(
             /// Flags determining the method of how the path is resolved.
             path-flags: path-flags,
@@ -478,6 +509,7 @@ interface types {
         /// Create a hard link.
         ///
         /// Note: This is similar to `linkat` in POSIX.
+        @since(version = 0.2.0)
         link-at: func(
             /// Flags determining the method of how the path is resolved.
             old-path-flags: path-flags,
@@ -507,6 +539,7 @@ interface types {
         /// `error-code::read-only`.
         ///
         /// Note: This is similar to `openat` in POSIX.
+        @since(version = 0.2.0)
         open-at: func(
             /// Flags determining the method of how the path is resolved.
             path-flags: path-flags,
@@ -524,6 +557,7 @@ interface types {
         /// filesystem, this function fails with `error-code::not-permitted`.
         ///
         /// Note: This is similar to `readlinkat` in POSIX.
+        @since(version = 0.2.0)
         readlink-at: func(
             /// The relative path of the symbolic link from which to read.
             path: string,
@@ -534,6 +568,7 @@ interface types {
         /// Return `error-code::not-empty` if the directory is not empty.
         ///
         /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
+        @since(version = 0.2.0)
         remove-directory-at: func(
             /// The relative path to a directory to remove.
             path: string,
@@ -542,6 +577,7 @@ interface types {
         /// Rename a filesystem object.
         ///
         /// Note: This is similar to `renameat` in POSIX.
+        @since(version = 0.2.0)
         rename-at: func(
             /// The relative source path of the file or directory to rename.
             old-path: string,
@@ -557,6 +593,7 @@ interface types {
         /// `error-code::not-permitted`.
         ///
         /// Note: This is similar to `symlinkat` in POSIX.
+        @since(version = 0.2.0)
         symlink-at: func(
             /// The contents of the symbolic link.
             old-path: string,
@@ -568,6 +605,7 @@ interface types {
         ///
         /// Return `error-code::is-directory` if the path refers to a directory.
         /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
+        @since(version = 0.2.0)
         unlink-file-at: func(
             /// The relative path to a file to unlink.
             path: string,
@@ -579,6 +617,7 @@ interface types {
         /// same device (`st_dev`) and inode (`st_ino` or `d_ino`) numbers.
         /// wasi-filesystem does not expose device and inode numbers, so this function
         /// may be used instead.
+        @since(version = 0.2.0)
         is-same-object: func(other: borrow<descriptor>) -> bool;
 
         /// Return a hash of the metadata associated with a filesystem object referred
@@ -600,12 +639,14 @@ interface types {
         ///    computed hash.
         ///
         /// However, none of these is required.
+        @since(version = 0.2.0)
         metadata-hash: func() -> result<metadata-hash-value, error-code>;
 
         /// Return a hash of the metadata associated with a filesystem object referred
         /// to by a directory descriptor and a relative path.
         ///
         /// This performs the same hash computation as `metadata-hash`.
+        @since(version = 0.2.0)
         metadata-hash-at: func(
             /// Flags determining the method of how the path is resolved.
             path-flags: path-flags,
@@ -615,8 +656,10 @@ interface types {
     }
 
     /// A stream of directory entries.
+    @since(version = 0.2.0)
     resource directory-entry-stream {
         /// Read a single directory entry from a `directory-entry-stream`.
+        @since(version = 0.2.0)
         read-directory-entry: func() -> result<option<directory-entry>, error-code>;
     }
 
@@ -630,5 +673,6 @@ interface types {
     ///
     /// Note that this function is fallible because not all stream-related
     /// errors are filesystem-related errors.
+    @since(version = 0.2.0)
     filesystem-error-code: func(err: borrow<error>) -> option<error-code>;
 }
diff --git a/wit/deps/filesystem/world.wit b/wit/deps/filesystem/world.wit
index 663f579..c8d99f5 100644
--- a/wit/deps/filesystem/world.wit
+++ b/wit/deps/filesystem/world.wit
@@ -1,6 +1,9 @@
 package wasi:filesystem@0.2.0;
 
+@since(version = 0.2.0)
 world imports {
+    @since(version = 0.2.0)
     import types;
+    @since(version = 0.2.0)
     import preopens;
 }
diff --git a/wit/deps/io/error.wit b/wit/deps/io/error.wit
index 22e5b64..7e66dbb 100644
--- a/wit/deps/io/error.wit
+++ b/wit/deps/io/error.wit
@@ -1,6 +1,6 @@
 package wasi:io@0.2.0;
 
-
+@since(version = 0.2.0)
 interface error {
     /// A resource which represents some error information.
     ///
@@ -11,16 +11,15 @@ interface error {
     /// `wasi:io/streams/stream-error` type.
     ///
     /// To provide more specific error information, other interfaces may
-    /// provide functions to further "downcast" this error into more specific
-    /// error information. For example, `error`s returned in streams derived
-    /// from filesystem types to be described using the filesystem's own
-    /// error-code type, using the function
-    /// `wasi:filesystem/types/filesystem-error-code`, which takes a parameter
-    /// `borrow<error>` and returns
-    /// `option<wasi:filesystem/types/error-code>`.
+    /// offer functions to "downcast" this error into more specific types. For example,
+    /// errors returned from streams derived from filesystem types can be described using
+    /// the filesystem's own error-code type. This is done using the function
+    /// `wasi:filesystem/types/filesystem-error-code`, which takes a `borrow<error>`
+    /// parameter and returns an `option<wasi:filesystem/types/error-code>`.
     ///
     /// The set of functions which can "downcast" an `error` into a more
     /// concrete type is open.
+    @since(version = 0.2.0)
     resource error {
         /// Returns a string that is suitable to assist humans in debugging
         /// this error.
@@ -29,6 +28,7 @@ interface error {
         /// It may change across platforms, hosts, or other implementation
         /// details. Parsing this string is a major platform-compatibility
         /// hazard.
+        @since(version = 0.2.0)
         to-debug-string: func() -> string;
     }
 }
diff --git a/wit/deps/io/poll.wit b/wit/deps/io/poll.wit
index ddc67f8..cbdc960 100644
--- a/wit/deps/io/poll.wit
+++ b/wit/deps/io/poll.wit
@@ -2,13 +2,16 @@ package wasi:io@0.2.0;
 
 /// A poll API intended to let users wait for I/O events on multiple handles
 /// at once.
+@since(version = 0.2.0)
 interface poll {
     /// `pollable` represents a single I/O event which may be ready, or not.
+    @since(version = 0.2.0)
     resource pollable {
 
       /// Return the readiness of a pollable. This function never blocks.
       ///
       /// Returns `true` when the pollable is ready, and `false` otherwise.
+      @since(version = 0.2.0)
       ready: func() -> bool;
 
       /// `block` returns immediately if the pollable is ready, and otherwise
@@ -16,6 +19,7 @@ interface poll {
       ///
       /// This function is equivalent to calling `poll.poll` on a list
       /// containing only this pollable.
+      @since(version = 0.2.0)
       block: func();
     }
 
@@ -27,8 +31,9 @@ interface poll {
     /// The result `list<u32>` contains one or more indices of handles in the
     /// argument list that is ready for I/O.
     ///
-    /// If the list contains more elements than can be indexed with a `u32`
-    /// value, this function traps.
+    /// This function traps if either:
+    /// - the list is empty, or:
+    /// - the list contains more elements than can be indexed with a `u32` value.
     ///
     /// A timeout can be implemented by adding a pollable from the
     /// wasi-clocks API to the list.
@@ -36,6 +41,7 @@ interface poll {
     /// This function does not return a `result`; polling in itself does not
     /// do any I/O so it doesn't fail. If any of the I/O sources identified by
     /// the pollables has an error, it is indicated by marking the source as
-    /// being reaedy for I/O.
+    /// being ready for I/O.
+    @since(version = 0.2.0)
     poll: func(in: list<borrow<pollable>>) -> list<u32>;
 }
diff --git a/wit/deps/io/streams.wit b/wit/deps/io/streams.wit
index 6d2f871..a57f204 100644
--- a/wit/deps/io/streams.wit
+++ b/wit/deps/io/streams.wit
@@ -5,11 +5,15 @@ package wasi:io@0.2.0;
 ///
 /// In the future, the component model is expected to add built-in stream types;
 /// when it does, they are expected to subsume this API.
+@since(version = 0.2.0)
 interface streams {
+    @since(version = 0.2.0)
     use error.{error};
+    @since(version = 0.2.0)
     use poll.{pollable};
 
     /// An error for input-stream and output-stream operations.
+    @since(version = 0.2.0)
     variant stream-error {
         /// The last operation (a write or flush) failed before completion.
         ///
@@ -29,6 +33,7 @@ interface streams {
     /// available, which could even be zero. To wait for data to be available,
     /// use the `subscribe` function to obtain a `pollable` which can be polled
     /// for using `wasi:io/poll`.
+    @since(version = 0.2.0)
     resource input-stream {
         /// Perform a non-blocking read from the stream.
         ///
@@ -56,6 +61,7 @@ interface streams {
         /// is not possible to allocate in wasm32, or not desirable to allocate as
         /// as a return value by the callee. The callee may return a list of bytes
         /// less than `len` in size while more bytes are available for reading.
+        @since(version = 0.2.0)
         read: func(
             /// The maximum number of bytes to read
             len: u64
@@ -63,6 +69,7 @@ interface streams {
 
         /// Read bytes from a stream, after blocking until at least one byte can
         /// be read. Except for blocking, behavior is identical to `read`.
+        @since(version = 0.2.0)
         blocking-read: func(
             /// The maximum number of bytes to read
             len: u64
@@ -72,6 +79,7 @@ interface streams {
         ///
         /// Behaves identical to `read`, except instead of returning a list
         /// of bytes, returns the number of bytes consumed from the stream.
+        @since(version = 0.2.0)
         skip: func(
             /// The maximum number of bytes to skip.
             len: u64,
@@ -79,6 +87,7 @@ interface streams {
 
         /// Skip bytes from a stream, after blocking until at least one byte
         /// can be skipped. Except for blocking behavior, identical to `skip`.
+        @since(version = 0.2.0)
         blocking-skip: func(
             /// The maximum number of bytes to skip.
             len: u64,
@@ -90,6 +99,7 @@ interface streams {
         /// The created `pollable` is a child resource of the `input-stream`.
         /// Implementations may trap if the `input-stream` is dropped before
         /// all derived `pollable`s created with this function are dropped.
+        @since(version = 0.2.0)
         subscribe: func() -> pollable;
     }
 
@@ -102,6 +112,7 @@ interface streams {
     /// promptly, which could even be zero. To wait for the stream to be ready to
     /// accept data, the `subscribe` function to obtain a `pollable` which can be
     /// polled for using `wasi:io/poll`.
+    @since(version = 0.2.0)
     resource output-stream {
         /// Check readiness for writing. This function never blocks.
         ///
@@ -112,6 +123,7 @@ interface streams {
         /// When this function returns 0 bytes, the `subscribe` pollable will
         /// become ready when this function will report at least 1 byte, or an
         /// error.
+        @since(version = 0.2.0)
         check-write: func() -> result<u64, stream-error>;
 
         /// Perform a write. This function never blocks.
@@ -127,6 +139,7 @@ interface streams {
         ///
         /// returns Err(closed) without writing if the stream has closed since
         /// the last call to check-write provided a permit.
+        @since(version = 0.2.0)
         write: func(
             contents: list<u8>
         ) -> result<_, stream-error>;
@@ -155,6 +168,7 @@ interface streams {
         /// // Check for any errors that arose during `flush`
         /// let _ = this.check-write();         // eliding error handling
         /// ```
+        @since(version = 0.2.0)
         blocking-write-and-flush: func(
             contents: list<u8>
         ) -> result<_, stream-error>;
@@ -169,10 +183,12 @@ interface streams {
         /// writes (`check-write` will return `ok(0)`) until the flush has
         /// completed. The `subscribe` pollable will become ready when the
         /// flush has completed and the stream can accept more writes.
+        @since(version = 0.2.0)
         flush: func() -> result<_, stream-error>;
 
         /// Request to flush buffered output, and block until flush completes
         /// and stream is ready for writing again.
+        @since(version = 0.2.0)
         blocking-flush: func() -> result<_, stream-error>;
 
         /// Create a `pollable` which will resolve once the output-stream
@@ -193,6 +209,7 @@ interface streams {
         /// preconditions (must use check-write first), but instead of
         /// passing a list of bytes, you simply pass the number of zero-bytes
         /// that should be written.
+        @since(version = 0.2.0)
         write-zeroes: func(
             /// The number of zero-bytes to write
             len: u64
@@ -222,6 +239,7 @@ interface streams {
         /// // Check for any errors that arose during `flush`
         /// let _ = this.check-write();         // eliding error handling
         /// ```
+        @since(version = 0.2.0)
         blocking-write-zeroes-and-flush: func(
             /// The number of zero-bytes to write
             len: u64
@@ -240,6 +258,7 @@ interface streams {
         ///
         /// This function returns the number of bytes transferred; it may be less
         /// than `len`.
+        @since(version = 0.2.0)
         splice: func(
             /// The stream to read from
             src: borrow<input-stream>,
@@ -252,6 +271,7 @@ interface streams {
         /// This is similar to `splice`, except that it blocks until the
         /// `output-stream` is ready for writing, and the `input-stream`
         /// is ready for reading, before performing the `splice`.
+        @since(version = 0.2.0)
         blocking-splice: func(
             /// The stream to read from
             src: borrow<input-stream>,
diff --git a/wit/deps/io/world.wit b/wit/deps/io/world.wit
index 5f0b43f..f5c0987 100644
--- a/wit/deps/io/world.wit
+++ b/wit/deps/io/world.wit
@@ -1,6 +1,10 @@
 package wasi:io@0.2.0;
 
+@since(version = 0.2.0)
 world imports {
+    @since(version = 0.2.0)
     import streams;
+
+    @since(version = 0.2.0)
     import poll;
 }
diff --git a/wit/deps/random/insecure-seed.wit b/wit/deps/random/insecure-seed.wit
index 47210ac..4cce628 100644
--- a/wit/deps/random/insecure-seed.wit
+++ b/wit/deps/random/insecure-seed.wit
@@ -3,6 +3,7 @@ package wasi:random@0.2.0;
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
+@since(version = 0.2.0)
 interface insecure-seed {
     /// Return a 128-bit value that may contain a pseudo-random value.
     ///
@@ -21,5 +22,6 @@ interface insecure-seed {
     /// This will likely be changed to a value import, to prevent it from being
     /// called multiple times and potentially used for purposes other than DoS
     /// protection.
+    @since(version = 0.2.0)
     insecure-seed: func() -> tuple<u64, u64>;
 }
diff --git a/wit/deps/random/insecure.wit b/wit/deps/random/insecure.wit
index c58f4ee..3cea0c4 100644
--- a/wit/deps/random/insecure.wit
+++ b/wit/deps/random/insecure.wit
@@ -3,6 +3,7 @@ package wasi:random@0.2.0;
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
+@since(version = 0.2.0)
 interface insecure {
     /// Return `len` insecure pseudo-random bytes.
     ///
@@ -12,11 +13,13 @@ interface insecure {
     /// There are no requirements on the values of the returned bytes, however
     /// implementations are encouraged to return evenly distributed values with
     /// a long period.
+    @since(version = 0.2.0)
     get-insecure-random-bytes: func(len: u64) -> list<u8>;
 
     /// Return an insecure pseudo-random `u64` value.
     ///
     /// This function returns the same type of pseudo-random data as
     /// `get-insecure-random-bytes`, represented as a `u64`.
+    @since(version = 0.2.0)
     get-insecure-random-u64: func() -> u64;
 }
diff --git a/wit/deps/random/random.wit b/wit/deps/random/random.wit
index 0c017f0..41c3a03 100644
--- a/wit/deps/random/random.wit
+++ b/wit/deps/random/random.wit
@@ -3,6 +3,7 @@ package wasi:random@0.2.0;
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
+@since(version = 0.2.0)
 interface random {
     /// Return `len` cryptographically-secure random or pseudo-random bytes.
     ///
@@ -16,11 +17,13 @@ interface random {
     /// This function must always return fresh data. Deterministic environments
     /// must omit this function, rather than implementing it with deterministic
     /// data.
+    @since(version = 0.2.0)
     get-random-bytes: func(len: u64) -> list<u8>;
 
     /// Return a cryptographically-secure random or pseudo-random `u64` value.
     ///
     /// This function returns the same type of data as `get-random-bytes`,
     /// represented as a `u64`.
+    @since(version = 0.2.0)
     get-random-u64: func() -> u64;
 }
diff --git a/wit/deps/random/world.wit b/wit/deps/random/world.wit
index 3da3491..b5560a6 100644
--- a/wit/deps/random/world.wit
+++ b/wit/deps/random/world.wit
@@ -1,7 +1,13 @@
 package wasi:random@0.2.0;
 
+@since(version = 0.2.0)
 world imports {
+    @since(version = 0.2.0)
     import random;
+
+    @since(version = 0.2.0)
     import insecure;
+
+    @since(version = 0.2.0)
     import insecure-seed;
 }
diff --git a/wit/deps/sockets/instance-network.wit b/wit/deps/sockets/instance-network.wit
index e455d0f..5f6e6c1 100644
--- a/wit/deps/sockets/instance-network.wit
+++ b/wit/deps/sockets/instance-network.wit
@@ -1,9 +1,11 @@
 
 /// This interface provides a value-export of the default network handle..
+@since(version = 0.2.0)
 interface instance-network {
+    @since(version = 0.2.0)
     use network.{network};
 
     /// Get a handle to the default network.
+    @since(version = 0.2.0)
     instance-network: func() -> network;
-
 }
diff --git a/wit/deps/sockets/ip-name-lookup.wit b/wit/deps/sockets/ip-name-lookup.wit
index 8e639ec..0368b48 100644
--- a/wit/deps/sockets/ip-name-lookup.wit
+++ b/wit/deps/sockets/ip-name-lookup.wit
@@ -1,9 +1,10 @@
-
+@since(version = 0.2.0)
 interface ip-name-lookup {
+    @since(version = 0.2.0)
     use wasi:io/poll@0.2.0.{pollable};
+    @since(version = 0.2.0)
     use network.{network, error-code, ip-address};
 
-
     /// Resolve an internet host name to a list of IP addresses.
     ///
     /// Unicode domain names are automatically converted to ASCII using IDNA encoding.
@@ -24,8 +25,10 @@ interface ip-name-lookup {
     /// - <https://man7.org/linux/man-pages/man3/getaddrinfo.3.html>
     /// - <https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo>
     /// - <https://man.freebsd.org/cgi/man.cgi?query=getaddrinfo&sektion=3>
+    @since(version = 0.2.0)
     resolve-addresses: func(network: borrow<network>, name: string) -> result<resolve-address-stream, error-code>;
 
+    @since(version = 0.2.0)
     resource resolve-address-stream {
         /// Returns the next address from the resolver.
         ///
@@ -40,12 +43,14 @@ interface ip-name-lookup {
         /// - `temporary-resolver-failure`: A temporary failure in name resolution occurred. (EAI_AGAIN)
         /// - `permanent-resolver-failure`: A permanent failure in name resolution occurred. (EAI_FAIL)
         /// - `would-block`:                A result is not available yet. (EWOULDBLOCK, EAGAIN)
+        @since(version = 0.2.0)
         resolve-next-address: func() -> result<option<ip-address>, error-code>;
 
         /// Create a `pollable` which will resolve once the stream is ready for I/O.
         ///
         /// Note: this function is here for WASI Preview2 only.
         /// It's planned to be removed when `future` is natively supported in Preview3.
+        @since(version = 0.2.0)
         subscribe: func() -> pollable;
     }
 }
diff --git a/wit/deps/sockets/network.wit b/wit/deps/sockets/network.wit
index 9cadf06..8c13b34 100644
--- a/wit/deps/sockets/network.wit
+++ b/wit/deps/sockets/network.wit
@@ -1,8 +1,9 @@
-
+@since(version = 0.2.0)
 interface network {
     /// An opaque resource that represents access to (a subset of) the network.
     /// This enables context-based security for networking.
     /// There is no need for this to map 1:1 to a physical network interface.
+    @since(version = 0.2.0)
     resource network;
 
     /// Error codes.
@@ -17,6 +18,7 @@ interface network {
     /// - `concurrency-conflict`
     ///
     /// See each individual API for what the POSIX equivalents are. They sometimes differ per API.
+    @since(version = 0.2.0)
     enum error-code {
         /// Unknown error
         unknown,
@@ -103,6 +105,7 @@ interface network {
         permanent-resolver-failure,
     }
 
+    @since(version = 0.2.0)
     enum ip-address-family {
         /// Similar to `AF_INET` in POSIX.
         ipv4,
@@ -111,14 +114,18 @@ interface network {
         ipv6,
     }
 
+    @since(version = 0.2.0)
     type ipv4-address = tuple<u8, u8, u8, u8>;
+    @since(version = 0.2.0)
     type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>;
 
+    @since(version = 0.2.0)
     variant ip-address {
         ipv4(ipv4-address),
         ipv6(ipv6-address),
     }
 
+    @since(version = 0.2.0)
     record ipv4-socket-address {
         /// sin_port
         port: u16,
@@ -126,6 +133,7 @@ interface network {
         address: ipv4-address,
     }
 
+    @since(version = 0.2.0)
     record ipv6-socket-address {
         /// sin6_port
         port: u16,
@@ -137,9 +145,9 @@ interface network {
         scope-id: u32,
     }
 
+    @since(version = 0.2.0)
     variant ip-socket-address {
         ipv4(ipv4-socket-address),
         ipv6(ipv6-socket-address),
     }
-
 }
diff --git a/wit/deps/sockets/tcp-create-socket.wit b/wit/deps/sockets/tcp-create-socket.wit
index c7ddf1f..eedbd30 100644
--- a/wit/deps/sockets/tcp-create-socket.wit
+++ b/wit/deps/sockets/tcp-create-socket.wit
@@ -1,6 +1,8 @@
-
+@since(version = 0.2.0)
 interface tcp-create-socket {
+    @since(version = 0.2.0)
     use network.{network, error-code, ip-address-family};
+    @since(version = 0.2.0)
     use tcp.{tcp-socket};
 
     /// Create a new TCP socket.
@@ -23,5 +25,6 @@ interface tcp-create-socket {
     /// - <https://man7.org/linux/man-pages/man2/socket.2.html>
     /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
     /// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
+    @since(version = 0.2.0)
     create-tcp-socket: func(address-family: ip-address-family) -> result<tcp-socket, error-code>;
 }
diff --git a/wit/deps/sockets/tcp.wit b/wit/deps/sockets/tcp.wit
index 5902b9e..e4a6210 100644
--- a/wit/deps/sockets/tcp.wit
+++ b/wit/deps/sockets/tcp.wit
@@ -1,10 +1,15 @@
-
+@since(version = 0.2.0)
 interface tcp {
+    @since(version = 0.2.0)
     use wasi:io/streams@0.2.0.{input-stream, output-stream};
+    @since(version = 0.2.0)
     use wasi:io/poll@0.2.0.{pollable};
+    @since(version = 0.2.0)
     use wasi:clocks/monotonic-clock@0.2.0.{duration};
+    @since(version = 0.2.0)
     use network.{network, error-code, ip-socket-address, ip-address-family};
 
+    @since(version = 0.2.0)
     enum shutdown-type {
         /// Similar to `SHUT_RD` in POSIX.
         receive,
@@ -27,8 +32,8 @@ interface tcp {
     /// - `connect-in-progress`
     /// - `connected`
     /// - `closed`
-    /// See <https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md>
-    /// for a more information.
+    /// See <https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md>
+    /// for more information.
     ///
     /// Note: Except where explicitly mentioned, whenever this documentation uses
     /// the term "bound" without backticks it actually means: in the `bound` state *or higher*.
@@ -37,6 +42,7 @@ interface tcp {
     /// In addition to the general error codes documented on the
     /// `network::error-code` type, TCP socket methods may always return
     /// `error(invalid-state)` when in the `closed` state.
+    @since(version = 0.2.0)
     resource tcp-socket {
         /// Bind the socket to a specific network on the provided IP address and port.
         ///
@@ -76,13 +82,15 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
+        @since(version = 0.2.0)
         start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
+        @since(version = 0.2.0)
         finish-bind: func() -> result<_, error-code>;
 
         /// Connect to a remote endpoint.
         ///
         /// On success:
-        /// - the socket is transitioned into the `connection` state.
+        /// - the socket is transitioned into the `connected` state.
         /// - a pair of streams is returned that can be used to read & write to the connection
         ///
         /// After a failed connection attempt, the socket will be in the `closed`
@@ -121,7 +129,9 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
         /// - <https://man.freebsd.org/cgi/man.cgi?connect>
+        @since(version = 0.2.0)
         start-connect: func(network: borrow<network>, remote-address: ip-socket-address) -> result<_, error-code>;
+        @since(version = 0.2.0)
         finish-connect: func() -> result<tuple<input-stream, output-stream>, error-code>;
 
         /// Start listening for new connections.
@@ -149,7 +159,9 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/listen.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-listen>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=listen&sektion=2>
+        @since(version = 0.2.0)
         start-listen: func() -> result<_, error-code>;
+        @since(version = 0.2.0)
         finish-listen: func() -> result<_, error-code>;
 
         /// Accept a new client socket.
@@ -178,6 +190,7 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/accept.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=accept&sektion=2>
+        @since(version = 0.2.0)
         accept: func() -> result<tuple<tcp-socket, input-stream, output-stream>, error-code>;
 
         /// Get the bound local address.
@@ -196,6 +209,7 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
         /// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
+        @since(version = 0.2.0)
         local-address: func() -> result<ip-socket-address, error-code>;
 
         /// Get the remote address.
@@ -208,16 +222,19 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
+        @since(version = 0.2.0)
         remote-address: func() -> result<ip-socket-address, error-code>;
 
         /// Whether the socket is in the `listening` state.
         ///
         /// Equivalent to the SO_ACCEPTCONN socket option.
+        @since(version = 0.2.0)
         is-listening: func() -> bool;
 
         /// Whether this is a IPv4 or IPv6 socket.
         ///
         /// Equivalent to the SO_DOMAIN socket option.
+        @since(version = 0.2.0)
         address-family: func() -> ip-address-family;
 
         /// Hints the desired listen queue size. Implementations are free to ignore this.
@@ -229,6 +246,7 @@ interface tcp {
         /// - `not-supported`:        (set) The platform does not support changing the backlog size after the initial listen.
         /// - `invalid-argument`:     (set) The provided value was 0.
         /// - `invalid-state`:        (set) The socket is in the `connect-in-progress` or `connected` state.
+        @since(version = 0.2.0)
         set-listen-backlog-size: func(value: u64) -> result<_, error-code>;
 
         /// Enables or disables keepalive.
@@ -240,7 +258,9 @@ interface tcp {
         /// These properties can be configured while `keep-alive-enabled` is false, but only come into effect when `keep-alive-enabled` is true.
         ///
         /// Equivalent to the SO_KEEPALIVE socket option.
+        @since(version = 0.2.0)
         keep-alive-enabled: func() -> result<bool, error-code>;
+        @since(version = 0.2.0)
         set-keep-alive-enabled: func(value: bool) -> result<_, error-code>;
 
         /// Amount of time the connection has to be idle before TCP starts sending keepalive packets.
@@ -253,7 +273,9 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The provided value was 0.
+        @since(version = 0.2.0)
         keep-alive-idle-time: func() -> result<duration, error-code>;
+        @since(version = 0.2.0)
         set-keep-alive-idle-time: func(value: duration) -> result<_, error-code>;
 
         /// The time between keepalive packets.
@@ -266,7 +288,9 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The provided value was 0.
+        @since(version = 0.2.0)
         keep-alive-interval: func() -> result<duration, error-code>;
+        @since(version = 0.2.0)
         set-keep-alive-interval: func(value: duration) -> result<_, error-code>;
 
         /// The maximum amount of keepalive packets TCP should send before aborting the connection.
@@ -279,7 +303,9 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The provided value was 0.
+        @since(version = 0.2.0)
         keep-alive-count: func() -> result<u32, error-code>;
+        @since(version = 0.2.0)
         set-keep-alive-count: func(value: u32) -> result<_, error-code>;
 
         /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
@@ -288,7 +314,9 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The TTL value must be 1 or higher.
+        @since(version = 0.2.0)
         hop-limit: func() -> result<u8, error-code>;
+        @since(version = 0.2.0)
         set-hop-limit: func(value: u8) -> result<_, error-code>;
 
         /// The kernel buffer space reserved for sends/receives on this socket.
@@ -301,9 +329,13 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The provided value was 0.
+        @since(version = 0.2.0)
         receive-buffer-size: func() -> result<u64, error-code>;
+        @since(version = 0.2.0)
         set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
+        @since(version = 0.2.0)
         send-buffer-size: func() -> result<u64, error-code>;
+        @since(version = 0.2.0)
         set-send-buffer-size: func(value: u64) -> result<_, error-code>;
 
         /// Create a `pollable` which can be used to poll for, or block on,
@@ -318,11 +350,12 @@ interface tcp {
         /// `subscribe` only has to be called once per socket and can then be
         /// (re)used for the remainder of the socket's lifetime.
         ///
-        /// See <https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness>
-        /// for a more information.
+        /// See <https://github.com/WebAssembly/wasi-sockets/blob/main/TcpSocketOperationalSemantics.md#pollable-readiness>
+        /// for more information.
         ///
         /// Note: this function is here for WASI Preview2 only.
         /// It's planned to be removed when `future` is natively supported in Preview3.
+        @since(version = 0.2.0)
         subscribe: func() -> pollable;
 
         /// Initiate a graceful shutdown.
@@ -335,7 +368,7 @@ interface tcp {
         ///   associated with this socket will be closed and a FIN packet will be sent.
         /// - `both`: Same effect as `receive` & `send` combined.
         ///
-        /// This function is idempotent. Shutting a down a direction more than once
+        /// This function is idempotent; shutting down a direction more than once
         /// has no effect and returns `ok`.
         ///
         /// The shutdown function does not close (drop) the socket.
@@ -348,6 +381,7 @@ interface tcp {
         /// - <https://man7.org/linux/man-pages/man2/shutdown.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-shutdown>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
+        @since(version = 0.2.0)
         shutdown: func(shutdown-type: shutdown-type) -> result<_, error-code>;
     }
 }
diff --git a/wit/deps/sockets/udp-create-socket.wit b/wit/deps/sockets/udp-create-socket.wit
index 0482d1f..e8eeacb 100644
--- a/wit/deps/sockets/udp-create-socket.wit
+++ b/wit/deps/sockets/udp-create-socket.wit
@@ -1,6 +1,8 @@
-
+@since(version = 0.2.0)
 interface udp-create-socket {
+    @since(version = 0.2.0)
     use network.{network, error-code, ip-address-family};
+    @since(version = 0.2.0)
     use udp.{udp-socket};
 
     /// Create a new UDP socket.
@@ -23,5 +25,6 @@ interface udp-create-socket {
     /// - <https://man7.org/linux/man-pages/man2/socket.2.html>
     /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
     /// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
+    @since(version = 0.2.0)
     create-udp-socket: func(address-family: ip-address-family) -> result<udp-socket, error-code>;
 }
diff --git a/wit/deps/sockets/udp.wit b/wit/deps/sockets/udp.wit
index d987a0a..48e753c 100644
--- a/wit/deps/sockets/udp.wit
+++ b/wit/deps/sockets/udp.wit
@@ -1,9 +1,12 @@
-
+@since(version = 0.2.0)
 interface udp {
+    @since(version = 0.2.0)
     use wasi:io/poll@0.2.0.{pollable};
+    @since(version = 0.2.0)
     use network.{network, error-code, ip-socket-address, ip-address-family};
 
     /// A received datagram.
+    @since(version = 0.2.0)
     record incoming-datagram {
         /// The payload.
         /// 
@@ -19,6 +22,7 @@ interface udp {
     }
 
     /// A datagram to be sent out.
+    @since(version = 0.2.0)
     record outgoing-datagram {
         /// The payload.
         data: list<u8>,
@@ -33,9 +37,8 @@ interface udp {
         remote-address: option<ip-socket-address>,
     }
 
-
-
     /// A UDP socket handle.
+    @since(version = 0.2.0)
     resource udp-socket {
         /// Bind the socket to a specific network on the provided IP address and port.
         ///
@@ -63,7 +66,9 @@ interface udp {
         /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
+        @since(version = 0.2.0)
         start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
+        @since(version = 0.2.0)
         finish-bind: func() -> result<_, error-code>;
 
         /// Set up inbound & outbound communication channels, optionally to a specific peer.
@@ -106,6 +111,7 @@ interface udp {
         /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
         /// - <https://man.freebsd.org/cgi/man.cgi?connect>
+        @since(version = 0.2.0)
         %stream: func(remote-address: option<ip-socket-address>) -> result<tuple<incoming-datagram-stream, outgoing-datagram-stream>, error-code>;
 
         /// Get the current bound address.
@@ -124,6 +130,7 @@ interface udp {
         /// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
         /// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
+        @since(version = 0.2.0)
         local-address: func() -> result<ip-socket-address, error-code>;
 
         /// Get the address the socket is currently streaming to.
@@ -136,11 +143,13 @@ interface udp {
         /// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
+        @since(version = 0.2.0)
         remote-address: func() -> result<ip-socket-address, error-code>;
 
         /// Whether this is a IPv4 or IPv6 socket.
         ///
         /// Equivalent to the SO_DOMAIN socket option.
+        @since(version = 0.2.0)
         address-family: func() -> ip-address-family;
 
         /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
@@ -149,7 +158,9 @@ interface udp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The TTL value must be 1 or higher.
+        @since(version = 0.2.0)
         unicast-hop-limit: func() -> result<u8, error-code>;
+        @since(version = 0.2.0)
         set-unicast-hop-limit: func(value: u8) -> result<_, error-code>;
 
         /// The kernel buffer space reserved for sends/receives on this socket.
@@ -162,18 +173,24 @@ interface udp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The provided value was 0.
+        @since(version = 0.2.0)
         receive-buffer-size: func() -> result<u64, error-code>;
+        @since(version = 0.2.0)
         set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
+        @since(version = 0.2.0)
         send-buffer-size: func() -> result<u64, error-code>;
+        @since(version = 0.2.0)
         set-send-buffer-size: func(value: u64) -> result<_, error-code>;
 
         /// Create a `pollable` which will resolve once the socket is ready for I/O.
         ///
         /// Note: this function is here for WASI Preview2 only.
         /// It's planned to be removed when `future` is natively supported in Preview3.
+        @since(version = 0.2.0)
         subscribe: func() -> pollable;
     }
 
+    @since(version = 0.2.0)
     resource incoming-datagram-stream {
         /// Receive messages on the socket.
         ///
@@ -198,15 +215,18 @@ interface udp {
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recvfrom>
         /// - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
+        @since(version = 0.2.0)
         receive: func(max-results: u64) -> result<list<incoming-datagram>, error-code>;
 
         /// Create a `pollable` which will resolve once the stream is ready to receive again.
         ///
         /// Note: this function is here for WASI Preview2 only.
         /// It's planned to be removed when `future` is natively supported in Preview3.
+        @since(version = 0.2.0)
         subscribe: func() -> pollable;
     }
 
+    @since(version = 0.2.0)
     resource outgoing-datagram-stream {
         /// Check readiness for sending. This function never blocks.
         ///
@@ -255,12 +275,14 @@ interface udp {
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-sendto>
         /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
         /// - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
+        @since(version = 0.2.0)
         send: func(datagrams: list<outgoing-datagram>) -> result<u64, error-code>;
         
         /// Create a `pollable` which will resolve once the stream is ready to send again.
         ///
         /// Note: this function is here for WASI Preview2 only.
         /// It's planned to be removed when `future` is natively supported in Preview3.
+        @since(version = 0.2.0)
         subscribe: func() -> pollable;
     }
 }
diff --git a/wit/deps/sockets/world.wit b/wit/deps/sockets/world.wit
index f8bb92a..a1f7d14 100644
--- a/wit/deps/sockets/world.wit
+++ b/wit/deps/sockets/world.wit
@@ -1,11 +1,19 @@
 package wasi:sockets@0.2.0;
 
+@since(version = 0.2.0)
 world imports {
+    @since(version = 0.2.0)
     import instance-network;
+    @since(version = 0.2.0)
     import network;
+    @since(version = 0.2.0)
     import udp;
+    @since(version = 0.2.0)
     import udp-create-socket;
+    @since(version = 0.2.0)
     import tcp;
+    @since(version = 0.2.0)
     import tcp-create-socket;
+    @since(version = 0.2.0)
     import ip-name-lookup;
 }