html5/markup/src attributes.html,1.13,1.14 datatypes.html,1.44,1.45 documents.html,1.10,1.11 header.src.html,1.36,1.37 intro-scope.html,1.12,1.13 status.html,1.19,1.20 syntax.html,1.82,1.83 terms.html,1.19,1.20

Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv27709/src

Modified Files:
	attributes.html datatypes.html documents.html header.src.html 
	intro-scope.html status.html syntax.html terms.html 
Log Message:
wording changes to make it clear that this document is a non-normative reference and that normative requirements are in the HTML5 spec

Index: status.html
===================================================================
RCS file: /sources/public/html5/markup/src/status.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- status.html	2 Mar 2010 05:12:41 -0000	1.19
+++ status.html	25 Jun 2010 05:32:27 -0000	1.20
@@ -1,12 +1,14 @@
 <div xmlns="http://www.w3.org/1999/xhtml">
-  <p>This non-normative document is intended to complement the
-  normative conformance criteria defined in the specification
+  <p>This document is a non-normative reference intended to complement the
+  normative conformance criteria defined in the
   <a href="http://dev.w3.org/html5/spec/">HTML5: A vocabulary and associated APIs for HTML and XHTML</a>
+  specification
   <a href="references.html#refsHTML5">[HTML5]</a>,
   and is similar in scope to the
-  <a href="http://dev.w3.org/html5/spec-author-view/">HTML5 (Author Edition)</a>
-  subset of that specification
-  <a href="references.html#refsHTML5AUTHOR">[HTML5AUTHOR]</a>.</p>
+  <a href="http://dev.w3.org/html5/spec-author-view/">HTML5 (Edition for Web Authors)</a>
+  subset 
+  <a href="references.html#refsHTML5AUTHOR">[HTML5AUTHOR]</a>
+  of that specification.</p>
   <div>
     <h2 id="instability">Instability and incompleteness of this document</h2>
     <p>This document is a working draft — all parts of it remain

Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/src/documents.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- documents.html	5 Mar 2010 08:53:36 -0000	1.10
+++ documents.html	25 Jun 2010 05:32:27 -0000	1.11
@@ -10,24 +10,24 @@
       <h2>The HTML language and HTML and XML syntaxes</h2>
   <p>The term
   <dfn id="document"
-    title="document">document</dfn> is used in this specification
+    title="document">document</dfn> is used in this reference
   to mean an instance of the
   <a href="#html-language">HTML language</a>.</p>
   <p>The
   <dfn id="html-language"
     title="html-language">HTML language</dfn> is the language
-  described in this specification; it is an abstract language that
+  described in this reference; it 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.</p>
-  <p>This specification makes
-  reference to two particular concrete syntaxes for the 
+  <p>This reference
+  describes two particular concrete syntaxes for the 
   <a href="#html-language">HTML language</a>:
-  One syntax which
-  is referred to throughout this specification as
+  One syntax, which
+  is referred to throughout this reference as
   <a href="#html-syntax">the HTML syntax</a>,
   and another syntax, which is referred to throughout this
-  specification as
+  reference as
   <a href="#xml-syntax">the XML syntax</a>.
   Web browsers typically implement two separate parsers for
   processing documents: an
@@ -42,7 +42,7 @@
     >HTML syntax</dfn>
   is the syntax described in the
   <a href="#syntax">HTML syntax</a>
-  section of this specification.</p>
+  section of this reference.</p>
   <p>The
   <dfn id="xml-syntax"
     title="xml-syntax"
@@ -53,7 +53,7 @@
   <a href="#refsXML">[XMLNS]</a>;
   any syntax-level requirements for 
   <a href="#syntax-document-xml">documents in the XML syntax</a>
-  described in this specification are intended to be the same as
+  described in this reference are intended to be the same as
   those defined in the XML specification.</p>
   </section>
   <section id="mime-types">
@@ -69,8 +69,10 @@
     and for
     <a href="#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
+    <code>text/html</code> MIME type
+    <a href="#must-requirement">must</a>
+    match the descriptions in this
+    reference for characteristics of
     <a href="#syntax-document-html">documents in the HTML syntax</a>.</p>
     <p>Documents that have an
     <a href="#html-namespace">HTML namespace</a>
@@ -79,7 +81,9 @@
     <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="#must-requirement">must</a>
+    match the descriptions in this
+    reference for characteristics of
     <a href="#syntax-document-xml">documents in the XML syntax</a>.</p>
   </section>
   <section id="conformant-documents">
@@ -87,7 +91,9 @@
     <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
+      syntax</dfn>
+    <a href="#must-requirement">must</a>
+    consist of the following parts, in the
     following order:</p>
     <ol>
       <li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM)
@@ -110,28 +116,37 @@
       <a href="#space">space characters</a>.</li>
     </ol>
     <p><a href="#syntax-document-html">Documents in the HTML syntax</a>
-    must conform to the syntax described in the
+    <a href="#must-requirement">must</a>
+    match the syntax described in the
     <a href="#html-syntax">HTML syntax</a>
-    section of this specification.</p>
+    section of this reference.</p>
     <p>A conformant
     <dfn id="syntax-document-xml"
       title="syntax-document-xml">document in the XML syntax</dfn>
-    must be a
+    <a href="#must-requirement">must</a>
+    be a
     <dfn id="namespace-well-formed-xml-document">namespace-well-formed</dfn>
     XML document, as defined in the Namespaces in XML 1.0 specification
     <a href="#refsXML">[XMLNS]</a>,
     and its
     <dfn id="root-element">root element</dfn>
-    must be an
+    <a href="#must-requirement">must</a>
+    be an
     <a href="#html" class="element">html</a> element.</p>
     <p class="note">
-    Documents in the XML syntax  must not make use of any features
+    Documents in the XML syntax 
+    <a href="#must-requirement">must</a>
+    not make use of any features
     of the
     <a href="#html-syntax">HTML syntax</a>
     that do not follow XML well-formedness constraints (for
-    example, documents in the XML syntax must not use
+    example, documents in the XML syntax
+    <a href="#must-requirement">must</a>
+    not use
     <a href="#syntax-attr-unquoted">unquoted attribute value syntax</a>
-    and must not
+    and
+    <a href="#must-requirement">must</a>
+    not
     <a href="#omitted">omit tags</a>).</p>
   </section>
   <section id="case-insensitivity">
@@ -166,14 +181,16 @@
       <li><a href="#tag-name">Tag names</a>
       for
       <a href="#html-elements">HTML elements</a>
-      must exactly match the names of the elements given in the
+      <a href="#must-requirement">must</a>
+      exactly match the names of the elements given in the
       <a href="#elements">HTML elements</a>
       section of this document; that is, tag names are
       case-sensitive.</li>
       <li><a href="#attribute-name">Attribute names</a>
       for
       <a href="#html-elements">HTML elements</a>
-      must exactly match the names of the attributes given in the
+      <a href="#must-requirement">must</a>
+      exactly match the names of the attributes given in the
       <a href="#elements">HTML elements</a>
       section of this document; that is, attribute names are
       case-sensitive.</li>

Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- terms.html	18 Feb 2010 20:39:19 -0000	1.19
+++ terms.html	25 Jun 2010 05:32:27 -0000	1.20
@@ -2,7 +2,7 @@
   xmlns="http://www.w3.org/1999/xhtml">
   <h2>Terminology</h2>
     <p>The following is a list of terms that are used in other
-    sections of this specification.</p>
+    sections of this reference.</p>
   <dl>
     <dt><dfn
         id="context"
@@ -21,7 +21,7 @@
         id="case-insensitive"
         title="case-insensitive"
         >case-insensitive match</dfn></dt>
-    <dd>For the purposes of this specification,
+    <dd>For the purposes of this reference,
       performing a
       <a href="#case-insensitive">case-insensitive match</a>
       between two strings means comparing the strings exactly,
@@ -58,6 +58,19 @@
     <dd>HTML user agents; that is, applications (such as
     Web browsers) which consume HTML content.</dd>
     <dt><dfn
+        id="must-requirement"
+        title="must-requirement"
+        >must</dfn></dt>
+    <dd>The word <i>must</i> is used in this reference to mark
+      document-conformance requirements that are normatively
+      defined in the
+      <a href="http://dev.w3.org/html5/spec/">HTML5: A vocabulary and associated APIs for HTML and XHTML</a>
+      full specification.
+      <a href="references.html#refsHTML5">[HTML5]</a>.
+      <p class="note">This reference does not itself normatively
+      define any requirements.</p>
+    </dd>
+    <dt><dfn
         id="newlines"
         title="newlines"
         >newline</dfn></dt>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- datatypes.html	26 Mar 2010 14:07:19 -0000	1.44
+++ datatypes.html	25 Jun 2010 05:32:27 -0000	1.45
@@ -55,10 +55,12 @@
         <a href="#data-string">string</a>,
         with the following restrictions:
         <ul>
-          <li>must not start with a
+          <li><a href="#must-requirement">must</a>
+          not start with a
           "<code title="U+005F LOW LINE">_</code>"
           character</li>
-          <li>must be at least one character long</li>
+          <li><a href="#must-requirement">must</a>
+          be at least one character long</li>
         </ul>
       </div>
     </dd>
@@ -93,8 +95,10 @@
         <a href="#data-string">string</a>,
         with the following restrictions:
         <ul>
-          <li>must be at least one character long</li>
-          <li>must not contain any
+          <li><a href="#must-requirement">must</a>
+          be at least one character long</li>
+          <li><a href="#must-requirement">must</a>
+          not contain any
           <a href="#space">space characters</a></li>
         </ul>
         <p class="note">Previous versions of HTML placed greater
@@ -113,8 +117,10 @@
         <a href="#data-string">string</a>,
         with the following restrictions:
         <ul>
-          <li>must be at least one character long</li>
-          <li>must not contain any
+          <li><a href="#must-requirement">must</a>
+          be at least one character long</li>
+          <li><a href="#must-requirement">must</a>
+          not contain any
           <a href="#space">space characters</a></li>
         </ul>
       </div>
@@ -135,8 +141,10 @@
         <a href="#data-string">string</a>,
         with the following restrictions:
         <ul>
-          <li>must be at least one character long</li>
-          <li>must not contain any
+          <li><a href="#must-requirement">must</a>
+          be at least one character long</li>
+          <li><a href="#must-requirement">must</a>
+          not contain any
           <a href="#space">space characters</a></li>
         </ul>
       </div>
@@ -175,7 +183,8 @@
         <a href="#common.data.integer.non-negative">non-negative integer</a>,
         with the following restriction:
         <ul>
-          <li>must be greater than zero</li>
+          <li><a href="#must-requirement">must</a>
+          be greater than zero</li>
         </ul>
       </div>
     </dd>
@@ -236,7 +245,8 @@
         <a href="#common.data.float.non-negative">non-negative float</a>,
         with the following restriction:
         <ul>
-          <li>must be greater than zero</li>
+          <li><a href="#must-requirement">must</a>
+          be greater than zero</li>
         </ul>
       </div>
     </dd>
@@ -268,7 +278,9 @@
         with these additional qualifications:</div>
       <ul>
         <li>the literal letters <code>T</code> and
-        <code>Z</code> in the date/time syntax must always be
+        <code>Z</code> in the date/time syntax
+        <a href="#must-requirement">must</a>
+        always be
         uppercase</li>
         <li>a <dfn id="data-date-fullyear">date-fullyear</dfn> is
         defined as four or more digits representing a number
@@ -308,7 +320,7 @@
         <p class="note">The empty string is a valid
         <a href="#data.iri-ref">IRI-reference</a>,
         so the empty string is allowed as the value of any
-        attribute for which this document defines
+        attribute for which this reference lists
         <a href="#common.data.uri">URI</a>
         as the allowed datatype.</p>
       </div>
@@ -351,7 +363,9 @@
       <div class="datatype-desc">An unordered set of unique
         space-separated
         <a href="#data-token">tokens</a>,
-        each of which must be one of the following:
+        each of which
+        <a href="#must-requirement">must</a>
+        be one of the following:
         <ul>
           <li>the literal string "<code>any</code>"</li>
           <li>two valid
@@ -506,14 +520,17 @@
     <dd>
       <div class="datatype-desc">An ordered set of unique
         space-separated <a href="#data-token">tokens</a>, each of
-        which must be exactly one Unicode code point in
+        which
+        <a href="#must-requirement">must</a>
+        be exactly one Unicode code point in
         length.</div>
     </dd>
   </dl>
   <dl><dt>pattern</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A regular expression that must
+      <div class="datatype-desc">A regular expression that
+        <a href="#must-requirement">must</a>
         match the JavaScript <i>Pattern</i> production <a
           href="#refsECMA262">[ECMA262]</a>.</div>
     </dd>
@@ -550,7 +567,7 @@
         with the additional qualification that the year component
         is a
         <a href="#data-date-fullyear">date-fullyear</a>
-        as defined in this document.</div>
+        as described in this reference.</div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1996-12-19</code></pre>

Index: header.src.html
===================================================================
RCS file: /sources/public/html5/markup/src/header.src.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- header.src.html	3 Jun 2010 04:52:02 -0000	1.36
+++ header.src.html	25 Jun 2010 05:32:27 -0000	1.37
@@ -43,15 +43,17 @@
     <div id="tocjump"/>
     <section id="abstract">
       <h2>Abstract</h2>
-      <p>This document describes <!--the fifth major version of-->
-      the HTML markup language and provides details necessary for
-      producers of HTML content to create documents that conform
+      <p>This document is primarily a reference that describes the
+      <!--fifth major version of-->
+      HTML markup language and provides details to help
+      producers of HTML content create documents that conform
       to the language. By design, it does not define related APIs,
-      nor attempt to specify how consumers of HTML content are
-      meant to process documents (those areas are covered by the
+      nor attempt to explain how implementations that are
+      consumers of HTML content are meant to process documents
+      (those areas are covered by the
       <a href="http://dev.w3.org/html5/spec/">HTML5 specification</a>
       itself),
-      nor attempt to be a tutorial or “how to” authoring guide.</p>
+      nor attempt to also be a tutorial or “how to” authoring guide.</p>
     </section>
     <section id="status">
       <h2>Status of this Document</h2>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- syntax.html	2 Apr 2010 19:42:22 -0000	1.82
+++ syntax.html	25 Jun 2010 05:32:27 -0000	1.83
@@ -22,7 +22,9 @@
     which, for legacy reasons that have to do with processing
     modes in browsers, is a required part of any
     <a href="#syntax-document-html">document in the HTML syntax</a>;
-    it must conform to one of the following three formats:</p>
+    it
+    <a href="#must-requirement">must</a>
+    match the characteristics of one of the following three formats:</p>
     <ul>
       <li><a href="#normal-doctype">normal doctype</a></li>
       <li><a href="#deprecated-doctype">deprecated doctype</a></li>
@@ -198,27 +200,40 @@
     <p>The following restrictions apply to character encoding
     declarations:</p>
     <ul>
-      <li>The character encoding name given must be the name of
+      <li>The character encoding name given
+      <a href="#must-requirement">must</a>
+      be the name of
       the character encoding used to serialize the file.</li>
-      <li>The value must be a valid character encoding name, and
-      must be the preferred name for that encoding.
+      <li>The value
+      <a href="#must-requirement">must</a>
+      be a valid character encoding name, and
+      <a href="#must-requirement">must</a>
+      be the preferred name for that encoding.
       <a href="#refsIANACHARSET">[IANACHARSET]</a></li>
-      <li>The character encoding declaration must be serialized
+      <li>The character encoding declaration
+      <a href="#must-requirement">must</a>
+      be serialized
       without the use of
       <a href="#syntax-charref">character references</a>
       or character escapes of any kind.</li>
       <li>The element containing the character encoding
-      declaration must be serialized completely within the first
+      declaration
+      <a href="#must-requirement">must</a>
+      be serialized completely within the first
       512 bytes of the document.</li>
     </ul>
     <p>If the document does not start with a
     U+FEFF BYTE ORDER MARK (BOM) character, and if its
     encoding is not explicitly given by a
     <code>Content-Type</code> HTTP header, then the character
-    encoding used must be an
+    encoding used
+    <a href="#must-requirement">must</a>
+    be an
     <a href="#ascii-compatible">ASCII-compatible character encoding</a>,
     and, in addition, if that encoding isn't US-ASCII itself, then
-    the encoding must be specified using a
+    the encoding
+    <a href="#must-requirement">must</a>
+    be specified using a
     <code><a href="#meta">meta</a></code> element with a
     <a href="#meta.charset.attrs.charset">charset</a>
     attribute or a <code><a href="#meta">meta</a></code> element
@@ -230,7 +245,9 @@
     <a href="#meta.charset.attrs.charset">charset</a>
     attribute or a <code><a href="#meta">meta</a></code> element in the
     <a href="#encoding-declaration-state" >encoding declaration state</a>,
-    then the character encoding used must be an
+    then the character encoding used
+    <a href="#must-requirement">must</a>
+    be an
     <a href="#ascii-compatible">ASCII-compatible character encoding</a>.</p>
     <p>An
     <dfn id="ascii-compatible">ASCII-compatible character encoding</dfn>
@@ -247,7 +264,9 @@
     JOHAB (Windows code page 1361),
     encodings based on ISO-2022,
     or encodings based on EBCDIC.</p>
-    <p>Documents must not use
+    <p>Documents
+    <a href="#must-requirement">must</a>
+    not use
     CESU-8,
     UTF-7,
     BOCU-1,
@@ -277,10 +296,12 @@
     contain, as well as what attributes (if any) the element can
     have. The
     <a href="#elements">HTML elements</a>
-    section of this specification defines the content models for
+    section of this reference describes the content models for
     all of elements that are part of the
     <a href="#html-language">HTML language</a>.
-    An element must not contain
+    An element
+    <a href="#must-requirement">must</a>
+    not contain
     <a href="#contents">contents</a>
     or attributes that are not part of its content model.</p>
     <p>The
@@ -360,7 +381,9 @@
         <a href="#tag-name" title="syntax-tag-name">tag name</a>.</li>
         <li>Optionally, one or more
         <a href="#attribute">attributes</a>,
-        each of which must be preceded by one or more
+        each of which
+        <a href="#must-requirement">must</a>
+        be preceded by one or more
         <a href="#space">space characters</a>.</li>
         <li>Optionally, one or more
         <a href="#space">space characters</a>.</li>
@@ -394,20 +417,26 @@
       </ol>
       </li>
       <li><a href="#void-element">Void elements</a> only have a
-      start tag; end tags must not be specified for void
+      start tag; end tags
+      <a href="#must-requirement">must</a>
+      not be specified for void
       elements.</li>
       <li>The start and end tags of certain elements can be <dfn
         id="omitted" title="syntax-tag-omission">omitted</dfn>. 
       The subsection for each element in the <a
         href="#elements">HTML elements</a> section of this
-      specification provides information about which tags (if any)
+      reference provides information about which tags (if any)
       can be omitted for that particular element.</li>
-      <li>A non-<a href="#void-element">void</a> element must have
+      <li>A non-<a href="#void-element">void</a> element
+      <a href="#must-requirement">must</a>
+      have
       an end tag, unless the subsection for that element in the <a
         href="#elements">HTML elements</a> section of this
-      specification indicates that its end tag can be <a
+      reference indicates that its end tag can be <a
         href="#omitted">omitted</a>.</li>
-      <li>The <a href="#contents">contents</a> of an element must be
+      <li>The <a href="#contents">contents</a> of an element
+      <a href="#must-requirement">must</a>
+      be
       placed between just after its start tag (which
       <a href="#omitted" title="syntax-tag-omission" >might be
         implied, in certain cases</a>) and just before its end tag
@@ -422,7 +451,9 @@
       <a href="#syntax-start-tags">start tag</a>
       and an
       <a href="#syntax-end-tags">end tag</a>,
-      its end tag must be contained within the
+      its end tag
+      <a href="#must-requirement">must</a>
+      be contained within the
       <a href="#contents">contents</a>
       of the same element in which its start tag is contained.
       An
@@ -462,7 +493,9 @@
       <a href="#attribute-name">name</a>
       and a
       <a href="#syntax-attribute-value">value</a>.</p>
-      <p>There must never be two or more attributes on the same
+      <p>There
+      <a href="#must-requirement">must</a>
+      never be two or more attributes on the same
       start tag whose names are a
       <a href="#case-insensitive">case-insensitive match</a>
       for each other.</p>
@@ -477,7 +510,8 @@
       <ul>
         <li><dfn id="attribute-name"
           title="syntax-attribute-name">Attribute names</dfn>
-      must consist of one or more characters other than the
+        <a href="#must-requirement">must</a>
+        consist of one or more characters other than the
       <a href="#space">space characters</a>,
       U+0000 NULL,
       "<code title="U+0022 QUOTATION MARK">"</code>",
@@ -502,10 +536,12 @@
       general, are
       <a href="#normal-character-data">normal character data</a>;
       however, the <a href="#elements">HTML elements</a> section
-      of this specification defines further restrictions on the
+      of this reference describes further restrictions on the
       allowed values of all attributes that are part of the
       <a href="#html-language">HTML language</a>.
-      An attribute must not have a value that is not allowed by
+      An attribute
+      <a href="#must-requirement">must</a>
+      not have a value that is not allowed by
       the
       <a href="#content-model">content model</a>
       of the element that contains it.</li>
@@ -558,15 +594,18 @@
           attribute values, an unquoted attribute value has the
           following restrictions:</p>
           <ul>
-            <li>must not contain any literal
+            <li><a href="#must-requirement">must</a>
+            not contain any literal
             <a href="#space">space characters</a></li>
-            <li>must not contain any
+            <li><a href="#must-requirement">must</a>
+            not contain any
             "<code title="U+0022 QUOTATION MARK">"</code>",
             "<code title="U+0027 APOSTROPHE">'</code>",
             "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
             "<code title="U+003D EQUALS SIGN">=</code>",
             characters</li>
-            <li>must not be the empty string</li>
+            <li><a href="#must-requirement">must</a>
+            not be the empty string</li>
           </ul>
           <div class="example">
             <p>In the following example, the
@@ -578,7 +617,9 @@
           <p>If the value of an attribute using the unquoted
             attribute syntax is followed by a
             "<code title="U+002F SOLIDUS">/</code>"
-            character, then there must be at least one
+            character, then there
+            <a href="#must-requirement">must</a>
+            be at least one
             <a href="#space">space character</a>
             after the value and before the
             "<code title="U+002F SOLIDUS">/</code>"
@@ -615,7 +656,8 @@
           for attribute values, a single-quoted attribute value
           has the following restriction:</p>
           <ul>
-            <li>must not contain any literal
+            <li><a href="#must-requirement">must</a>
+            not contain any literal
             "<code title="U+0027 APOSTROPHE">'</code>"
             characters</li>
           </ul>
@@ -658,7 +700,8 @@
           attribute values, a double-quoted attribute value has
           the following restriction:</p>
           <ul>
-            <li>must not contain any literal
+            <li><a href="#must-requirement">must</a>
+            not contain any literal
             "<code title="U+0022 QUOTATION MARK">"</code>"
             characters</li>
           </ul>
@@ -680,12 +723,16 @@
       <a href="#syntax-comments">comments</a>)
       and
       <a href="#syntax-attribute-value">attribute values</a>
-      must consist of Unicode characters, with the following
+      <a href="#must-requirement">must</a>
+      consist of Unicode characters, with the following
       restrictions:</p>
     <ul>
-      <li>must not contain U+0000 characters</li>
-      <li>must not contain permanently undefined Unicode characters</li>
-      <li>must not contain control characters other than
+      <li><a href="#must-requirement">must</a>
+      not contain U+0000 characters</li>
+      <li><a href="#must-requirement">must</a>
+      not contain permanently undefined Unicode characters</li>
+      <li><a href="#must-requirement">must</a>
+      not contain control characters other than
         <a href="#space">space characters</a></li>
     </ul>
     <!-- * <p class="note">There are two special types of -->
@@ -722,12 +769,13 @@
         </ul>
         <p>Normal character data has the following restrictions:</p>
         <ul>
-          <li>must not contain any
+          <li><a href="#must-requirement">must</a>
+          not contain any
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
           characters</li>
-          <!-- * <li>must not contain any -->
+          <!-- * <li><a href="#must-requirement">must</a> not contain any -->
           <!-- * <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li> -->
-          <!-- * <li>must not contain any -->
+          <!-- * <li><a href="#must-requirement">must</a> not contain any -->
           <!-- * <a href="#syntax-escape">escaping text spans</a></li> -->
         </ul>
       </dd>
@@ -756,9 +804,11 @@
         </ul>
         <p>Replaceable character data has the following restrictions:</p>
         <ul>
-          <li>must not contain any
+          <li><a href="#must-requirement">must</a>
+          not contain any
           <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
-          <li>must not contain any occurrences of the string
+          <li><a href="#must-requirement">must</a>
+          not contain any occurrences of the string
           "<code title="U+003C LESS-THAN SIGN, U+002F SOLIDUS">&lt;/</code>"
           followed by characters that are a
           <a href="#case-insensitive">case-insensitive match</a>
@@ -773,14 +823,17 @@
           "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
         <p class="note">Replaceable character data,
-        as defined in this specification, is a feature of
+        as described in this reference, is a feature of
         <a href="#html-syntax">the HTML syntax</a>
         that is not available in
         <a href="#xml-syntax">the XML syntax</a>.
         <a href="#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
+          syntax</a>
+        <a href="#must-requirement">must</a>
+        not contain replaceable character data
+        as described in this reference; instead they 
+        <a href="#must-requirement">must</a>
+        conform to all syntax constraints described in the XML
         specification <a href="#refsXML">[XML]</a>.</p>
       </dd>
       <dt><dfn
@@ -809,8 +862,10 @@
         </ul>
         <p>Non-replaceable character data has the following restrictions:</p>
         <ul>
-          <li>must not contain <a href="#syntax-charref">character references</a></li>
-          <li>must not contain any occurrences of the string
+          <li><a href="#must-requirement">must</a>
+          not contain <a href="#syntax-charref">character references</a></li>
+          <li><a href="#must-requirement">must</a>
+          not contain any occurrences of the string
           "<code title="U+003C LESS-THAN SIGN, U+002F SOLIDUS">&lt;/</code>",
           followed by characters that are a
           <a href="#case-insensitive">case-insensitive match</a>
@@ -826,13 +881,16 @@
           "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
         <p class="note">Non-replaceable character data,
-        as defined in this specification, is a feature of
+        as described in this reference, is a feature of
         <a href="#html-syntax">the HTML syntax</a>
         that is not available in
         <a href="#xml-syntax">the XML syntax</a>.
         <a href="#syntax-document-xml">Documents in the XML
-          syntax</a> must not contain non-replaceable character
-        data as defined in this specification; instead they must
+          syntax</a>
+        <a href="#must-requirement">must</a>
+        not contain non-replaceable character
+        data as described in this reference; instead they
+        <a href="#must-requirement">must</a>
         conform to all syntax constraints defined in the XML
         specification <a href="#refsXML">[XML]</a>.</p>
       </dd>
@@ -990,19 +1048,23 @@
     <p>The <a href="#syntax-text">text</a>
     part of comments has the following restrictions:</p>
     <ul>
-      <li>must not start with a
+      <li><a href="#must-requirement">must</a>
+      not start with a
       "<code
         title="U+003E GREATER-THAN SIGN"
         >&gt;</code>" character</li>
-      <li>must not start with the string
+      <li><a href="#must-requirement">must</a>
+      not start with the string
       "<code
         title="U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN"
         >-&gt;</code>"</li>
-      <li>must not contain the string
+      <li><a href="#must-requirement">must</a>
+      not contain the string
       "<code
         title="U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS"
         >--</code>"</li>
-      <li>must not end with a
+      <li><a href="#must-requirement">must</a>
+      not end with a
       "<code
         title="U+002D HYPHEN-MINUS"
         >-</code>" character</li>
@@ -1040,13 +1102,17 @@
      "<code title="U+003E GREATER-THAN SIGN">></code>"
      character are said to be
      <dfn id="syntax-self-closing">marked as self-closing</dfn>.</li>
-     <li>SVG and MathML elements must either have a
+     <li>SVG and MathML elements
+     <a href="#must-requirement">must</a>
+     either have a
      <a href="#syntax-start-tags">start tag</a>
      and an
      <a href="#syntax-end-tags">end tag</a>,
      or a start tag that is
      <a href="#syntax-self-closing">marked as self-closing</a>,
-     in which case they must not have an end tag.</li>
+     in which case they
+     <a href="#must-requirement">must</a>
+     not have an end tag.</li>
      <li>SVG and MathML elements whose start tag is
      <a href="#syntax-self-closing">marked as self-closing</a>,
      can’t have any contents.</li>
@@ -1061,7 +1127,9 @@
      that it contains, with the restriction
      that any 
      <a href="#character-data">character data</a>
-     it contains must be
+     it contains
+     <a href="#must-requirement">must</a>
+     be
      <a href="#normal-character-data">normal character data</a>.</li>
    </ul>
  </section>
@@ -1083,7 +1151,9 @@
      "<code title="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 D, U+0041 LATIN CAPITAL LETTER A, U+0054 LATIN CAPITAL LETTER T, U+0041 LATIN CAPITAL LETTER A, U+005B LEFT SQUARE BRACKET"
        >&lt;![CDATA[</code>"</li>
      <li><a href="#syntax-text" title="syntax-text">text</a>, with the
-     additional restriction that the text must not contain the
+     additional restriction that the text
+     <a href="#must-requirement">must</a>
+     not contain the
      string
      "<code title="U+005D RIGHT SQUARE BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E GREATER-THAN SIGN">]]&gt;</code>“</li>
      <li>the 

Index: intro-scope.html
===================================================================
RCS file: /sources/public/html5/markup/src/intro-scope.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- intro-scope.html	3 Sep 2009 02:39:07 -0000	1.12
+++ intro-scope.html	25 Jun 2010 05:32:27 -0000	1.13
@@ -1,12 +1,13 @@
 <section id="intro"
   xmlns="http://www.w3.org/1999/xhtml">
   <h2>Introduction</h2>
-  <p>This specification provides the details necessary for
+  <p>This document is a non-normative reference that provides
+  details to help
   <a href="#html-producer">producers of HTML content</a>
-  to create
+  create
   <a href="#conformant-documents">conformant documents</a>,
-  and for others to check the conformance of existing documents.
-  It is designed:</p>
+  and to help others check the conformance of existing documents.
+  It has the following design goals:</p>
   <ul>
     <li>to describe the syntax and structure of the
     <a href="#html-language">HTML language</a></li>
@@ -17,17 +18,34 @@
     <li>to be clear and unambiguous</li>
     <li>to be as concise and readable as possible</li>
   </ul>
+  <p>The first two of the above design goals make this reference
+  similar in scope to the 
+  <a href="http://dev.w3.org/html5/spec-author-view/">HTML5 (Edition for Web Authors)</a>
+  subset
+  <a href="references.html#refsHTML5AUTHOR">[HTML5AUTHOR]</a>
+  of the normative
+  <a href="http://dev.w3.org/html5/spec/">HTML5: A vocabulary and associated APIs for HTML and XHTML</a>
+  full specification
+  <a href="references.html#refsHTML5">[HTML5]</a>.</p>
   <p>Certain purposes are intentionally out of scope for this
-  specification; in particular, it:</p>
+  reference document; specifically, it:</p>
   <ul>
-    <li>does not provide any conformance criteria for
+    <li>does not provide any descriptions of implementation
+    conformance criteria for
     <a href="#html-consumer">HTML consumers</a>;
-    in particular, it does not attempt to define how Web browsers
-    and other user agents process documents</li>
-    <li>does not define any APIs related to processing of HTML
-    content by
+    in particular, it does not attempt to explain how Web browsers
+    and other user agents are meant to process documents</li>
+    <li>does not provide detailed information on APIs related to
+    processing of HTML content by
     <a href="#html-consumer">HTML consumers</a>.</li>
-    <li>does not attempt to be a tutorial or “how to” authoring
-    guide</li>
   </ul>
+  <p>For implementation conformance criteria for
+    <a href="#html-consumer">HTML consumers</a>
+    and detailed information on related APIs, instead see the
+  <a href="http://dev.w3.org/html5/spec/">HTML5: A vocabulary and associated APIs for HTML and XHTML</a>
+  full specification
+  <a href="references.html#refsHTML5">[HTML5]</a>.</p>
+  <p>Finally, because this document is intended for use strictly
+  as a reference, it does not attempt to also be a tutorial or
+  “how to” authoring guide.</p>
 </section>

Index: attributes.html
===================================================================
RCS file: /sources/public/html5/markup/src/attributes.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- attributes.html	2 Apr 2010 08:21:45 -0000	1.13
+++ attributes.html	25 Jun 2010 05:32:27 -0000	1.14
@@ -6,7 +6,9 @@
     <dl>
       <dt id="common.attrs.id">id</dt>
       <dd>A unique identifier for the element.</dd>
-      <dd>There must not be multiple elements in a document that
+      <dd>There
+        <a href="#must-requirement">must</a>
+        not be multiple elements in a document that
         have the same
         <a href="#common.attrs.id" class="attribute">id</a>
         value.</dd>
@@ -99,7 +101,9 @@
       <dd>The <code class="attribute">xml:space</code>
         attribute should only be used with 
         <a href="#syntax-document-xml">documents in the XML syntax</a>;
-        it must not be used in 
+        it
+        <a href="#must-requirement">must</a>
+        not be used in 
         <a href="#syntax-document-html">documents in the HTML syntax</a>.</dd>
     </dl>
     <dl>
@@ -109,7 +113,9 @@
       <dd>The <code class="attribute">xml:base</code>
         attribute should only be used with
         <a href="#syntax-document-xml">documents in the XML syntax</a>;
-        it must not be used in 
+        it
+        <a href="#must-requirement">must</a>
+        not be used in 
         <a href="#syntax-document-html">documents in the HTML syntax</a>.</dd>
     </dl>
   </div>

Received on Friday, 25 June 2010 05:32:32 UTC