changed from Tomáš, Andreas and Pieter.

git-svn-id: http://svn.cacert.org/CAcert/Policies@1965 14b1bab8-4ef6-0310-b690-991c95c89dfd
14 years ago · 3fa400bb84
parent bfa5117123
commit 3fa400bb84
1 changed files with 54 additions and 3 deletions
--- a/Agreements/RootDistributionLicense.html
+++ b/Agreements/RootDistributionLicense.html
@ -5,6 +5,28 @@
 <head>
 <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8" />
 <title> CAcert - Root Distribution License </title>
+<style type="text/css">  <!-- only for WIP -->
+<!--
+.q {
+        color : green;
+        font-weight: bold;
+        text-align: center;
+        font-style:italic;
+}
+.change {
+        color : blue;
+        font-weight: bold;
+}
+.change2 {
+        color : steelblue;
+}
+.strike {
+        color : blue;
+        text-decoration:line-through;
+}
+-->
+</style>
+
 </head>
 <body>

@ -34,8 +56,9 @@ Source: <a href="//wiki.cacert.org/PolicyDrafts/RootDistributionLicense">wiki</a

 <p>
 "CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia.<br />
-"CAcert Community Agreement" means the agreement entered into by each person wishing to use or rely on CAcert's services.<br />
-"Member" means a natural or legal person who has agreed to the CAcert Community Agreement. "Certificate" means any certificate or like device to which CAcert Inc's digital signature has been affixed.<br />
+"CAcert Community Agreement" means the agreement entered into by each person wishing to <span class="change">RELY.</span> <span class="strike">use or rely on CAcert's services</span>.<br />
+"Member" means a natural or legal person who has agreed to the CAcert Community Agreement.<br />
+"Certificate" means any certificate or like device to which CAcert Inc's digital signature has been affixed.<br />
 "CAcert Root Certificates" means any certificate issued by CAcert Inc to itself for the purposes of signing further CAcert Roots or for signing certificates of Members.<br />
 "RELY" means the human act in taking on a risk or liability on the basis of the claim(s) bound within a certificate issued by CAcert.<br />
 "Embedded" means a certificate that is contained within a software application or hardware system, when and only when, that software application or system is distributed in binary form only.<br />
@ -58,7 +81,7 @@ CAcert Inc grants you a free, non-exclusive license to copy and distribute CAcer
 </p>

 <ul><li>
-    Redistributions of Embedded CAcert Root Certificates must take reasonable steps to inform the recipient of the disclaimer at the end of this license or reproduce this license and copyright notice in full in the documentation provided with the distribution.
+    Redistributions of Embedded CAcert Root Certificates must take reasonable steps to inform the recipient of the disclaimer <span class="change">in section 4</span> <span class="strike">at the end of this license</span> or reproduce this license and copyright notice in full in the documentation provided with the distribution.
  </li><li>
    Redistributions in all other forms must reproduce this license and copyright notice in full.
 </li></ul>
@ -81,5 +104,33 @@ Nothing in this license affects any statutory rights that cannot be waived or li

 </td></tr></table>

+<span class="change2">
+<h2> Alternatives </h2>
+
+<p>
+If you find the terms of the above
+Root Distribution License
+difficult or inadequate for your purposes, you may wish to:
+</p>
+
+<ul><li>
+    Enter into the CAcert Community Agreement by
+    <a href="https://www.cacert.org/index.php?id=1">
+    registering as a Member</a>.
+    This is free.
+  </li><li>
+    Delete CAcert Root Certificates from your software.
+    Your software documentation should give
+    directions and assistance for this.
+</li></ul>
+
+<p>
+These alternatives are outside the above
+Root Distribution License
+and do not incorporate.
+</p>
+</span>
+
+
 </body>
 </html>