W3C home > Mailing lists > Public > public-html-commits@w3.org > September 2012

html5/html4-differences Overview.html,1.181,1.182 Overview.src.html,1.194,1.195

From: Simon Pieters via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 14 Sep 2012 11:58:17 +0000
To: public-html-commits@w3.org
Message-Id: <E1TCUXJ-0002un-Ig@lionel-hutz.w3.org>
Update of /sources/public/html5/html4-differences
In directory hutz:/tmp/cvs-serv11169

Modified Files:
	Overview.html Overview.src.html 
Log Message:
editorial tweaks

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/html4-differences/Overview.html,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- Overview.html	14 Sep 2012 11:39:21 -0000	1.181
+++ Overview.html	14 Sep 2012 11:58:15 -0000	1.182
@@ -146,7 +146,7 @@
    <li><a href="#changed-attributes"><span class="secno">3.4 </span>Changed Attributes</a></li>
    <li><a href="#obsolete-elements"><span class="secno">3.5 </span>Obsolete Elements</a></li>
    <li><a href="#obsolete-attributes"><span class="secno">3.6 </span>Obsolete Attributes</a></ol></li>
- <li><a href="#content-model"><span class="secno">4 </span>Content Model Changes</a></li>
+ <li><a href="#content-model"><span class="secno">4 </span>Content Model</a></li>
  <li><a href="#apis"><span class="secno">5 </span>APIs</a>
   <ol class="toc">
    <li><a href="#new-apis"><span class="secno">5.1 </span>New APIs</a></li>
@@ -263,7 +263,7 @@
     and
     <a href="http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.3.7">shorthand markup</a>
     as these are not supported by most user agents. Documents using the HTML
-    syntax are almost always served with the <code>text/html</code> media
+    syntax are served with the <code>text/html</code> media
     type.</p>
 
     <p>HTML5 also defines detailed parsing rules (including "error
@@ -307,7 +307,7 @@
 
     <h3 id="character-encoding"><span class="secno">2.1 </span>Character Encoding</h3>
 
-    <p>For the HTML syntax of HTML5, authors are required to declare the
+    <p>For the HTML syntax, authors are required to declare the
     character encoding. There are three ways to do that:</p>
 
     <ul>
@@ -334,17 +334,19 @@
 
     <p>The HTML syntax of HTML5 requires a doctype to be specified to ensure
     that the browser renders the page in standards mode. The doctype has no
-    other purpose and is therefore optional for XML. Documents with an XML
-    media type are always handled in standards mode.
-    <a href="#refsDOCTYPE">[DOCTYPE]</a>
+    other purpose. <a href="#refsDOCTYPE">[DOCTYPE]</a>
 
-    <p>The doctype declaration is <code>&lt;!DOCTYPE html&gt;</code> and is
-    case-insensitive in the HTML syntax. Doctypes from earlier versions of
+    <p>The doctype declaration for the HTML syntax is <code>&lt;!DOCTYPE html&gt;</code> and is
+    case-insensitive. Doctypes from earlier versions of
     HTML were longer because the HTML language was SGML-based and therefore
     required a reference to a DTD. With HTML5 this is no longer the case and
     the doctype is only needed to enable standards mode for documents
     written using the HTML syntax. Browsers already do this for
     <code>&lt;!DOCTYPE html&gt;</code>.</p>
+    
+    <p>In the XML syntax, any doctype declaration may be used, or it may be
+    omitted altogether. Documents with an XML media type are always handled in
+    standards mode.
 
 
     <h3 id="mathml-svg"><span class="secno">2.3 </span>MathML and SVG</h3>
@@ -1824,7 +1826,7 @@
       and <code class="external"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/grouping-content.html#the-pre-element">pre</a></code>.
     </ul>
 
-    <h2 id="content-model"><span class="secno">4 </span>Content Model Changes</h2>
+    <h2 id="content-model"><span class="secno">4 </span>Content Model</h2>
 
     <p>Content model is what defines how elements may be nested — what is
     allowed as children (or descendants) of a certain element.

Index: Overview.src.html
===================================================================
RCS file: /sources/public/html5/html4-differences/Overview.src.html,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- Overview.src.html	14 Sep 2012 11:39:21 -0000	1.194
+++ Overview.src.html	14 Sep 2012 11:58:15 -0000	1.195
@@ -218,7 +218,7 @@
     and
     <a href="http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.3.7">shorthand markup</a>
     as these are not supported by most user agents. Documents using the HTML
-    syntax are almost always served with the <code>text/html</code> media
+    syntax are served with the <code>text/html</code> media
     type.</p>
 
     <p>HTML5 also defines detailed parsing rules (including "error
@@ -262,7 +262,7 @@
 
     <h3 id="character-encoding">Character Encoding</h3>
 
-    <p>For the HTML syntax of HTML5, authors are required to declare the
+    <p>For the HTML syntax, authors are required to declare the
     character encoding. There are three ways to do that:</p>
 
     <ul>
@@ -289,17 +289,19 @@
 
     <p>The HTML syntax of HTML5 requires a doctype to be specified to ensure
     that the browser renders the page in standards mode. The doctype has no
-    other purpose and is therefore optional for XML. Documents with an XML
-    media type are always handled in standards mode.
-    <span data-anolis-ref>DOCTYPE</span>
+    other purpose. <span data-anolis-ref>DOCTYPE</span>
 
-    <p>The doctype declaration is <code>&lt;!DOCTYPE html></code> and is
-    case-insensitive in the HTML syntax. Doctypes from earlier versions of
+    <p>The doctype declaration for the HTML syntax is <code>&lt;!DOCTYPE html></code> and is
+    case-insensitive. Doctypes from earlier versions of
     HTML were longer because the HTML language was SGML-based and therefore
     required a reference to a DTD. With HTML5 this is no longer the case and
     the doctype is only needed to enable standards mode for documents
     written using the HTML syntax. Browsers already do this for
     <code>&lt;!DOCTYPE html></code>.</p>
+    
+    <p>In the XML syntax, any doctype declaration may be used, or it may be
+    omitted altogether. Documents with an XML media type are always handled in
+    standards mode.
 
 
     <h3 id="mathml-svg">MathML and SVG</h3>
@@ -1823,7 +1825,7 @@
       and <code data-anolis-spec=html>pre</code>.
     </ul>
 
-    <h2 id="content-model">Content Model Changes</h2>
+    <h2 id="content-model">Content Model</h2>
 
     <p>Content model is what defines how elements may be nested &mdash; what is
     allowed as children (or descendants) of a certain element.
Received on Friday, 14 September 2012 11:58:23 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 14 September 2012 11:58:23 GMT