Editorial: address fallout from the storage infrastructure commit

storage.bs

@@ -438,24 +438,26 @@ evaluating quotas.
 
 <h2 id=ui-guidelines>User Interface Guidelines</h2>
 
-<p>User agents should not distinguish between network state and <a>storage</a> in their user
-interface. Instead user agents should offer users the ability to remove all storage for each group
-of <a>schemelessly same site</a> <a for=/>origins</a>. This ensures to some extent that network
-state cannot be used to revive <a>storage</a>. This also reduces the amount users need to know about
-the different ways in which websites can store data.
+<p>User agents should not distinguish between network state and storage in their user interface.
+Instead user agents should offer users the ability to remove all storage for each group of
+<a>schemelessly same site</a> <a for=/>origins</a>. This ensures to some extent that network state
+cannot be used to revive storage. This also reduces the amount users need to know about the
+different ways in which websites can store data.
 <!-- To some extent, since HTTP ETag... And also, permissions/credentials, maybe? -->
 
 <p>Credentials should be separated as they contain data the user might not be able to revive, such
 as an autogenerated password. Permissions are best separated too to avoid inconveniencing the user.
 Credentials and permissions are also somewhat easier to understand and differentiate for users from
-network state and <a>storage</a>.
+network state and storage.
 
 
 <h3 id=storage-pressure>Storage Pressure</h3>
 
 <p>When the user agent notices it comes under storage pressure and it cannot free up sufficient
-space by clearing network state and <a>non-persistent buckets</a> within <a>storage</a>, then the
-user agent should alert the user and offer a way to clear <a>persistent buckets</a>.
+space by clearing network state, <a>session storage buckets</a>, and <a>local storage buckets</a>
+whose <a for="local storage bucket">mode</a> is "<code>best-effort</code>", then the user agent
+should inform the user and offer a way to clear the remaining <a>local storage buckets</a>, i.e.,
+those whose <a for="local storage bucket">mode</a> is "<code>persistent</code>".
 
 
 
@@ -499,7 +501,7 @@ dictionary StorageEstimate {
  <li><p>Let <var>shelf</var> be the result of running <a>obtain a local storage shelf</a> with
  <a>this</a>'s <a>relevant settings object</a>.
 
- <li><p>If <var>shelf</var> is a failure, then reject <var>promise</var> with a {{TypeError}}.
+ <li><p>If <var>shelf</var> is failure, then reject <var>promise</var> with a {{TypeError}}.
 
  <li>
   <p>Otherwise, run these steps <a>in parallel</a>:
@@ -526,7 +528,7 @@ dictionary StorageEstimate {
  <li><p>Let <var>shelf</var> be the result of running <a>obtain a local storage shelf</a> with
  <a>this</a>'s <a>relevant settings object</a>.
 
- <li><p>If <var>shelf</var> is a failure, then reject <var>promise</var> with a {{TypeError}}.
+ <li><p>If <var>shelf</var> is failure, then reject <var>promise</var> with a {{TypeError}}.
 
  <li>
   <p>Otherwise, run these steps <a>in parallel</a>:
@@ -572,7 +574,7 @@ dictionary StorageEstimate {
  <li><p>Let <var>shelf</var> be the result of running <a>obtain a local storage shelf</a> with
  <a>this</a>'s <a>relevant settings object</a>.
 
- <li><p>If <var>shelf</var> is a failure, then reject <var>promise</var> with a {{TypeError}}.
+ <li><p>If <var>shelf</var> is failure, then reject <var>promise</var> with a {{TypeError}}.
 
  <li>
   <p>Otherwise, run these steps <a>in parallel</a>: