WWW/2011/tracking-protection/drafts tracking-compliance.html,1.63,1.64

Update of /w3ccvs/WWW/2011/tracking-protection/drafts
In directory hutz:/tmp/cvs-serv28803/drafts

Modified Files:
	tracking-compliance.html 
Log Message:
revised definitions

Index: tracking-compliance.html
===================================================================
RCS file: /w3ccvs/WWW/2011/tracking-protection/drafts/tracking-compliance.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- tracking-compliance.html	17 Aug 2012 19:27:39 -0000	1.63
+++ tracking-compliance.html	17 Aug 2012 21:59:29 -0000	1.64
@@ -1,3 +1,1016 @@
+<<<<<<< tracking-compliance.html
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Tracking Compliance and Scope Specification</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+  <script src='http://www.w3.org/Tools/respec/respec-w3c-common' class='remove' async></script>
+  <script src="http://code.jquery.com/jquery-1.7.2.min.js" type="text/javascript" charset="utf-8"></script>
+  <script class="remove">
+    var respecConfig = {
+      specStatus:          "ED",
[...990 lines suppressed...]
+<p>[!!TRACKING-DNT</p>
+<p>Roy T. Fielding; David Singer. <a href="http://www.w3.org/TR/tracking-dnt/">Tracking Preference Expression (DNT).</a> 13 March 2012. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/2011/WD-tracking-dnt-20120313/">http://www.w3.org/TR/2011/WD-tracking-dnt-20120313/</a></p>
+<h3>B.2 Informative references</h3>
+<p>[KnowPrivacy</p>
+<p>Joshua Gomez; Travis Pinnick; Ashkan Soltani. <a href="http://www.knowprivacy.org/report/KnowPrivacy_Final_Report.pdf">KnowPrivacy.</a> 1 June 2009. URL: <a href="http://www.knowprivacy.org/report/KnowPrivacy_Final_Report.pdf">http://www.knowprivacy.org/report/KnowPrivacy_Final_Report.pdf</a></p>
+</section>
+<div id="toggle-widget">
+  <a href="#" id="toggle-button">Hide non-normative sections</a>
+</div>
+</body>
+</html>
+=======
 <!DOCTYPE html>
 <html>
 <head>
@@ -999,3 +2012,4 @@
 </div>
 </body>
 </html>
+>>>>>>> 1.63

Received on Friday, 17 August 2012 21:59:33 UTC