diff --git a/index b/index index 61edd4319d0..f8e783e3794 100644 --- a/index +++ b/index @@ -9145,13 +9145,17 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0 also be specified. Otherwise, it must be omitted.

The charset - attribute specifies the character encoding used by the document. In - HTML documents this is a character - encoding declaration. If the attribute is present in an XML document, its value must be an ASCII - case-insensitive match for the string "UTF-8", and the resource must be encoded using the - UTF-8 character encoding. (The element has no effect in XML - documents, and is only allowed to facilitate migration to and from - XHTML.)

+ attribute specifies the character encoding used by the + document. This is a character encoding declaration. If + the attribute is present in an XML + document, its value must be an ASCII + case-insensitive match for the string "UTF-8" (and the document is therefore required to + use UTF-8 as its encoding).

+ +

The charset + attribute on the meta element has no effect in XML + documents, and is only allowed in order to facilitate migration to + and from XHTML.

There must not be more than one meta element with a charset attribute per @@ -9645,7 +9649,9 @@ people expect to have work and what is necessary. + parsing section for conformance checkers, and we have to make sure + that the requirements for charset="" apply even in XML, for the + polyglot hack -->

A character encoding declaration is a mechanism by which the character encoding used to store or transmit a document is @@ -9669,16 +9675,18 @@ people expect to have work and what is necessary. declaration must be serialised completely within the first 512 bytes of the document. -

If the document does not start with a BOM, and if its encoding is - not explicitly given by Content-Type - metadata, then the character encoding used must be an - ASCII-compatible character encoding, and, in addition, - if that encoding isn't US-ASCII itself, then the encoding must be - specified using a meta element with a charset attribute or a +

If an HTML document does not + start with a BOM, and if its encoding is not explicitly given by + Content-Type metadata, then the + character encoding used must be an ASCII-compatible character + encoding, and, in addition, if that encoding isn't US-ASCII + itself, then the encoding must be specified using a + meta element with a charset attribute or a meta element in the Encoding declaration state.

-

If the document contains a meta element with a charset attribute or a +

If an HTML document contains + a meta element with a charset attribute or a meta element in the Encoding declaration state, then the character encoding used must be an ASCII-compatible character encoding.

diff --git a/source b/source index 5aa9813a6b8..b02382c6902 100644 --- a/source +++ b/source @@ -9488,15 +9488,18 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0 also be specified. Otherwise, it must be omitted.

The charset - attribute specifies the character encoding used by the document. In - HTML documents this is a character - encoding declaration. If the attribute is present in an XML document, its value must be an ASCII + attribute specifies the character encoding used by the + document. This is a character encoding declaration. If + the attribute is present in an XML + document, its value must be an ASCII case-insensitive match for the string "UTF-8", and the resource must be encoded using the - UTF-8 character encoding. (The element has no effect in XML - documents, and is only allowed to facilitate migration to and from - XHTML.)

+ title="">UTF-8" (and the document is therefore required to + use UTF-8 as its encoding).

+ +

The charset + attribute on the meta element has no effect in XML + documents, and is only allowed in order to facilitate migration to + and from XHTML.

There must not be more than one meta element with a charset attribute per @@ -10081,7 +10084,9 @@ people expect to have work and what is necessary. + parsing section for conformance checkers, and we have to make sure + that the requirements for charset="" apply even in XML, for the + polyglot hack -->

A character encoding declaration is a mechanism by which the character encoding used to store or transmit a document is @@ -10110,18 +10115,20 @@ people expect to have work and what is necessary. -

If the document does not start with a BOM, and if its encoding is - not explicitly given by Content-Type - metadata, then the character encoding used must be an - ASCII-compatible character encoding, and, in addition, - if that encoding isn't US-ASCII itself, then the encoding must be - specified using a meta element with a If an HTML document does not + start with a BOM, and if its encoding is not explicitly given by + Content-Type metadata, then the + character encoding used must be an ASCII-compatible character + encoding, and, in addition, if that encoding isn't US-ASCII + itself, then the encoding must be specified using a + meta element with a charset attribute or a meta element in the Encoding declaration state.

-

If the document contains a meta element with a If an HTML document contains + a meta element with a charset attribute or a meta element in the Encoding declaration