[e] (1) more work on getting this <meta> element section to flow well

git-svn-id: http://svn.whatwg.org/webapps@613 340c8d12-0b0e-0410-8428-c7bf67bfef74

index

@@ -7178,7 +7178,7 @@ class="main"> or <div class="content">. Why do we also need a body?
    <dd><code title=attr-meta-name><a href="#name">name</a></code>
 
    <dd><code title=attr-meta-http-equiv><a
-    href="#http-equiv">http-equiv</a></code>
+    href="#http-equiv0">http-equiv</a></code>
 
    <dd><code title=attr-meta-content><a href="#content0">content</a></code>
 
@@ -7206,47 +7206,47 @@ class="main"> or <div class="content">. Why do we also need a body?
    href="#style0">style</a></code>, and <code><a
    href="#script2">script</a></code> elements.
 
-  <p>The first kind of metadata expressible with <code><a
-   href="#meta1">meta</a></code> elements is document-level metadata. If a a
-   <code><a href="#meta1">meta</a></code> element has a <code
-   title=attr-meta-name><a href="#name">name</a></code> attribute, it sets
-   document metadata. Document metadata is expressed in terms of name/value
-   pairs, the <dfn id=name title=attr-meta-name><code>name</code></dfn>
-   attribute on the <code><a href="#meta1">meta</a></code> element giving the
-   name, and the <dfn id=content0
-   title=attr-meta-content><code>content</code></dfn> attribute on the same
-   element giving the value. The name specifies what aspect of metadata is
-   being set; valid names and the meaning of their values are described in
-   the following sections. If a <code><a href="#meta1">meta</a></code>
-   element has no <code title=attr-meta-content><a
-   href="#content0">content</a></code> attribute, then the value part of the
-   metadata name/value pair is the empty string.
-
-  <p>The value must not be a URI. Links must be represented using the
-   <code><a href="#link0">link</a></code> element, not the <code><a
-   href="#meta1">meta</a></code> element.
-
-  <p>The <code><a href="#meta1">meta</a></code> element also allows authors
-   to set pragma directives, using the <code title=attr-meta-http-equiv><a
-   href="#http-equiv">http-equiv</a></code> attribute, and to declare the
-   character encoding used when an HTML document is serialised to string form
-   (e.g. for transmission over the network or for disk storage), using the
-   <code title=attr-meta-charset><a href="#charset0">charset</a></code>
-   attribute.
+  <p>The <code><a href="#meta1">meta</a></code> element can represent
+   document-level metadata with the <code title=attr-meta-name><a
+   href="#name">name</a></code> attribute, pragma directives with the <code
+   title=attr-meta-http-equiv><a href="#http-equiv0">http-equiv</a></code>
+   attribute, and the file's character encoding declaration when an HTML
+   document is serialised to string form (e.g. for transmission over the
+   network or for disk storage) with <code title=attr-meta-charset><a
+   href="#charset0">charset</a></code> attribute.
 
   <p>Exactly one of the <code title=attr-meta-name><a
    href="#name">name</a></code>, <code title=attr-meta-http-equiv><a
-   href="#http-equiv">http-equiv</a></code>, and <code
+   href="#http-equiv0">http-equiv</a></code>, and <code
    title=attr-meta-charset><a href="#charset0">charset</a></code> attributes
    must be specified. If either <code title=attr-meta-name><a
    href="#name">name</a></code> or <code title=attr-meta-http-equiv><a
-   href="#http-equiv">http-equiv</a></code> is specified, then the <code
+   href="#http-equiv0">http-equiv</a></code> is specified, then the <code
    title=attr-meta-content><a href="#content0">content</a></code> attribute
    must also be specified. Otherwise, it must be omitted. If the <code
    title=attr-meta-charset><a href="#charset0">charset</a></code> attribute
    is specified, the element must be the first element in <a
    href="#the-head0">the <code>head</code> element</a> of the file.
 
+  <p>The <dfn id=content0 title=attr-meta-content><code>content</code></dfn>
+   attribute gives the value of the document metadata or pragma directive
+   when the element is used for those purposes. The allowed values depend on
+   the exact context, as described in subsequent sections of this
+   specification.
+
+  <p>If a <code><a href="#meta1">meta</a></code> element has a <dfn id=name
+   title=attr-meta-name><code>name</code></dfn> attribute, it sets document
+   metadata. Document metadata is expressed in terms of name/value pairs, the
+   <code title=attr-meta-name><a href="#name">name</a></code> attribute on
+   the <code><a href="#meta1">meta</a></code> element giving the name, and
+   the <code title=attr-meta-content><a href="#content0">content</a></code>
+   attribute on the same element giving the value. The name specifies what
+   aspect of metadata is being set; valid names and the meaning of their
+   values are described in the following sections. If a <code><a
+   href="#meta1">meta</a></code> element has no <code
+   title=attr-meta-content><a href="#content0">content</a></code> attribute,
+   then the value part of the metadata name/value pair is the empty string.
+
   <p>The DOM attributes <dfn id=name0
    title=dom-meta-name><code>name</code></dfn> and <dfn id=content1
    title=dom-meta-content><code>content</code></dfn> must <a
@@ -7347,16 +7347,25 @@ class="main"> or <div class="content">. Why do we also need a body?
   <p>This specification does not define how new values will get approved. It
    is expected that the Wiki will have a community that addresses this.
 
+  <p>Metadata names whose values are to be URIs must not be proposed or
+   accepted. Links must be represented using the <code><a
+   href="#link0">link</a></code> element, not the <code><a
+   href="#meta1">meta</a></code> element.
+
   <h5 id=pragma><span class=secno>3.7.5.3. </span>Pragma directives</h5>
 
-  <p>The <dfn id=http-equiv
-   title=attr-meta-http-equiv><code>http-equiv</code></dfn> attribute, which
-   is used to set pragma directives, is an <a href="#enumerated">enumerated
-   attribute</a>. The following table lists the keywords defined for this
-   attribute. The states given in the first cell of the the rows with
-   keywords give the states to which those keywords
-   map.<!-- Some of the keywords are non-conforming, as noted in
-  the last column.-->
+  <p>When the <dfn id=http-equiv
+   title=attr-meta-http-equiv><code>http-equiv</code></dfn> attribute is
+   specified on a <code><a href="#meta1">meta</a></code> element, the element
+   is a pragma directive.
+
+  <p>The <dfn id=http-equiv0
+   title=attr-meta-http-equiv><code>http-equiv</code></dfn> attribute is an
+   <a href="#enumerated">enumerated attribute</a>. The following table lists
+   the keywords defined for this attribute. The states given in the first
+   cell of the the rows with keywords give the states to which those keywords
+   map.<!-- Some of the keywords are non-conforming, as
+  noted in the last column.-->
 
   <table>
    <thead>
@@ -7391,14 +7400,14 @@ class="main"> or <div class="content">. Why do we also need a body?
 
     <tr>
      <td><a href="#default" title=attr-meta-http-equiv-default-style>Default
-      Style</a>
+      style</a>
 
      <td><code title="">default-style</code> <!--     <td>-->
   </table>
 
   <p>When a <code><a href="#meta1">meta</a></code> element is inserted into
    the document, if its <code title=attr-meta-http-equiv><a
-   href="#http-equiv">http-equiv</a></code> attribute is present and
+   href="#http-equiv0">http-equiv</a></code> attribute is present and
    represents one of the above states, then the user agent must run the
    algorithm appropriate for that state, as described in the following list:
 
@@ -7423,8 +7432,8 @@ class="main"> or <div class="content">. Why do we also need a body?
 
    <dd>
 
-   <dt><dfn id=default title=attr-meta-http-equiv-default-style>Default
-    Style</dfn>
+   <dt><dfn id=default title=attr-meta-http-equiv-default-style>Default style
+    state</dfn>
 
    <dd>
     <ol>

source

@@ -5937,30 +5937,13 @@ class="main"> or <div class="content">. Why do we also need a body?
   <code>base</code>, <code>link</code>, <code>style</code>, and
   <code>script</code> elements.</p>
 
-  <p>The first kind of metadata expressible with <code>meta</code>
-  elements is document-level metadata. If a a <code>meta</code>
-  element has a <code title="attr-meta-name">name</code> attribute, it
-  sets document metadata. Document metadata is expressed in terms of
-  name/value pairs, the <dfn
-  title="attr-meta-name"><code>name</code></dfn> attribute on the
-  <code>meta</code> element giving the name, and the <dfn
-  title="attr-meta-content"><code>content</code></dfn> attribute on
-  the same element giving the value. The name specifies what aspect of
-  metadata is being set; valid names and the meaning of their values
-  are described in the following sections.  If a <code>meta</code>
-  element has no <code title="attr-meta-content">content</code>
-  attribute, then the value part of the metadata name/value pair is
-  the empty string.</p>
-
-  <p>The value must not be a URI. Links must be represented using the
-  <code>link</code> element, not the <code>meta</code> element.</p>
-
-  <p>The <code>meta</code> element also allows authors to set pragma
-  directives, using the <code
-  title="attr-meta-http-equiv">http-equiv</code> attribute, and to
-  declare the character encoding used when an HTML document is
+  <p>The <code>meta</code> element can represent document-level
+  metadata with the <code title="attr-meta-name">name</code>
+  attribute, pragma directives with the <code
+  title="attr-meta-http-equiv">http-equiv</code> attribute, and the
+  file's character encoding declaration when an HTML document is
   serialised to string form (e.g. for transmission over the network or
-  for disk storage), using the <code
+  for disk storage) with <code
   title="attr-meta-charset">charset</code> attribute.</p>
 
   <p>Exactly one of the <code title="attr-meta-name">name</code>,
@@ -5974,6 +5957,25 @@ class="main"> or <div class="content">. Why do we also need a body?
   element must be the first element in <span>the <code>head</code>
   element</span> of the file.</p>
 
+  <p>The <dfn title="attr-meta-content"><code>content</code></dfn>
+  attribute gives the value of the document metadata or pragma
+  directive when the element is used for those purposes. The allowed
+  values depend on the exact context, as described in subsequent
+  sections of this specification.</p>
+
+  <p>If a <code>meta</code> element has a <dfn
+  title="attr-meta-name"><code>name</code></dfn> attribute, it sets
+  document metadata. Document metadata is expressed in terms of
+  name/value pairs, the <code title="attr-meta-name">name</code>
+  attribute on the <code>meta</code> element giving the name, and the
+  <code title="attr-meta-content">content</code> attribute on the same
+  element giving the value. The name specifies what aspect of metadata
+  is being set; valid names and the meaning of their values are
+  described in the following sections.  If a <code>meta</code> element
+  has no <code title="attr-meta-content">content</code> attribute,
+  then the value part of the metadata name/value pair is the empty
+  string.</p>
+
   <p>The DOM attributes <dfn
   title="dom-meta-name"><code>name</code></dfn> and <dfn
   title="dom-meta-content"><code>content</code></dfn> must
@@ -6090,17 +6092,25 @@ class="main"> or <div class="content">. Why do we also need a body?
   approved. It is expected that the Wiki will have a community that
   addresses this.</p>
 
+  <p>Metadata names whose values are to be URIs must not be proposed
+  or accepted. Links must be represented using the <code>link</code>
+  element, not the <code>meta</code> element.</p>
+
 
   <h5>Pragma directives</h5>
 
+  <p>When the <dfn
+  title="attr-meta-http-equiv"><code>http-equiv</code></dfn> attribute
+  is specified on a <code>meta</code> element, the element is a pragma
+  directive.</p>
+
   <p>The <dfn
-  title="attr-meta-http-equiv"><code>http-equiv</code></dfn>
-  attribute, which is used to set pragma directives, is an
-  <span>enumerated attribute</span>. The following table lists the
-  keywords defined for this attribute. The states given in the first
-  cell of the the rows with keywords give the states to which those
-  keywords map.<!-- Some of the keywords are non-conforming, as noted in
-  the last column.--></p>
+  title="attr-meta-http-equiv"><code>http-equiv</code></dfn> attribute
+  is an <span>enumerated attribute</span>. The following table lists
+  the keywords defined for this attribute. The states given in the
+  first cell of the the rows with keywords give the states to which
+  those keywords map.<!-- Some of the keywords are non-conforming, as
+  noted in the last column.--></p>
 
   <table>
    <thead>
@@ -6132,7 +6142,7 @@ class="main"> or <div class="content">. Why do we also need a body?
      <td><code title="">refresh</code>
 <!--     <td>-->
     <tr>
-     <td><span title="attr-meta-http-equiv-default-style">Default Style</span>
+     <td><span title="attr-meta-http-equiv-default-style">Default style</span>
      <td><code title="">default-style</code>
 <!--     <td>-->
   </table>
@@ -6167,7 +6177,7 @@ class="main"> or <div class="content">. Why do we also need a body?
 
    <dd>
 
-   <dt><dfn title="attr-meta-http-equiv-default-style">Default Style</dfn>
+   <dt><dfn title="attr-meta-http-equiv-default-style">Default style state</dfn>
 
    <dd>