From 2f43ce3633fefaceaed50796c149ec8742de6d29 Mon Sep 17 00:00:00 2001
From: Ade Bateman <bateman@acm.org>
Date: Wed, 8 Jun 2016 08:53:39 -0700
Subject: [PATCH 1/2] Remove special case handling for single shipping option.

---
 index.html | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/index.html b/index.html
index 156fc1e0..0a95881e 100644
--- a/index.html
+++ b/index.html
@@ -423,13 +423,8 @@ <h2>PaymentRequest constructor</h2>
         Set the value of the <a><code>shippingOption</code></a> attribute on <em>request</em> to <em>null</em>.
       </li>
       <li>
-        If <code>details</code> contains a <code>shippingOptions</code> sequence with a
-        length of 1, then set <a><code>shippingOption</code></a> to the <code>id</code> of
-            the only <a><code>PaymentShippingOption</code></a> in the sequence.
-      </li>
-      <li>
-        If <code>details</code> contains a <code>shippingOptions</code> sequence with a
-            length greater than 1, and if any <a><code>PaymentShippingOption</code></a> in the sequence
+        If <code>details</code> contains a <code>shippingOptions</code> sequence and
+        if any <a><code>PaymentShippingOption</code></a> in the sequence
         has the <code>selected</code> field set to <code>true</code>, then set
         <a><code>shippingOption</code></a> to the <code>id</code> of the last <a><code>ShippingOption</code></a>
         in the sequence with <code>selected</code> set to <code>true</code>.
@@ -1123,13 +1118,8 @@ <h2>PaymentRequestUpdateEvent</h2>
               </li>
               <li>Let <em>newOption</em> be <em>null</em>.</li>
               <li>
-                If <code>details</code> contains a <code>shippingOptions</code> sequence with a
-                length of 1, then set <em>newOption</em> to the <code>id</code> of the only
-                <a><code>ShippingOption</code></a> in the sequence.
-              </li>
-              <li>
-                If <code>details</code> contains a <code>shippingOptions</code> sequence with a
-                length greater than 1, and if any <a><code>ShippingOption</code></a> in the sequence
+                If <code>details</code> contains a <code>shippingOptions</code> sequence
+                and if any <a><code>ShippingOption</code></a> in the sequence
                 has the <code>selected</code> field set to <code>true</code>, then set
                 <em>newOption</em> to the <code>id</code> of the last <a><code>ShippingOption</code></a>
                 in the sequence with <code>selected</code> set to <code>true</code>.

From 749ff2eaf1b6d080eec498087811947485bee2df Mon Sep 17 00:00:00 2001
From: Ade Bateman <bateman@acm.org>
Date: Wed, 8 Jun 2016 10:34:36 -0700
Subject: [PATCH 2/2] Remove other notes about one shipping option item.

---
 index.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 0a95881e..61a42be6 100644
--- a/index.html
+++ b/index.html
@@ -715,9 +715,6 @@ <h2>PaymentDetails dictionary</h2>
       A sequence containing the different shipping options for the user to choose from.
       <p>If the sequence is empty, then this indicates that the merchant
         cannot ship to the current <a><code>shippingAddress</code></a>.</p>
-      <p>If the sequence only contains one item, then this is the shipping option that
-        will be used and <a><code>shippingOption</code></a> will be set to the <code>id</code>
-        of this option without running the <a>shipping option changed algorithm</a>.</p>
       <p>If an item in the sequence has the <code>selected</code> field set to <code>true</code>,
         then this is the shipping option that will be used by default and <a><code>shippingOption</code></a>
         will be set to the <code>id</code> of this option without running the <a>shipping option changed
@@ -728,7 +725,7 @@ <h2>PaymentDetails dictionary</h2>
         constructed with <a><code>PaymentOptions</code></a> <code>requestShipping</code>
         set to <code>true</code>.</p>
       <p class="note">
-        If the sequence contains only one item or if the sequence has an item with the <code>selected</code>
+        If the sequence has an item with the <code>selected</code>
         field set to <code>true</code>, then authors SHOULD ensure that the <code>total</code> field includes
         the cost of the shipping option. This is because no <a><code>shippingoptionchange</code></a> event
         will be fired for this option unless the user selects an alternative option first.