html5/markup/src datatypes.html,1.34,1.35 documents.html,1.7,1.8 header.src.html,1.24,1.25 intro-scope.html,1.11,1.12 status.html,1.11,1.12 syntax.html,1.69,1.70 terms.html,1.13,1.14

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

Modified Files:
	datatypes.html documents.html header.src.html intro-scope.html 
	status.html syntax.html terms.html 
Log Message:
removed <datagrid> and made assorted refinements to prose


Index: status.html
===================================================================
RCS file: /sources/public/html5/markup/src/status.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- status.html	4 Aug 2009 15:46:34 -0000	1.11
+++ status.html	3 Sep 2009 02:39:07 -0000	1.12
@@ -1,35 +1,33 @@
 <div xmlns="http://www.w3.org/1999/xhtml">
   <p>This document does not represent consensus in the HTML
   Working Group. In particular, some members of the group do not
-  support normative status for this document, and thus do not
-  support its advance on the Recommendation track.  Discussions
-  about the normative status of this document are ongoing, and no
-  decision has been taken yet. Like all documents produced by the
-  HTML Working Group, this document will use the design approach
-  described in <a
-  href="http://www.w3.org/TR/html-design-principles/"
-  >HTML Design Principles</a>.</p>
+  support normative status for it, and thus do not support its
+  advance on the W3C Recommendation track. Discussions about the
+  normative status of this document are ongoing, and no decision
+  has been reached yet. As with other documents produced by the
+  HTML Working Group, this document uses the design approach
+  described in
+  <a href="http://www.w3.org/TR/html-design-principles/">HTML Design Principles</a>.</p>
   <div>
     <h2>Instability and incompleteness of this document</h2>
-    <p>This document should not be considered stable. All
-    parts of it remain subject to significant change or complete
-    removal. Also, this document should in no way be considered
-    complete. In particular, many elements in the 
-    <a href="#html-elements">HTML elements</a>
-    section of this document currently lack the following
-    subsections:</p>
+    <p>This document is a working draft — all parts of it remain
+    subject to significant change or removal, and some parts are
+    currently incomplete; in particular, many elements currently
+    lack complete documentation in the following subsections:</p>
     <dl class="status-missing">
       <dt><span class="section-title-ref">Examples</span></dt>
-      <dd>The plan is to have one of these subsections for every
-        element, with each giving at least one conformant example
-        and at least one non-conformant example.</dd>
+      <dd>The documentation for each element will eventually have
+        at least one conformant example and at least one
+        non-conformant example.</dd>
       <dt><span class="section-title-ref">Details</span></dt>
-      <dd>Where needed, this subsection provides additional details
-        about the semantics of the element and its attributes.</dd>
+      <dd>The purpose of this subsection is to provide, where
+        needed, additional details about the semantics of the
+        element and its attributes.</dd>
       <dt><span class="section-title-ref">Additional constraints</span></dt>
-      <dd>Where needed, this subsection provides additional
-        document-conformance constraints for the element and its
-        attributes (in addition to those already document in the
+      <dd>This purpose of this subsection is to provide, where
+        needed, additional document-conformance constraints for
+        the element and its attributes (in addition to those
+        already documented in the
         <i>Content model</i>,
         <i>Attribute model</i>,
         <i>Assertions</i>,

Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/src/documents.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- documents.html	16 Aug 2009 10:53:46 -0000	1.7
+++ documents.html	3 Sep 2009 02:39:07 -0000	1.8
@@ -1,14 +1,19 @@
 <section id="documents"
   xmlns="http://www.w3.org/1999/xhtml">
   <h2>Documents</h2>
-  <p>This section introduces the following:</p>
+  <p>This section defines the term
+  <a href="#document">document</a>,
+  and provides additional details related to the definition of
+  that term. It is divided into the following parts:</p>
   <div class="toc"/>
     <section id="language-and-syntax">
       <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
-  to mean an instance of the HTML language. The
+  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
@@ -17,7 +22,8 @@
   of possible concrete syntaxes.</p>
   <p>This specification makes
   reference to two particular concrete syntaxes for the 
-  <a href="#html-language">HTML language</a>: One syntax which
+  <a href="#html-language">HTML language</a>:
+  One syntax which
   is referred to throughout this specification as
   <a href="#html-syntax">the HTML syntax</a>,
   and another syntax, which is referred to throughout this
@@ -157,7 +163,7 @@
       <a href="#case-insensitive">case-insensitive match</a>
       for the names of the elements given in the
       <a href="#elements">HTML elements</a>
-      section of this document; tag names are
+      section of this document; that is, tag names are
       case-insensitive.</li>
       <li><a href="#attribute-name">Attribute names</a>
       for
@@ -167,7 +173,7 @@
       <a href="#case-insensitive">case-insensitive match</a>
       for the names of the attributes given in the
       <a href="#elements">HTML elements</a>
-      section of this document; attribute names are
+      section of this document; that is, attribute names are
       case-insensitive.</li>
     </ul>
     <p>In
@@ -178,14 +184,14 @@
       <a href="#html-elements">HTML elements</a>
       must exactly match the names of the elements given in the
       <a href="#elements">HTML elements</a>
-      section of this document; tag names are
+      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="#elements">HTML elements</a>
-      section of this document; attribute names are
+      section of this document; that is, attribute names are
       case-sensitive.</li>
     </ul>
   </section>

Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- terms.html	21 Aug 2009 13:10:59 -0000	1.13
+++ terms.html	3 Sep 2009 02:39:07 -0000	1.14
@@ -8,11 +8,17 @@
     <p>The following is a list of terms that are common to various
     other sections in this specification.</p>
   <dl>
-    <dt><dfn id="context">browsing context</dfn></dt>
+    <dt><dfn
+        id="context"
+        title="context"
+        >browsing context</dfn></dt>
     <dd>A <a href="#context">browsing context</a> is a collection
       of one or more documents and one or more <a
         href="#view">views</a>.</dd>
-    <dt><dfn id="case-insensitive">case-insensitive match</dfn></dt>
+    <dt><dfn
+        id="case-insensitive"
+        title="case-insensitive"
+        >case-insensitive match</dfn></dt>
     <dd>For the purposes of this specification,
       performing a
       <a href="#case-insensitive">case-insensitive match</a>
@@ -23,35 +29,28 @@
       and the corresponding characters in the range
       <code title="U+0061 LATIN SMALL LETTER A–U+007A LATIN SMALL LETTER Z">a-z</code>
       are considered to also match.</dd>
-    <dt><dfn id="fallback">fallback content</dfn></dt>
+    <dt><dfn
+        id="fallback"
+        title="fallback"
+        >fallback content</dfn></dt>
     <dd>Some embedded content elements can have fallback content:
       content that is to be used when the embedded content cannot
       be used (for example, when it is of an unsupported format).</dd>
     <dt><dfn
-      id="group"
-      title="group"
-      >group</dfn></dt>
-    <dd>A
-      <a href="#group">group</a>
-      is any combination of names and symbols in definitions in the
-    <a href="#elements">HTML elements</a>,
-    <a href="#common-models">Common content models</a>,
-    <a href="#common-attributes">Common attributes</a>,
-    or 
-    <a href="#forms-attributes">Forms attributes</a>
-    that are delimited by a set of matching
-    "<code>(</code>" and "<code>)</code>"
-    (parentheses) symbols.</dd>
-    <dt><dfn id="html-producer"
-      title="html-producer">HTML producers</dfn></dt>
+        id="html-producer"
+        title="html-producer">HTML producers</dfn></dt>
     <dd>HTML authors (that is, people) and applications
     (such as editors and content management systems)
     that produce HTML content.</dd>
-    <dt><dfn id="html-consumer"
-      title="html-consumer">HTML consumers</dfn></dt>
+    <dt><dfn
+        id="html-consumer"
+        title="html-consumer">HTML consumers</dfn></dt>
     <dd>HTML user agents; that is, applications (such as
     Web browsers) which consume HTML content</dd>
-    <dt><dfn id="newlines">newline</dfn></dt>
+    <dt><dfn
+        id="newlines"
+        title="newlines"
+        >newline</dfn></dt>
     <dd>A <a href="#newlines">newline</a> may be represented as any
       of the following:
       <ul>
@@ -62,20 +61,9 @@
       </ul>
     </dd>
     <dt><dfn
-      id="pattern-name"
-      title="pattern-name"
-      >pattern name</dfn></dt>
-    <dd>A
-      <a href="#pattern-name">pattern name</a>
-      is any name used in definitions in the
-    <a href="#elements">HTML elements</a>,
-    <a href="#common-models">Common content models</a>,
-    <a href="#common-attributes">Common attributes</a>,
-    or 
-    <a href="#forms-attributes">Forms attributes</a>
-    sections of this specification that is not an element name or
-    an attribute name.</dd>
-    <dt><dfn id="space">space</dfn></dt>
+        id="space"
+        title="space"
+        >space</dfn></dt>
     <dd>A <a href="#space">space character</a> is any of the
       following:
       <ul>
@@ -86,7 +74,10 @@
         <li>U+000D CARRIAGE RETURN (CR)</li>
       </ul>
     </dd>
-    <dt><dfn id="view">view</dfn></dt>
+    <dt><dfn
+        id="view"
+        title="view"
+        >view</dfn></dt>
     <dd>A <a href="#view">view</a> is as defined in <cite>Document
         Object Model (DOM) Level 2 Views</cite> <a
         href="#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd>
@@ -104,6 +95,22 @@
     and
     <a href="#forms-attributes">Forms attributes</a>
     sections.</p>
+
+    <p>The explanations use the term 
+    <dfn
+      id="group"
+      title="group"
+      >group</dfn>
+    to mean any combination of names and symbols that are
+    delimited by a pair of matching
+    "<code>(</code>" and "<code>)</code>"
+    (parentheses) symbols, and the term
+    <dfn
+      id="pattern-name"
+      title="pattern-name"
+      >pattern name</dfn>
+    to mean any hyperlinked name used in a definition that is not
+    an element name or an attribute name.</p>
     <dl id="rnc-symbol-list">
       <dt id="optional"><span class="rnc-symbol">?</span> (optional)</dt>
       <dd>The "<code>?</code>" (question mark) symbol after an
@@ -155,10 +162,6 @@
         <a href="#group">groups</a>
         indicates that the two items it separates can occur in any
         order.</dd>
-      <dt id="parentheses"><span class="rnc-symbol">(</span> and <span class="rnc-symbol">)</span> (grouping)</dt>
-      <dd>The "<code>(</code>" and "<code>)</code>" (parentheses)
-        symbols are used to delimit multiple items such that they
-        are treated as a group.</dd>
     </dl>
   </section>
 </section>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- datatypes.html	16 Aug 2009 10:53:46 -0000	1.34
+++ datatypes.html	3 Sep 2009 02:39:07 -0000	1.35
@@ -8,9 +8,7 @@
     datatype, a
     <dfn id="data-string" title="string">string</dfn>
     is defined as
-    <a href="#normal-character-data">normal character data</a>
-    that does not contain any
-    <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
+    <a href="#normal-character-data">normal character data</a>.</p>
     <p>The <a href="#syntax-attributes">Attributes</a> section of
     this document describes additional restrictions on strings in
     attribute values — in particular, restrictions for the

Index: header.src.html
===================================================================
RCS file: /sources/public/html5/markup/src/header.src.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- header.src.html	20 Aug 2009 09:22:46 -0000	1.24
+++ header.src.html	3 Sep 2009 02:39:07 -0000	1.25
@@ -42,7 +42,7 @@
     <section id="abstract">
       <h2>Abstract</h2>
       <p>This specification describes the fifth major version of
-      the HTML language and provides the details necessary for
+      the HTML language and provides details necessary for
       producers of HTML content to 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

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- syntax.html	20 Aug 2009 09:22:46 -0000	1.69
+++ syntax.html	3 Sep 2009 02:39:07 -0000	1.70
@@ -310,9 +310,8 @@
       all have names that only use characters in the range
       <code title="U+0030 DIGIT ZERO–U+0039 DIGIT NINE">0–9</code>,
       <code title="U+0061 LATIN SMALL LETTER A–U+007A LATIN SMALL LETTER Z">a–z</code>,
-      <code title="U+0041 LATIN CAPITAL LETTER A–U+005A LATIN CAPITAL LETTER Z">A–Z</code>,
-      and the character
-      "<code title="U+002D HYPHEN-MINUS">-</code>".</li>
+      and
+      <code title="U+0041 LATIN CAPITAL LETTER A–U+005A LATIN CAPITAL LETTER Z">A–Z</code>.</li>
       <li>
       <dfn id="syntax-start-tags">Start tags</dfn>
       consist of the following parts, in exactly the following

Index: intro-scope.html
===================================================================
RCS file: /sources/public/html5/markup/src/intro-scope.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- intro-scope.html	16 Aug 2009 10:53:46 -0000	1.11
+++ intro-scope.html	3 Sep 2009 02:39:07 -0000	1.12
@@ -8,8 +8,12 @@
   and for others to check the conformance of existing documents.
   It is designed:</p>
   <ul>
-    <li>to describe the syntax, structure, and semantics of the
+    <li>to describe the syntax and structure of the
     <a href="#html-language">HTML language</a></li>
+    <li>to describe the semantics of
+    <a href="#html-elements">HTML elements</a>
+    and their attributes (that is, to describe what the elements
+    and attributes represent)</li>
     <li>to be clear and unambiguous</li>
     <li>to be as concise and readable as possible</li>
   </ul>

Received on Thursday, 3 September 2009 02:39:18 UTC