Update the site to include Discussion Draft #2

diff --git a/wpdd.html b/wpdd.html
index 3c1acf1576c41660b574812700e18b06e5caf663..4d729d15f6ad1122826dd4d5f7ae70bb9b93dd27 100644 (file)
--- a/wpdd.html
+++ b/wpdd.html
@@ -18,53 +18,52 @@
         <p>To address this the WPDD first acts as a waiver of
         rights (sections 2 and 4) and then a license fallback for
         when that doesn't work (sections 3 and 5.)</p>
-        <p>What follows is Discussion Draft #1. To learn about 
-        changes for Discussion Draft #2 please check GitWeb and the 
+        <p>What follows is Discussion Draft #2. To learn about 
+        changes from Discussion Draft #1 please check GitWeb and the 
         mailing list. All participation is welcome.</p>
         <pre><code>
 ==== THIS IS A DRAFT. DO NOT USE AS A LICENSE. ====
 
 Worldwide Public Domain Dedication (WPDD)
-Public Discussion Draft #1
+Public Discussion Draft #2
 Please send feedback by email to the public mailing list:
 https://wpdd.info/cgi-bin/mailman/listinfo/discuss
 
 Copying and distribution of this file, with or without modification, 
 are permitted in any medium without royalty, provided this notice is 
-preserved. So as to avoid potential confusion, if you make 
-modifications please don't call your version the Worldwide Public 
-Domain Dedication (WPDD) or anything else that might be confusingly 
-similar. This file is offered as-is, without any warranty.
+preserved. To avoid potential confusion, if you make modifications 
+please don't call your version the Worldwide Public Domain Dedication 
+(WPDD) or anything else that might be confusingly similar. This file 
+is offered as-is, without any warranty.
 
 Statement of Purpose
 
 The laws of most jurisdictions throughout the world automatically 
-confer exclusive Copyright and Related Rights (defined below) upon 
-the creator and subsequent owner(s) (each and all, an "owner") of an 
-original work of authorship and/or a database (each, a "Work").
+confer exclusive Copyright and Related Rights (defined below) upon the 
+copyright holder(s) (each and all, a "holder") of an original work of 
+authorship and/or a database (each, a "Work").
 
-Certain owners wish to permanently relinquish those rights to a Work 
+Certain holders wish to permanently relinquish those rights to a Work 
 for the purpose of contributing to a commons of creative, cultural 
 and scientific works ("Commons") that the public can reliably and 
 without fear of later claims of infringement build upon, modify, 
 incorporate in other works, reuse and redistribute as freely as 
 possible in any form whatsoever and for any purposes, including 
-without limitation commercial purposes. These owners may contribute 
+without limitation commercial purposes. These holders may contribute 
 to the Commons to promote the ideal of a free culture and the further 
 production of creative, cultural and scientific works, or to gain 
 reputation or greater distribution for their Work in part through the 
 use and efforts of others.
 
 For these and/or other purposes and motivations, and without any 
-expectation of additional consideration or compensation, the person 
-associating this Worldwide Public Domain Dedication with a Work (the 
-"Affirmer"), to the extent that they are an owner of Copyright and 
-Related Rights in the Work, voluntarily elects to apply this 
-Worldwide Public Domain Dedication to the Work and publicly 
-distribute the Work under its terms, with knowledge of their 
-Copyright and Related Rights in the Work and the meaning and intended 
-legal effect of this Worldwide Public Domain Dedication on those 
-rights.
+expectation of additional consideration or compensation, the person or 
+organization associating this Worldwide Public Domain Dedication with 
+a Work (the "Affirmer"), to the extent that they are a holder of 
+Copyright and Related Rights in the Work, voluntarily elects to apply 
+this Worldwide Public Domain Dedication to the Work and publicly 
+distribute the Work under its terms, with knowledge of their Copyright 
+and Related Rights in the Work and the meaning and intended legal 
+effect of this Worldwide Public Domain Dedication on those rights.
 
 1. Copyright and Related Rights. A Work made available under this 
 Worldwide Public Domain Dedication may be protected by copyright and 
@@ -78,16 +77,14 @@ following:
       performer(s);
  iii. publicity and privacy rights pertaining to a person's image or
       likeness depicted in a Work;
-  iv. rights protecting against unfair competition in regards to a 
-      Work, subject to the limitations in paragraph 4(a), below;
-   v. rights protecting the extraction, dissemination, use and reuse 
+  iv. rights protecting the extraction, dissemination, use and reuse 
       of data in a Work;
-  vi. database rights (such as those arising under Directive 96/9/EC 
+   v. database rights (such as those arising under Directive 96/9/EC 
       of the European Parliament and of the Council of 11 March 1996 
       on the legal protection of databases, and under any national 
       implementation thereof, including any amended or successor 
       version of such directive); 
- vii. other similar, equivalent or corresponding rights throughout 
+  vi. other similar, equivalent or corresponding rights throughout 
       the world based on applicable law or treaty, and any national
       implementations thereof.
 
@@ -185,12 +182,13 @@ License, and in such case Affirmer hereby affirms that they will not
 any associated claims and causes of action with respect to the Work, 
 in either case contrary to Affirmer's express Statement of Purpose.
 
-6. Versions. New versions of this Worldwide Public Domain Dedication 
+6. Versions. New versions of the Worldwide Public Domain Dedication 
 (WPDD) may be released via https://wpdd.info in order to address 
 issues or concerns that come up. Such new versions shall remain 
 similar in spirit to provide, as closely as possible, a total waiver 
-of all rights. You may elect to apply any later version of this 
-Worldwide Public Domain Dedication (WPDD) to the Work.
+of all rights. Any person or organization receiving a Work covered 
+by this version of the WPDD may elect to apply any later version of 
+the WPDD to that Work.
 
 7. Limitations and Disclaimers.
 
@@ -199,7 +197,7 @@ Worldwide Public Domain Dedication (WPDD) to the Work.
     statutory or otherwise, including without limitation warranties 
     of title, merchantability, fitness for a particular purpose, non
     infringement, or the absence of latent or other defects, 
-    accuracy, or the present or absence of errors, whether or not 
+    accuracy, or the presence or absence of errors, whether or not 
     discoverable, all to the greatest extent permissible under 
     applicable law.
  b. Affirmer disclaims responsibility for clearing rights of other