Re-apply fixes for 'mandatory' and 'ScrollLock'.
authorGary Kacmarcik <garykac@google.com>
Tue, 04 Jun 2013 14:26:39 -0700
changeset 426 6cc9e60bf4b1
parent 425 ad60a8a8fbf7
child 427 eae783ac561c
Re-apply fixes for 'mandatory' and 'ScrollLock'.

These changes were originally added on Sept/Oct 2012, but got overwritten on 3 June when we applied the Sept 06 working draft to the mainline. Other than the "WD" markings which are still on the mainline, this changelist effectively merges the branches together.
html/DOM3-Events.html
--- a/html/DOM3-Events.html	Tue Jun 04 13:36:43 2013 -0700
+++ b/html/DOM3-Events.html	Tue Jun 04 14:26:39 2013 -0700
@@ -1306,7 +1306,7 @@
 								href="#addEventListener_useCapture"><code class="parameter-name">useCapture</code></a> were specified to be <code>false</code>.</p>
 
 							<p class="note" id="addEventListener_useCapture-author"><strong>Authoring Note:</strong>  The <a href="#events-EventTarget-addEventListener"><code class="parameter-name">
-								useCapture</code></a> parameter was manditory in DOM2 Events [<a href="#references-DOM2Events">DOM2 Events</a>], and omitting this parameter could cause an error
+								useCapture</code></a> parameter was mandatory in DOM2 Events [<a href="#references-DOM2Events">DOM2 Events</a>], and omitting this parameter could cause an error
 								in older implementations.</p>
 						</dd>
 					</dl>
@@ -1343,7 +1343,7 @@
 							<p>This parameter MUST be optional. If not provided, the <a href="#events-EventTarget-removeEventListener">EventTarget.removeEventListener</a> method MUST behave as if <a
 								href="#removeEventListener_useCapture"><code class="parameter-name">useCapture</code></a> were specified to be <code>false</code>.</p>
 
-							<p class="note"><strong>Authoring Note:</strong>  The <a href="#removeEventListener_useCapture"><code class="parameter-name">useCapture</code></a> parameter was manditory in DOM2
+							<p class="note"><strong>Authoring Note:</strong>  The <a href="#removeEventListener_useCapture"><code class="parameter-name">useCapture</code></a> parameter was mandatory in DOM2
 								Events [<a href="#references-DOM2Events">DOM2 Events</a>], and omitting this parameter could cause an error in older implementations.</p>
 						</dd>
 					</dl>
@@ -4444,7 +4444,7 @@
 										<a href="#key-Fn"><code class="key">'Fn'</code></a>
 										<a href="#key-Meta"><code class="key">'Meta'</code></a>
 										<a href="#key-NumLock"><code class="key">'NumLock'</code></a>
-										<a href="#key-Scroll"><code class="key">'Scroll'</code></a>
+										<a href="#key-ScrollLock"><code class="key">'ScrollLock'</code></a>
 										<a href="#key-Shift"><code class="key">'Shift'</code></a>
 										<a href="#key-SymbolLock"><code class="key">'SymbolLock'</code></a>, and
 										<a href="#key-OS"><code class="key">'OS'</code></a>
@@ -5973,7 +5973,7 @@
 					<code>keydown</code></a> and <a class="eventtype" href="#event-type-keyup"><code>keyup</code></a> events, as shown in the example below. Some modifiers are activated
 					while the key is being pressed down or maintained pressed such as <code class="key">'Alt'</code>, <code class="key">'Control'</code>, <code class="key">'Shift'</code>,
 					<code class="key">'AltGraph'</code>, or <code class="key">'Meta'</code>. Others modifiers are activated depending on their state such as <code class="key">'CapsLock'</code>,
-					<code class="key">'NumLock'</code>, or <code class="key">'Scroll'</code>. Change in the state happens when the modifier key is being pressed down. The <a href="#events-KeyboardEvent">
+					<code class="key">'NumLock'</code>, or <code class="key">'ScrollLock'</code>. Change in the state happens when the modifier key is being pressed down. The <a href="#events-KeyboardEvent">
 					<code>KeyboardEvent</code></a> interface provides convenient attributes for some common modifiers keys: <a href="#events-KeyboardEvent-ctrlKey"><code>KeyboardEvent.ctrlKey</code></a>,
 					<a href="#events-KeyboardEvent-shiftKey"><code>KeyboardEvent.shiftKey</code></a>, <a href="#events-KeyboardEvent-altKey"><code>KeyboardEvent.altKey</code></a>,
 					<a href="#events-KeyboardEvent-metaKey"><code>KeyboardEvent.metaKey</code></a>. Some operating systems simulate the <code class="key">'AltGraph'</code> modifier
@@ -6437,7 +6437,7 @@
 						<key name="Menu" cat="UI">Toggle display of content or system menu, if available.</key>
 						<key name="Pause" cat="UI">Pause the current state or application (as appropriate).</key>
 						<key name="Play" cat="UI">Play or resume the current state or application (as appropriate).</key>
-						<key name="Scroll" cat="UI">The Scroll Lock key, to toggle between scrolling and cursor movement modes.</key>
+						<key name="ScrollLock" cat="UI">The Scroll Lock key, to toggle between scrolling and cursor movement modes.</key>
 						<key name="Execute" cat="UI">The Execute key.</key>
 						<key name="Cancel" cat="UI" char="0018">The Cancel key.</key>
 						<key name="Esc" cat="UI" char="001B">The Escape (Esc) key, to initiate an escape sequence.</key>