diff --git a/.spec.whatwg.org/robots.txt b/.spec.whatwg.org/robots.txt
new file mode 100644
index 000000000..4447a4183
--- /dev/null
+++ b/.spec.whatwg.org/robots.txt
@@ -0,0 +1,4 @@
+User-agent: *
+Disallow: /branch-snapshots/
+Disallow: /commit-snapshots/
+Disallow: /review-drafts/
diff --git a/.spec.whatwg.org/service-worker.js b/.spec.whatwg.org/service-worker.js
new file mode 100644
index 000000000..ec0db5f25
--- /dev/null
+++ b/.spec.whatwg.org/service-worker.js
@@ -0,0 +1,4 @@
+"use strict";
+
+importScripts("https://resources.whatwg.org/standard-service-worker.js");
+// Version (for service worker freshness check): f7c5e882862c50ae296097f41f4cb70b61d322ae
diff --git a/index.bs b/index.bs
index 9d1f07870..889d25dbe 100644
--- a/index.bs
+++ b/index.bs
@@ -15,6 +15,7 @@ Abstract: as a guide to implementors of already-published specifications,
 Abstract: and that newly published specifications reference this
 Abstract: document to ensure conforming implementations of interfaces
 Abstract: are interoperable.
+Complain About: accidental-2119 no
 </pre>
 
 <pre class="link-defaults">
@@ -942,7 +943,7 @@ definitions does not matter.
 
 Note: A partial interface definition cannot specify that the interface
 [=interface/inherits=] from another interface.
-Inheritance must be specified on the original [=interface=]
+Inheritance is to be specified on the original [=interface=]
 definition.
 
 The relevant language binding determines how interfaces correspond to constructs
@@ -1611,7 +1612,9 @@ or one of the three special floating point constant values
 (<emu-t>-Infinity</emu-t>, <emu-t>Infinity</emu-t> and <emu-t>NaN</emu-t>).
 
 Note: These values – in addition to strings and the empty sequence – can also be used to specify the
-[=dictionary member/default value|default value of a dictionary member=] or [=optional argument/default value|of an optional argument=].  Note that strings, the
+[=dictionary member/default value|default value of a dictionary member=] or
+<a for="optional argument" lt="default value" class=allow-2119>of an optional argument</a>.
+Note that strings, the
 empty sequence <emu-t>[]</emu-t>, and the default dictionary <emu-t>{}</emu-t> cannot be used as the value of a
 [=constant=].
 
@@ -5047,7 +5050,8 @@ No [=extended attributes=] are applicable to dictionaries.
 
 <div class="example" id="example-f7efabfd">
 
-    One use of dictionary types is to allow a number of optional arguments to
+    One use of dictionary types is to allow a number of <span class=allow-rfc2119>optional</span>
+    arguments to
     an [=operation=] without being
     constrained as to the order they are specified at the call site.  For example,
     consider the following [=IDL fragment=]:
@@ -5073,7 +5077,8 @@ No [=extended attributes=] are applicable to dictionaries.
     </pre>
 
     In an ECMAScript implementation of the IDL, an Object
-    can be passed in for the optional <code class="idl">PaintOptions</code> dictionary:
+    can be passed in for the <span class=allow-rfc2119>optional</span>
+    <code class="idl">PaintOptions</code> dictionary:
 
     <pre highlight="js">
         // Get an instance of GraphicsContext.
@@ -11353,7 +11358,8 @@ Note: The HTML Standard defines how a security check is performed. [[!HTML]]
     index to determine which IDL type it can correspond to.
     This allows us to select the final overload that will
     be invoked.  If the value passed in is <emu-val>undefined</emu-val>
-    and there is an overload with an optional argument at this position, then
+    and there is an overload with an <span class=allow-rfc2119>optional</span> argument at this
+    position, then
     we will choose that overload.  If there is no valid overload for the type of
     value passed in here, then we throw a {{ECMAScript/TypeError}}.
     Generally, the inspection of the value at the distinguishing argument index does not have any
@@ -11370,15 +11376,17 @@ Note: The HTML Standard defines how a security check is performed. [[!HTML]]
     again ignoring any additional arguments that were ignored due to being passed
     after the last possible argument.
 
-    When converting an optional argument’s ECMAScript value to its equivalent IDL value,
-    <emu-val>undefined</emu-val> will be converted into
-    the [=optional argument/default value|optional argument’s default value=],
+    When converting an <span class=allow-rfc2119>optional</span> argument’s ECMAScript value to its
+    equivalent IDL value,
+    <emu-val>undefined</emu-val> will be converted into the
+    <a for="optional argument" lt="default value" class=allow-2119>optional argument’s default value</a>,
     if it has one, or a special value “missing” otherwise.
 
-    Optional arguments corresponding to a final, variadic argument do not treat
-    <emu-val>undefined</emu-val> as a special “missing” value, however.
+    <span class=allow-2119>Optional</span> arguments corresponding to a final, variadic argument do
+    not treat <emu-val>undefined</emu-val> as a special “missing” value, however.
     The <emu-val>undefined</emu-val> value is converted to the type
-    of variadic argument as would be done for a non-optional argument.
+    of variadic argument as would be done for a non-<span class=allow-rfc2119>optional</span>
+    argument.
 
 </div>