html5/spec Overview.html,1.1354,1.1355

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv11167

Modified Files:
	Overview.html 
Log Message:
WF2: Merge the XHTML2 and XForms sections in the intro, and remove the WF2 bit, since we're merging it in now. (whatwg r2182)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1354
retrieving revision 1.1355
diff -u -d -r1.1354 -r1.1355
--- Overview.html	15 Sep 2008 09:59:58 -0000	1.1354
+++ Overview.html	15 Sep 2008 10:19:56 -0000	1.1355
@@ -264,12 +264,9 @@
         </span>Relationship to XHTML 1.x</a>
 
        <li><a href="#relationship1"><span class=secno>1.4.3
-        </span>Relationship to XHTML2</a>
+        </span>Relationship to XHTML2 and XForms</a>
 
        <li><a href="#relationship2"><span class=secno>1.4.4
-        </span>Relationship to Web Forms 2.0 and XForms</a>
-
-       <li><a href="#relationship3"><span class=secno>1.4.5
         </span>Relationship to XUL, Flash, Silverlight, and other proprietary
         UI languages</a>
       </ul>
@@ -2347,44 +2344,32 @@
    those who do need such a mechanism are encouraged to continue using the
    XHTML 1.1 line of specifications.
 
-  <h4 id=relationship1><span class=secno>1.4.3 </span>Relationship to XHTML2</h4>
+  <h4 id=relationship1><span class=secno>1.4.3 </span>Relationship to XHTML2
+   and XForms</h4>
 
   <p><em>This section is non-normative.</em>
 
-  <p>XHTML2 <a href="#references">[XHTML2]</a> defines a new HTML vocabulary
-   with better features for hyperlinks, multimedia content, annotating
-   document edits, rich metadata, declarative interactive forms, and
-   describing the semantics of human literary works such as poems and
-   scientific papers.
+  <p>XHTML2 defines a new vocabulary with features for hyperlinks, multimedia
+   content, annotating document edits, rich metadata, declarative interactive
+   forms, and describing the semantics of human literary works such as poems
+   and scientific papers. <a href="#references">[XHTML2]</a>
 
-  <p>However, it lacks elements to express the semantics of many of the
-   non-document types of content often seen on the Web. For instance, forum
-   sites, auction sites, search engines, online shops, and the like, do not
-   fit the document metaphor well, and are not covered by XHTML2.
+  <p>XForms similarly defines a new vocabulary with features for complex data
+   entry, such as tax forms or insurance forms.
+
+  <p>However, XHTML2 and XForms lack features to express the semantics of
+   many of the non-document types of content often seen on the Web. For
+   instance, they are not well-suited for marking up forum sites, auction
+   sites, search engines, online shops, mapping applications, e-mail
+   applications, word processors, real-time strategy games, and the like.
 
   <p><em>This</em> specification aims to extend HTML so that it is also
    suitable in these contexts.
 
-  <p>XHTML2 and this specification use different namespaces and therefore can
-   both be implemented in the same XML processor.
-
-  <h4 id=relationship2><span class=secno>1.4.4 </span>Relationship to Web
-   Forms 2.0 and XForms</h4>
-
-  <p><em>This section is non-normative.</em>
-
-  <p>This specification will eventually supplant Web Forms 2.0. The current
-   Web Forms 2.0 draft can be considered part of this specification for the
-   time being; its features will eventually be merged into this
-   specification. <a href="#references">[WF2]</a>
-
-  <p>As it stands today, this specification is unrelated and orthognoal to
-   XForms. When the forms features defined in HTML4 and Web Forms 2.0 are
-   merged into this specification, then the relationship to XForms described
-   in the Web Forms 2.0 draft will apply to this specification. <a
-   href="#references">[XForms]</a>
+  <p>XHTML2, XForms, and this specification all use different namespaces and
+   therefore can all be implemented in the same XML processor.
 
-  <h4 id=relationship3><span class=secno>1.4.5 </span>Relationship to XUL,
+  <h4 id=relationship2><span class=secno>1.4.4 </span>Relationship to XUL,
    Flash, Silverlight, and other proprietary UI languages</h4>
 
   <p><em>This section is non-normative.</em>

Received on Monday, 15 September 2008 10:20:33 UTC