[e] (0) Rewrite the form intro. Let me know if there's anything in th…

…e old intro you think I should have kept. git-svn-id: http://svn.whatwg.org/webapps@5263 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 10, 2010 · f857b59 · f857b59
1 parent 5da87a5
commit f857b59
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 30 deletions.
diff --git a/complete.html b/complete.html
@@ -33468,10 +33468,10 @@ <h4 id=the-table-element><span class=secno>4.9.1 </span>The <dfn><code>table</co
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>In this order: optionally a <code><a href=#the-caption-element>caption</a></code> element,
-   followed by either zero or more <code><a href=#the-colgroup-element>colgroup</a></code> elements,
-   followed optionally by a <code><a href=#the-thead-element>thead</a></code> element, followed
-   optionally by a <code><a href=#the-tfoot-element>tfoot</a></code> element, followed by either zero
-   or more <code><a href=#the-tbody-element>tbody</a></code> elements or one or more <code><a href=#the-tr-element>tr</a></code>
+   followed by zero or more <code><a href=#the-colgroup-element>colgroup</a></code> elements, followed
+   optionally by a <code><a href=#the-thead-element>thead</a></code> element, followed optionally by
+   a <code><a href=#the-tfoot-element>tfoot</a></code> element, followed by either zero or more
+   <code><a href=#the-tbody-element>tbody</a></code> elements or one or more <code><a href=#the-tr-element>tr</a></code>
    elements, followed optionally by a <code><a href=#the-tfoot-element>tfoot</a></code> element (but
    there can only be one <code><a href=#the-tfoot-element>tfoot</a></code> element child in
    total).</dd>
@@ -35932,12 +35932,14 @@ <h4 id=introduction-0><span class=secno>4.10.1 </span>Introduction</h4>
 
   <p><i>This section is non-normative.</i></p>
 
-  <p>Forms allow unscripted client-server interaction: given a form, a
-  user can provide data, submit it to the server, and have the server
-  act on it accordingly (e.g. returning the results of a search or
-  calculation). The elements used in forms can also be used for user
-  interaction with no associated submission mechanism, in conjunction
-  with scripts.</p>
+  <p>A form is a component of a Web page that has form controls, such
+  as text fields, buttons, check boxes, range controls, or color
+  pickers. A user can interact with such a form, providing data that
+  can then be sent to the server for further processing (e.g.
+  returning the results of a search or calculation). No client-side
+  scripting is needed in many cases, though an API is available so
+  that scripts can augment the user experience or use forms for
+  purposes other than submitting data to a server.</p>
 
   <p>Writing a form consists of several steps, which can be performed
   in any order: writing the user interface, implementing the

diff --git a/index b/index
@@ -33395,10 +33395,10 @@ function AddCloud(data, x, y) { ... }</pre>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>In this order: optionally a <code><a href=#the-caption-element>caption</a></code> element,
-   followed by either zero or more <code><a href=#the-colgroup-element>colgroup</a></code> elements,
-   followed optionally by a <code><a href=#the-thead-element>thead</a></code> element, followed
-   optionally by a <code><a href=#the-tfoot-element>tfoot</a></code> element, followed by either zero
-   or more <code><a href=#the-tbody-element>tbody</a></code> elements or one or more <code><a href=#the-tr-element>tr</a></code>
+   followed by zero or more <code><a href=#the-colgroup-element>colgroup</a></code> elements, followed
+   optionally by a <code><a href=#the-thead-element>thead</a></code> element, followed optionally by
+   a <code><a href=#the-tfoot-element>tfoot</a></code> element, followed by either zero or more
+   <code><a href=#the-tbody-element>tbody</a></code> elements or one or more <code><a href=#the-tr-element>tr</a></code>
    elements, followed optionally by a <code><a href=#the-tfoot-element>tfoot</a></code> element (but
    there can only be one <code><a href=#the-tfoot-element>tfoot</a></code> element child in
    total).</dd>
@@ -35859,12 +35859,14 @@ the cell that corresponds to the values of the two dice.
 
   <p><i>This section is non-normative.</i></p>
 
-  <p>Forms allow unscripted client-server interaction: given a form, a
-  user can provide data, submit it to the server, and have the server
-  act on it accordingly (e.g. returning the results of a search or
-  calculation). The elements used in forms can also be used for user
-  interaction with no associated submission mechanism, in conjunction
-  with scripts.</p>
+  <p>A form is a component of a Web page that has form controls, such
+  as text fields, buttons, check boxes, range controls, or color
+  pickers. A user can interact with such a form, providing data that
+  can then be sent to the server for further processing (e.g.
+  returning the results of a search or calculation). No client-side
+  scripting is needed in many cases, though an API is available so
+  that scripts can augment the user experience or use forms for
+  purposes other than submitting data to a server.</p>
 
   <p>Writing a form consists of several steps, which can be performed
   in any order: writing the user interface, implementing the

diff --git a/source b/source
@@ -36988,10 +36988,10 @@ function AddCloud(data, x, y) { ... }</pre>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd>In this order: optionally a <code>caption</code> element,
-   followed by either zero or more <code>colgroup</code> elements,
-   followed optionally by a <code>thead</code> element, followed
-   optionally by a <code>tfoot</code> element, followed by either zero
-   or more <code>tbody</code> elements or one or more <code>tr</code>
+   followed by zero or more <code>colgroup</code> elements, followed
+   optionally by a <code>thead</code> element, followed optionally by
+   a <code>tfoot</code> element, followed by either zero or more
+   <code>tbody</code> elements or one or more <code>tr</code>
    elements, followed optionally by a <code>tfoot</code> element (but
    there can only be one <code>tfoot</code> element child in
    total).</dd>
@@ -39928,12 +39928,14 @@ the cell that corresponds to the values of the two dice.
 
   <p><i>This section is non-normative.</i></p>
 
-  <p>Forms allow unscripted client-server interaction: given a form, a
-  user can provide data, submit it to the server, and have the server
-  act on it accordingly (e.g. returning the results of a search or
-  calculation). The elements used in forms can also be used for user
-  interaction with no associated submission mechanism, in conjunction
-  with scripts.</p>
+  <p>A form is a component of a Web page that has form controls, such
+  as text fields, buttons, check boxes, range controls, or color
+  pickers. A user can interact with such a form, providing data that
+  can then be sent to the server for further processing (e.g.
+  returning the results of a search or calculation). No client-side
+  scripting is needed in many cases, though an API is available so
+  that scripts can augment the user experience or use forms for
+  purposes other than submitting data to a server.</p>
 
   <p>Writing a form consists of several steps, which can be performed
   in any order: writing the user interface, implementing the