[html5] r2182 - [e] (0) WF2: Merge the XHTML2 and XForms sections in the intro, and remove the W [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2008-09-15 03:19:51 -0700 (Mon, 15 Sep 2008)
New Revision: 2182

Modified:
   index
   source
Log:
[e] (0) WF2: Merge the XHTML2 and XForms sections in the intro, and remove the WF2 bit, since we're merging it in now.

Modified: index
===================================================================
--- index	2008-09-15 09:59:53 UTC (rev 2181)
+++ index	2008-09-15 10:19:51 UTC (rev 2182)
@@ -257,12 +257,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>
@@ -2340,44 +2337,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="#refsXHTML2">[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="#refsXHTML2">[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.
+  <p>XHTML2, XForms, and this specification all use different namespaces and
+   therefore can all 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="#refsWF2">[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="#refsXForms">[XForms]</a>
-
-  <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>

Modified: source
===================================================================
--- source	2008-09-15 09:59:53 UTC (rev 2181)
+++ source	2008-09-15 10:19:51 UTC (rev 2182)
@@ -157,45 +157,34 @@
   to continue using the XHTML 1.1 line of specifications.</p>
 
 
-  <h4>Relationship to XHTML2</h4>
+  <h4>Relationship to XHTML2 and XForms</h4>
 
   <p><em>This section is non-normative.</em></p>
 
-  <p>XHTML2 <a href="#refsXHTML2">[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>
+  <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="#refsXHTML2">[XHTML2]</a></p>
 
-  <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>
+  <p>XForms similarly defines a new vocabulary with features for
+  complex data entry, such as tax forms or insurance forms.</p>
 
+  <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>
+
   <p><em>This</em> specification aims to extend HTML so that it is
   also suitable in these contexts.</p>
 
-  <p>XHTML2 and this specification use different namespaces and
-  therefore can both be implemented in the same XML processor.</p>
+  <p>XHTML2, XForms, and this specification all use different
+  namespaces and therefore can all be implemented in the same XML
+  processor.</p>
 
 
-  <h4>Relationship to Web Forms 2.0 and XForms</h4>
-
-  <p><em>This section is non-normative.</em></p>
-
-  <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="#refsWF2">[WF2]</a></p>
-
-  <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="#refsXForms">[XForms]</a></p>
-
-
   <h4>Relationship to XUL, Flash, Silverlight, and other proprietary UI languages</h4>
 
   <p><em>This section is non-normative.</em></p>