Use canonical name of 'SVG 2' and not 'SVG2' or 'SVG 2.0'.
authorCameron McCormack <cam@mcc.id.au>
Thu, 26 Jul 2012 07:33:41 +1000
changeset 205 d31d13e21199
parent 204 0d1733e39feb
child 206 ad417bf773f8
Use canonical name of 'SVG 2' and not 'SVG2' or 'SVG 2.0'.
master/animate.html
master/changes.html
master/color.html
master/feature.html
master/fonts.html
master/index.html
master/interact.html
master/painting.html
master/paths.html
master/pservers.html
master/publish.xml
master/render.html
master/script.html
master/struct.html
master/styling.html
master/svgdom.html
master/text.html
master/types.html
--- a/master/animate.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/animate.html	Thu Jul 26 07:33:41 2012 +1000
@@ -16,7 +16,7 @@
 
 <div class="annotation">
  <p>
-   SVG2 Requirements:
+   SVG 2 Requirements:
  </p>
  <ul>
    <li>Support for non-negative speed on time containers</li>
--- a/master/changes.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/changes.html	Thu Jul 26 07:33:41 2012 +1000
@@ -127,7 +127,7 @@
 <h3 id="svgdtd">Document Type Definition appendix</h3>
 
 <ul>
-  <li>Removed this appendix, as SVG 2.0 is not defined in terms of a DTD.</li>
+  <li>Removed this appendix, as SVG 2 is not defined in terms of a DTD.</li>
 </ul>
 
 </body>
--- a/master/color.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/color.html	Thu Jul 26 07:33:41 2012 +1000
@@ -20,15 +20,15 @@
 </p>
 
 <div class="annotation">
-  <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>SVG 2 Requirement: Add color management subject to deciding the exact conformance classes required.</p>
+  <p>Resolution: SVG color management becomes a chapter in SVG 2. (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>SVG 2 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>
@@ -36,8 +36,8 @@
 </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>SVG 2 Requirement: Add new paint values currentFillPaint, currentStrokePaint.</p>
+  <p>Resolution: We will add new paint values currentFillPaint, currentStrokePaint etc. to SVG 2.</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>
--- a/master/feature.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/feature.html	Thu Jul 26 07:33:41 2012 +1000
@@ -37,7 +37,7 @@
 the SVG 1.0 feature strings can be considered deprecated.</p>
 
 <div class="ready-for-wg-review">
-<h2 id="SVG2FeatureStrings">SVG 2.0 feature strings</h2>
+<h2 id="SVG2FeatureStrings">SVG 2 feature strings</h2>
 
 <dl id="GraphicsAttribute">
   <dt>Feature String:</dt>
--- a/master/fonts.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/fonts.html	Thu Jul 26 07:33:41 2012 +1000
@@ -16,7 +16,7 @@
 
 <div class="annotation">
 
-<p>SVG2 Requirement: Explicit support for Web Open Font Format (WOFF).</p>
+<p>SVG 2 Requirement: Explicit support for Web Open Font Format (WOFF).</p>
 
 <p>Resolution: We will mandate WOFF support in SVG 2.</p>
 
@@ -31,7 +31,7 @@
 
 <div class="annotation">
 
-<p>SVG2 Requirement: Mandate support for SVG Tiny fonts.</p>
+<p>SVG 2 Requirement: Mandate support for SVG Tiny fonts.</p>
 
 <p>Resolution: SVG 2 will mandate support for SVG Tiny fonts support, and SVG Full fonts will be specified in a separate module.</p>
 
@@ -48,9 +48,9 @@
 
 <div class="annotation">
 
-<p>SVG2 Requirement: <a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#CSS_Spec_dependencies">SVG2 will depend on CSS3 Fonts</a>.</p>
+<p>SVG 2 Requirement: <a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#CSS_Spec_dependencies">SVG 2 will depend on CSS3 Fonts</a>.</p>
 
-<p>Resolution: SVG2 will depend on CSS3 Fonts</p>
+<p>Resolution: SVG 2 will depend on CSS3 Fonts</p>
 
 <p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item08">29 Jul 2011 telcon</a>.
 </p>
@@ -90,7 +90,7 @@
 single Web site using WebFonts that worked across all user
 agents.</p>
 
-<p>SVG2 mandates support for Web Open Font Format [<a href="refs.html#ref-WOFF">WOFF</a>], which 
+<p>SVG 2 mandates support for Web Open Font Format [<a href="refs.html#ref-WOFF">WOFF</a>], which 
  is now supported in <a href="http://w3c-test.org/framework/review/woff-at/">most user agents</a>. Besides enabling compressed, subsetted WebFonts
 with accompanying metadata for clear licensing, WOFF also benefits from OpenType multilingual features 
 and support for advanced typography. Thus, content authors can author CSS to request discretionary ligatures, 
@@ -100,7 +100,7 @@
 to be supported by all <a
 href="conform.html#ConformingSVGViewers">conforming SVG
 viewers</a>, SVG provideed a facility to define fonts in SVG.
-This facility was called <em>SVG fonts</em>. For backwards compatibility, SVG2 requires support for a subset
+This facility was called <em>SVG fonts</em>. For backwards compatibility, SVG 2 requires support for a subset
 of SVG Fonts, SVG Tiny Fonts, which has been widely deployed especially for mobile content.</p>
 
 
--- a/master/index.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/index.html	Thu Jul 26 07:33:41 2012 +1000
@@ -47,7 +47,7 @@
 <h2 id="abstract">Abstract</h2>
 
 <p>This specification defines the features and syntax for Scalable
-Vector Graphics (SVG) Version 2.0, a language for describing
+Vector Graphics (SVG) Version 2, a language for describing
 two-dimensional vector and mixed vector/raster graphics.  Although
 an XML serialization is given, processing is defined in terms of a
 DOM.</p>
@@ -59,7 +59,7 @@
 publications and the latest revision of this technical report can be found in
 the <a href="http://www.w3.org/TR/">W3C technical reports index</a> at http://www.w3.org/TR/</em>.</p>
 
-<p>This document is the <edit:date/> <strong><edit:maturity/></strong> of SVG 2.0.  This version of SVG
+<p>This document is the <edit:date/> <strong><edit:maturity/></strong> of SVG 2.  This version of SVG
 builds upon <a href="http://www.w3.org/2011/08/REC-SVG11-20110816/">SVG 1.1 Second Edition</a>
 by improving the usability of the language and by adding new features commonly
 requested by authors.  The <a href="changes.html">Changes</a> appendix lists all
@@ -67,7 +67,7 @@
 
 <p>Comments on this <edit:maturity/> are welcome.  <!--Corrections
 against the specification will be published as errata,
-and subsequently will be incorporated into future editions of SVG 2.0.-->
+and subsequently will be incorporated into future editions of SVG 2.-->
 Comments can be sent to <a href="mailto:[email protected]" class='url'>[email protected]</a>,
 the public email list for issues related to vector graphics on the Web. This list is
 <a href="http://lists.w3.org/Archives/Public/www-svg/">archived</a> and
--- a/master/interact.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/interact.html	Thu Jul 26 07:33:41 2012 +1000
@@ -69,7 +69,7 @@
 <h2 id="SVGEvents">Complete list of supported events</h2>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Anchor events</p>
+  <p>SVG 2 Requirement: Anchor events</p>
   <p>Resolution: SVG 2 will consider adding HTML document wide events (including hashchange) apply to SVG documents when they make sense</p>
   <p><a href="http://www.w3.org/2011/12/22-svg-irc#T21-17-25">22 December 2011 SVG WG telcon</a>.</p>
   <p>Purpose: Allow authors to use the same set of event listener attributes on a root SVG element that they can on an HTML body or root element</p>
@@ -77,15 +77,15 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Have event listener attributes on an appropriate interface</p>
-  <p>Resolution: SVG2 will move all events listener attributes to Element, in accordance with the similar move in HTML</p>
+  <p>SVG 2 Requirement: Have event listener attributes on an appropriate interface</p>
+  <p>Resolution: SVG 2 will move all events listener attributes to Element, in accordance with the similar move in HTML</p>
   <p><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item03">Seattle F2F 2011 Day 1</a>.</p>
   <p>Purpose: Alignment with HTML</p>
   <p>Owner: Cameron (ACTION-3283)</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Introduce evt as an alias to event in event handlers</p>
+  <p>SVG 2 Requirement: Introduce evt as an alias to event in event handlers</p>
   <p>Resolution: We decide to resolve ISSUE-2176 by introducing evt as an alias to event in event handlers</p>
   <p><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item15">Seattle F2F 2011 Day 1</a>.</p>
   <p>Purpose: Alignment with HTML</p>
@@ -93,8 +93,8 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Support drag &amp; drop functionality</p>
-  <p>Resolution: SVG2 may require drag &amp; drop functionality, and we'll investigate html5's functionality for that</p>
+  <p>SVG 2 Requirement: Support drag &amp; drop functionality</p>
+  <p>Resolution: SVG 2 may require drag &amp; drop functionality, and we'll investigate html5's functionality for that</p>
   <p><a href="http://www.w3.org/2011/12/22-svg-irc#T21-13-35">Telcon 2011-12-22</a>.</p>
   <p>Purpose: Allow easier drag &amp; drop in svg, alignment with html5</p>
   <p>Owner: Erik</p>
@@ -885,8 +885,8 @@
 <h2 id="EnableZoomAndPanControls">Magnification and panning</h2>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Support level of detail control.</p>
-  <p>Resolution: We will support Level of Detail control in SVG2.</p>
+  <p>SVG 2 Requirement: Support level of detail control.</p>
+  <p>Resolution: We will support Level of Detail control in SVG 2.</p>
   <p><a href="">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Control visibility of elements based on zoom level (useful, for example,
   in mapping). See <a href="http://www.w3.org/Submission/2011/SUBM-SVGTL-20110607/#VisibilityControllingAccordingToZooming">Tiling and Layering Module for SVG 1.2 Tiny</a>.</p>
--- a/master/painting.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/painting.html	Thu Jul 26 07:33:41 2012 +1000
@@ -347,7 +347,7 @@
 
 <div class="annotation">
  <p>
-   SVG2 Requirement: Have the vector-effect property
+   SVG 2 Requirement: Have the vector-effect property
  </p>
  <p>
    Resolution: SVG 2 will have the vector-effect property
@@ -446,8 +446,8 @@
 <span class="attr-value">'M 40,40 c 0,0 0,0 0,0'</span>.</p>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Include non-scaling stroke.</p>
-  <p>Resolution: SVG2 will include non-scaling stroke.</p>
+  <p>SVG 2 Requirement: Include non-scaling stroke.</p>
+  <p>Resolution: SVG 2 will include non-scaling stroke.</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T17-46-34">Pre-TPAC F2F 2011-10-28</a>.</p>
   <p>Purpose: Keep diagrams readable as zoom level changes.</p>
   <p>Owner: Chris.</p>
@@ -455,8 +455,8 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Include a way to specify stroke-position.</p>
-  <p>Resolution: SVG2 shall include a way to specify stroke-position.</p>
+  <p>SVG 2 Requirement: Include a way to specify stroke-position.</p>
+  <p>Resolution: SVG 2 shall include a way to specify stroke-position.</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-09-48">Pre-TPAC F2F 2011-10-28</a>.</p>
   <p>Purpose: Allow stroke to be inside or outside path.</p>
   <p>Owner: Cameron.</p>
@@ -464,16 +464,16 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Specify more precisely stroke dashing.</p>
-  <p>Resolution: SVG2 shall specify stroke dashing more precisely.</p>
+  <p>SVG 2 Requirement: Specify more precisely stroke dashing.</p>
+  <p>Resolution: SVG 2 shall specify stroke dashing more precisely.</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-14-14">Pre-TPAC F2F 2011-10-28</a>.</p>
   <p>Purpose: Define dash starting point on basic shapes and path segments.</p>
   <p>Owner: Cameron.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Allow more author control over positions of dashes. (Scaling of dashes to fit path.)</p>
-  <p>Resolution: SVG2 shall allow more author control over positions of dashes.</p>
+  <p>SVG 2 Requirement: Allow more author control over positions of dashes. (Scaling of dashes to fit path.)</p>
+  <p>Resolution: SVG 2 shall allow more author control over positions of dashes.</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-17-51">Pre-TPAC 2011-10-28</a>.</p>
   <p>Purpose: Allow things like aligning dashes at rectangle corners or along paths, needed for mapping.</p>
   <p>Owner: Cameron.</p>
@@ -1286,8 +1286,8 @@
 <h2 id="Markers">Markers</h2>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Improve markers</p>
-  <p>Resolution: We will improve markers for SVG2</p>
+  <p>SVG 2 Requirement: Improve markers</p>
+  <p>Resolution: We will improve markers for SVG 2</p>
   <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-12-30">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: To solve the common problems authors have with SVG markers</p>
   <p>Owner: Cameron (ACTION-3286)</p>
@@ -2542,8 +2542,8 @@
 <span class="property">'paint-order'</span> property</h2>
 
 <div class="annotation">
- <p>SVG2 Requirement: Control the order of painting and filling and markers</p>
- <p>Resolution: SVG2 will adopt the "paint-order" property proposal, though possibly with a different name.</p>
+ <p>SVG 2 Requirement: Control the order of painting and filling and markers</p>
+ <p>Resolution: SVG 2 will adopt the "paint-order" property proposal, though possibly with a different name.</p>
  <p><a href="http://www.w3.org/2012/05/07-svg-minutes#item05">Hamburg 2012 F2F Day 1</a>.</p>
  <p>Purpose: To address the common desire to paint strokes below fills without having to duplicate an element</p>
  <p>Owner: Cameron (ACTION-3285)</p>
@@ -3137,7 +3137,7 @@
 property</h3>
 
 <div class="annotation">
- <p>SVG2 Requirement: Add buffered-rendering</p>
+ <p>SVG 2 Requirement: Add buffered-rendering</p>
  <p>Resolution: SVG 2 will add buffered-rendering (implementor feedback indicates that it is needed).</p>
  <p><a href="http://www.w3.org/2012/01/26-svg-irc#T21-28-56">SVG telcon 2012-01-26</a>.</p>
  <p>Purpose: For caching rendered results for faster display.</p>
--- a/master/paths.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/paths.html	Thu Jul 26 07:33:41 2012 +1000
@@ -15,7 +15,7 @@
 <h1>Paths</h1>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Include the smooth path between points functionality (Catmull-Rom).</p>
+  <p>SVG 2 Requirement: Include the smooth path between points functionality (Catmull-Rom).</p>
   <p>Resolution: Add a Catmull Rom syntax to the path syntax with a
   tension parameter to control the whole curve (not per-point
   control)</p>
@@ -25,7 +25,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Add a path rotation command.</p>
+  <p>SVG 2 Requirement: Add a path rotation command.</p>
   <p>Resolution: Same as requirement.</p>
   <p><a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#Add_a_path_rotation_command">Seattle 2011 F2F Day 1</a>.</p>
   <p>Purpose: Make path rotations easy to animate. Make pie charts easy to draw.</p>
@@ -33,7 +33,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Make arcs in paths easier.</p>
+  <p>SVG 2 Requirement: Make arcs in paths easier.</p>
   <p>Resolution: Same as requirement.</p>
   <p><a href="http://www.w3.org/2011/11/04-svg-minutes.html#item08">TPAC 2011 F2F</a>.</p>
   <p>Purpose: Allow arcs of longer than 180 degrees easily.</p>
--- a/master/pservers.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/pservers.html	Thu Jul 26 07:33:41 2012 +1000
@@ -45,8 +45,8 @@
 </p>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Support hatching without the artifacts that patterns currently impose.</p>
-  <p>Resolution: SVG2 should support hatching without the artifacts that patterns currently impose.</p>
+  <p>SVG 2 Requirement: Support hatching without the artifacts that patterns currently impose.</p>
+  <p>Resolution: SVG 2 should support hatching without the artifacts that patterns currently impose.</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-17-51">Pre-TPAC meeting</a>.
   Issue <a href="http://www.w3.org/Graphics/SVG/WG/track/issues/2372">2372</a>.</p>
   <p>Purpose: Hatchings (required for mapping, engraving, etc.) approved.</p>
@@ -54,7 +54,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: SVG 2 shall support filling and stroking from arbitrary elements.</p>
+  <p>SVG 2 Requirement: SVG 2 shall support filling and stroking from arbitrary elements.</p>
   <p>Resolution: Same as requirement.</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-32-52">Pre-TPAC meeting</a>.
   Issue <a href="http://www.w3.org/Graphics/SVG/WG/track/issues/2371">2371</a>.</p>
@@ -92,8 +92,8 @@
 <p class="note">Solid Colors are new in SVG 2 (ported from SVG 1.2 Tiny).</p>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Add the solidColor element and its properties.</p>
-  <p>Resolution: Will add solidColor element to SVG2.</p>
+  <p>SVG 2 Requirement: Add the solidColor element and its properties.</p>
+  <p>Resolution: Will add solidColor element to SVG 2.</p>
   <p><a href="http://www.w3.org/2012/01/26-svg-minutes.html">WG teleconference: 26 Jan 2012</a>.</p>
   <p>Purpose: To provide an easy mechanism for creating named colors and
   palettes. Also useful for animation.</p>
@@ -909,7 +909,7 @@
   </dl>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Clarify radial gradients with focal point on the circle.</p>
+  <p>SVG 2 Requirement: Clarify radial gradients with focal point on the circle.</p>
   <p>Resolution: The spec. should say that when the focal point is on the
   circle edge, with repeat, then the distance between the first and last stop
   for the repeating colors is 0 and the paint should generate a color that is
@@ -1079,7 +1079,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Support Coons patches.</p>
+  <p>SVG 2 Requirement: Support Coons patches.</p>
   <p>Resolution: Mesh gradients are accepted by the WG for SVG 2.</p>
   <p><a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#Mesh_gradients_are_accepted_by_the_WG_for_SVG_2.0">Seattle 2011 F2F day 3</a></p>
   <p>Purpose: To allow more complex gradients such as those found in nature.</p>
--- a/master/publish.xml	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/publish.xml	Thu Jul 26 07:33:41 2012 +1000
@@ -1,8 +1,8 @@
-<!-- Publication script configuration for SVG 1.1 (Second Edition). -->
+<!-- Publication script configuration for SVG 2. -->
 
 <publish-conf xmlns='http://mcc.id.au/ns/local'>
-  <title>Scalable Vector Graphics (SVG) 2.0</title>
-  <short-title>SVG 2.0</short-title>
+  <title>Scalable Vector Graphics (SVG) 2</title>
+  <short-title>SVG 2</short-title>
   <maturity>ED</maturity>
   <output use-publish-directory='true' publish-directory='build/publish'/>
 
--- a/master/render.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/render.html	Thu Jul 26 07:33:41 2012 +1000
@@ -14,10 +14,10 @@
 
 <div class="annotation">
   <p>
-    SVG2 Requirement: Support the z-index.
+    SVG 2 Requirement: Support the z-index.
   </p>
   <p>
-    Resolution: We will add Jonathan Watt's z-index proposal to SVG2.
+    Resolution: We will add Jonathan Watt's z-index proposal to SVG 2.
   </p>
   <p>
     <a href="http://www.w3.org/2011/03/03-svg-minutes.html#item03">Auckland 2011 F2F day 5</a>.
--- a/master/script.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/script.html	Thu Jul 26 07:33:41 2012 +1000
@@ -17,7 +17,7 @@
 <h2 id="ScriptElement">The <span class="element-name">'script'</span> element</h2>
 
 <div class="annotation">
-  <p>SVG2 Requirement:  Consider allowing async/defer on &lt;svg:script&gt;</p>
+  <p>SVG 2 Requirement:  Consider allowing async/defer on &lt;svg:script&gt;</p>
   <p>Resolution: SVG 2 will allow async/defer on &lt;svg:script&gt;</p>
   <p><a href="http://www.w3.org/2012/01/05-svg-irc#T21-07-03">5 January 2012 SVG WG telcon</a>.</p>
   <p>Purpose: To align with the HTML script element</p>
@@ -25,7 +25,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Incorporate SVG Tiny 1.2 script processing model</p>
+  <p>SVG 2 Requirement: Incorporate SVG Tiny 1.2 script processing model</p>
   <p>Resolution: SVG 2 will define how inline scriptable content will be processed, in a compatible way to HTML5</p>
   <p><a href="http://www.w3.org/2012/03/08-svg-irc#T21-09-09">8 March 2012 SVG WG telcon</a>.</p>
   <p>Purpose: To have consistent script running behaviour across HTML and SVG</p>
--- a/master/struct.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/struct.html	Thu Jul 26 07:33:41 2012 +1000
@@ -123,10 +123,10 @@
 
     <div class="annotation">
       <p>
-	SVG2 Requirement: Allow transform on the &lt;SVG&gt; element.
+	SVG 2 Requirement: Allow transform on the &lt;SVG&gt; element.
       </p>
       <p>
-	Resolution: We will allow transform on &lt;svg&gt; in SVG2.
+	Resolution: We will allow transform on &lt;svg&gt; in SVG 2.
       </p>
       <p>
 	<a href="http://www.w3.org/2011/10/28-svg-irc#T00-23-44">Pre-TPAC F2F</a>.
@@ -298,7 +298,7 @@
 
 <div class="annotation">
   <p>
-    SVG2 Requirement: Have unknown elements treated as &lt;g&gt; for the purpose of rendering.
+    SVG 2 Requirement: Have unknown elements treated as &lt;g&gt; for the purpose of rendering.
   </p>
   <p>
     Resolution: Accept having unknown elements treated as &lt;g&gt; for the purpose of rendering. However, the groups wants community feedback on how much content would be impacted.
@@ -909,15 +909,15 @@
 elements within an SVG file.</p>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Auto-size image.</p>
-  <p>Resolution: We will allow auto-sized images in SVG2.</p>
+  <p>SVG 2 Requirement: Auto-size image.</p>
+  <p>Resolution: We will allow auto-sized images in SVG 2.</p>
   <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-52-24">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Allow raster images to use own size without the need to set width and height.</p>
   <p>Owner: Cameron.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Have a method for &gt;image&lt; to select a part of an image to display, maybe by allowing viewBox on it.</p>
+  <p>SVG 2 Requirement: Have a method for &gt;image&lt; to select a part of an image to display, maybe by allowing viewBox on it.</p>
   <p>Resolution: We will have a method for &lt;image&gt; to select a part of an image to display, maybe by allowing viewBox on it.</p>
   <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-45-13">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Allow selection of part of an image.</p>
@@ -925,8 +925,8 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Support CSS3 image-fit.</p>
-  <p>Resolution: SVG2 will depend on CSS3 Image Values and CSS4 Image Values.</p>
+  <p>SVG 2 Requirement: Support CSS3 image-fit.</p>
+  <p>Resolution: SVG 2 will depend on CSS3 Image Values and CSS4 Image Values.</p>
   <p><a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#CSS_Spec_dependencies">Seattle 2011 F2F Day 3</a>.</p>
   <p>Purpose: Align with CSS WG preserveAspectRatio.</p>
   <p>Owner: Erik.</p>
@@ -1296,7 +1296,7 @@
 attributes <a>'xml:lang'</a> and <a>'xml:space'</a>.</p>
 
 <div class="annotation">
-<p>SVG2 Requirement: Deprecate the use of xml:space to effect layout and will use the CSS white-space property.</p>
+<p>SVG 2 Requirement: Deprecate the use of xml:space to effect layout and will use the CSS white-space property.</p>
 <p>Resolution: We drop xml:space from SVG 2 and remove the relating tests from the SVG 1.1. test suite.</p>
 <p><a href="http://www.w3.org/2011/03/03-svg-minutes.html#item04">Auckland F2F Day 5</a>.</p>
 <p>Purpose: Align with CSS.</p>
--- a/master/styling.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/styling.html	Thu Jul 26 07:33:41 2012 +1000
@@ -656,7 +656,7 @@
 case.</p>
 
 <div class="annotation">
-  <p>SVG2 Requirement:  Consider relaxing case sensitivity of presentation attribute values</p>
+  <p>SVG 2 Requirement:  Consider relaxing case sensitivity of presentation attribute values</p>
   <p>Resolution: We will make property values case insensitive</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T16-40-11">Pre-TPAC F2F Day 2</a>.</p>
   <p>Purpose: To make presentation attribute syntax parsing be the same as parsing for the corresponding CSS property</p>
@@ -713,7 +713,7 @@
 <h2 id='StyleElement'>The <span class="element-name">'style'</span> element</h2>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Add HTML5 style-element attributes to SVG's style element</p>
+  <p>SVG 2 Requirement: Add HTML5 style-element attributes to SVG's style element</p>
   <p>Resolution: SVG 2 style element shall be aligned with the HTML5 style element</p>
   <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-45-45">Pre-TPAC F2F Day 2</a>.</p>
   <p>Purpose: To not surprise authors with different behaviour for the style element in HTML and SVG content.</p>
--- a/master/svgdom.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/svgdom.html	Thu Jul 26 07:33:41 2012 +1000
@@ -17,24 +17,24 @@
 <p class="normativity"><strong>This appendix is normative.</strong></p>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Improve the DOM.</p>
-  <p>Resolution: We will generally improve the SVG DOM for SVG2.</p>
+  <p>SVG 2 Requirement: Improve the DOM.</p>
+  <p>Resolution: We will generally improve the SVG DOM for SVG 2.</p>
   <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-35-49">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Keep our users happy. Speed up access.  See <a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG_2_DOM">SVG 2 DOM</a> Wiki page.</p>
   <p>Owner: Cameron</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Make it easier to read and write to attributes in the SVG DOM.</p>
-  <p>Resolution: We will make it easier to read and write to attributes in the SVG DOM in SVG2.</p>
+  <p>SVG 2 Requirement: Make it easier to read and write to attributes in the SVG DOM.</p>
+  <p>Resolution: We will make it easier to read and write to attributes in the SVG DOM in SVG 2.</p>
   <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-19-13">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Easier is easier.</p>
   <p>Owner: Cameron</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Improve the SVG path DOM APIs.</p>
-  <p>Resolution: We will improve the SVG path DOM APIs in SVG2.</p>
+  <p>SVG 2 Requirement: Improve the SVG path DOM APIs.</p>
+  <p>Resolution: We will improve the SVG path DOM APIs in SVG 2.</p>
   <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-23-23">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Clean up SVGPathSegList interface, possibly share API with Canvas.</p>
   <p>Owner: Cameron</p>
--- a/master/text.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/text.html	Thu Jul 26 07:33:41 2012 +1000
@@ -17,23 +17,23 @@
 <!-- THESE ANNOTATIONS NEED TO BE MOVED TO PROPER SECTIONS -->
 
 <div class="annotation">
-  <p>SVG2 Requirement: Require automatic text wrapping in arbitrary shapes compatible with CSS.</p>
-  <p>Resolution: SVG2 will require automatic textwrapping compatible with CSS.</p>
+  <p>SVG 2 Requirement: Require automatic text wrapping in arbitrary shapes compatible with CSS.</p>
+  <p>Resolution: SVG 2 will require automatic textwrapping compatible with CSS.</p>
   <p><a href="http://www.w3.org/2011/11/17-svg-irc#T22-04-11">Conference call 2012-11-17</a>.</p>
   <p>Purpose: Text in flow charts, etc.</p>
   <p>Owner: Tav.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Support glyphs being aligned to different baselines, perhaps by using existing or improved CSS properties</p>
-  <p>Resolution: SVG2 will support glyphs being aligned to different baselines, perhaps by using existing or improved CSS properties.</p>
+  <p>SVG 2 Requirement: Support glyphs being aligned to different baselines, perhaps by using existing or improved CSS properties</p>
+  <p>Resolution: SVG 2 will support glyphs being aligned to different baselines, perhaps by using existing or improved CSS properties.</p>
   <p><a href="http://www.w3.org/2012/03/15-svg-irc#T21-07-21">Pre-TPAC F2F Day 1</a>.</p>
   <p>Purpose: Allows aligning of different sized glyphs along a baseline other than alphabetic.</p>
   <p>Owner: Chris.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Clarify the stretch method for textpath.</p>
+  <p>SVG 2 Requirement: Clarify the stretch method for textpath.</p>
   <p>Resolution: We will clarify method=stretch on textPath elements.</p>
   <p><a href="http://www.w3.org/2011/11/17-svg-irc#T22-23-10">Conference call 2011-11-17</a>.</p>
   <p>Purpose: Better definition of how glyphs should be stretched.</p>
@@ -41,23 +41,23 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Have a way to specify flip-invariant text.</p>
-  <p>Resolution: SVG2 will have a way to specify flip-invariant text.</p>
+  <p>SVG 2 Requirement: Have a way to specify flip-invariant text.</p>
+  <p>Resolution: SVG 2 will have a way to specify flip-invariant text.</p>
   <p><a href="http://www.w3.org/2011/11/17-svg-irc#T22-26-26">Conference call 2011-11-17</a>.</p>
   <p>Purpose: Keep text readable if image flipped.</p>
   <p>Owner: Doug.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Allow transforms on tspan.</p>
-  <p>Resolution: SVG2 will allow transforms on tspan.</p>
+  <p>SVG 2 Requirement: Allow transforms on tspan.</p>
+  <p>Resolution: SVG 2 will allow transforms on tspan.</p>
   <p><a href="http://www.w3.org/2011/12/01-svg-irc#T21-02-34">Conferene call 2011-12-01</a>.</p>
   <p>Purpose: Align with other elements such as &lt;a&gt; which already allow transforms.</p>
   <p>Owner: Cameron.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Have a DOM method to convert a &lt;text&gt; element to outline path data.</p>
+  <p>SVG 2 Requirement: Have a DOM method to convert a &lt;text&gt; element to outline path data.</p>
   <p>Resolution: Add a DOM method to convert a &lt;text&gt; element to outline path data and possible migrate to fx.</p>
   <p><a href="http://www.w3.org/2012/01/13-svg-irc#T05-07-07">Sydney F2F day 4</a>.</p>
   <p>Purpose: Allow manipulation of text as a path (while still keeping it as text).</p>
@@ -65,7 +65,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Include the improved text from SVG Tiny 1.2 on characters and glyphs, text layout, text selection, text search.</p>
+  <p>SVG 2 Requirement: Include the improved text from SVG Tiny 1.2 on characters and glyphs, text layout, text selection, text search.</p>
   <p>Resolution: SVG 2 will include the improved text from SVG Tiny 1.2 on characters and glyphs, text layout, text selection, text search.</p>
   <p><a href="http://www.w3.org/2012/02/02-svg-minutes.html#action05">Conference call 2012-02-02</a>.</p>
   <p>Purpose: Include more clear SVG Tiny 1.2 text, no functional change.</p>
@@ -73,23 +73,23 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Use CSS3 definitions for text layout (whitespacing, bidi, etc) that is not specific to SVG.</p>
-  <p>Resolution: SVG2 will use CSS3 definitions for text layout (whitespacing, bidi, etc) that is not specific to SVG.</p>
+  <p>SVG 2 Requirement: Use CSS3 definitions for text layout (whitespacing, bidi, etc) that is not specific to SVG.</p>
+  <p>Resolution: SVG 2 will use CSS3 definitions for text layout (whitespacing, bidi, etc) that is not specific to SVG.</p>
   <p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item08">Seattle 2011 F2F Day 3</a>.</p>
   <p>Purpose: Align with CSS3.</p>
   <p>Owner: Cameron, Chris (Action-3004, Action-3005).</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Add text-overflow.</p>
-  <p>Resolution: We will add text-overflow in SVG2.</p>
+  <p>SVG 2 Requirement: Add text-overflow.</p>
+  <p>Resolution: We will add text-overflow in SVG 2.</p>
   <p><a href="http://www.w3.org/2011/03/03-svg-minutes.html#item04">Conference call 2011-03-03</a>.</p>
   <p>Purpose: Align with CSS. Indicate that not all text is shown.</p>
   <p>Owner: Erik.</p>
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Remove the restriction of tref pointing to only an SVG document fragment.</p>
+  <p>SVG 2 Requirement: Remove the restriction of tref pointing to only an SVG document fragment.</p>
   <p>Resolution: We agree to remove the restriction of tref pointing to only an SVG document fragment.</p>
   <p><a href="http://lists.w3.org/Archives/Public/public-svg-wg/2009JulSep/att-0094/26-svg-minutes-last-topic.html#item01">Mountain View F2F 2009 Day 1</a>.</p>
   <p> Purpose: Allow easier text substitution.</p>
@@ -97,7 +97,7 @@
 </div>
 
 <div class="annotation">
-  <p>SVG2 Requirement: Deprecate baseline-shift and use vertical-align instead</p>
+  <p>SVG 2 Requirement: Deprecate baseline-shift and use vertical-align instead</p>
   <p>Resolution: SVG 2 will deprecate baseline-shift and use vertical-align
   <em>(although we will not actually deprecate baseline-shift, but incorporate
   the vertical-align shorthand and all the baseline properties that css3-linebox
@@ -4323,9 +4323,9 @@
 Aligns SVG and HTML/CSS text processing. <a>'xml:space'</a> deprecated in new content, retained for backwards compatibility.
 </p>
 
-<h3 id="NewWhiteSpaceProperty">SVG2 Preferred white space handling</h3>
-
-<p id="white-spaceProperty">Rendering of white space in SVG2 is controlled by the <a>'white-space'</a>
+<h3 id="NewWhiteSpaceProperty">SVG 2 Preferred white space handling</h3>
+
+<p id="white-spaceProperty">Rendering of white space in SVG 2 is controlled by the <a>'white-space'</a>
 property. This specifies two things:</p>
 <ul>
     <li>whether and how white space inside the element is collapsed</li>
@@ -4376,7 +4376,7 @@
 
 <h3 id="LegacyXMLSpace">Legacy whitespace handling</h3>
 
-<p id="XMLSpaceAttribute">For compatibility, SVG2 also supports the  XML attribute
+<p id="XMLSpaceAttribute">For compatibility, SVG 2 also supports the  XML attribute
 <a>'xml:space'</a> to specify the handling of white space characters
 within a given <a>'text'</a> element's character data. New content should not use 
 <a>'xml:space'</a> but instead, use the <a>'white-space'</a> property.</p>
--- a/master/types.html	Thu Jul 26 07:23:04 2012 +1000
+++ b/master/types.html	Thu Jul 26 07:33:41 2012 +1000
@@ -166,7 +166,7 @@
 
 <div class="annotation">
   <p>
-    SVG2 Requirement: Make the SVGList* interfaces a bit more like other lists/arrays.
+    SVG 2 Requirement: Make the SVGList* interfaces a bit more like other lists/arrays.
   </p>
   <p>
     Resolution: ?.
@@ -1552,7 +1552,7 @@
 
 <div class="annotation">
   <p>
-  SVG2 Requirement: Detect if a mouse event is on the fill or stroke
+  SVG 2 Requirement: Detect if a mouse event is on the fill or stroke
   </p>
   <p>
   Resolution: SVG 2 will make it easier to detect if an mouse event is on the stroke or fill of an element