[e] (0) Stop one: rename 'allowed to navigate' to 'friends with'

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=22319 Affected topics: DOM APIs, HTML, Security git-svn-id: http://svn.whatwg.org/webapps@8045 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jul 9, 2013 · 16a7d0c · 16a7d0c
1 parent ed2f902
commit 16a7d0c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 36 deletions.
diff --git a/complete.html b/complete.html
@@ -65113,8 +65113,7 @@ <h4 id=secondary-browsing-contexts><span class=secno>6.1.3 </span>Secondary brow
 
   <h4 id=security-nav><span class=secno>6.1.4 </span>Security</h4>
 
-  <p id=security-1>A <a href=#browsing-context>browsing context</a> <var title="">A</var> is <dfn id=allowed-to-navigate>allowed to
-  navigate</dfn> a second <a href=#browsing-context>browsing context</a> <var title="">B</var> if one of the
+  <p id=security-1>A <a href=#browsing-context>browsing context</a> <var title="">A</var> is <dfn id=friends-with>friends with</dfn> a second <a href=#browsing-context>browsing context</a> <var title="">B</var> if one of the
   following conditions is true:</p>
 
   <ul><li>Either the <a href=#origin>origin</a> of the <a href=#active-document>active document</a> of <var title="">A</var>
@@ -65125,7 +65124,7 @@ <h4 id=security-nav><span class=secno>6.1.4 </span>Security</h4>
    <a href=#top-level-browsing-context>top-level browsing context</a>, and its <a href=#top-level-browsing-context>top-level browsing context</a> is <var title="">B</var>, or</li>
 
    <li>The browsing context <var title="">B</var> is an <a href=#auxiliary-browsing-context>auxiliary browsing context</a> and
-   <var title="">A</var> is <a href=#allowed-to-navigate>allowed to navigate</a> <var title="">B</var>'s <a href=#opener-browsing-context>opener
+   <var title="">A</var> is <a href=#friends-with>friends with</a> <var title="">B</var>'s <a href=#opener-browsing-context>opener
    browsing context</a>, or</li>
 
    <li>The browsing context <var title="">B</var> is not a <a href=#top-level-browsing-context>top-level browsing context</a>,
@@ -65135,8 +65134,7 @@ <h4 id=security-nav><span class=secno>6.1.4 </span>Security</h4>
 
   </ul><p class=note>Sandboxing (in particular the <a href=#sandboxed-navigation-browsing-context-flag>sandboxed navigation browsing context
   flag</a>) can further restrict the above in certain cases, but it does so indirectly via other
-  algorithms and doesn't affect whether a browsing context is considered to be <i><a href=#allowed-to-navigate>allowed to
-  navigate</a></i> another as defined above.</p>
+  algorithms and doesn't affect whether a browsing context is considered to be <i><a href=#friends-with>friends with</a></i> another as defined above.</p>
 
   <hr><p>An element has a <dfn id=browsing-context-scope-origin>browsing context scope origin</dfn> if its <code><a href=#document>Document</a></code>'s
   <a href=#browsing-context>browsing context</a> is a <a href=#top-level-browsing-context>top-level browsing context</a> or if all of its
@@ -65343,23 +65341,23 @@ <h4 id=browsing-context-names><span class=secno>6.1.6 </span>Browsing context na
      <td>none
      <td>none
 
-    <tr><td>name that exists with different top, if <a href=#allowed-to-navigate>allowed to navigate</a> and <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
+    <tr><td>name that exists with different top, if <a href=#friends-with title="friends with">friends</a> and <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
      <td>specified
      <td>specified
      <td>specified
      <td>specified
      <td>specified
      <td>specified
 
-    <tr><td>name that exists with different top, if <a href=#allowed-to-navigate>allowed to navigate</a> but not <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
+    <tr><td>name that exists with different top, if <a href=#friends-with title="friends with">friends</a> but not <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
      <td>specified
      <td>specified
      <td>none
      <td>none
      <td>none
      <td>none
 
-    <tr><td>name that exists with different top, not <a href=#allowed-to-navigate>allowed to navigate</a>
+    <tr><td>name that exists with different top, not <a href=#friends-with title="friends with">friends</a>
      <td>new
      <td>new
      <td>maybe new
@@ -65408,7 +65406,7 @@ <h4 id=browsing-context-names><span class=secno>6.1.6 </span>Browsing context na
 
     <p>If the given browsing context name is not <code title="">_blank</code> and there exists a
     browsing context whose <a href=#browsing-context-name title="browsing context name">name</a> is the same as the given
-    browsing context name, and the current browsing context is <a href=#allowed-to-navigate>allowed to navigate</a> that
+    browsing context name, and the current browsing context is <a href=#friends-with>friends with</a> that
     browsing context, and the user agent determines that the two browsing contexts are related
     enough that it is ok if they reach each other, then that browsing context must be the chosen
     one. If there are multiple matching browsing contexts, the user agent should select one in some
@@ -65819,7 +65817,7 @@ <h4 id=apis-for-creating-and-navigating-browsing-contexts-by-name><span class=se
    <a href=#script-closable>script-closable</a>.</li>
 
    <li>The <a href="#script's-browsing-context" title="script's browsing context">browsing context</a> of the <a href=#incumbent-script>incumbent
-   script</a> is <a href=#allowed-to-navigate>allowed to navigate</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</li>
+   script</a> is <a href=#friends-with>friends with</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</li>
 
    <li id=sandboxClose>The <a href=#active-sandboxing-flag-set>active sandboxing flag set</a> of the <a href="#script's-document" title="script's
    document">document</a> of the <a href=#incumbent-script>incumbent script</a> does not have its <a href=#sandboxed-top-level-navigation-browsing-context-flag>sandboxed
@@ -67725,11 +67723,11 @@ <h5 id=security-location><span class=secno>6.5.3.1 </span>Security</h5>
   exceptions:</p>
 
   <ul><li>The <code title=dom-url-href><a href=#dom-url-href>href</a></code> setter, if the <a href=#entry-script>entry script</a>'s
-   <a href="#script's-browsing-context">script's browsing context</a> is <a href=#allowed-to-navigate>allowed to navigate</a> the <a href=#browsing-context>browsing
+   <a href="#script's-browsing-context">script's browsing context</a> is <a href=#friends-with>friends with</a> the <a href=#browsing-context>browsing
    context</a> with which the <code><a href=#location>Location</a></code> object is associated
 
    <li>The <code title=dom-location-replace><a href=#dom-location-replace>replace()</a></code> method, if the <a href=#entry-script>entry
-   script</a>'s <a href="#script's-browsing-context">script's browsing context</a> is <a href=#allowed-to-navigate>allowed to navigate</a> the
+   script</a>'s <a href="#script's-browsing-context">script's browsing context</a> is <a href=#friends-with>friends with</a> the
    <a href=#browsing-context>browsing context</a> with which the <code><a href=#location>Location</a></code> object is associated
 
    <li>Any properties not defined in the IDL for the <code><a href=#location>Location</a></code> object or indirectly via

diff --git a/index b/index
@@ -65113,8 +65113,7 @@ END:VCARD</pre>
 
   <h4 id=security-nav><span class=secno>6.1.4 </span>Security</h4>
 
-  <p id=security-1>A <a href=#browsing-context>browsing context</a> <var title="">A</var> is <dfn id=allowed-to-navigate>allowed to
-  navigate</dfn> a second <a href=#browsing-context>browsing context</a> <var title="">B</var> if one of the
+  <p id=security-1>A <a href=#browsing-context>browsing context</a> <var title="">A</var> is <dfn id=friends-with>friends with</dfn> a second <a href=#browsing-context>browsing context</a> <var title="">B</var> if one of the
   following conditions is true:</p>
 
   <ul><li>Either the <a href=#origin>origin</a> of the <a href=#active-document>active document</a> of <var title="">A</var>
@@ -65125,7 +65124,7 @@ END:VCARD</pre>
    <a href=#top-level-browsing-context>top-level browsing context</a>, and its <a href=#top-level-browsing-context>top-level browsing context</a> is <var title="">B</var>, or</li>
 
    <li>The browsing context <var title="">B</var> is an <a href=#auxiliary-browsing-context>auxiliary browsing context</a> and
-   <var title="">A</var> is <a href=#allowed-to-navigate>allowed to navigate</a> <var title="">B</var>'s <a href=#opener-browsing-context>opener
+   <var title="">A</var> is <a href=#friends-with>friends with</a> <var title="">B</var>'s <a href=#opener-browsing-context>opener
    browsing context</a>, or</li>
 
    <li>The browsing context <var title="">B</var> is not a <a href=#top-level-browsing-context>top-level browsing context</a>,
@@ -65135,8 +65134,7 @@ END:VCARD</pre>
 
   </ul><p class=note>Sandboxing (in particular the <a href=#sandboxed-navigation-browsing-context-flag>sandboxed navigation browsing context
   flag</a>) can further restrict the above in certain cases, but it does so indirectly via other
-  algorithms and doesn't affect whether a browsing context is considered to be <i><a href=#allowed-to-navigate>allowed to
-  navigate</a></i> another as defined above.</p>
+  algorithms and doesn't affect whether a browsing context is considered to be <i><a href=#friends-with>friends with</a></i> another as defined above.</p>
 
   <hr><p>An element has a <dfn id=browsing-context-scope-origin>browsing context scope origin</dfn> if its <code><a href=#document>Document</a></code>'s
   <a href=#browsing-context>browsing context</a> is a <a href=#top-level-browsing-context>top-level browsing context</a> or if all of its
@@ -65343,23 +65341,23 @@ END:VCARD</pre>
      <td>none
      <td>none
 
-    <tr><td>name that exists with different top, if <a href=#allowed-to-navigate>allowed to navigate</a> and <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
+    <tr><td>name that exists with different top, if <a href=#friends-with title="friends with">friends</a> and <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
      <td>specified
      <td>specified
      <td>specified
      <td>specified
      <td>specified
      <td>specified
 
-    <tr><td>name that exists with different top, if <a href=#allowed-to-navigate>allowed to navigate</a> but not <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
+    <tr><td>name that exists with different top, if <a href=#friends-with title="friends with">friends</a> but not <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
      <td>specified
      <td>specified
      <td>none
      <td>none
      <td>none
      <td>none
 
-    <tr><td>name that exists with different top, not <a href=#allowed-to-navigate>allowed to navigate</a>
+    <tr><td>name that exists with different top, not <a href=#friends-with title="friends with">friends</a>
      <td>new
      <td>new
      <td>maybe new
@@ -65408,7 +65406,7 @@ END:VCARD</pre>
 
     <p>If the given browsing context name is not <code title="">_blank</code> and there exists a
     browsing context whose <a href=#browsing-context-name title="browsing context name">name</a> is the same as the given
-    browsing context name, and the current browsing context is <a href=#allowed-to-navigate>allowed to navigate</a> that
+    browsing context name, and the current browsing context is <a href=#friends-with>friends with</a> that
     browsing context, and the user agent determines that the two browsing contexts are related
     enough that it is ok if they reach each other, then that browsing context must be the chosen
     one. If there are multiple matching browsing contexts, the user agent should select one in some
@@ -65819,7 +65817,7 @@ END:VCARD</pre>
    <a href=#script-closable>script-closable</a>.</li>
 
    <li>The <a href="#script's-browsing-context" title="script's browsing context">browsing context</a> of the <a href=#incumbent-script>incumbent
-   script</a> is <a href=#allowed-to-navigate>allowed to navigate</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</li>
+   script</a> is <a href=#friends-with>friends with</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</li>
 
    <li id=sandboxClose>The <a href=#active-sandboxing-flag-set>active sandboxing flag set</a> of the <a href="#script's-document" title="script's
    document">document</a> of the <a href=#incumbent-script>incumbent script</a> does not have its <a href=#sandboxed-top-level-navigation-browsing-context-flag>sandboxed
@@ -67725,11 +67723,11 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   exceptions:</p>
 
   <ul><li>The <code title=dom-url-href><a href=#dom-url-href>href</a></code> setter, if the <a href=#entry-script>entry script</a>'s
-   <a href="#script's-browsing-context">script's browsing context</a> is <a href=#allowed-to-navigate>allowed to navigate</a> the <a href=#browsing-context>browsing
+   <a href="#script's-browsing-context">script's browsing context</a> is <a href=#friends-with>friends with</a> the <a href=#browsing-context>browsing
    context</a> with which the <code><a href=#location>Location</a></code> object is associated
 
    <li>The <code title=dom-location-replace><a href=#dom-location-replace>replace()</a></code> method, if the <a href=#entry-script>entry
-   script</a>'s <a href="#script's-browsing-context">script's browsing context</a> is <a href=#allowed-to-navigate>allowed to navigate</a> the
+   script</a>'s <a href="#script's-browsing-context">script's browsing context</a> is <a href=#friends-with>friends with</a> the
    <a href=#browsing-context>browsing context</a> with which the <code><a href=#location>Location</a></code> object is associated
 
    <li>Any properties not defined in the IDL for the <code><a href=#location>Location</a></code> object or indirectly via

diff --git a/source b/source
@@ -72597,8 +72597,7 @@ END:VCARD</pre>
 
   <h4 id="security-nav">Security</h4>
 
-  <p id="security-1">A <span>browsing context</span> <var title="">A</var> is <dfn>allowed to
-  navigate</dfn> a second <span>browsing context</span> <var title="">B</var> if one of the
+  <p id="security-1">A <span>browsing context</span> <var title="">A</var> is <dfn>friends with</dfn> a second <span>browsing context</span> <var title="">B</var> if one of the
   following conditions is true:</p>
 
   <ul>
@@ -72612,7 +72611,7 @@ END:VCARD</pre>
    title="">B</var>, or</li>
 
    <li>The browsing context <var title="">B</var> is an <span>auxiliary browsing context</span> and
-   <var title="">A</var> is <span>allowed to navigate</span> <var title="">B</var>'s <span>opener
+   <var title="">A</var> is <span>friends with</span> <var title="">B</var>'s <span>opener
    browsing context</span>, or</li>
 
    <li>The browsing context <var title="">B</var> is not a <span>top-level browsing context</span>,
@@ -72625,8 +72624,7 @@ END:VCARD</pre>
 
   <p class="note">Sandboxing (in particular the <span>sandboxed navigation browsing context
   flag</span>) can further restrict the above in certain cases, but it does so indirectly via other
-  algorithms and doesn't affect whether a browsing context is considered to be <i>allowed to
-  navigate</i> another as defined above.</p>
+  algorithms and doesn't affect whether a browsing context is considered to be <i>friends with</i> another as defined above.</p>
 
   <hr>
 
@@ -72863,7 +72861,7 @@ END:VCARD</pre>
      <td>none
 
     <tr>
-     <td>name that exists with different top, if <span>allowed to navigate</span> and <span>one permitted sandboxed navigator</span>
+     <td>name that exists with different top, if <span title="friends with">friends</span> and <span>one permitted sandboxed navigator</span>
      <td>specified
      <td>specified
      <td>specified
@@ -72872,7 +72870,7 @@ END:VCARD</pre>
      <td>specified
 
     <tr>
-     <td>name that exists with different top, if <span>allowed to navigate</span> but not <span>one permitted sandboxed navigator</span>
+     <td>name that exists with different top, if <span title="friends with">friends</span> but not <span>one permitted sandboxed navigator</span>
      <td>specified
      <td>specified
      <td>none
@@ -72881,7 +72879,7 @@ END:VCARD</pre>
      <td>none
 
     <tr>
-     <td>name that exists with different top, not <span>allowed to navigate</span>
+     <td>name that exists with different top, not <span title="friends with">friends</span>
      <td>new
      <td>new
      <td>maybe new
@@ -72946,7 +72944,7 @@ END:VCARD</pre>
 
     <p>If the given browsing context name is not <code title="">_blank</code> and there exists a
     browsing context whose <span title="browsing context name">name</span> is the same as the given
-    browsing context name, and the current browsing context is <span>allowed to navigate</span> that
+    browsing context name, and the current browsing context is <span>friends with</span> that
     browsing context, and the user agent determines that the two browsing contexts are related
     enough that it is ok if they reach each other, then that browsing context must be the chosen
     one. If there are multiple matching browsing contexts, the user agent should select one in some
@@ -73398,7 +73396,7 @@ END:VCARD</pre>
    <span>script-closable</span>.</li>
 
    <li>The <span title="script's browsing context">browsing context</span> of the <span>incumbent
-   script</span> is <span>allowed to navigate</span> the <span>browsing context</span> <var
+   script</span> is <span>friends with</span> the <span>browsing context</span> <var
    title="">A</var>.</li>
 
    <li id="sandboxClose">The <span>active sandboxing flag set</span> of the <span title="script's
@@ -75597,11 +75595,11 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
   <ul>
 
    <li>The <code title="dom-url-href">href</code> setter, if the <span>entry script</span>'s
-   <span>script's browsing context</span> is <span>allowed to navigate</span> the <span>browsing
+   <span>script's browsing context</span> is <span>friends with</span> the <span>browsing
    context</span> with which the <code>Location</code> object is associated
 
    <li>The <code title="dom-location-replace">replace()</code> method, if the <span>entry
-   script</span>'s <span>script's browsing context</span> is <span>allowed to navigate</span> the
+   script</span>'s <span>script's browsing context</span> is <span>friends with</span> the
    <span>browsing context</span> with which the <code>Location</code> object is associated
 
    <li>Any properties not defined in the IDL for the <code>Location</code> object or indirectly via