From 3f9aabb8d0d98b3d38631825719e75dcaf95a2b8 Mon Sep 17 00:00:00 2001
From: Ian Grigg <iang@cacert.org>
Date: Sun, 17 Oct 2010 12:07:42 +0000
Subject: [PATCH]  changed over the CAcert references according to the scheme
 suggested by Ulrich + Nik.

git-svn-id: http://svn.cacert.org/CAcert/Policies@2145 14b1bab8-4ef6-0310-b690-991c95c89dfd
---
 Agreements/CAcertCommunityAgreement.html | 104 ++++++++++++-----------
 1 file changed, 54 insertions(+), 50 deletions(-)

diff --git a/Agreements/CAcertCommunityAgreement.html b/Agreements/CAcertCommunityAgreement.html
index 6dc52f8..7d13c65 100644
--- a/Agreements/CAcertCommunityAgreement.html
+++ b/Agreements/CAcertCommunityAgreement.html
@@ -49,6 +49,7 @@
         </p>
     <a href="http://validator.w3.org/check?uri=referer"><img style="float: right; border-width: 0" src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a>
      <ul>
+        <li>Iang <span class="change">20101017</span>: Attempt to distinguish and clarify CAcert from CAcert Inc from CAcert Community.  Change requested by Uli + Nik + Benrd, effectively in <span class="change">BLUE</span>.  Where unclarity is seen, I have marked it as <span class="q">XXX</span>. </li>
         <li>Iang <span class="change">20101009</span>: <a href="//wiki.cacert.org/PolicyDecisions#p20101009">motion posted</a>, votes requested on <span class="change">BLUE changes</span> in policy group!  Ignore the green.  </li>
         <li>Iang <span class="change">20101002</span>: Added the policy block and heading.  That which is in the document is below the line. </li>
         <li>Iang <span class="change">20101002</span>: Re-org of section 4.2 to better reflect current times. </li>
@@ -92,23 +93,26 @@ Editor: <a style="color: steelblue" href="//wiki.cacert.org/Iang">Iang</a><br />
 This agreement is between
 you, being a registered member ("Member")
 within CAcert's community at large ("Community")
-and CAcert Incorporated ("CAcert"),
+and CAcert Incorporated ("CAcert <span class="change">Inc.</span>"),
 being an operator of services to the Community.
 </p>
 
 <h4 id="s0.1"> 0.1  Terms </h4>
 <ol><li id="s0.1.1">
-    "CAcert"
-    means CAcert Inc.,
-    a non-profit Association of Members incorporated in
+    "CAcert <span class="change">Inc. means the</span>"
+    <span class="strike">means CAcert Inc., a<span>
+    non-profit Association of Members incorporated in
     New South Wales, Australia.
     Note that Association Members are distinct from
     the Members defined here.
-<ul class="q"><li>Does CAcert mean CAcert Inc. still?</li>
-<li>CAcert seems more to mean the Community these days.  Consider a change in definition?</li></ul>
+<ul class="q">
+<li>Does CAcert mean CAcert Inc. still?</li>
+<li>CAcert seems more to mean the Community these days.  Consider a change in definition?</li>
+<li>Attempt to make this break in the text, in BLUE.</li>
+</ul>
   </li><li id="s0.1.2">
     "Member"
-    means you, a registered participant within CAcert's Community,
+    means you, a registered participant within CAcert's Community <span class="q">XXX</span>,
     with an account on the website and the
     facility to request certificates.
     Members may be individuals ("natural persons")
@@ -123,7 +127,7 @@ being an operator of services to the Community.
     means all of the Members
     that are registered by this agreement
     and other parties by other agreements,
-    all being under CAcert's Arbitration.
+    all being under <span class="change">Community</span><span class="strike">CAcert's.</span> Arbitration <span class="q">XXX</span>.
   </li><li id="s0.1.5">
     "Non-Related Person" ("NRP"),
     being someone who is not a
@@ -177,19 +181,19 @@ being an operator of services to the Community.
     OFFER does not imply suggestion of <span class="strike">reliance</span> <span class="change">RELIANCE</span>.
   </li><li id="s0.1.12">
     "Issue"
-    means creation of a certificate by CAcert.
+    means creation of a certificate by CAcert <span class="change">Inc.</span> <span class="q">XXX</span>.
     To create a certificate,
-    CAcert affixes a digital signature from the root
+    CAcert <span class="change">Inc.</span> <span class="q">XXX</span> affixes a digital signature from the root
     onto a public key and other information.
     This act would generally bind a statement or claim,
     such as your name, to your key.
   </li><li id="s0.1.13">
     "Root"
-    means CAcert's top level key,
+    means CAcert <span class="change">Inc.</span>'s top level key,
     used for signing certificates for Members.
     In this document, the term includes any subroots.
   </li><li id="s0.1.14">
-    "<a href="//svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">CAcert Official Document</a>" ("COD" <span class="strike"> => COD3 </span>)
+    <span class="q">XXX</span> "<a href="//svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">CAcert Official Document</a>" ("COD" <span class="strike"> => COD3 </span>)
     <span class="strike">in</span> <span class="change">is</span> a standard format for describing the details of
     operation and governance essential to a certificate authority.
     Changes are managed and controlled.
@@ -198,11 +202,11 @@ being an operator of services to the Community.
   </li><li id="s0.1.15">
     "<a href="//www.cacert.org/policy/CertificationPracticeStatement.php">Certification Practice Statement</a>" ("CPS" => COD6)
     is the document that controls details
-    about operational matters within CAcert.
+    about operational matters within CAcert <span class="q">XXX</span>.
   </li><li id="s0.1.16">
    <span class="change">
     "Certificate" means any public key or like device to which
-    the digital signature from CAcert's root has been affixed.  
+    the digital signature from CAcert <span class="change">Inc.</span>'s root has been affixed.  
     Where applicable, the term includes certificate chain,
     being an issued certificate and any roots needed for
     correct operation.
@@ -215,7 +219,7 @@ being an operator of services to the Community.
 <h4 id="s1.1"> 1.1  Agreement </h4>
 
 <p>
-You and CAcert both agree to the terms and conditions
+You and CAcert <span class="change">Inc.</span> both agree to the terms and conditions
 in this agreement.
 Your agreement is given by any of
 </p>
@@ -247,19 +251,19 @@ This Agreement replaces and supercedes prior agreements.
 <h4 id="s1.2"> 1.2  Licence </h4>
 
 <p>
-As part of the Community, CAcert offers you these rights:
+As part of the Community, CAcert <span class="change">Inc.</span> offers you these rights:
 </p>
 
 <ol><li id="s1.2.1">
-    You may USE any certificates issued by CAcert.
+    You may USE any certificates issued by <span class="q">XXX</span> CAcert <span class="change">Inc.</span>.
   </li><li id="s1.2.2">
-    You may RELY on any certificate issued by CAcert,
+    You may RELY on any certificate issued by CAcert <span class="change">Inc.</span>,
     as explained and limited by CPS (COD6).
   </li><li id="s1.2.3">
-    You may OFFER certificates issued to you by CAcert
+    You may OFFER certificates issued to you by CAcert <span class="change">Inc.</span>
     to Members for their RELIANCE.
   </li><li id="s1.2.4">
-    You may OFFER certificates issued to you by CAcert
+    You may OFFER certificates issued to you by CAcert <span class="change">Inc.</span>
     to NRPs for their USE, within the general principles
     of the Community.
   </li><li id="s1.2.5">
@@ -272,11 +276,11 @@ As part of the Community, CAcert offers you these rights:
 
 <p>
 You agree to a non-exclusive non-restrictive non-revokable
-transfer of Licence to CAcert for your contributions.
-That is, if you post an idea or comment on a CAcert forum,
+transfer of Licence to CAcert <span class="change">Inc.</span> for your contributions.
+That is, if you post an idea or comment on a CAcert forum <span class="q">XXX</span>,
 or email it to other Members,
 your work can be used freely by the Community for
-CAcert purposes, including placing under CAcert's licences
+<span class="q">XXX</span> CAcert purposes, including placing under CAcert <span class="change">Inc.</span>'s licences
 for wider publication.
 </p>
 
@@ -302,12 +306,12 @@ Note that the following exceptions override this clause:
 
 
 <p>
-You give rights to CAcert to store, verify, <span class="strike">and</span> process
+You give rights to CAcert <span class="change">Inc.</span> to store, verify, <span class="strike">and</span> process
 and publish your data in accordance with policies in force.
 These rights include shipping the data to foreign countries
 for system administration, support and processing purposes.
 Such shipping will only be done among
-CAcert Community administrators and Assurers.
+CAcert <span class="q">XXX</span> Community administrators and Assurers.
 </p>
 
 <p>
@@ -365,7 +369,7 @@ and obligations within this agreement.
     to provide accurate information
     as part of Assurance.
     You give permission for verification of the information
-    using CAcert-approved methods.
+    using <span class="q">XXX</span> CAcert-approved methods.
   </li><li id="s2.3.2">
     to make no false representations.
   </li><li id="s2.3.3">
@@ -376,7 +380,7 @@ and obligations within this agreement.
 <h4 id="s2.4"> 2.4  Principles </h4>
 
 <p>
-As a Member of CAcert, you are a member of
+As a <span class="q">XXX</span> Member of CAcert, you are a member of
 the Community.
     You are further obliged to 
     work within the spirit of the Principles
@@ -387,7 +391,7 @@ the Community.
 
 <h4 id="s2.5"> 2.5  Security </h4>
 <p>
-CAcert exists to help you to secure yourself.
+<span class="q">XXX</span> CAcert exists to help you to secure yourself.
 You are primarily responsible for your own security.
 Your security obligations include
 </p>
@@ -397,7 +401,7 @@ Your security obligations include
   </li><li id="s2.5.2">
     to keep your email account in good working order,
   </li><li id="s2.5.3">
-    to secure your CAcert account
+    to secure your <span class="q">XXX</span> CAcert account
     (e.g., credentials such as username, password),
   </li><li id="s2.5.4">
     to secure your private keys,
@@ -405,7 +409,7 @@ Your security obligations include
     to review certificates for accuracy,
     and
   </li><li id="s2.5.6">
-    when in doubt, notify CAcert,
+    when in doubt, notify CAcert <span class="q">XXX</span>,
   </li><li id="s2.5.7">
     when in doubt, take other reasonable actions, such as
     revoking certificates,
@@ -432,23 +436,23 @@ being the home of the CAcert Inc. Association.
 <h4 id="s3.2"> 3.2  Arbitration as Forum of Dispute Resolution </h4>
 
 <p>
-You agree, with CAcert and all of the Community,
+You agree, with CAcert <span class="change">Inc.</span> and all of the Community,
 that all disputes arising out
-of or in connection to our use of CAcert services
+of or in connection to our use of <span class="q">XXX</span> CAcert <span class="change">Inc.</span> services
 shall be referred to and finally resolved
 by Arbitration under the rules within the
-Dispute Resolution Policy of CAcert
+Dispute Resolution Policy of <span class="q">XXX</span> CAcert
 (DRP => COD7).
-The rules select a single Arbitrator chosen by CAcert
+The rules select a single Arbitrator chosen by <span class="q">XXX</span> CAcert
 from among senior Members in the Community.
 The ruling of the Arbitrator is binding and
-final on Members and CAcert alike.
+final on Members and CAcert <span class="change">Inc.</span> alike.
 </p>
 
 <p>
 In general, the jurisdiction for resolution of disputes
-is within CAcert's own forum of Arbitration,
-as defined and controlled by its own rules (DRP => COD7).
+is within CAcert <span class="change">Inc.</span>'s own <span class="q">XXX</span> forum of Arbitration,
+as defined and controlled by <span class="q">XXX</span> its own rules (DRP => COD7).
 </p>
 
 <p>
@@ -465,8 +469,8 @@ order to initiate support actions.
 <h4 id="s3.3"> 3.3  Termination </h4>
 <p>
 You may terminate this agreement by resigning
-from CAcert.  You may do this at any time by
-writing to CAcert's online support forum and
+from CAcert <span class="q">XXX</span>.  You may do this at any time by
+writing to CAcert's <span class="q">XXX</span> online support forum and
 filing dispute to resign.
 All services will be terminated, and your
 certificates will be revoked.
@@ -487,8 +491,8 @@ be held for certificate processing purposes.
 
 <p>
 The provisions on Arbitration survive any termination
-by you by leaving CAcert.
-That is, even if you resign from CAcert,
+by you by leaving  <span class="q">XXX</span> CAcert.
+That is, even if you resign from  <span class="q">XXX</span> CAcert,
 you are still bound by the DRP (COD7),
 and the Arbitrator may reinstate any provision of this
 agreement or bind you to a ruling.
@@ -501,8 +505,8 @@ Only the Arbitrator may terminate this agreement with you.
 <h4 id="s3.4"> 3.4  Changes of Agreement </h4>
 
 <p>
-CAcert may from time to time vary the terms of this Agreement.
-Changes will be done according to the documented CAcert policy
+CAcert <span class="change">Inc.</span> may from time to time vary the terms of this Agreement.
+Changes will be done according to the documented  <span class="q">XXX</span> CAcert policy
 for changing policies, and is subject to scrutiny and feedback
 by the Community.
 Changes will be notified to you by email to your primary address.
@@ -522,7 +526,7 @@ by you.
 <h4 id="s3.5"> 3.5  Communication </h4>
 
 <p>
-Notifications to CAcert are to be sent by
+Notifications to  <span class="q">XXX</span> CAcert are to be sent by
 email to the address
 <b>support</b> <i>at</i> CAcert.org.
 You should attach a digital signature,
@@ -532,11 +536,11 @@ or similar urgency.
 
 <p>
 Notifications to you are sent
-by CAcert to the primary email address
+by  <span class="q">XXX</span> CAcert to the primary email address
 registered with your account.
 You are responsible for keeping your email
 account in good working order and able
-to receive emails from CAcert.
+to receive emails from  <span class="q">XXX</span> CAcert.
 </p>
 
 <p>
@@ -549,7 +553,7 @@ Arbitration is generally conducted by email.
 
 <p>
 As well as you and other Members in the Community,
-CAcert forms agreements with third party
+CAcert <span class="change">Inc.</span> forms agreements with third party
 vendors and others.
 Thus, such parties will also be in the Community.
 Such agreements are also controlled by the same
@@ -577,7 +581,7 @@ and think nowadays it is somewhat misplaced here. Simply drop it??</li>
 </ul>
 
 <p class="strike">
-This agreement is CAcert Official Document 9 (COD9)
+This agreement is  <span class="q">XXX</span> CAcert Official Document 9 (COD9)
 and is a controlled document.
 <span class="q">moved down.</span>
 </p>
@@ -651,11 +655,11 @@ by this agreement and others listed above.
 <p>
 <b>Intellectual Property.</b>
 This Licence does not transfer any intellectual
-property rights ("IPR") to you.  CAcert asserts and
+property rights ("IPR") to you.  CAcert <span class="change">Inc.</span> asserts and
 maintains its IPR over its roots, issued certificates,
 brands, logos and other assets.
 Note that the certificates issued to you
-are CAcert's intellectual property
+are CAcert <span class="change">Inc.</span>'s intellectual property
 and you do not have rights other than those stated.
 </p>