diff --git a/master/definitions.xml b/master/definitions.xml
index 545ae938..1d2bf042 100644
--- a/master/definitions.xml
+++ b/master/definitions.xml
@@ -742,7 +742,7 @@
   <property name='font-size-adjust' href='https://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop'/>
   <property name='font-stretch'     href='https://www.w3.org/TR/css-fonts-3/#font-stretch-prop'/>
   <property name='font-style'       href='https://www.w3.org/TR/css-fonts-3/#font-style-prop'/>
-  <property name='font-variant'     href='text.html#FontVariantProperty'/>
+  <property name='font-variant'     href='https://www.w3.org/TR/css-fonts-3/#propdef-font-variant'/>
   <property name='font-variant-ligatures' href='https://www.w3.org/TR/css-fonts-3/#font-variant-ligatures-prop'/>
   <property name='font-weight'      href='https://www.w3.org/TR/css-fonts-3/#font-weight-prop'/>
 
diff --git a/master/text.html b/master/text.html
index 453a0950..921616a2 100644
--- a/master/text.html
+++ b/master/text.html
@@ -1994,7 +1994,7 @@ <h3 id='InlineSize'>The <span class="property">'inline-size'</span> property</h3
     </tr>
     <tr>
       <th>Value:</th>
-      <td><a>auto | &lt;length-percentage&gt;</a></td>
+      <td>auto | <a>&lt;length-percentage&gt;</a></td>
     </tr>
     <tr>
       <th>Initial:</th>
@@ -5248,16 +5248,22 @@ <h3 id="TextPropertiesAdaptions">SVG adaptions</h3>
 
 <h4 id='FontVariantProperty'>The <span class="property">'font-variant'</span> property</h4>
 
+  <em>This section is not normative</em>
+
+  <p>The <a>'font-variant'</a> property gets defined by the CSS Font Module
+    ([<a href="refs.html#ref-css-fonts-3">css-font-3</a>]).
+</p>
+
   <p>
-    CSS Font Module Level 3 changes the meaning of the
-    <a href="https://www.w3.org/TR/css-fonts-3/#propdef-font-variant">'font-variant'</a>
+    CSS Font Module changes the meaning of the
+    <a>'font-variant'</a>
     property from that defined by CSS 2.1. It has been repurposed (and
     its functionality greatly expanded) as a shorthand for selecting font
     variants from within a single font.
   </p>
-  <p class="note">
-    SVG 2 requires all <a>'font-variant'</a> subproperties to be
-    implemented (e.g. <a>'font-variant-ligatures'</a>).
+
+  <p>
+    SVG 2 supports all <a>'font-variant'</a> longhand properties (e.g. <a>'font-variant-ligatures'</a>).
   </p>
 
   <h4 id='LineHeightProperty'>The <span class="property">'line-height'</span> property</h4>
@@ -5283,12 +5289,18 @@ <h4 id='LineHeightProperty'>The <span class="property">'line-height'</span> prop
 
   <h4 id='WritingModeProperty'>The <span class="property">'writing-mode'</span> property</h4>
 
+  <em>This section is not normative.</em>
+
+  <p>The <a>'writing-mode'</a> property gets defined by the CSS Writing Modes Module
+        ([<a href="refs.html#ref-css-writing-modes-3">css-writing-modes-3</a>]).
+    </p>
+  
   <p>
     This property sets the <a>block-flow direction</a>; or in-other-words,
     the direction in which lines of text are stacked. As a consequence it
     also determines if the text has a horizontal or vertical orientation.
   </p>
-  <p>
+  <p class="annotation">
     SVG 2 references
     <a href="https://www.w3.org/TR/css-writing-modes-3">CSS Writing
       Modes Level 3</a> for the definition of the
@@ -5297,21 +5309,8 @@ <h4 id='WritingModeProperty'>The <span class="property">'writing-mode'</span> pr
     The SVG 1.1 values are obsolete but must still be supported by
     converting the specified values to computed values as follows:
   </p>
-  <ul>
-    <li>
-      <span class="prop-value">'lr'</span>,
-      <span class="prop-value">'lr-tb'</span>,
-      <span class="prop-value">'rl'</span>, and
-      <span class="prop-value">'rl-tb'</span> to
-      <span class="prop-value">'horizontal-tb'</span>;
-    </li>
-    <li>
-      <span class="prop-value">'tb'</span>, and
-      <span class="prop-value">'tb-rl'</span>, to
-      <span class="prop-value">'vertical-rl'</span>.
-    </li>
-  </ul>
-  <p class="note"><!-- This could be an annotation. -->
+
+  <p class="annotation"><!-- This could be an annotation. -->
     In SVG 1.0, this property could be interpreted as to also setting the
     <a>inline-base direction</a> leading to confusion about its role
     relative to the <a>'direction'</a> property. SVG 1.1 was a bit
@@ -5321,13 +5320,6 @@ <h4 id='WritingModeProperty'>The <span class="property">'writing-mode'</span> pr
     interpretation. The fact that neither SVG 1.0 nor SVG 1.1 allowed
     multi-line text added to the confusion.
   </p>
-  <p class="note">
-    Except for the additional information provided here, the
-    <a href="https://www.w3.org/TR/css-writing-modes-3/#block-flow">normative
-      definition</a> of the <a>'writing-mode'</a> property is in CSS
-      Writing Modes Level 3
-      ([<a href="refs.html#ref-css-writing-modes-3">css-writing-modes-3</a>]).
-  </p>
 
   <h4 id='DirectionProperty'>The <span class="property">'direction'</span> property</h4>
 
@@ -5467,12 +5459,6 @@ <h4 id='BaselineShiftProperty'>The <span class="property">'baseline-shift'</span
     in new content.
   </p>
 
-  <p>
-    The SVG 1.1 initial value 'baseline' has been removed from SVG
-    2. User agents <em>may</em> support this value as computing to '0'
-    if necessary to support legacy SVG content.
-  </p>
-
   <p class="annotation">
     The 'baseline' value was removed with the conversion of
     'vertical-align' to a shorthand for 'alignment-baseline' and