additional fixes to merge
authorFrederick Hirsch <frederick.hirsch@nokia.com>
Mon, 01 Oct 2012 14:37:20 -0400
changeset 236 523263026147
parent 235 a57c4372913c (current diff)
parent 233 02244eba98f4 (diff)
child 237 7729986a7295
additional fixes to merge
wi-addendum-local-services/FPWD/FPWD.html
wi-addendum-local-services/FPWD/FPWD_src.html
--- a/wi-addendum-local-services/FPWD/FPWD.html	Mon Oct 01 14:18:48 2012 -0400
+++ b/wi-addendum-local-services/FPWD/FPWD.html	Mon Oct 01 14:37:20 2012 -0400
@@ -220,11 +220,11 @@
   </p>
   <h1 class="title" id="title">Web Intents Addendum - Local Services</h1>
   
-  <h2 id="w3c-working-draft-27-september-2012"><abbr title="World Wide Web Consortium">W3C</abbr> Working Draft 27 September 2012</h2>
+  <h2 id="w3c-working-draft-04-october-2012"><abbr title="World Wide Web Consortium">W3C</abbr> Working Draft 04 October 2012</h2>
   <dl>
     
       <dt>This version:</dt>
-      <dd><a href="http://www.w3.org/TR/2012/WD-webintents-local-services-20120927/">http://www.w3.org/TR/2012/WD-webintents-local-services-20120927/</a></dd>
+      <dd><a href="http://www.w3.org/TR/2012/WD-webintents-local-services-20121004/">http://www.w3.org/TR/2012/WD-webintents-local-services-20121004/</a></dd>
       <dt>Latest published version:</dt>
       <dd><a href="http://www.w3.org/TR/webintents-local-services/">http://www.w3.org/TR/webintents-local-services/</a></dd>
     
@@ -279,7 +279,7 @@
         </p>
         
         <p>
-          This document was published by the <a href="http://www.w3.org/2009/dap/">DAP/Web Apps Web Intents task force</a> as a First Public Working Draft.
+          This document was published by the <a href="http://www.w3.org/2009/dap/">Device Applications (DAP) Working Group</a> and <a href="http://www.w3.org/2008/webapps/">Web Applications (WebApps) Working Group</a> as a First Public Working Draft.
           
             This document is intended to become a <abbr title="World Wide Web Consortium">W3C</abbr> Recommendation.
           
@@ -307,7 +307,7 @@
           
           
             
-              <abbr title="World Wide Web Consortium">W3C</abbr> maintains a <a href="" rel="disclosure">public list of any patent disclosures</a> 
+              <abbr title="World Wide Web Consortium">W3C</abbr> maintains a public list of any patent disclosures (<a href="http://www.w3.org/2004/01/pp-impl/43696/status" rel="disclosure">Device Applications (DAP) Working Group</a>, <a href="http://www.w3.org/2004/01/pp-impl/42538/status" rel="disclosure">Web Applications (WebApps) Working Group</a>)
             
             made in connection with the deliverables of the group; that page also includes instructions for 
             disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains
@@ -978,6 +978,7 @@
         </p>
     </section>
   
+
 <section id="references" class="appendix"><!--OddPage--><h2><span class="secno">C. </span>References</h2><section id="normative-references"><h3><span class="secno">C.1 </span>Normative references</h3><dl class="bibliography"><dt id="bib-DNS-SD">[DNS-SD]</dt><dd>S. Cheshire; M. Krochmal. <a href="http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt"><cite>DNS-Based Service Discovery.</cite></a> 27 February 2011. IETF Draft. URL: <a href="http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt">http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt</a>
 </dd><dt id="bib-IANA-SRVPORT-REG">[IANA-SRVPORT-REG]</dt><dd><a href="http://www.iana.org/form/ports-services">IANA Service Name and Transport Protocol Port Number Registry</a>. URL: <a href="http://www.iana.org/form/ports-services">http://www.iana.org/form/ports-services</a>
 </dd><dt id="bib-MDNS">[MDNS]</dt><dd>S. Cheshire; M. Krochmal. <a href="http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt"><cite>Multicast DNS.</cite></a> 14 February 2011. IETF Draft. URL: <a href="http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt">http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt</a>
--- a/wi-addendum-local-services/FPWD/FPWD_src.html	Mon Oct 01 14:18:48 2012 -0400
+++ b/wi-addendum-local-services/FPWD/FPWD_src.html	Mon Oct 01 14:37:20 2012 -0400
@@ -66,7 +66,7 @@
           wg:           ["Device Applications (DAP) Working Group",  "Web Applications (WebApps) Working Group"],
           
           // URI of the public WG page
-          wgURI:        ["http://www.w3.org/2009/dap/", "http://www.w3.org/2008/webapps/",
+          wgURI:        ["http://www.w3.org/2009/dap/", "http://www.w3.org/2008/webapps/"],
           
           // name (without the @w3c.org) of the public mailing to which comments are due
           wgPublicList: "public-web-intents",
@@ -76,7 +76,7 @@
           // This is important for Rec-track documents, do not copy a patent URI from a random
           // document unless you know what you're doing. If in doubt ask your friendly neighbourhood
           // Team Contact.
-          wgPatentURI: ["http://www.w3.org/2004/01/pp-impl/43696/status", "http://www.w3.org/2004/01/pp-impl/42538/status"],
+          wgPatentURI: ["http://www.w3.org/2004/01/pp-impl/43696/status", "http://www.w3.org/2004/01/pp-impl/42538/status"]
       };
     </script>
 
--- a/wi-addendum-local-services/Overview.html	Mon Oct 01 14:18:48 2012 -0400
+++ b/wi-addendum-local-services/Overview.html	Mon Oct 01 14:37:20 2012 -0400
@@ -15,7 +15,7 @@
           specStatus:           "ED",
           
           // the specification's short name, as in http://www.w3.org/TR/short-name/
-          shortName:            "Web Intents-LD addendum",
+          shortName:            "webintents-local-services",
 
           // if your specification has a subtitle that goes below the main
           // formal title, define it here