discovery-api/Overview.src.html
changeset 192 3ecf12df315d
parent 191 5e0da09685f7
parent 185 ef42cb5f9a60
child 194 ad608906c611
child 203 1c5a2f31a18d
     1.1 --- a/discovery-api/Overview.src.html	Wed Aug 22 15:45:40 2012 +0200
     1.2 +++ b/discovery-api/Overview.src.html	Wed Aug 22 16:00:54 2012 +0200
     1.3 @@ -3,7 +3,6 @@
     1.4    <head>
     1.5      <title>Networked Service Discovery and Messaging</title>
     1.6      <meta http-equiv='Content-Type' content='text/html;charset=utf-8'/>
     1.7 -    <!-- This spec has been compiled with ReSpec v2 -->
     1.8      <script type="text/javascript" class='remove'>
     1.9        var respecConfig = {
    1.10            specStatus:   "ED",
    1.11 @@ -26,7 +25,6 @@
    1.12                companyURL: "http://cablelabs.com/"
    1.13              }
    1.14            ],
    1.15 -          //extraCSS:             ["./css/respec2.css"],
    1.16            noIDLIn:      true,
    1.17            wg:           "Device APIs and Policy Working Group",
    1.18            wgURI:        "http://www.w3.org/2009/dap/",
    1.19 @@ -35,359 +33,7 @@
    1.20        };
    1.21      </script>
    1.22  
    1.23 -    <style type="text/css">
    1.24 -      /**
    1.25 -       * SyntaxHighlighter
    1.26 -       * http://alexgorbatchev.com/SyntaxHighlighter
    1.27 -       *
    1.28 -       * SyntaxHighlighter is donationware. If you are using it, please donate.
    1.29 -       * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
    1.30 -       *
    1.31 -       * @version
    1.32 -       * 3.0.83 (July 02 2010)
    1.33 -       *
    1.34 -       * @copyright
    1.35 -       * Copyright (C) 2004-2010 Alex Gorbatchev.
    1.36 -       *
    1.37 -       * @license
    1.38 -       * Dual licensed under the MIT and GPL licenses.
    1.39 -       */
    1.40 -      .syntaxhighlighter a,
    1.41 -      .syntaxhighlighter div,
    1.42 -      .syntaxhighlighter code,
    1.43 -      .syntaxhighlighter table,
    1.44 -      .syntaxhighlighter table td,
    1.45 -      .syntaxhighlighter table tr,
    1.46 -      .syntaxhighlighter table tbody,
    1.47 -      .syntaxhighlighter table thead,
    1.48 -      .syntaxhighlighter table caption,
    1.49 -      .syntaxhighlighter textarea {
    1.50 -        -moz-border-radius: 0 0 0 0 !important;
    1.51 -        -webkit-border-radius: 0 0 0 0 !important;
    1.52 -        background: none !important;
    1.53 -        border: 0 !important;
    1.54 -        bottom: auto !important;
    1.55 -        float: none !important;
    1.56 -        height: auto !important;
    1.57 -        left: auto !important;
    1.58 -        line-height: 1.1em !important;
    1.59 -        margin: 0 !important;
    1.60 -        outline: 0 !important;
    1.61 -        overflow: visible !important;
    1.62 -        padding: 0 !important;
    1.63 -        position: static !important;
    1.64 -        right: auto !important;
    1.65 -        text-align: left !important;
    1.66 -        top: auto !important;
    1.67 -        vertical-align: baseline !important;
    1.68 -        width: auto !important;
    1.69 -        box-sizing: content-box !important;
    1.70 -        font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
    1.71 -        font-weight: normal !important;
    1.72 -        font-style: normal !important;
    1.73 -        font-size: 1em !important;
    1.74 -        min-height: inherit !important;
    1.75 -        min-height: auto !important;
    1.76 -      }
    1.77 -
    1.78 -      .syntaxhighlighter {
    1.79 -        width: 100% !important;
    1.80 -        margin: 1em 0 1em 0 !important;
    1.81 -        position: relative !important;
    1.82 -        overflow: auto !important;
    1.83 -        font-size: 0.8em !important;
    1.84 -      }
    1.85 -      .syntaxhighlighter.source {
    1.86 -        overflow: hidden !important;
    1.87 -      }
    1.88 -      .syntaxhighlighter .bold {
    1.89 -        font-weight: bold !important;
    1.90 -      }
    1.91 -      .syntaxhighlighter .italic {
    1.92 -        font-style: italic !important;
    1.93 -      }
    1.94 -      .syntaxhighlighter .line {
    1.95 -        white-space: pre !important;
    1.96 -      }
    1.97 -      .syntaxhighlighter table {
    1.98 -        width: 100% !important;
    1.99 -      }
   1.100 -      .syntaxhighlighter table caption {
   1.101 -        text-align: left !important;
   1.102 -        padding: .5em 0 0.5em 1em !important;
   1.103 -      }
   1.104 -      .syntaxhighlighter table td.code {
   1.105 -        width: 100% !important;
   1.106 -      }
   1.107 -      .syntaxhighlighter table td.code .container {
   1.108 -        position: relative !important;
   1.109 -      }
   1.110 -      .syntaxhighlighter table td.code .container textarea {
   1.111 -        box-sizing: border-box !important;
   1.112 -        position: absolute !important;
   1.113 -        left: 0 !important;
   1.114 -        top: 0 !important;
   1.115 -        width: 100% !important;
   1.116 -        height: 100% !important;
   1.117 -        border: none !important;
   1.118 -
   1.119 -        padding-left: 1em !important;
   1.120 -        overflow: hidden !important;
   1.121 -        white-space: pre !important;
   1.122 -      }
   1.123 -      .syntaxhighlighter table td.gutter .line {
   1.124 -        text-align: right !important;
   1.125 -        padding: 0 0.5em 0 1em !important;
   1.126 -      }
   1.127 -      .syntaxhighlighter table td.code .line {
   1.128 -        padding: 0 1em !important;
   1.129 -      }
   1.130 -      .syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
   1.131 -        padding-left: 0em !important;
   1.132 -      }
   1.133 -      .syntaxhighlighter.show {
   1.134 -        display: block !important;
   1.135 -      }
   1.136 -      .syntaxhighlighter.collapsed table {
   1.137 -        display: none !important;
   1.138 -      }
   1.139 -      .syntaxhighlighter.collapsed .toolbar {
   1.140 -        padding: 0.1em 0.8em 0em 0.8em !important;
   1.141 -        font-size: 1em !important;
   1.142 -        position: static !important;
   1.143 -        width: auto !important;
   1.144 -        height: auto !important;
   1.145 -      }
   1.146 -      .syntaxhighlighter.collapsed .toolbar span {
   1.147 -        display: inline !important;
   1.148 -        margin-right: 1em !important;
   1.149 -      }
   1.150 -      .syntaxhighlighter.collapsed .toolbar span a {
   1.151 -        padding: 0 !important;
   1.152 -        display: none !important;
   1.153 -      }
   1.154 -      .syntaxhighlighter.collapsed .toolbar span a.expandSource {
   1.155 -        display: inline !important;
   1.156 -      }
   1.157 -      .syntaxhighlighter .toolbar {
   1.158 -        position: absolute !important;
   1.159 -        right: 1px !important;
   1.160 -        top: 1px !important;
   1.161 -        width: 11px !important;
   1.162 -        height: 11px !important;
   1.163 -        font-size: 10px !important;
   1.164 -        z-index: 10 !important;
   1.165 -      }
   1.166 -      .syntaxhighlighter .toolbar span.title {
   1.167 -        display: inline !important;
   1.168 -      }
   1.169 -      .syntaxhighlighter .toolbar a {
   1.170 -        display: block !important;
   1.171 -        text-align: center !important;
   1.172 -        text-decoration: none !important;
   1.173 -        padding-top: 1px !important;
   1.174 -      }
   1.175 -      .syntaxhighlighter .toolbar a.expandSource {
   1.176 -        display: none !important;
   1.177 -      }
   1.178 -      .syntaxhighlighter.ie {
   1.179 -        font-size: .9em !important;
   1.180 -        padding: 1px 0 1px 0 !important;
   1.181 -      }
   1.182 -      .syntaxhighlighter.ie .toolbar {
   1.183 -        line-height: 8px !important;
   1.184 -      }
   1.185 -      .syntaxhighlighter.ie .toolbar a {
   1.186 -        padding-top: 0px !important;
   1.187 -      }
   1.188 -      .syntaxhighlighter.printing .line.alt1 .content,
   1.189 -      .syntaxhighlighter.printing .line.alt2 .content,
   1.190 -      .syntaxhighlighter.printing .line.highlighted .number,
   1.191 -      .syntaxhighlighter.printing .line.highlighted.alt1 .content,
   1.192 -      .syntaxhighlighter.printing .line.highlighted.alt2 .content {
   1.193 -        background: none !important;
   1.194 -      }
   1.195 -      .syntaxhighlighter.printing .line .number {
   1.196 -        color: #bbbbbb !important;
   1.197 -      }
   1.198 -      .syntaxhighlighter.printing .line .content {
   1.199 -        color: black !important;
   1.200 -      }
   1.201 -      .syntaxhighlighter.printing .toolbar {
   1.202 -        display: none !important;
   1.203 -      }
   1.204 -      .syntaxhighlighter.printing a {
   1.205 -        text-decoration: none !important;
   1.206 -      }
   1.207 -      .syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
   1.208 -        color: black !important;
   1.209 -      }
   1.210 -      .syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
   1.211 -        color: #008200 !important;
   1.212 -      }
   1.213 -      .syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
   1.214 -        color: blue !important;
   1.215 -      }
   1.216 -      .syntaxhighlighter.printing .keyword {
   1.217 -        color: #006699 !important;
   1.218 -        font-weight: bold !important;
   1.219 -      }
   1.220 -      .syntaxhighlighter.printing .preprocessor {
   1.221 -        color: gray !important;
   1.222 -      }
   1.223 -      .syntaxhighlighter.printing .variable {
   1.224 -        color: #aa7700 !important;
   1.225 -      }
   1.226 -      .syntaxhighlighter.printing .value {
   1.227 -        color: #009900 !important;
   1.228 -      }
   1.229 -      .syntaxhighlighter.printing .functions {
   1.230 -        color: #ff1493 !important;
   1.231 -      }
   1.232 -      .syntaxhighlighter.printing .constants {
   1.233 -        color: #0066cc !important;
   1.234 -      }
   1.235 -      .syntaxhighlighter.printing .script {
   1.236 -        font-weight: bold !important;
   1.237 -      }
   1.238 -      .syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
   1.239 -        color: gray !important;
   1.240 -      }
   1.241 -      .syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
   1.242 -        color: #ff1493 !important;
   1.243 -      }
   1.244 -      .syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
   1.245 -        color: red !important;
   1.246 -      }
   1.247 -      .syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
   1.248 -        color: black !important;
   1.249 -      }
   1.250 -    </style>
   1.251 -    <style type="text/css">
   1.252 -      /**
   1.253 -       * SyntaxHighlighter
   1.254 -       * http://alexgorbatchev.com/SyntaxHighlighter
   1.255 -       *
   1.256 -       * SyntaxHighlighter is donationware. If you are using it, please donate.
   1.257 -       * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
   1.258 -       *
   1.259 -       * @version
   1.260 -       * 3.0.83 (July 02 2010)
   1.261 -       *
   1.262 -       * @copyright
   1.263 -       * Copyright (C) 2004-2010 Alex Gorbatchev.
   1.264 -       *
   1.265 -       * @license
   1.266 -       * Dual licensed under the MIT and GPL licenses.
   1.267 -       */
   1.268 -      .syntaxhighlighter {
   1.269 -        background-color: none !important;
   1.270 -      }
   1.271 -      .syntaxhighlighter .line.alt1 {
   1.272 -        background-color: none !important;
   1.273 -      }
   1.274 -      .syntaxhighlighter .line.alt2 {
   1.275 -        background-color: none !important;
   1.276 -      }
   1.277 -      .syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
   1.278 -        background-color: none !important;
   1.279 -      }
   1.280 -      .syntaxhighlighter .line.highlighted.number {
   1.281 -        color: black !important;
   1.282 -      }
   1.283 -      .syntaxhighlighter table caption {
   1.284 -        color: black !important;
   1.285 -      }
   1.286 -      .syntaxhighlighter .gutter {
   1.287 -        color: #afafaf !important;
   1.288 -      }
   1.289 -      .syntaxhighlighter .gutter .line {
   1.290 -        border-right: 3px solid #6ce26c !important;
   1.291 -      }
   1.292 -      .syntaxhighlighter .gutter .line.highlighted {
   1.293 -        background-color: #6ce26c !important;
   1.294 -        color: white !important;
   1.295 -      }
   1.296 -      .syntaxhighlighter.printing .line .content {
   1.297 -        border: none !important;
   1.298 -      }
   1.299 -      .syntaxhighlighter.collapsed {
   1.300 -        overflow: visible !important;
   1.301 -      }
   1.302 -      .syntaxhighlighter.collapsed .toolbar {
   1.303 -        color: blue !important;
   1.304 -        background: none !important;
   1.305 -        border: 1px solid #6ce26c !important;
   1.306 -      }
   1.307 -      .syntaxhighlighter.collapsed .toolbar a {
   1.308 -        color: blue !important;
   1.309 -      }
   1.310 -      .syntaxhighlighter.collapsed .toolbar a:hover {
   1.311 -        color: red !important;
   1.312 -      }
   1.313 -      .syntaxhighlighter .toolbar {
   1.314 -        color: white !important;
   1.315 -        background: #6ce26c !important;
   1.316 -        border: none !important;
   1.317 -      }
   1.318 -      .syntaxhighlighter .toolbar a {
   1.319 -        color: white !important;
   1.320 -      }
   1.321 -      .syntaxhighlighter .toolbar a:hover {
   1.322 -        color: black !important;
   1.323 -      }
   1.324 -      .syntaxhighlighter .plain, .syntaxhighlighter .plain a {
   1.325 -        color: black !important;
   1.326 -      }
   1.327 -      .syntaxhighlighter .comments, .syntaxhighlighter .comments a {
   1.328 -        color: #008200 !important;
   1.329 -      }
   1.330 -      .syntaxhighlighter .string, .syntaxhighlighter .string a {
   1.331 -        color: blue !important;
   1.332 -      }
   1.333 -      .syntaxhighlighter .keyword {
   1.334 -        color: #006699 !important;
   1.335 -      }
   1.336 -      .syntaxhighlighter .preprocessor {
   1.337 -        color: gray !important;
   1.338 -      }
   1.339 -      .syntaxhighlighter .variable {
   1.340 -        color: #aa7700 !important;
   1.341 -      }
   1.342 -      .syntaxhighlighter .value {
   1.343 -        color: #009900 !important;
   1.344 -      }
   1.345 -      .syntaxhighlighter .functions {
   1.346 -        color: #ff1493 !important;
   1.347 -      }
   1.348 -      .syntaxhighlighter .constants {
   1.349 -        color: #0066cc !important;
   1.350 -      }
   1.351 -      .syntaxhighlighter .script {
   1.352 -        font-weight: bold !important;
   1.353 -        color: #006699 !important;
   1.354 -        background-color: none !important;
   1.355 -      }
   1.356 -      .syntaxhighlighter .color1, .syntaxhighlighter .color1 a {
   1.357 -        color: gray !important;
   1.358 -      }
   1.359 -      .syntaxhighlighter .color2, .syntaxhighlighter .color2 a {
   1.360 -        color: #ff1493 !important;
   1.361 -      }
   1.362 -      .syntaxhighlighter .color3, .syntaxhighlighter .color3 a {
   1.363 -        color: red !important;
   1.364 -      }
   1.365 -
   1.366 -      .syntaxhighlighter .keyword {
   1.367 -        font-weight: bold !important;
   1.368 -      }
   1.369 -    </style>
   1.370 -    <script src="tools/syntaxhighlighter/js/shCore.js" type="text/javascript" class='remove'></script>
   1.371 -    <script src="tools/syntaxhighlighter/js/shAutoloader.js" type="text/javascript" class='remove'></script>
   1.372 -    <script src="tools/syntaxhighlighter/js/shBrushXml.js" type="text/javascript" class='remove'></script>
   1.373 -    <script src="tools/syntaxhighlighter/js/shBrushJScript.js" type="text/javascript" class='remove'></script>
   1.374 -
   1.375 -    <script src='./js/profiles/w3c-common-loader.js' type="text/javascript" class='remove'></script>
   1.376 +    <script src='http://www.w3.org/Tools/respec/respec-w3c-common' type="text/javascript" class='remove' async></script>
   1.377      <style type="text/css">
   1.378        /* Custom CSS optimizations (Richard Tibbett) */
   1.379  
   1.380 @@ -420,7 +66,7 @@
   1.381    <body>
   1.382      <section id='abstract'>
   1.383        <p>
   1.384 -        This specification defines a mechanism for an HTML document to discover and subsequently communicate with <acronym title="Hypertext Transfer Protocol">HTTP</acronym>-based services
   1.385 +        This specification defines a mechanism for an HTML document to discover and subsequently communicate with <abbr title="Hypertext Transfer Protocol">HTTP</abbr>-based services
   1.386          advertised via common discovery protocols within a user's network.
   1.387        </p>
   1.388      </section>
   1.389 @@ -439,7 +85,7 @@
   1.390        <a href="#navigatornetworkservice"><code>NavigatorNetworkService</code></a> interface.</p>
   1.391  
   1.392        <p>
   1.393 -         Using this <acronym title="Application Programming Interface">API</acronym> consists of requesting a well-known service type, known by developers and advertised by Local-networked Devices. User authorization, where the user connects the web page to one or more discovered services,
   1.394 +         Using this <abbr title="Application Programming Interface">API</abbr> consists of requesting a well-known service type, known by developers and advertised by Local-networked Devices. User authorization, where the user connects the web page to one or more discovered services,
   1.395           is expected before the web page is able to interact with any Local-networked Services.
   1.396        </p>
   1.397  
   1.398 @@ -467,7 +113,7 @@
   1.399        <div class="example">
   1.400         <p>Example of requesting a DNS-SD advertised service:</p>
   1.401         <hr />
   1.402 -       <pre class="brush:js">function showServices( services ) {
   1.403 +       <pre class="highlight">function showServices( services ) {
   1.404    // Show a list of all the services provided to the web page
   1.405    for(var i = 0, l = services.length; i < l; i++) console.log( services[i].name );
   1.406  }
   1.407 @@ -478,7 +124,7 @@
   1.408        <div class="example">
   1.409          <p>Example of requesting a UPnP advertised service, also handling error conditions:</p>
   1.410          <hr />
   1.411 -        <pre class="brush:js">function showServices( services ) {
   1.412 +        <pre class="highlight">function showServices( services ) {
   1.413    // Show a list of all the services provided to the web page
   1.414    for(var i = 0, l = services.length; i < l; i++) console.log( services[i].name );
   1.415  }
   1.416 @@ -493,7 +139,7 @@
   1.417        <div class="example">
   1.418          <p>Example of requesting either a DNS-SD or UPnP advertised service:</p>
   1.419          <hr />
   1.420 -        <pre class="brush:js">function showServices( services ) {
   1.421 +        <pre class="highlight">function showServices( services ) {
   1.422    // Show a list of all the services provided to the web page (+ service type)
   1.423    for(var i = 0, l = services.length; i < l; i++)
   1.424       console.log( services[i].name + '(' + services[i].type + ')' );
   1.425 @@ -562,7 +208,7 @@
   1.426  
   1.427        <p>
   1.428           The term DOM is used to refer to the API set made available to scripts in Web applications, and does not necessarily imply the existence of an actual <code>Document</code> object or of any
   1.429 -         other <code>Node</code> objects as defined in the DOM Core specifications. [[!DOM-CORE]]
   1.430 +         other <code>Node</code> objects as defined in the DOM Core specifications. [[!DOM4]]
   1.431        </p>
   1.432  
   1.433        <p>
   1.434 @@ -760,7 +406,7 @@
   1.435  
   1.436                 <ol class="rule">
   1.437                    <li>
   1.438 -                     Add the <var>service</var>'s <code>url</code> parameter to the <a>entry script origin's <acronym title="Uniform Resource Locator">URL</acronym> whitelist</a>.
   1.439 +                     Add the <var>service</var>'s <code>url</code> parameter to the <a>entry script origin's <abbr title="Uniform Resource Locator">URL</abbr> whitelist</a>.
   1.440                    </li>
   1.441                    <li>
   1.442                      If <var>service</var>'s <code>type</code> parameter begins with the DOMString &quot;<code>upnp:</code>&quot; and the <var>service</var>'s <code>eventsUrl</code> parameter is not empty then <a>setup a UPnP Events Subscription</a> for <var>service</var>.
   1.443 @@ -1260,7 +906,7 @@
   1.444              <h2>Service Discovery</h2>
   1.445  
   1.446        <p>
   1.447 -         A <a>user agent</a> conforming to this specification MAY implement <acronym title="Simple Service Discovery Protocol">SSDP</acronym> [[!UPNP]] and Zeroconf [[!DNS-SD]] + [[!MDNS]] service discovery mechanisms
   1.448 +         A <a>user agent</a> conforming to this specification MAY implement <acronym title="Simple Service Discovery Protocol">SSDP</acronym> [[!UPNP-DEVICEARCH11]] and Zeroconf [[!DNS-SD]] + [[!MDNS]] service discovery mechanisms
   1.449           to enable Web pages to request and connect with HTTP services running on networked devices, discovered via either mechanism, through this API. When a <a>user agent</a> implements either of these service discovery mechanisms, then it MUST conform to the corresponding algorithms provided in this section of the specification.
   1.450        </p>
   1.451        <p>
   1.452 @@ -1281,10 +927,10 @@
   1.453        </p>
   1.454  
   1.455              <section>
   1.456 -         <h4>Zeroconf (<acronym title="Multicast DNS">mDNS</acronym> + <acronym title="Domain Name System">DNS</acronym>-<acronym title="Service Discovery">SD</acronym>)</h4>
   1.457 +         <h4>Zeroconf (<abbr title="Multicast DNS">mDNS</abbr> + <abbr title="Domain Name System">DNS</abbr>-<abbr title="Service Discovery">SD</abbr>)</h4>
   1.458  
   1.459           <p>
   1.460 -            For each DNS response received from a user-agent-initiated Multicast DNS Browse for <acronym title="DNS Pointer Record">PTR</acronym> records with the name <code>_services._dns-sd._udp</code> on the resolved recommended automatic browsing
   1.461 +            For each DNS response received from a user-agent-initiated Multicast DNS Browse for <abbr title="DNS Pointer Record">PTR</abbr> records with the name <code>_services._dns-sd._udp</code> on the resolved recommended automatic browsing
   1.462     domain [[!MDNS]], the <a>user agent</a> MUST run the following steps:
   1.463           </p>
   1.464  
   1.465 @@ -1366,10 +1012,10 @@
   1.466        </section>
   1.467  
   1.468        <section>
   1.469 -         <h5>Universal Plug-and-Play (<acronym title="Universal Plug-and-Play">UPnP</acronym>)</h5>
   1.470 +         <h5>Universal Plug-and-Play (<abbr title="Universal Plug-and-Play">UPnP</abbr>)</h5>
   1.471  
   1.472           <p>
   1.473 -            For each SSDP Presence Announcement [[!UPNP]] - a HTTP NOTIFY request - received from a user-agent-initiated SSDP Discovery Request [[!UPNP]], the <a>user agent</a> MUST run the following steps:
   1.474 +            For each SSDP Presence Announcement [[!UPNP-DEVICEARCH11]] - a HTTP NOTIFY request - received from a user-agent-initiated SSDP Discovery Request [[!UPNP-DEVICEARCH11]], the <a>user agent</a> MUST run the following steps:
   1.475           </p>
   1.476  
   1.477           <ol class="rule">
   1.478 @@ -1388,7 +1034,7 @@
   1.479  
   1.480              <li>
   1.481                 Let <var>root device descriptor file</var> contain the contents of the file located at the URL provided in the first occurrence of <var>Location</var> obtained according to the rules
   1.482 -               defined in the section 'Retrieving a description using HTTP' [[!UPNP]].
   1.483 +               defined in the section 'Retrieving a description using HTTP' [[!UPNP-DEVICEARCH11]].
   1.484              </li>
   1.485  
   1.486              <li>
   1.487 @@ -1397,7 +1043,7 @@
   1.488  
   1.489              <li>
   1.490                 Let <var>advertised services</var> be a <a>list of all advertised services</a> obtained from the <var>root device descriptor file</var> containing all sub-nodes of the <code>serviceList</code> node as described in
   1.491 -               the section 'Device Description' [[!UPNP]].
   1.492 +               the section 'Device Description' [[!UPNP-DEVICEARCH11]].
   1.493              </li>
   1.494  
   1.495              <li>
   1.496 @@ -1714,7 +1360,7 @@
   1.497              <p>The button is re-enabled only when the connected network service disconnects for whatever reason (the service becomes unavailable on the network, the user disconnects from their current network or the user revokes access to the service from the current web page). At this point the user can re-click the button to select a new network service to connect to the web page and the above steps are repeated.</p>
   1.498              <p>The provided service type identifier and service interaction used in this example is based on the well-defined service type and messaging format supported by the <a href="http://xbmc.org/about/">XBMC Media Server</a>. </p>
   1.499              <hr />
   1.500 -            <pre class="brush:js">&lt;input type="button" value="Start" onclick="start()" id="startBtn"/&gt;
   1.501 +            <pre class="highlight">&lt;input type="button" value="Start" onclick="start()" id="startBtn"/&gt;
   1.502  &lt;div id="debugconsole">&lt;/div>
   1.503  
   1.504  &lt;script>
   1.505 @@ -1782,7 +1428,7 @@
   1.506               <br /><br />Once the user has authorized the device, the web page sends a simple mute command according to the messaging format supported by the device.
   1.507              </p>
   1.508              <hr />
   1.509 -            <pre class="brush:js">&lt;select name="make" id="make"&gt;
   1.510 +            <pre class="highlight">&lt;select name="make" id="make"&gt;
   1.511    &lt;option selected="selected" disabled="disabled"&gt;Select make&lt;/option&gt;
   1.512    &lt;option&gt;Sony&lt;/option&gt;
   1.513    &lt;option&gt;Philips&lt;/option&gt;
   1.514 @@ -1899,14 +1545,5 @@
   1.515        <br /></br />
   1.516        CableLabs, Opera Software ASA, W3C Device APIs Working Group, W3C Web and TV Interest Group, ...</p>
   1.517      </section>
   1.518 -
   1.519 -    <script class='remove'>
   1.520 -    if(SyntaxHighlighter) {
   1.521 -      SyntaxHighlighter.defaults['gutter'] = false;
   1.522 -      SyntaxHighlighter.defaults['toolbar'] = false;
   1.523 -      SyntaxHighlighter.all()
   1.524 -    }
   1.525 -    </script>
   1.526 -
   1.527  </body>
   1.528  </html>