--- a/Overview.html	Wed Oct 23 12:06:26 2013 +0900
+++ b/Overview.html	Wed Oct 23 12:25:56 2013 +0900
@@ -1251,7 +1251,7 @@
       throws.</p>
 
       <p class="XXX">Should we only encode as utf-8? What happens in the face
-      of an <a class="external" href="http://encoding.spec.whatwg.org/#encoder-error">encoder error</a>?
+      of an <a class="external" href="http://encoding.spec.whatwg.org/#error">error</a>?
 
       <p class="note">In particular, if the document cannot be serialized an
       "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidstateerror">InvalidStateError</a></code>" exception is
@@ -1878,7 +1878,7 @@
     <a href="#send-flag"><code>send()</code> flag</a> being unset, or
     <a href="#dom-xmlhttprequest-done" title="dom-XMLHttpRequest-DONE">DONE</a> go to the next step.</p>
 
-    <p>Otherwise run these substeps:</p>
+    <p>Otherwise, run these substeps:</p>
 
     <ol>
      <li><p>Change the state to <a href="#dom-xmlhttprequest-done" title="dom-XMLHttpRequest-DONE">DONE</a>.</li>
@@ -2267,8 +2267,8 @@
  <a class="external" href="http://encoding.spec.whatwg.org/#utf-8-decode">utf-8 decode</a> on byte stream
  <a href="#response-entity-body">response entity body</a>.
 
- <li><p>Return the result of invoking the <code title="">parse</code> function
- of the <code title="">JSON</code> object defined in ECMAScript, with
+ <li><p>Return the result of invoking the initial value of the <code title="">parse</code>
+ property of the <code title="">JSON</code> object defined in JavaScript, with
  <var title="">JSON text</var> as its only argument, or null if that function
  throws an exception. <a href="#refsECMASCRIPT">[ECMASCRIPT]</a>
 </ol>

--- a/Overview.src.html	Wed Oct 23 12:06:26 2013 +0900
+++ b/Overview.src.html	Wed Oct 23 12:25:56 2013 +0900
@@ -1260,7 +1260,7 @@
       throws.</p>
 
       <p class=XXX>Should we only encode as utf-8? What happens in the face
-      of an <span data-anolis-spec=encoding>encoder error</span>?
+      of an <span data-anolis-spec=encoding>error</span>?
 
       <p class=note>In particular, if the document cannot be serialized an
       "<code data-anolis-spec=dom>InvalidStateError</code>" exception is
@@ -1887,7 +1887,7 @@
     <span><code>send()</code> flag</span> being unset, or
     <span title="dom-XMLHttpRequest-DONE">DONE</span> go to the next step.</p>
 
-    <p>Otherwise run these substeps:</p>
+    <p>Otherwise, run these substeps:</p>
 
     <ol>
      <li><p>Change the state to <span title="dom-XMLHttpRequest-DONE">DONE</span>.</p></li>
@@ -2276,8 +2276,8 @@
  <span data-anolis-spec=encoding>utf-8 decode</span> on byte stream
  <span>response entity body</span>.
 
- <li><p>Return the result of invoking the <code title>parse</code> function
- of the <code title>JSON</code> object defined in ECMAScript, with
+ <li><p>Return the result of invoking the initial value of the <code title>parse</code>
+ property of the <code title>JSON</code> object defined in JavaScript, with
  <var title>JSON text</var> as its only argument, or null if that function
  throws an exception. <span data-anolis-ref>ECMASCRIPT</span>
 </ol>

--- a/data/xrefs/network/encoding.json	Wed Oct 23 12:06:26 2013 +0900
+++ b/data/xrefs/network/encoding.json	Wed Oct 23 12:25:56 2013 +0900
@@ -16,10 +16,10 @@
     "decoder error": "decoder-error",
     "encode": "encode",
     "encoder": "encoder",
-    "encoder error": "encoder-error",
     "encoding": "encoding",
     "eof byte": "eof-byte",
     "eof code point": "eof-code-point",
+    "error": "error",
     "euc-jp": "euc-jp",
     "euc-jp decoder": "euc-jp-decoder",
     "euc-jp encoder": "euc-jp-encoder",