From 3324f22808974f1cde9c0df234b1f7299c8112c6 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Wed, 30 Sep 2015 12:57:41 +0200
Subject: [PATCH] Clean up definitions borrowed from Encoding

---
 source | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/source b/source
index 19dc88c79e2..7d20249ccb4 100644
--- a/source
+++ b/source
@@ -2252,11 +2252,14 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
 
   <h4 id="encoding-terminology">Character encodings</h4>
 
-  <p>A <dfn data-x="encoding">character encoding</dfn>, or just <i>encoding</i> where that is not
-  ambiguous, is a defined way to convert between byte streams and Unicode strings, as defined in the
-  WHATWG Encoding standard. An <span>encoding</span> has an <dfn>encoding name</dfn> and one or more
-  <dfn data-x="encoding label">encoding labels</dfn>, referred to as the encoding's <i>name</i> and
-  <i>labels</i> in the Encoding standard. <ref spec=ENCODING></p>
+  <p>A <dfn data-noexport="" data-x="encoding"
+  data-x-href="https://encoding.spec.whatwg.org/#encoding">character encoding</dfn>, or just
+  <i>encoding</i> where that is not ambiguous, is a defined way to convert between byte streams and
+  Unicode strings, as defined in the WHATWG Encoding standard. An <span>encoding</span> has an
+  <dfn data-noexport="" data-x-href="https://encoding.spec.whatwg.org/#name">encoding name</dfn> and
+  one or more <dfn data-noexport="" data-x="encoding label"
+  data-x-href="https://encoding.spec.whatwg.org/#label">encoding labels</dfn>, referred to as the
+  encoding's <i>name</i> and <i>labels</i> in the Encoding standard. <ref spec=ENCODING></p>
 
   <p>A <dfn>UTF-16 encoding</dfn> is UTF-16BE or UTF-16LE. <ref spec=ENCODING></p>
 
@@ -2266,7 +2269,7 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   <p class="note">Since support for encodings that are not defined in the WHATWG Encoding standard
   is prohibited, <span data-x="UTF-16 encoding">UTF-16 encodings</span> are the only encodings that
   this specification needs to treat as not being <span
-  data="ASCII-compatible encoding">ASCII-compatible encodings</span>.
+  data-x="ASCII-compatible encoding">ASCII-compatible encodings</span>.
 
   <p>The term <dfn>code unit</dfn> is used as defined in the Web IDL specification: a 16 bit
   unsigned integer, the smallest atomic component of a <code