Index: source
===================================================================
--- source	(revision 3008)
+++ source	(revision 3009)
@@ -9095,9 +9095,9 @@
 
   <p>Paragraphs in <span>flow content</span> are defined relative to
   what the document looks like without the <code>a</code>,
-  <code>ins</code> and <code>del</code> elements complicating matters,
-  since those elements, with their hybrid content models, can straddle
-  paragraph boundaries.</p>
+  <code>ins</code>, <code>del</code>, and <code>map</code> elements
+  complicating matters, since those elements, with their hybrid
+  content models, can straddle paragraph boundaries.</p>
 
   <p class="note">Generally, having elements straddle paragraph
   boundaries is best avoided. Maintaining such markup can be
@@ -9106,9 +9106,9 @@
   <div class="impl">
 
   <p>Let <var title="">view</var> be a view of the DOM that replaces
-  all <code>a</code>, <code>ins</code> and <code>del</code> elements
-  in the document with their contents. Then, in <var
-  title="">view</var>, for each run of sibling <span>phrasing
+  all <code>a</code>, <code>ins</code>, <code>del</code>, and
+  <code>map</code> elements in the document with their contents. Then,
+  in <var title="">view</var>, for each run of sibling <span>phrasing
   content</span> nodes uninterrupted by other types of content, in an
   element that accepts content other than <span>phrasing
   content</span>, let <var title="">first</var> be the first node of
@@ -9118,10 +9118,13 @@
   whitespace</span>, a paragraph exists in the original DOM from
   immediately before <var title="">first</var> to immediately after
   <var title="">last</var>. (Paragraphs can thus span across
-  <code>a</code>, <code>ins</code> and <code>del</code> elements.)</p>
+  <code>a</code>, <code>ins</code>, <code>del</code>, and
+  <code>map</code> elements.)</p>
 
   <p>Conformance checkers may warn authors of cases where they have
-  paragraphs that overlap each other.</p>
+  paragraphs that overlap each other (this can happen with
+  <code>object</code>, <code>video</code>, <code>audio</code>, and
+  <code>canvas</code> elements).</p> <!-- example below -->
 
   </div>
 
@@ -14897,8 +14900,8 @@
   the user follows the link.</p>
 
   <p>The <span>activation behavior</span> of <code>a</code> elements
-  that represent <span>hyperlinks</span> is to run the following
-  steps:</p>
+  that represent <span title="hyperlink">hyperlinks</span> is to run
+  the following steps:</p>
 
   <ol>
 
@@ -27439,10 +27442,11 @@
   <dl class="element">
    <dt>Categories</dt>
    <dd><span>Flow content</span>.</dd>
+   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
-   <dd>Where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Flow content</span>.</dd>
+   <dd><span>Transparent</span>.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-map-name">name</code></dd>