[e] (0) Try renaming 'friends with' to 'familiar 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@8136 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 7, 2013 · 19e34fa · 19e34fa
1 parent 973ef79
commit 19e34fa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/complete.html b/complete.html
@@ -64850,7 +64850,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=friends-with>friends with</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=familiar-with>familiar 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>
@@ -64861,7 +64861,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=#friends-with>friends with</a> <var title="">B</var>'s <a href=#opener-browsing-context>opener
+   <var title="">A</var> is <a href=#familiar-with>familiar 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>,
@@ -65097,23 +65097,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=#friends-with title="friends with">friends</a> and <a href=#one-permitted-sandboxed-navigator>one permitted sandboxed navigator</a>
+    <tr><td>name that exists with different top, if <a href=#familiar-with title="familiar 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=#friends-with title="friends with">friends</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=#familiar-with title="familiar 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=#friends-with title="friends with">friends</a>
+    <tr><td>name that exists with different top, not <a href=#familiar-with title="familiar with">friends</a>
      <td>new
      <td>new
      <td>maybe new
@@ -65187,7 +65187,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=#friends-with>friends with</a> that
+    browsing context name, and the current browsing context is <a href=#familiar-with>familiar 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
@@ -65603,7 +65603,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=#friends-with>friends with</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</li>
+   script</a> is <a href=#familiar-with>familiar with</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</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>
@@ -67510,11 +67510,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=#friends-with>friends with</a> the <a href=#browsing-context>browsing
+   <a href="#script's-browsing-context">script's browsing context</a> is <a href=#familiar-with>familiar 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=#friends-with>friends with</a> the
+   script</a>'s <a href="#script's-browsing-context">script's browsing context</a> is <a href=#familiar-with>familiar 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
@@ -64850,7 +64850,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=friends-with>friends with</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=familiar-with>familiar 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>
@@ -64861,7 +64861,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=#friends-with>friends with</a> <var title="">B</var>'s <a href=#opener-browsing-context>opener
+   <var title="">A</var> is <a href=#familiar-with>familiar 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>,
@@ -65097,23 +65097,23 @@ END:VCARD</pre>
      <td>none
      <td>none
 
-    <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>
+    <tr><td>name that exists with different top, if <a href=#familiar-with title="familiar 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=#friends-with title="friends with">friends</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=#familiar-with title="familiar 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=#friends-with title="friends with">friends</a>
+    <tr><td>name that exists with different top, not <a href=#familiar-with title="familiar with">friends</a>
      <td>new
      <td>new
      <td>maybe new
@@ -65187,7 +65187,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=#friends-with>friends with</a> that
+    browsing context name, and the current browsing context is <a href=#familiar-with>familiar 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
@@ -65603,7 +65603,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=#friends-with>friends with</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</li>
+   script</a> is <a href=#familiar-with>familiar with</a> the <a href=#browsing-context>browsing context</a> <var title="">A</var>.</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>
@@ -67510,11 +67510,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=#friends-with>friends with</a> the <a href=#browsing-context>browsing
+   <a href="#script's-browsing-context">script's browsing context</a> is <a href=#familiar-with>familiar 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=#friends-with>friends with</a> the
+   script</a>'s <a href="#script's-browsing-context">script's browsing context</a> is <a href=#familiar-with>familiar 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
@@ -72305,7 +72305,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>friends with</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>familiar with</dfn> a second <span>browsing context</span> <var title="">B</var> if one of the
   following conditions is true:</p>
 
   <ul>
@@ -72319,7 +72319,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>friends with</span> <var title="">B</var>'s <span>opener
+   <var title="">A</var> is <span>familiar 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>,
@@ -72599,7 +72599,7 @@ END:VCARD</pre>
      <td>none
 
     <tr>
-     <td>name that exists with different top, if <span title="friends with">friends</span> and <span>one permitted sandboxed navigator</span>
+     <td>name that exists with different top, if <span title="familiar with">friends</span> and <span>one permitted sandboxed navigator</span>
      <td>specified
      <td>specified
      <td>specified
@@ -72608,7 +72608,7 @@ END:VCARD</pre>
      <td>specified
 
     <tr>
-     <td>name that exists with different top, if <span title="friends with">friends</span> but not <span>one permitted sandboxed navigator</span>
+     <td>name that exists with different top, if <span title="familiar with">friends</span> but not <span>one permitted sandboxed navigator</span>
      <td>specified
      <td>specified
      <td>none
@@ -72617,7 +72617,7 @@ END:VCARD</pre>
      <td>none
 
     <tr>
-     <td>name that exists with different top, not <span title="friends with">friends</span>
+     <td>name that exists with different top, not <span title="familiar with">friends</span>
      <td>new
      <td>new
      <td>maybe new
@@ -72708,7 +72708,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>friends with</span> that
+    browsing context name, and the current browsing context is <span>familiar 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
@@ -73163,7 +73163,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>friends with</span> the <span>browsing context</span> <var
+   script</span> is <span>familiar with</span> the <span>browsing context</span> <var
    title="">A</var>.</li>
 
    <li>The <span title="script's browsing context">browsing context</span> of the <span>incumbent
@@ -75364,11 +75364,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>friends with</span> the <span>browsing
+   <span>script's browsing context</span> is <span>familiar 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>friends with</span> the
+   script</span>'s <span>script's browsing context</span> is <span>familiar 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