REFERRER: Drop draconian conflict/typo handling.

specs/referrer-policy/index.html

@@ -71,7 +71,7 @@
    <h1 class="p-name no-ref" id="title">Referrer Policy</h1>
 
    <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
-    <time class="dt-updated" datetime="2015-02-07">7 February 2015</time></span></h2>
+    <time class="dt-updated" datetime="2015-02-10">10 February 2015</time></span></h2>
 
    <div data-fill-with="spec-metadata">
     <dl>
@@ -1067,55 +1067,24 @@ <h3 class="heading settled" data-level="6.1" id="set-referrer-policy"><span clas
 
     <p>If no referrer policy has been set for a <a data-link-type="dfn" href="#javascript-global-environment">global environment</a>, then
   setting its value is straightforward. If a policy has previously been set,
-  however, then we need to deal with potential conflict. We handle conflict
-  in a draconian fashion: conflicts resolve to <code>No Referrer</code>, as
-  described below.</p>
+  then we overwrite it with the new value.</p>
 
 
     <ol>
 
-     <li>If <var>policy</var> is not one of <code><a data-link-type="dfn" href="#no-referrer">No Referrer</a></code>,
-    <code><a data-link-type="dfn" href="#no-referrer-when-downgrade">No Referrer When Downgrade</a></code>, <code><a data-link-type="dfn" href="#origin-only">Origin
-    Only</a></code>, <code><a data-link-type="dfn" href="#origin-when-cross_origin">Origin when cross-origin</a></code>, or
-    <code><a data-link-type="dfn" href="#unsafe-url">Unsafe URL</a></code>, then set <var>policy</var> to
-    <code><a data-link-type="dfn" href="#no-referrer">No Referrer</a></code>.
-
-
-
-     <li>
-      Let <var>currentPolicy</var> be the value of <var>environment</var>’s
-      <a data-link-type="dfn" href="#referrer-policy">referrer policy</a>.
-
-
-
-
      <li>
-      If <var>currentPolicy</var> is <code>null</code> (that is, if no policy has
-      been explicitly set), then:
-
-
-      <ol>
-
-       <li>
-          Set <var>environment</var>’s <a data-link-type="dfn" href="#referrer-policy">referrer policy</a> to
-          <var>policy</var>.
-
-
-
-       <li>
-          Skip the remaining steps.
-
-
-
-      </ol>
-
+      If <var>policy</var> is not one of <code><a data-link-type="dfn" href="#no-referrer">No Referrer</a></code>,
+      <code><a data-link-type="dfn" href="#no-referrer-when-downgrade">No Referrer When Downgrade</a></code>, <code><a data-link-type="dfn" href="#origin-only">Origin
+      Only</a></code>, <code><a data-link-type="dfn" href="#origin-when-cross_origin">Origin when cross-origin</a></code>, or
+      <code><a data-link-type="dfn" href="#unsafe-url">Unsafe URL</a></code>, then return without setting
+      <var>environment</var>’s referrer policy.
 
 
 
 
      <li>
-      If <var>currentPolicy</var> is not <var>policy</var>, then set
-      <var>environment</var>’s <a data-link-type="dfn" href="#referrer-policy">referrer policy</a> to <code>Never</code>.
+      Set <var>environment</var>’s <a data-link-type="dfn" href="#referrer-policy">referrer policy</a> to
+      <var>policy</var>.
 
 
 

specs/referrer-policy/index.src.html

@@ -657,40 +657,20 @@ <h3 id="set-referrer-policy">
 
   If no referrer policy has been set for a <a>global environment</a>, then
   setting its value is straightforward. If a policy has previously been set,
-  however, then we need to deal with potential conflict. We handle conflict
-  in a draconian fashion: conflicts resolve to <code>No Referrer</code>, as
-  described below.
+  then we overwrite it with the new value.
 
   <ol>
-    <li>If <var>policy</var> is not one of <code><a>No Referrer</a></code>,
-    <code><a>No Referrer When Downgrade</a></code>, <code><a>Origin
-    Only</a></code>, <code><a>Origin when cross-origin</a></code>, or
-    <code><a>Unsafe URL</a></code>, then set <var>policy</var> to
-    <code><a>No Referrer</a></code>.</li>
-
-    <li>
-      Let <var>currentPolicy</var> be the value of <var>environment</var>'s
-      <a>referrer policy</a>.
-    </li>
-
     <li>
-      If <var>currentPolicy</var> is <code>null</code> (that is, if no policy has
-      been explicitly set), then:
-
-      <ol>
-        <li>
-          Set <var>environment</var>'s <a>referrer policy</a> to
-          <var>policy</var>.
-        </li>
-        <li>
-          Skip the remaining steps.
-        </li>
-      </ol>
+      If <var>policy</var> is not one of <code><a>No Referrer</a></code>,
+      <code><a>No Referrer When Downgrade</a></code>, <code><a>Origin
+      Only</a></code>, <code><a>Origin when cross-origin</a></code>, or
+      <code><a>Unsafe URL</a></code>, then return without setting
+      <var>environment</var>'s referrer policy.
     </li>
 
     <li>
-      If <var>currentPolicy</var> is not <var>policy</var>, then set
-      <var>environment</var>'s <a>referrer policy</a> to <code>Never</code>.
+      Set <var>environment</var>'s <a>referrer policy</a> to
+      <var>policy</var>.
     </li>
   </ol>