diff --git a/complete.html b/complete.html
index 45f5a79c78c..d5ae60bbf9b 100644
--- a/complete.html
+++ b/complete.html
@@ -298,7 +298,7 @@
The readyState
attribute represents
the state of the connection. It can have the following values:
@@ -101343,6 +101347,7 @@ References
[RFC3490]
Internationalizing Domain Names in Applications (IDNA), P. Faltstrom, P. Hoffman, A. Costello. IETF.
+
[RFC3629]
UTF-8, a transformation format of ISO 10646, F. Yergeau. IETF.
diff --git a/index b/index
index 45f5a79c78c..d5ae60bbf9b 100644
--- a/index
+++ b/index
@@ -298,7 +298,7 @@
![WHATWG](/images/logo)
HTML
- Living Standard — Last Updated 20 November 2013
+ Living Standard — Last Updated 21 November 2013
- Web developer edition:
- http://developers.whatwg.org/
- Multiple-page version:
@@ -6672,20 +6672,24 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
Let encoding be determined as follows:
- - If the URL had a character encoding defined when the URL was created or defined
+ - If the URL had a character encoding defined when the URL was created or defined or when
+ this algorithm was invoked
- The URL character encoding is as defined.
+
- If the URL came from a script (e.g. as an argument to a method)
- The URL character encoding is the API URL character encoding specified by the script's settings object.
+
- If the URL came from a DOM node (e.g. from an element)
- The node has a
Document
, and the URL character encoding is the
document's character encoding.
+
If encoding is a UTF-16 encoding, then change the value
@@ -79103,8 +79107,8 @@ interface WebSocket : EventTarget
The url
attribute must return the result of
resolving the URL that was passed to the
- constructor. (It doesn't matter what it is resolved relative to, since we already know it is an
- absolute URL.)
+ constructor, with the URL character encoding set to UTF-8. (It doesn't matter what it is resolved
+ relative to, since we already know it is an absolute URL.)
The readyState
attribute represents
the state of the connection. It can have the following values:
@@ -101343,6 +101347,7 @@ if (s = prompt('What is your name?')) {
[RFC3490]
Internationalizing Domain Names in Applications (IDNA), P. Faltstrom, P. Hoffman, A. Costello. IETF.
+
[RFC3629]
UTF-8, a transformation format of ISO 10646, F. Yergeau. IETF.
diff --git a/source b/source
index ae816584305..6dea9a8da1f 100644
--- a/source
+++ b/source
@@ -6040,20 +6040,25 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
- - If the URL had a character encoding defined when the URL was created or defined
+
+ - If the URL had a character encoding defined when the URL was created or defined or when
+ this algorithm was invoked
- The URL character encoding is as defined.
+
- If the URL came from a script (e.g. as an argument to a method)
- The URL character encoding is the API URL character encoding specified by the script's settings object.
+
- If the URL came from a DOM node (e.g. from an element)
- The node has a
Document
, and the URL character encoding is the
document's character encoding.
+
@@ -88599,8 +88604,8 @@ interface WebSocket : EventTarget {
The url
attribute must return the result of
resolving the URL that was passed to the
- constructor. (It doesn't matter what it is resolved relative to, since we already know it is an
- absolute URL.)
+ constructor, with the URL character encoding set to UTF-8. (It doesn't matter what it is resolved
+ relative to, since we already know it is an absolute URL.)
The readyState
attribute represents
the state of the connection. It can have the following values:
@@ -113204,6 +113209,7 @@ if (s = prompt('What is your name?')) {
[RFC3490]
Internationalizing Domain Names in Applications (IDNA), P. Faltstrom, P. Hoffman, A. Costello. IETF.
+
[RFC3629]
UTF-8, a transformation format of ISO 10646, F. Yergeau. IETF.