--- a/master/color.html	Wed May 16 20:02:04 2012 +1000
+++ b/master/color.html	Thu May 17 12:30:33 2012 +1000
@@ -14,65 +14,33 @@
 
 <h1>Color</h1>
 
-<div class="annotation">
-  <p>
-    This section should include an overall discussion of color in SVG as well as links to all the places color
-    is discussed in the specification: currentColor, SVG colors, etc.
-  </p>
-</div>
+<p class="annotation">
+  This section should include an overall discussion of color in SVG as well as links to all the places color
+  is discussed in the specification: currentColor, SVG colors, etc.
+</p>
 
 <div class="annotation">
-  <p>
-    SVG2 Requirement: Add color management subject to deciding the exact conformance classes required.
-  </p>
-  <p>
-    Resolution: SVG colormanagement becomes a chapter in SVG2. (No longer an independent module.)
-  </p>
-  <p>
-    <a href="http://www.w3.org/2011/10/28-svg-irc#T16-52-12">Conference call 2011-10-28</a>.
-  </p>
-  <p>
-    Purpose: Align with mainstream graphics use. Allow fluorescent colors, more than 8bit color, etc.
-  </p>
-  <p>
-    Owner: Chris.
-  </p>
+  <p>SVG2 Requirement: Add color management subject to deciding the exact conformance classes required.</p>
+  <p>Resolution: SVG color management becomes a chapter in SVG2. (No longer an independent module.)</p>
+  <p><a href="http://www.w3.org/2011/10/28-svg-irc#T16-52-12">Conference call 2011-10-28</a>.</p>
+  <p>Purpose: Align with mainstream graphics use. Allow fluorescent colors, more than 8bit color, etc.</p>
+  <p>Owner: Chris.</p>
 </div>
 
 <div class="annotation">
-  <p>
-    SVG2 Requirement: Support CSS3 Color syntax.
-  </p>
-  <p>
-    Resolution: ?.
-  </p>
-  <p>
-    <a href="http://www.w3.org/2011/07/29-svg-minutes.html#item01">F2F Seattle 2011</a>.
-  </p>
-  <p>
-    Purpose: Align with CSS. Already widely implemented.
-  </p>
-  <p>
-    Owner: Chris.
-  </p>
+  <p>SVG2 Requirement: Support CSS3 Color syntax.</p>
+  <p>Resolution: ?.</p>
+  <p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item01">F2F Seattle 2011</a>.</p>
+  <p>Purpose: Align with CSS. Already widely implemented.</p>
+  <p>Owner: Chris.</p>
 </div>
 
 <div class="annotation">
-  <p>
-    SVG2 Requirement: Add new paint values currentFillPaint, currentStrokePaint.
-  </p>
-  <p>
-    Resolution: We will add new paint values currentFillPaint, currentStrokePaint etc. to SVG2.
-  </p>
-  <p>
-    <a href="http://www.w3.org/2011/07/29-svg-minutes.html#item01">Seattle 2011 F2F Day 3</a>.
-  </p>
-  <p>
-    Purpose: Among other things, to provide an easy way to match marker color to stroke color.
-  </p>
-  <p>
-    Owner: Chris.
-  </p>
+  <p>SVG2 Requirement: Add new paint values currentFillPaint, currentStrokePaint.</p>
+  <p>Resolution: We will add new paint values currentFillPaint, currentStrokePaint etc. to SVG2.</p>
+  <p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item01">Seattle 2011 F2F Day 3</a>.</p>
+  <p>Purpose: Among other things, to provide an easy way to match marker color to stroke color.</p>
+  <p>Owner: Chris.</p>
 </div>
 
 
@@ -312,7 +280,9 @@
 <pre>
 @color-profile { &lt;color-profile-description&gt; }
 </pre>
-    where the &lt;color-profile-description&gt; has the form: 
+
+<p>where the &lt;color-profile-description&gt; has the form:</p>
+
 <pre>
 descriptor: value;
 [...]
@@ -361,43 +331,45 @@
         </dd>
       </dl>
     </div>
-    <dl>
-      <dt><span class='prop-value'>sRGB</span></dt>
-      <dd>The source profile is the sRGB color space. For
-      consistency with
-      <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
-      ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
-      case-insensitive; however, it is recommended that the mixed
-      capitalization "sRGB" be used for consistency with common
-      industry practice.</dd>
 
-      <dt><span class='prop-value'>&lt;local-profile&gt;</span></dt>
-      <dd>
-        The source profile is a locally-stored profile. The syntax
-        for &lt;local-profile&gt; is: 
+<dl>
+  <dt><span class='prop-value'>sRGB</span></dt>
+  <dd>The source profile is the sRGB color space. For
+  consistency with
+  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
+  ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
+  case-insensitive; however, it is recommended that the mixed
+  capitalization "sRGB" be used for consistency with common
+  industry practice.</dd>
+
+  <dt><span class='prop-value'>&lt;local-profile&gt;</span></dt>
+  <dd>
+    <p>The source profile is a locally-stored profile. The syntax
+    for &lt;local-profile&gt; is:</p>
+
 <pre>
 "local(" + &lt;string&gt; + ")"
 </pre>
-        where &lt;string&gt; is the profile's unique ID as
-        specified by <a href="http://www.color.org/">International
-        Color Consortium</a>. (Note: Profile description fields do
-        <em>not</em> represent a profile's unique ID. With current
-        ICC proposals, the profile's unique ID is an MD5-encoded
-        value within the profile header.)
-      </dd>
 
-      <dt><span class='prop-value'><a
-      href="types.html#DataTypeIRI">&lt;iri&gt;</a></span></dt>
-      <dd>The source profile is a <a
-      href="linking.html#IRIReference">IRI reference</a>
-      to a color profile.</dd>
+    <p>where &lt;string&gt; is the profile's unique ID as
+    specified by <a href="http://www.color.org/">International
+    Color Consortium</a>. (Note: Profile description fields do
+    <em>not</em> represent a profile's unique ID. With current
+    ICC proposals, the profile's unique ID is an MD5-encoded
+    value within the profile header.)</p>
+  </dd>
 
-      <dt>(<span class='prop-value'>&lt;local-profile&gt; <a
-      href="types.html#DataTypeIRI">&lt;iri&gt;</a>)</span></dt>
-      <dd>Two profiles are specified. If &lt;local-profile&gt;
-      cannot be found on the local system, then the <a
-      href="types.html#DataTypeIRI">&lt;iri&gt;</a> is used.</dd>
-    </dl>
+  <dt><span class='prop-value'><a
+  href="types.html#DataTypeIRI">&lt;iri&gt;</a></span></dt>
+  <dd>The source profile is an <a>IRI reference</a>
+  to a color profile.</dd>
+
+  <dt>(<span class='prop-value'>&lt;local-profile&gt; <a
+  href="types.html#DataTypeIRI">&lt;iri&gt;</a>)</span></dt>
+  <dd>Two profiles are specified. If &lt;local-profile&gt;
+  cannot be found on the local system, then the <a>&lt;iri&gt;</a>
+  is used.</dd>
+</dl>
 
     <div class="propdef">
       <dl>
@@ -422,13 +394,14 @@
         </dd>
       </dl>
     </div>
-    <dl>
-      <dt><span class='prop-value'>&lt;name&gt;</span></dt>
-      <dd>See the description for the <a>'color-profile/name'</a> attribute on the
-      <a>'color-profile element'</a> element. Note that if &lt;name&gt; is not
-      provided, it will be impossible to reference the given @color-profile
-      definition.</dd>
-    </dl>
+
+<dl>
+  <dt><span class='prop-value'>&lt;name&gt;</span></dt>
+  <dd>See the description for the <a>'color-profile/name'</a> attribute on the
+  <a>'color-profile element'</a> element. Note that if &lt;name&gt; is not
+  provided, it will be impossible to reference the given @color-profile
+  definition.</dd>
+</dl>
 
     <div class="propdef">
       <dl>
@@ -519,16 +492,20 @@
   that do have a profile built into their data, that profile is
   used. For images that do not have a profile, the sRGB profile
   is used.</dd>
+
   <dt><span class='prop-value'>sRGB</span></dt>
-  <dd>The source profile is assumed to be sRGB. This differs
-  from auto in that it overrides an embedded profile inside an
-  image.<br />
-  <br />
-  For consistency with <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
-  case-insensitive; however, it is recommended that the mixed
-  capitalization "sRGB" be used for consistency with common
-  industry practice.</dd>
+  <dd>
+    <p>The source profile is assumed to be sRGB. This differs
+    from auto in that it overrides an embedded profile inside an
+    image.</p>
+
+    <p>For consistency with <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
+    ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
+    case-insensitive; however, it is recommended that the mixed
+    capitalization "sRGB" be used for consistency with common
+    industry practice.</p>
+  </dd>
+
   <dt><span class='prop-value'>&lt;name&gt;</span></dt>
   <dd>A name corresponding to a defined color profile that is
   in the user agent's color profile description database. The
@@ -539,10 +516,10 @@
   If a match is found, the corresponding profile overrides an
   embedded profile inside an image. If no match is found, then
   the embedded profile inside the image is used.</dd>
+
   <dt><span class='prop-value'><a
   href="types.html#DataTypeIRI">&lt;iri&gt;</a></span></dt>
-  <dd>A <a href="linking.html#IRIReference">IRI
-  reference</a> to the source color profile. The referenced
+  <dd>An <a>IRI reference</a> to the source color profile. The referenced
   color profile overrides an embedded profile inside the
   image.</dd>
 </dl>