Merge Anne's change: Oct 11, 2012, xref encode and utf-8
authorJungkee Song <jungkee.song@samsung.com>
Mon, 19 Nov 2012 13:34:21 +0900
changeset 90 e24b211e476b
parent 89 ef59fffdfe2d
child 91 3890331373fe
Merge Anne's change: Oct 11, 2012, xref encode and utf-8
Overview.html
Overview.src.html
--- a/Overview.html	Mon Nov 19 13:29:16 2012 +0900
+++ b/Overview.html	Mon Nov 19 13:34:21 2012 +0900
@@ -1339,13 +1339,14 @@
 
      <dt>a string
      <dd>
-      <p>Let <var>encoding</var> be UTF-8.</p>
+      <p>Let <var>encoding</var> be "<code title="">UTF-8</code>".
 
       <p>Let <var>mime type</var> be "<code>text/plain;charset=UTF-8</code>".</p>
 
       <p>Let the <a href="#request-entity-body">request entity body</a> be <var title="">data</var>
       <a class="external" href="http://dev.w3.org/2006/webapi/WebIDL/#dfn-obtain-unicode" title="convert a DOMString to a sequence of Unicode characters">converted to Unicode</a>
-      and encoded as utf-8.</p>
+      and <a class="external" href="http://encoding.spec.whatwg.org/#encode" title="encode">encoded</a> as
+      <a class="external" href="http://encoding.spec.whatwg.org/#utf-8">utf-8</a>.
      </dd>
 
      <dt><code><a href="#formdata">FormData</a></code>
@@ -1353,8 +1354,11 @@
       <p>Let the <a href="#request-entity-body">request entity body</a> be the result of running
       the
       <a class="external" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#multipart/form-data-encoding-algorithm"><code>multipart/form-data</code> encoding algorithm</a>
-      with <var>data</var> as <var>form data set</var> and with UTF-8 as the
-      explicit character encoding.</p>
+      with <var>data</var> as <var>form data set</var> and with
+      <a class="external" href="http://encoding.spec.whatwg.org/#utf-8">utf-8</a> as the
+      explicit character encoding.
+      <!-- need to provide explicit character encoding because otherwise the
+           encoding of the document is used -->
 
       <p>Let <var>mime type</var> be the concatenation of
       "<code title="">multipart/form-data;</code>",
@@ -2417,7 +2421,7 @@
   </ol>
 
   <p class="note">Authors are strongly encouraged to always encode their
-  resources using UTF-8.</p>
+  resources using <a class="external" href="http://encoding.spec.whatwg.org/#utf-8">utf-8</a>.
 
 
 
--- a/Overview.src.html	Mon Nov 19 13:29:16 2012 +0900
+++ b/Overview.src.html	Mon Nov 19 13:34:21 2012 +0900
@@ -1303,13 +1303,14 @@
 
      <dt>a string
      <dd>
-      <p>Let <var>encoding</var> be UTF-8.</p>
+      <p>Let <var>encoding</var> be "<code title>UTF-8</code>".
 
       <p>Let <var>mime type</var> be "<code>text/plain;charset=UTF-8</code>".</p>
 
       <p>Let the <span>request entity body</span> be <var title>data</var>
       <span data-anolis-spec=webidl title="convert a DOMString to a sequence of Unicode characters">converted to Unicode</span>
-      and encoded as utf-8.</p>
+      and <span data-anolis-spec=encoding title=encode>encoded</span> as
+      <span data-anolis-spec=encoding>utf-8</span>.
      </dd>
 
      <dt><code>FormData</code>
@@ -1317,8 +1318,11 @@
       <p>Let the <span>request entity body</span> be the result of running
       the
       <span data-anolis-spec=html><code>multipart/form-data</code> encoding algorithm</span>
-      with <var>data</var> as <var>form data set</var> and with UTF-8 as the
-      explicit character encoding.</p>
+      with <var>data</var> as <var>form data set</var> and with
+      <span data-anolis-spec=encoding>utf-8</span> as the
+      explicit character encoding.
+      <!-- need to provide explicit character encoding because otherwise the
+           encoding of the document is used -->
 
       <p>Let <var>mime type</var> be the concatenation of
       "<code title>multipart/form-data;</code>",
@@ -2381,7 +2385,7 @@
   </ol>
 
   <p class=note>Authors are strongly encouraged to always encode their
-  resources using UTF-8.</p>
+  resources using <span data-anolis-spec=encoding>utf-8</span>.