W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2009

html5/markup documents.html,NONE,1.1 .cvsignore,1.15,1.16 Makefile,1.71,1.72 Overview.html,1.324,1.325 datatypes.html,1.14,1.15 intro.html,1.5,1.6 meta.http-equiv.content-type.html,1.6,1.7 noscript.html,1.7,1.8 spec.html,1.48,1.49 syntax.html,1.13,1.14 terminology.html,1.9,1.10

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 14 Jul 2009 16:30:17 +0000
To: public-html-commits@w3.org
Message-Id: <E1MQktV-0000WU-Vp@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv1700

Modified Files:
	.cvsignore Makefile Overview.html datatypes.html intro.html 
	meta.http-equiv.content-type.html noscript.html spec.html 
	syntax.html terminology.html 
Added Files:
	documents.html 
Log Message:
renamed the "HTML and XHTML documents" section to simply "Documents"


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- Overview.html	14 Jul 2009 15:41:51 -0000	1.324
+++ Overview.html	14 Jul 2009 16:30:15 -0000	1.325
@@ -97,7 +97,7 @@
 <a href="terminology.html#terminology">4. Terminology</a>
 </li>
 <li>
-<a href="html-and-xhtml.html#html-and-xhtml">5. HTML and XHTML documents</a>
+<a href="documents.html#documents">5. Documents</a>
 </li>
 <li>
 <a href="syntax.html#syntax">6. HTML syntax</a>
@@ -155,14 +155,14 @@
 <li id="terminology-toc">
 <a href="terminology.html#terminology">4. Terminology</a>
 </li>
-<li id="html-and-xhtml-toc">
-<a href="html-and-xhtml.html#html-and-xhtml">5. HTML and XHTML documents</a>
+<li id="documents-toc">
+<a href="documents.html#documents">5. Documents</a>
 <ul>
 <li id="mime-types-toc">
-<a href="html-and-xhtml.html#mime-types">5.1. The HTML namespace and MIME types</a>
+<a href="documents.html#mime-types">5.1. The HTML namespace and MIME types</a>
 </li>
 <li id="documents-toc">
-<a href="html-and-xhtml.html#documents">5.2. Conformant documents</a>
+<a href="documents.html#documents">5.2. Conformant documents</a>
 </li>
 </ul>
 </li>

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- meta.http-equiv.content-type.html	29 Jun 2009 09:18:48 -0000	1.6
+++ meta.http-equiv.content-type.html	14 Jul 2009 16:30:15 -0000	1.7
@@ -62,8 +62,8 @@
         <div class="no-number no-toc" id="meta.http-equiv.content-type-constraints"><h2 class="element-subhead">Additional constraints <a class="hash" href="#meta.http-equiv.content-type-constraints">#</a></h2>
     <p>A <a href="meta.html#meta" class="element">meta</a> element in the
     <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
-      state</a> may be used in a <a href="html-and-xhtml.html#syntax-document-html">document in the HTML syntax</a>,
-    but it must not be used in a <a href="html-and-xhtml.html#syntax-document-xml">document in the XML syntax</a>.</p>
+      state</a> may be used in a <a href="documents.html#syntax-document-html">document in the HTML syntax</a>,
+    but it must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
     <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
       state</a> per document.</p>
     <p>If a document contains a

Index: intro.html
===================================================================
RCS file: /sources/public/html5/markup/intro.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intro.html	29 Jun 2009 09:18:47 -0000	1.5
+++ intro.html	14 Jul 2009 16:30:15 -0000	1.6
@@ -30,7 +30,7 @@
     <h2>1.1. Scope <a class="hash" href="#scope">#</a> <a class="toc-bak" href="Overview.html#scope-toc">T</a></h2>
     <p>This specification limits its scope to providing
     the details necessary for HTML producers to create
-    <a href="html-and-xhtml.html#documents">conformant documents</a>. It is
+    <a href="documents.html#documents">conformant documents</a>. It is
     designed:</p>
     <ul>
       <li>to describe the syntax, structure, and

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- syntax.html	10 Jul 2009 02:29:18 -0000	1.13
+++ syntax.html	14 Jul 2009 16:30:15 -0000	1.14
@@ -8,7 +8,7 @@
 <body>
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
 <div class="nav">
-<span class="nav-prev"><a href="html-and-xhtml.html">&#171; html-and-xhtml</a></span>
+<span class="nav-prev"><a href="documents.html">&#171; documents</a></span>
 <span class="nav-next"><a href="elements.html">elements &#187;</a></span>
 </div>
 <div id="syntax" class="section">
@@ -43,7 +43,7 @@
     an special instruction which, for legacy reasons that have to
     do with processing modes in browsers, is a required part of
     any
-    <a href="html-and-xhtml.html#syntax-document-html">document in the HTML syntax</a>.</p>
+    <a href="documents.html#syntax-document-html">document in the HTML syntax</a>.</p>
     <p>The DOCTYPE must match either the
     <a href="syntax.html#doctype.pattern">doctype</a>
     or
@@ -84,7 +84,7 @@
     </dl>
     <div class="example">
     <p>The following are examples of some DOCTYPEs that match the
-    <a href=".html#doctype,legacy">doctype.legacy</a> pattern.</p>
+    <a href="syntax.html#doctype.legacy">doctype.legacy</a> pattern.</p>
     <pre>&lt;!doctype html system 'about:legacy-compat'&gt;</pre>
     <pre>&lt;!DOCTYPE HTML system "about:legacy-compat"&gt;</pre>
     </div>
@@ -161,7 +161,7 @@
     <a href="references.html#refsSCSU">[SCSU]</a>
     </p>
     <p>In a
-    <a href="html-and-xhtml.html#syntax-document-xml">document the XML syntax</a>,
+    <a href="documents.html#syntax-document-xml">document the XML syntax</a>,
     the XML declaration should be used to provide
     character-encoding information, if necessary.</p>
   </div>
@@ -212,9 +212,9 @@
     </dl>
     <p id="elements-html-syntax">The following list describes syntax
       rules for the
-      <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>.
+      <a href="documents.html#html-syntax">the HTML syntax</a>.
       Rules for the
-      <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a>
+      <a href="documents.html#xml-syntax">the XML syntax</a>
       are defined in the XML specification
       <a href="references.html#refsXML">[XML]</a>.</p>
     <ul>
@@ -318,9 +318,9 @@
       match for each other.</p>
       <p id="elements-xml-syntax">The following list describes syntax
         rules for attributes in 
-        <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>.
+        <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.
         Syntax rules for attributes in
-        <a href="html-and-xhtml.html#syntax-document-xml">documents in the XML syntax</a>.
+        <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.
         are defined in
         the XML specification <a href="references.html#refsXML">[XML]</a>.
       </p>
@@ -351,7 +351,7 @@
       general, are
       <a href="syntax.html#normal-character-data">normal character data</a>.</li>
     </ul>
-    <p>In the <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>,
+    <p>In the <a href="documents.html#html-syntax">the HTML syntax</a>,
     attributes can be specified in four different ways:</p>
     <ol>
       <li><a href="syntax.html#syntax-attr-empty">empty attribute syntax</a></li>
@@ -536,7 +536,7 @@
       <dt><dfn id="replaceable-character-data" title="replaceable-character-data">Replaceable character data</dfn></dt>
       <dd>
         <p>In
-        <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>,
+        <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>,
         the
         <a href="title.html#title" class="element">title</a>
         and 
@@ -571,10 +571,10 @@
         </ul>
         <p class="note">Replaceable character data,
         as defined in this specification, is a feature of
-        <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>
+        <a href="documents.html#html-syntax">the HTML syntax</a>
         that is not available in
-        <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a>.
-        <a href="html-and-xhtml.html#syntax-document-xml">Documents in the XML
+        <a href="documents.html#xml-syntax">the XML syntax</a>.
+        <a href="documents.html#syntax-document-xml">Documents in the XML
           syntax</a> must not contain replaceable character data
         as defined in this specification; instead they must
         conform to all syntax constraints defined in the XML
@@ -583,7 +583,7 @@
       <dt><dfn id="non-replaceable-character-data" title="non-replaceable-character-data">Non-replaceable character data</dfn></dt>
       <dd>
         <p>In
-        <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>,
+        <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>,
         the
         <a href="script.html#script" class="element">script</a>
         and 
@@ -618,10 +618,10 @@
         </ul>
         <p class="note">Non-replaceable character data,
         as defined in this specification, is a feature of
-        <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>
+        <a href="documents.html#html-syntax">the HTML syntax</a>
         that is not available in
-        <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a>.
-        <a href="html-and-xhtml.html#syntax-document-xml">Documents in the XML
+        <a href="documents.html#xml-syntax">the XML syntax</a>.
+        <a href="documents.html#syntax-document-xml">Documents in the XML
           syntax</a> must not contain non-replaceable character
         data as defined in this specification; instead they must
         conform to all syntax constraints defined in the XML
@@ -761,16 +761,16 @@
    <dfn id="svg-mathml-elements" title="svg-mathml-elements">SVG and MathML elements</dfn>
    are elements from the SVG and MathML namespaces.
    SVG and MathML elements can be used both in
-   <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>
+   <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>
    and in 
-   <a href="html-and-xhtml.html#syntax-document-xml">documents in the XML syntax</a>.
+   <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.
    Syntax rules for SVG and MathML elements in
-   <a href="html-and-xhtml.html#syntax-document-xml">documents in the XML syntax</a>
+   <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>
    are defined in the XML specification
    <a href="references.html#refsXML">[XML]</a>.
    The following list describes additional syntax rules
    that specifically apply only to SVG and MathML elements in
-   <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>.
+   <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.
    </p>
    <ul>
      <li>SVG and MathML elements whose start tags
@@ -808,7 +808,7 @@
    <p>
    <dfn id="syntax-cdata-sections" title="syntax-cdata-sections">CDATA sections in MathML and SVG contents</dfn>
    in 
-   <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>
+   <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>
    must start with the character sequence U+003C LESS-THAN
    SIGN, U+0021 EXCLAMATION MARK, U+005B LEFT SQUARE BRACKET,
    U+0043 LATIN CAPITAL LETTER C, U+0044 LATIN CAPITAL LETTER
@@ -842,7 +842,7 @@
 </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="html-and-xhtml.html">&#171; html-and-xhtml</a></span>
+<span class="nav-prev"><a href="documents.html">&#171; documents</a></span>
 <span class="nav-next"><a href="elements.html">elements &#187;</a></span>
 </div>
 </body>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- Makefile	14 Jul 2009 15:41:51 -0000	1.71
+++ Makefile	14 Jul 2009 16:30:15 -0000	1.72
@@ -119,7 +119,7 @@
 html.spec.src.html: $(HTML_COMPILED_RNG) html.rnc.spec.html \
   tools/generate-spec-source.xsl $(HTML_RNC_SOURCE)/assertions.sch \
   schema.html html.rnc.xml src/head.html src/header.src.html src/intro-scope.html \
-  src/conformance.html src/structure.html src/terms.html src/syntax.html src/html-xhtml.html \
+  src/conformance.html src/structure.html src/terms.html src/syntax.html src/documents.html \
   $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \
   schema/LICENSE.xml html.css.xml html.css.LICENSE.xml
 	$(XSLTPROC) $(XSLTPROCFLAGS) tools/generate-spec-source.xsl $< > $@

Index: terminology.html
===================================================================
RCS file: /sources/public/html5/markup/terminology.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- terminology.html	29 Jun 2009 09:18:49 -0000	1.9
+++ terminology.html	14 Jul 2009 16:30:15 -0000	1.10
@@ -9,7 +9,7 @@
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
 <div class="nav">
 <span class="nav-prev"><a href="structure.html">&#171; structure</a></span>
-<span class="nav-next"><a href="html-and-xhtml.html">html-and-xhtml &#187;</a></span>
+<span class="nav-next"><a href="documents.html">documents &#187;</a></span>
 </div>
 <div id="terminology" class="section">
   <h2>4. Terminology <a class="hash" href="#terminology">#</a> <a class="toc-bak" href="Overview.html#terminology-toc">T</a></h2>
@@ -36,7 +36,7 @@
       LETTER Z). Many strings in the HTML syntax (for example, the
       names of elements and their attributes) are <a href="terminology.html#case-insensitive">case-insensitive</a>.
     </dd>
-    <dd>For <a href="html-and-xhtml.html#syntax-document-xml">documents in the XML
+    <dd>For <a href="documents.html#syntax-document-xml">documents in the XML
         syntax</a>, <a href="syntax.html#character-data">character data</a>
       is as defined in the XML specification <a href="references.html#refsXML">[XML]</a>.</dd>
     <dt><dfn id="fallback">fallback content</dfn></dt>
@@ -73,7 +73,7 @@
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="structure.html">&#171; structure</a></span>
-<span class="nav-next"><a href="html-and-xhtml.html">html-and-xhtml &#187;</a></span>
+<span class="nav-next"><a href="documents.html">documents &#187;</a></span>
 </div>
 </body>
 </html>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- datatypes.html	8 Jul 2009 10:31:01 -0000	1.14
+++ datatypes.html	14 Jul 2009 16:30:15 -0000	1.15
@@ -220,11 +220,11 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.charset">charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.charset" class="hash">#</a></div>
       <div class="datatype-desc">
-        <p>For documents in the <a href="html-and-xhtml.html#html-syntax">HTML
+        <p>For documents in the <a href="documents.html#html-syntax">HTML
           syntax</a>: Any <b class="defined-elsewhere">character
           set name</b> listed in the IANA <cite>Character Sets</cite>
         list <a href="references.html#refsIANACHARSET">[IANACHARSET]</a>.</p>
-        <p>For documents in the <a href="html-and-xhtml.html#xml-syntax">XML
+        <p>For documents in the <a href="documents.html#xml-syntax">XML
           syntax</a>, any <a href="terminology.html#ascii-case-insensitive">ASCII
           case-insensitive</a> match for the string
         "<code>UTF-8</code>".</p>

--- NEW FILE: documents.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title>HTML5: Documents</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
</head>
<body>
<h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
<div class="nav">
<span class="nav-prev"><a href="terminology.html">&#171; terminology</a></span>
<span class="nav-next"><a href="syntax.html">syntax &#187;</a></span>
</div>
<div id="documents" class="section">
  <h2>5. Documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="Overview.html#documents-toc">T</a></h2>
  <div class="toc">
<ul>
<li id="mime-types-toc"><a href="documents.html#mime-types">1. The HTML namespace and MIME types</a>
</li>
<li id="documents-toc"><a href="documents.html#documents">2. Conformant documents</a>
</li>
</ul>
</div>
  <p>The HTML vocabulary is an abstract language that applications
  can potentially represent in memory in any number of possible
  ways, and that can be transmitted using any number of possible
  concrete syntaxes. This specification makes reference to 
  two particular concrete syntaxes: One syntax which
  is referred to throughout this specification as
  <a href="documents.html#html-syntax">the HTML syntax</a>,
  and another syntax, which is referred to throughout this
  specification as
  <a href="documents.html#xml-syntax">the XML syntax</a>.</p>
  <p>Web browsers typically implement two separate parsers for
  processing documents: an
  <dfn id="html-parser">HTML parser</dfn>
  which is invoked when processing documents in the
  <a href="documents.html#html-syntax">HTML syntax</a>, and an
  <dfn id="xml-parser">XML parser</dfn>
  which is invoked when processing documents in the
  <a href="documents.html#xml-syntax">XML syntax</a>.</p>
  <p>The <dfn id="html-syntax" title="html-syntax">HTML syntax</dfn>
  is the syntax described in the
  &#8220;HTML syntax&#8221; section of this specification.
  The
  <dfn id="xml-syntax" title="xml-syntax">XML syntax</dfn>
  is defined by rules in the XML specification
  <a href="references.html#refsXML">[XML]</a>.</p>
  <div id="mime-types" class="section">
    <h2>5.1. The HTML namespace and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="Overview.html#mime-types-toc">T</a></h2>
    <p>The
    <dfn id="html-namespace" title="html-namespace">HTML namespace</dfn>
    is defined as <code>http://www.w3.org/1999/xhtml</code>.
    The <a href="documents.html#html-namespace">HTML namespace</a> is the
    namespace both for 
    <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>
    and for
    <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.</p>
    <p>Documents that are served with the
    <code>text/html</code> MIME type must conform to the rules in this
    specification for
    <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.</p>
    <p>Documents that have an
    <a href="documents.html#html-namespace">HTML namespace</a>
    declaration and that are served with an XML MIME type
    such as
    <code>text/xml</code>,
    <code>application/xml</code>, or
    <code>application/xhtml+xml</code>
    must conform to the rules in this specification for
    <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.</p>
  </div>
  <div id="documents" class="section">
    <h2>5.2. Conformant documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="Overview.html#documents-toc">T</a></h2>
    <p>A conformant
    <dfn id="syntax-document-html" title="syntax-document-html">document in the HTML
      syntax</dfn> must consist of the following parts, in the
    following order:</p>
    <ol>
      <li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM)
      character.</li>
      <li>Any number of
      <a href="syntax.html#syntax-comments">comments</a> and
      <a href="terminology.html#space">space characters</a>.</li>
      <li>A <a href="syntax.html#doctype">DOCTYPE</a>.</li>
      <li>Any number of
      <a href="syntax.html#syntax-comments">comments</a> and
      <a href="terminology.html#space">space characters</a>.</li>
      <li>The root element, in the form of an
      <a href="html.html#html">html</a> element.</li>
      <li>Any number of
      <a href="syntax.html#syntax-comments">comments</a> and
      <a href="terminology.html#space">space characters</a>.</li>
    </ol>
    <p>A conformant
    <dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn>
    must consist of the following parts, in the following order:</p>
    <ol>
      <li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM)
      character.</li>
      <li>Any number of comments and space characters, as defined
      in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
      <li>Optionally, a DOCTYPE, as defined
      in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
      <li>Any number of comments and space characters, as defined
      in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
      <li>The root element, in the form of an
      <a href="html.html#html">html</a> element.</li>
      <li>Any number of comments and space characters, as defined
      in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
    </ol>
    <p>Documents in the XML syntax must conform to XML constraints
    as defined in the XML specification <a href="references.html#refsXML">[XML]</a> &#8212; including XML well-formedness
    constraints &#8212; and must not make use of any features of the <a href="documents.html#html-syntax">HTML syntax</a> that do not follow XML
    well-formedness constraints (for example, documents in the XML
    syntax must not use <a href="syntax.html#syntax-attr-unquoted">unquoted attribute
      value syntax</a> and must not <a href="syntax.html#omitted">omit tags</a>).</p>
  </div>
</div>
<hr class="footerbreak"></hr>
<div class="nav">
<span class="nav-prev"><a href="terminology.html">&#171; terminology</a></span>
<span class="nav-next"><a href="syntax.html">syntax &#187;</a></span>
</div>
</body>
</html>

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- noscript.html	8 Jul 2009 10:31:02 -0000	1.7
+++ noscript.html	14 Jul 2009 16:30:15 -0000	1.8
@@ -69,7 +69,7 @@
       
         <div class="no-number no-toc" id="noscript-constraints"><h2 class="element-subhead">Additional constraints <a class="hash" href="#noscript-constraints">#</a></h2>
     <p>The <code><a href="noscript.html#noscript">noscript</a></code> element
-    must not be used in a <a href="html-and-xhtml.html#syntax-document-xml">document in the XML syntax</a>.</p>
+    must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
   </div>
       <div class="no-number no-toc" id="noscript-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#noscript-context">#</a></h2>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- spec.html	14 Jul 2009 15:41:52 -0000	1.48
+++ spec.html	14 Jul 2009 16:30:15 -0000	1.49
@@ -96,7 +96,7 @@
 <a href="#terminology">4. Terminology</a>
 </li>
 <li>
-<a href="#html-and-xhtml">5. HTML and XHTML documents</a>
+<a href="#documents">5. Documents</a>
 </li>
 <li>
 <a href="#syntax">6. HTML syntax</a>
@@ -154,8 +154,8 @@
 <li id="terminology-toc">
 <a href="#terminology">4. Terminology</a>
 </li>
-<li id="html-and-xhtml-toc">
-<a href="#html-and-xhtml">5. HTML and XHTML documents</a>
+<li id="documents-toc">
+<a href="#documents">5. Documents</a>
 <ul>
 <li id="mime-types-toc">
 <a href="#mime-types">5.1. The HTML namespace and MIME types</a>
@@ -808,8 +808,8 @@
         Object Model (DOM) Level 2 Views</cite> <a href="#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd>
   </dl>
 </div>
-    <div id="html-and-xhtml" class="section">
-  <h2>5. HTML and XHTML documents <a class="hash" href="#html-and-xhtml">#</a> <a class="toc-bak" href="#html-and-xhtml-toc">T</a>
+    <div id="documents" class="section">
+  <h2>5. Documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="#documents-toc">T</a>
 </h2>
   <div class="toc">
 <ul>
@@ -841,8 +841,8 @@
   <a href="#xml-syntax">XML syntax</a>.</p>
   <p>The <dfn id="html-syntax" title="html-syntax">HTML syntax</dfn>
   is the syntax described in the
-  <a href="#syntax">HTML syntax</a>
-  section of this specification. The
+  &#8220;HTML syntax&#8221; section of this specification.
+  The
   <dfn id="xml-syntax" title="xml-syntax">XML syntax</dfn>
   is defined by rules in the XML specification
   <a href="#refsXML">[XML]</a>.</p>
@@ -1006,7 +1006,7 @@
     </dl>
 <div class="example">
     <p>The following are examples of some DOCTYPEs that match the
-    <a href="#doctype,legacy">doctype.legacy</a> pattern.</p>
+    <a href="#doctype.legacy">doctype.legacy</a> pattern.</p>
     <pre>&lt;!doctype html system 'about:legacy-compat'&gt;</pre>
     <pre>&lt;!DOCTYPE HTML system "about:legacy-compat"&gt;</pre>
     </div>

Index: .cvsignore
===================================================================
RCS file: /sources/public/html5/markup/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- .cvsignore	1 May 2009 09:39:54 -0000	1.15
+++ .cvsignore	14 Jul 2009 16:30:15 -0000	1.16
@@ -10,9 +10,9 @@
 html.rnc.spec.html
 html-compiled.rng.combined.spec
 html.spec.src.html
-html4.css
+html.css
 html.css.xml
 webapps.html
 named.html
 writing.html
-html4.css.LICENSE.xml
+html.css.LICENSE.xml
Received on Tuesday, 14 July 2009 16:30:28 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 14 July 2009 16:30:44 GMT