[html5] r6771 - [e] (0) A first pass (for this quarter, anyway) at cleaning up some terminology [...]

whatwg at whatwg.org whatwg at whatwg.org
Thu Oct 27 13:02:05 PDT 2011


Author: ianh
Date: 2011-10-27 13:02:03 -0700 (Thu, 27 Oct 2011)
New Revision: 6771

Modified:
   complete.html
   index
   source
Log:
[e] (0) A first pass (for this quarter, anyway) at cleaning up some terminology around the word 'document'.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14565

Modified: complete.html
===================================================================
--- complete.html	2011-10-27 00:03:25 UTC (rev 6770)
+++ complete.html	2011-10-27 20:02:03 UTC (rev 6771)
@@ -1808,8 +1808,8 @@
 
   <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.
 
   This specification defines the latest HTML syntax, known simply as
@@ -1833,13 +1833,14 @@
 
   </p>
 
-  <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="">--></code>" can only be represented in the DOM, not in
-  the HTML and XML syntaxes.</p>
+  <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="">--></code>" can only be represented in the DOM, not in
+  the HTML and XHTML syntaxes.</p>
 
 
   <h3 id=structure-of-this-specification><span class=secno>1.9 </span>Structure of this specification</h3>
@@ -1935,8 +1936,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
@@ -3074,9 +3075,32 @@
   <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>
+  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>
 
-  <p>For simplicity, terms such as <dfn title="">shown</dfn>, <dfn title="">displayed</dfn>, and <dfn title="">visible</dfn> might
+  <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>
+
+  <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>
+
+  <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.</p>
+
+  <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
@@ -24053,9 +24077,9 @@
   and U+0026 AMPERSAND (&) 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>
 
-  <p class=note>Due to restrictions of <span>the XML syntax</span>,
-  in XML the U+003C LESS-THAN SIGN character (<) needs to be
-  escaped as well. In order to prevent <a href=http://www.w3.org/TR/REC-xml/#AVNormalize>attribute-value
+  <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 (<)
+  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 —
   specifically U+0009 CHARACTER TABULATION (tab), U+000A LINE FEED
   (LF), and U+000D CARRIAGE RETURN (CR) — also need to be
@@ -84046,9 +84070,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>

Modified: index
===================================================================
--- index	2011-10-27 00:03:25 UTC (rev 6770)
+++ index	2011-10-27 20:02:03 UTC (rev 6771)
@@ -1808,8 +1808,8 @@
 
   <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.
 
   This specification defines the latest HTML syntax, known simply as
@@ -1833,13 +1833,14 @@
 
   </p>
 
-  <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="">--></code>" can only be represented in the DOM, not in
-  the HTML and XML syntaxes.</p>
+  <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="">--></code>" can only be represented in the DOM, not in
+  the HTML and XHTML syntaxes.</p>
 
 
   <h3 id=structure-of-this-specification><span class=secno>1.9 </span>Structure of this specification</h3>
@@ -1935,8 +1936,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
@@ -3074,9 +3075,32 @@
   <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>
+  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>
 
-  <p>For simplicity, terms such as <dfn title="">shown</dfn>, <dfn title="">displayed</dfn>, and <dfn title="">visible</dfn> might
+  <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>
+
+  <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>
+
+  <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.</p>
+
+  <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
@@ -24053,9 +24077,9 @@
   and U+0026 AMPERSAND (&) 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>
 
-  <p class=note>Due to restrictions of <span>the XML syntax</span>,
-  in XML the U+003C LESS-THAN SIGN character (<) needs to be
-  escaped as well. In order to prevent <a href=http://www.w3.org/TR/REC-xml/#AVNormalize>attribute-value
+  <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 (<)
+  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 —
   specifically U+0009 CHARACTER TABULATION (tab), U+000A LINE FEED
   (LF), and U+000D CARRIAGE RETURN (CR) — also need to be
@@ -84046,9 +84070,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>

Modified: source
===================================================================
--- source	2011-10-27 00:03:25 UTC (rev 6770)
+++ source	2011-10-27 20:02:03 UTC (rev 6771)
@@ -567,8 +567,8 @@
 
   <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 <span>HTML MIME
-  type</span>, such as <code>text/html</code>, then it will be
+  Web browsers. If a document is transmitted with the
+  <code>text/html</code> <span>MIME type</span>, then it will be
   processed as an HTML document by Web browsers.
 
   <!--END html--><!--END dev-html--><!--END complete--><!--END epub--><!--VERSION-->
@@ -600,14 +600,15 @@
 
   </p>
 
-  <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>noscript</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
+  <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>noscript</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="">--></code>" can only be represented in the DOM, not in
-  the HTML and XML syntaxes.</p>
+  the HTML and XHTML syntaxes.</p>
 
 
   <h3>Structure of this specification</h3>
@@ -707,8 +708,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>
@@ -1926,8 +1927,34 @@
   <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>
+  fully-fledged interactive applications. The term is used to refer
+  both to <code>Document</code> objects and their descendant DOM
+  trees, and to serialized byte streams using the <span title="the
+  HTML syntax">HTML syntax</span> or <span title="the XHTML
+  syntax">XHTML syntax</span>, depending on context.</p>
 
+  <p>In the context of the DOM structures, the terms <span title="HTML
+  documents">HTML document</span> and <span title="XML documents">XML
+  document</span> are used as defined in the DOM Core specification,
+  and refer specifically to two different modes that
+  <code>Document</code> objects can find themselves in. <a
+  href="#refsDOMCORE">[DOMCORE]</a> (Such uses are always hyperlinked
+  to their definition.)</p>
+
+  <p>In the context of byte streams, the term HTML document refers to
+  resources labeled as <code>text/html</code>, and the term XML
+  document refers to resources labeled with an <span>XML MIME
+  type</span>.</p>
+
+  <p>The term <dfn>XHTML document</dfn> is used to refer to both
+  <code>Document</code>s in the <span title="XML documents">XML
+  document</span> mode that contains element nodes in the <span>HTML
+  namespace</span>, and byte streams labeled with an <span>XML MIME
+  type</span> that contain elements from the <span>HTML
+  namespace</span>, depending on context.</p>
+
+  <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
@@ -25748,9 +25775,9 @@
   title="attr-iframe-sandbox">sandbox</code> attribute, to ensure safe
   embedding of content.</p>
 
-  <p class="note">Due to restrictions of <span>the XML syntax</span>,
-  in XML the U+003C LESS-THAN SIGN character (<) needs to be
-  escaped as well. In order to prevent <a
+  <p class="note">Due to restrictions of <span>the XHTML
+  syntax</span>, in XML the U+003C LESS-THAN SIGN character (<)
+  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 —
   specifically U+0009 CHARACTER TABULATION (tab), U+000A LINE FEED
@@ -95226,9 +95253,9 @@
   are covered by the next section, entitled "<span>The XHTML
   syntax</span>".</p>
 
-  <p>For <span>HTML documents</span>, 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>HTML
+  <p>User agents must use the parsing rules described in this section
+  to generate the DOM trees from <code>text/html</code> resources.
+  Together, these rules define what is referred to as the <dfn>HTML
   parser</dfn>.</p>
 
   <div class="note">




More information about the Commit-Watchers mailing list