--- a/master/struct.html	Tue Jul 24 14:43:30 2012 +0200
+++ b/master/struct.html	Tue Jul 24 15:50:32 2012 +0200
@@ -1379,7 +1379,7 @@
 <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>
-<p>Owner: Chris/Jonathan (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3004">Action 3004</a> and <a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3005">Action 3005)</a>.</p>
+<p>Owner: Chris (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3004">Action 3004</a> and <a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3005">Action 3005)</a>. Done.</p>
 </div>
 
     <div class="adef-list">
@@ -1398,13 +1398,14 @@
         <dt id="XMLSpaceAttribute"> <span
         class="adef">xml:space</span> = "<span
         class="attr-value">{default | preserve}</span>"</dt>
-        <dd>Standard XML attribute to specify whether white space
+        <dd>DEprecated XML attribute to specify whether white space
         is preserved in character data. The only possible values
         are <span class='attr-value'>'default'</span> and <span class='attr-value'>'preserve'</span>. Refer to the
         <a href="http://www.w3.org/TR/2008/REC-xml-20081126/"><cite>Extensible Markup Language (XML) 1.0</cite></a>
         Recommendation [<a href="refs.html#ref-XML10">XML10</a>] and to the
         discussion <a href="text.html#WhiteSpace">white space
         handling</a> in SVG.<br />
+        New content should use the <a>'white-space'<a> property instead.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>

--- a/master/text.html	Tue Jul 24 14:43:30 2012 +0200
+++ b/master/text.html	Tue Jul 24 15:50:32 2012 +0200
@@ -77,7 +77,7 @@
   <p>Resolution: SVG2 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.</p>
+  <p>Owner: Cameron, Chris (Action-3004, Action-3005).</p>
 </div>
 
 <div class="annotation">
@@ -4395,12 +4395,73 @@
 
 </edit:with>
 
+<div class="ready-for-wg-review">
 <h2 id="WhiteSpace">White space handling</h2>
 
-<p id="XMLSpaceAttribute">SVG supports the standard XML attribute
+<p class="note">New in SVG 2.
+Added <a>'white-space'</a> to allow a more useful way to control whitespace handling.
+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>
+property. This specifies two things:</p>
+<ul>
+    <li>whether and how white space inside the element is collapsed</li>
+    <li>whether lines may wrap at unforced soft wrap opportunities</li>
+</ul>
+
+
+<table class="propdef">
+  <tr>
+    <th>Name:</th>
+    <td><dfn id="WhiteSpaceProperty">white-space</dfn></td>
+  </tr>
+  <tr>
+    <th>Value:</th>
+    <td>normal | pre | nowrap | pre-wrap | pre-line </td>
+  </tr>
+  <tr>
+    <th>Initial:</th>
+    <td>not defined for shorthand properties </td>
+  </tr>
+  <tr>
+    <th>Applies to:</th>
+    <td><a>text content elements</a></td>
+  </tr>
+  <tr>
+    <th>Inherited:</th>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <th>Percentages:</th>
+    <td>N/A</td>
+  </tr>
+  <tr>
+    <th>Media:</th>
+    <td>visual</td>
+  </tr>
+  <tr>
+    <th>Computed&#160;value:</th>
+    <td>see individual properties </td>
+  </tr>
+  <tr>
+    <th><a>Animatable</a>:</th>
+    <td>yes</td>
+  </tr>
+</table>
+
+<p>Values and their meanings are defined in [<a href="http://dev.w3.org/csswg/css3-text/#white-space">CSS3 Text</a>].</p>
+
+<h3 id="LegacyXMLSpace">Legacy whitespace handling</h3>
+
+<p id="XMLSpaceAttribute">For compatibility, SVG2 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. 
-Note that any child element of a <a>'text'</a> element may also 
+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>
+
+<p>Note that any child element of a <a>'text'</a> element may also 
 have an <a>'xml:space'</a> attribute which will apply to that 
 child element's text content.
 The SVG user agent has special processing rules associated with this attribute
@@ -4524,6 +4585,16 @@
 <p>&nbsp;&nbsp;&nbsp;&nbsp;<span class="anim-target"><a
 href="animate.html#Animatable">Animatable</a>: no.</span></p>
 
+<h3 id="DuplicateWhiteSpace">Duplicate whitespace directives</a>
+
+<p>Older, SVG 1.1 content will use <a>'xml-space'</a>. New content, and older 
+content that is being reworked, will use <a>'white-space'</a> and remove any existing 
+<a>'xml-space'</a>. However, user agents may come across content which uses 
+both methods on the same element. If the <a>'white-space'</a> property is set on 
+any element, then the value of <a>'xml:space'</a> is ignored.</p>
+
+</div>
+
 <h2 id="TextSelection">Text selection and clipboard operations</h2>
 
 <p><a href="conform.html#ConformingSVGViewers">Conforming SVG