html5/spec Overview.html,1.2343,1.2344

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv28542

Modified Files:
	Overview.html 
Log Message:
Fix wording to refer to 'schemes' not 'protocols' where appropriate. (credit: rb) (whatwg r3190)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2343
retrieving revision 1.2344
diff -u -d -r1.2343 -r1.2344
--- Overview.html	4 Jun 2009 22:29:04 -0000	1.2343
+++ Overview.html	4 Jun 2009 22:53:41 -0000	1.2344
@@ -822,7 +822,7 @@
    <li><a href="#system-state-and-capabilities"><span class="secno">6.8 </span>System state and capabilities</a>
     <ol>
      <li><a href="#client-identification"><span class="secno">6.8.1 </span>Client identification</a></li>
-     <li><a href="#custom-handlers"><span class="secno">6.8.2 </span>Custom protocol and content handlers</a>
+     <li><a href="#custom-handlers"><span class="secno">6.8.2 </span>Custom scheme and content handlers</a>
       <ol>
        <li><a href="#security-and-privacy"><span class="secno">6.8.2.1 </span>Security and privacy</a></li>
        <li><a href="#sample-handler-impl"><span class="secno">6.8.2.2 </span>Sample user interface</a></ol></li>
@@ -44009,7 +44009,7 @@
 
 [NoInterfaceObject, ImplementedOn=<a href="#navigator">Navigator</a>] interface <dfn id="navigatorabilities">NavigatorAbilities</dfn> {
   // content handler registration
-  void <a href="#dom-navigator-registerprotocolhandler" title="dom-navigator-registerProtocolHandler">registerProtocolHandler</a>(in DOMString protocol, in DOMString url, in DOMString title);
+  void <a href="#dom-navigator-registerprotocolhandler" title="dom-navigator-registerProtocolHandler">registerProtocolHandler</a>(in DOMString scheme, in DOMString url, in DOMString title);
   void <a href="#dom-navigator-registercontenthandler" title="dom-navigator-registerContentHandler">registerContentHandler</a>(in DOMString mimeType, in DOMString url, in DOMString title);
   void <a href="#dom-navigator-getstorageupdates" title="dom-navigator-getStorageUpdates">getStorageUpdates</a>();
 <!--  XXX cookieEnabled geolocator javaEnabled mozIsLocallyAvailable preference
@@ -44094,10 +44094,10 @@
 
    <!-- vendorSub: Mozilla and Safari only; always returns "" -->
 
-  </dl></div><h4 id="custom-handlers"><span class="secno">6.8.2 </span>Custom protocol and content handlers</h4><p>The <dfn id="dom-navigator-registerprotocolhandler" title="dom-navigator-registerProtocolHandler"><code>registerProtocolHandler()</code></dfn>
+  </dl></div><h4 id="custom-handlers"><span class="secno">6.8.2 </span>Custom scheme and content handlers</h4><p>The <dfn id="dom-navigator-registerprotocolhandler" title="dom-navigator-registerProtocolHandler"><code>registerProtocolHandler()</code></dfn>
   method allows Web sites to register themselves as possible handlers
-  for particular protocols. For example, an online fax service could
-  register itself as a handler of the <code>fax:</code> protocol (<a href="#references">[RFC2806]</a>), so that if the user clicks on
+  for particular schemes. For example, an online fax service could
+  register itself as a handler of the <code>fax:</code> scheme (<a href="#references">[RFC2806]</a>), so that if the user clicks on
   such a link, he is given the opportunity to use that Web
   site. Analogously, the <dfn id="dom-navigator-registercontenthandler" title="dom-navigator-registerContentHandler"><code>registerContentHandler()</code></dfn>
   method allows Web sites to register themselves as possible handlers
@@ -44106,12 +44106,12 @@
   <code>image/g3fax</code> files (<a href="#references">[RFC1494]</a>), so that if the user has no
   native application capable of handling G3 Facsimile byte streams,
   his Web browser can instead suggest he use that site to view the
-  image.<dl class="domintro"><dt><var title="">window</var> . <code title="dom-navigator"><a href="#dom-navigator">navigator</a></code> . <code title="dom-navigator-registerProtocolHandler"><a href="#dom-navigator-registerprotocolhandler">registerProtocolHandler</a></code>(<var title="">protocol</var>, <var title="">url</var>, <var title="">title</var>)</dt>
+  image.<dl class="domintro"><dt><var title="">window</var> . <code title="dom-navigator"><a href="#dom-navigator">navigator</a></code> . <code title="dom-navigator-registerProtocolHandler"><a href="#dom-navigator-registerprotocolhandler">registerProtocolHandler</a></code>(<var title="">scheme</var>, <var title="">url</var>, <var title="">title</var>)</dt>
    <dt><var title="">window</var> . <code title="dom-navigator"><a href="#dom-navigator">navigator</a></code> . <code title="dom-navigator-registerContentHandler"><a href="#dom-navigator-registercontenthandler">registerContentHandler</a></code>(<var title="">mimeType</var>, <var title="">url</var>, <var title="">title</var>)</dt>
 
    <dd>
 
-    <p>Registers a handler for the given protocol or content type, at
+    <p>Registers a handler for the given scheme or content type, at
     the given URL, with the given title.</p>
 
     <p>The string "<code title="">%s</code>" in the URL is used as a
@@ -44154,7 +44154,7 @@
     scheme part of URLs that they consider against the list of
     registered handlers.</p>
 
-    <p>The <var title="">protocol</var> value, if it contains a colon
+    <p>The <var title="">scheme</var> value, if it contains a colon
     (as in "<code>ftp:</code>"), will never match anything, since
     schemes don't contain colons.</p>
 
@@ -44248,7 +44248,7 @@
    </dd>
 
   </dl><p>User agents should raise <code><a href="#security_err">SECURITY_ERR</a></code> exceptions if
-  the methods are called with <var title="">protocol</var> or <var title="">mimeType</var> values that the UA deems to be
+  the methods are called with <var title="">scheme</var> or <var title="">mimeType</var> values that the UA deems to be
   "privileged". For example, a site attempting to register a handler
   for <code>http</code> URLs or <code>text/html</code> content in a
   Web browser would likely cause an exception to be raised.</p>
@@ -44284,7 +44284,7 @@
   particular privacy concerns.</p>
 
   <p><strong>Hijacking all Web usage.</strong> User agents should not
-  allow protocols that are key to its normal operation, such as
+  allow schemes that are key to its normal operation, such as
   <code>http</code> or <code>https</code>, to be rerouted through
   third-party sites. This would allow a user's activities to be
   trivially tracked, and would allow user information, even in secure
@@ -44340,7 +44340,7 @@
   which might tell the third party that Example Corporation is
   intending to merge with The Sample Company. Implementors might wish
   to consider allowing administrators to disable this feature for
-  certain subdomains, content types, or protocols.</p>
+  certain subdomains, content types, or schemes.</p>
 
   <p><strong>Leaking secure URLs.</strong> User agents should not send
   HTTPS URLs to third-party sites registered as content handlers, in
@@ -44366,7 +44366,7 @@
   <p>A simple implementation of this feature for a desktop Web browser
   might work as follows.</p>
 
-  <p>The <code title="dom-navigator-registerProtocolHandler"><a href="#dom-navigator-registerprotocolhandler">registerProtocolHandler()</a></code>
+  <p>The <code title="dom-navigator-registerContentHandler"><a href="#dom-navigator-registercontenthandler">registerContentHandler()</a></code>
   method could display a modal dialog box:</p>
 
   <pre>||[ Content Handler Registration ]||||||||||||||||||||||||||||
@@ -44425,7 +44425,7 @@
 |      application at "kittens.example.org".                 |
 |                                                            |
 |  [ ] Always do this for resources using the "application/  |
-|      x-meowmeow" protocol in future.                       |
+|      x-meowmeow" type in future.                           |
 |                                                            |
 |                                     ( Ok )  (( Cancel ))   |
 |____________________________________________________________|</pre>
@@ -64832,6 +64832,7 @@
   Robert Blaut,
   Robert O'Callahan,
   Robert Sayre,
+  Robin Berjon,
   Roman Ivanov,
   Ryan King,
   S. Mike Dierken,

Received on Thursday, 4 June 2009 23:00:47 UTC