hixie: A first pass (for this quarter, anyway) at cleaning up some terminology around the word 'document'. (whatwg r6771)

hixie: A first pass (for this quarter, anyway) at cleaning up some
terminology around the word 'document'. (whatwg r6771)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.5420&r2=1.5421&f=h
http://html5.org/tools/web-apps-tracker?from=6770&to=6771

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5420
retrieving revision 1.5421
diff -u -d -r1.5420 -r1.5421
--- Overview.html 27 Oct 2011 00:07:33 -0000 1.5420
+++ Overview.html 27 Oct 2011 20:06:18 -0000 1.5421
@@ -1503,8 +1503,8 @@
   resources that use this abstract language, two of which are defined
   in this specification.<p>The first such concrete syntax is the HTML syntax. This is the
   format suggested for most authors. It is compatible with most legacy
-  Web browsers. If a document is transmitted with an <a href="#html-mime-type">HTML MIME
-  type</a>, such as <code><a href="#text-html">text/html</a></code>, then it will be
+  Web browsers. If a document is transmitted with the
+  <code><a href="#text-html">text/html</a></code> <a href="#mime-type">MIME type</a>, then it will be
   processed as an HTML document by Web browsers.
 
   
@@ -1524,13 +1524,14 @@
   This specification defines version 5 of the XHTML syntax, known as
   "XHTML5".
 
-  <p>The DOM, the HTML syntax, and XML cannot all represent the same
-  content. For example, namespaces cannot be represented using the
-  HTML syntax, but they are supported in the DOM and in XML.
-  Similarly, documents that use the <code><a href="#the-noscript-element">noscript</a></code> feature can
-  be represented using the HTML syntax, but cannot be represented with
-  the DOM or in XML. Comments that contain the string "<code title="">--&gt;</code>" can only be represented in the DOM, not in
-  the HTML and XML syntaxes.<h3 id="structure-of-this-specification"><span class="secno">1.7 </span>Structure of this specification</h3><p><i>This section is non-normative.</i><p>This specification is divided into the following major
+  <p>The DOM, the HTML syntax, and the XHTML syntax cannot all
+  represent the same content. For example, namespaces cannot be
+  represented using the HTML syntax, but they are supported in the DOM
+  and in the XHTML syntax. Similarly, documents that use the
+  <code><a href="#the-noscript-element">noscript</a></code> feature can be represented using the HTML
+  syntax, but cannot be represented with the DOM or in the XHTML
+  syntax. Comments that contain the string "<code title="">--&gt;</code>" can only be represented in the DOM, not in
+  the HTML and XHTML syntaxes.<h3 id="structure-of-this-specification"><span class="secno">1.7 </span>Structure of this specification</h3><p><i>This section is non-normative.</i><p>This specification is divided into the following major
   sections:<dl><dt><a href="#infrastructure">Common infrastructure</a></dt>
 
    <dd>The conformance classes, algorithms, definitions, and the
@@ -1578,8 +1579,8 @@
 
    <dd>All of these features would be for naught if they couldn't be
    represented in a serialized form and sent to other people, and so
-   these sections define the syntaxes of HTML, along with rules for
-   how to parse content using those syntaxes.</dd>
+   these sections define the syntaxes of HTML and XHTML, along with
+   rules for how to parse content using those syntaxes.</dd>
 
 
   </dl><p>There are also some appendices, defining <a href="#rendering">rendering rules</a> for Web browsers and listing
@@ -2544,7 +2545,24 @@
   ... (this does not apply to XHTML)".<p>This specification uses the term <dfn title="">document</dfn> to
   refer to any use of HTML, ranging from short static documents to
   long essays or reports with rich multimedia, as well as to
-  fully-fledged interactive applications.<p>For simplicity, terms such as <dfn title="">shown</dfn>, <dfn title="">displayed</dfn>, and <dfn title="">visible</dfn> might
+  fully-fledged interactive applications. The term is used to refer
+  both to <code><a href="#document">Document</a></code> objects and their descendant DOM
+  trees, and to serialized byte streams using the <a href="#syntax" title="the
+  HTML syntax">HTML syntax</a> or <a href="#the-xhtml-syntax" title="the XHTML
+  syntax">XHTML syntax</a>, depending on context.<p>In the context of the DOM structures, the terms <a href="#html-documents" title="HTML
+  documents">HTML document</a> and <a href="#xml-documents" title="XML documents">XML
+  document</a> are used as defined in the DOM Core specification,
+  and refer specifically to two different modes that
+  <code><a href="#document">Document</a></code> objects can find themselves in. <a href="#refsDOMCORE">[DOMCORE]</a> (Such uses are always hyperlinked
+  to their definition.)<p>In the context of byte streams, the term HTML document refers to
+  resources labeled as <code><a href="#text-html">text/html</a></code>, and the term XML
+  document refers to resources labeled with an <a href="#xml-mime-type">XML MIME
+  type</a>.<p>The term <dfn id="xhtml-document">XHTML document</dfn> is used to refer to both
+  <code><a href="#document">Document</a></code>s in the <a href="#xml-documents" title="XML documents">XML
+  document</a> mode that contains element nodes in the <a href="#html-namespace-0">HTML
+  namespace</a>, and byte streams labeled with an <a href="#xml-mime-type">XML MIME
+  type</a> that contain elements from the <a href="#html-namespace-0">HTML
+  namespace</a>, depending on context.<hr><p>For simplicity, terms such as <dfn title="">shown</dfn>, <dfn title="">displayed</dfn>, and <dfn title="">visible</dfn> might
   sometimes be used when referring to the way a document is rendered
   to the user. These terms are not meant to imply a visual medium;
   they must be considered to apply to other media in equivalent
@@ -19883,9 +19901,9 @@
   remember to use U+0022 QUOTATION MARK characters (") to wrap the
   attribute contents and then to escape all U+0022 QUOTATION MARK (")
   and U+0026 AMPERSAND (&amp;) characters, and to specify the <code title="attr-iframe-sandbox"><a href="#attr-iframe-sandbox">sandbox</a></code> attribute, to ensure safe
-  embedding of content.<p class="note">Due to restrictions of <span>the XML syntax</span>,
-  in XML the U+003C LESS-THAN SIGN character (&lt;) needs to be
-  escaped as well. In order to prevent <a href="http://www.w3.org/TR/REC-xml/#AVNormalize">attribute-value
+  embedding of content.<p class="note">Due to restrictions of <a href="#the-xhtml-syntax">the XHTML
+  syntax</a>, in XML the U+003C LESS-THAN SIGN character (&lt;)
+  needs to be escaped as well. In order to prevent <a href="http://www.w3.org/TR/REC-xml/#AVNormalize">attribute-value
   normalization</a>, some of XML's whitespace characters &mdash;
   specifically U+0009 CHARACTER TABULATION (tab), U+000A LINE FEED
   (LF), and U+000D CARRIAGE RETURN (CR) &mdash; also need to be
@@ -56026,9 +56044,9 @@
   are covered by the next section, entitled "<a href="#the-xhtml-syntax">The XHTML
   syntax</a>".</p>
 
-  <p>For <a href="#html-documents">HTML documents</a>, user agents must use the parsing
-  rules described in this section to generate the DOM trees. Together,
-  these rules define what is referred to as the <dfn id="html-parser">HTML
+  <p>User agents must use the parsing rules described in this section
+  to generate the DOM trees from <code><a href="#text-html">text/html</a></code> resources.
+  Together, these rules define what is referred to as the <dfn id="html-parser">HTML
   parser</dfn>.</p>
 
   <div class="note">

Received on Thursday, 27 October 2011 20:06:46 UTC