From 16a05fff740ff8383bf323a506370960566a04f8 Mon Sep 17 00:00:00 2001
From: Brian McCullough <bmccullough@cacert.org>
Date: Fri, 24 May 2024 14:03:39 -0400
Subject: [PATCH 1/4] Corrected language.  This is the New Client Certificate
 page, but has the New Server Certificate language.

---
 pages/account/3.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/account/3.php b/pages/account/3.php
index c32460a..f98a696 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -18,11 +18,11 @@
 	include_once("../includes/shutdown.php");
 ?>
 <h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
-<p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
+<p><?=_("Once you decide to subscribe for an SSL Client Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
-<p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
+<p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for a Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
 
-<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
+<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Client Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
 
 <p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 

From 5989e8adaded05914e9af1425f21385ece3d0240 Mon Sep 17 00:00:00 2001
From: Brian McCullough <bdmc@debian-BULLSEYE-live-builder-AMD64>
Date: Wed, 29 May 2024 08:40:40 -0400
Subject: [PATCH 2/4] Corrected label on CSR text box.

---
 pages/account/3.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/account/3.php b/pages/account/3.php
index f98a696..2e04171 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -149,7 +149,7 @@
 
       <tr>
         <td class="DataTD" colspan="2">
-            <label for="optionalCSR"><?= _("Optional Client CSR, no information on the certificate will be used") ?></label><br/>
+            <label for="optionalCSR"><?= _("Paste Client CSR here") ?></label><br/>
             <textarea id="optionalCSR" name="optionalCSR" cols="80" rows="5"></textarea>
         </td>
       </tr>

From c4b9c6370e2120ffd1e4a38780efbff26c7a170e Mon Sep 17 00:00:00 2001
From: Brian McCullough <bdmc@debian-BULLSEYE-live-builder-AMD64>
Date: Sat, 1 Jun 2024 22:42:42 -0400
Subject: [PATCH 3/4] Adjusted wording as per
 https://lists.cacert.org/wws/arc/cacert-policy/2020-09/msg00008.html

---
 www/policy/RootDistributionLicense.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/policy/RootDistributionLicense.html b/www/policy/RootDistributionLicense.html
index 5a8c5a9..43c588e 100644
--- a/www/policy/RootDistributionLicense.html
+++ b/www/policy/RootDistributionLicense.html
@@ -51,7 +51,7 @@ Editor: Mark Lipscombe
 <h2 id="g0.1">1. Terms </h2>
 
 <p>
-"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia.
+"CAcert Inc" means CAcert Incorporated, a non-profit association.
 <br>
 "CAcert Community Agreement" means the agreement entered into by each person wishing to RELY.
 <br>

From 2ca4b1aab868a619a72363f0a629bc229b902d12 Mon Sep 17 00:00:00 2001
From: Brian McCullough <bmccullough@cacert.org>
Date: Wed, 12 Jun 2024 22:39:41 -0400
Subject: [PATCH 4/4] Updated text as per #bug-1537

Edited CCA, Privacy Policy and RDL text to remove references to Australia.
---
 www/policy/CAcertCommunityAgreement.html | 7 +++----
 www/policy/PrivacyPolicy.html            | 8 +-------
 www/policy/RootDistributionLicense.html  | 2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/www/policy/CAcertCommunityAgreement.html b/www/policy/CAcertCommunityAgreement.html
index 3c1edd0..774ed8e 100644
--- a/www/policy/CAcertCommunityAgreement.html
+++ b/www/policy/CAcertCommunityAgreement.html
@@ -68,8 +68,8 @@
   <h4><a name="0.1">0.1</a> Terms</h4>
 
   <ol>
-    <li>"CAcert" means CAcert Inc., a non-profit Association of Members
-    incorporated in New South Wales, Australia. Note that Association Members
+    <li>"CAcert" means CAcert Inc., a non-profit Association of Members.
+    Note that Association Members
     are distinct from the Members defined here.</li>
 
     <li>"Member" means you, a registered participant within CAcert's Community,
@@ -295,8 +295,7 @@
 
   <h4><a name="3.1">3.1</a> Governing Law</h4>
 
-  <p>This agreement is governed under the law of New South Wales, Australia,
-  being the home of the CAcert Inc. Association.</p>
+  <p>This agreement is governed under the law of New South Wales, Australia.</p>
 
   <h4><a name="3.2">3.2</a> Arbitration as Forum of Dispute Resolution</h4>
 
diff --git a/www/policy/PrivacyPolicy.html b/www/policy/PrivacyPolicy.html
index a39162f..4e4dbad 100644
--- a/www/policy/PrivacyPolicy.html
+++ b/www/policy/PrivacyPolicy.html
@@ -99,13 +99,7 @@ Please see <a href='http://www.privacy.gov.au/'>http://www.privacy.gov.au/</a> f
 Governmental warrants and civil supoenas will be processed through the dispute resolution system, which ensures that valid authority is given to whoever complies with the supoena or the warrant.
 </p>
 
-
-<p>If you need to contact us in writing, address your mail to:</p>
-<p>
-CAcert Inc.<br />
-PO Box 66 <br />
-Oatley NSW 2223<br />
-Australia
+<p>If you need to contact us in writing, address your mail to the postal address of CAcert Inc. The current postal address of Cacert Inc. can be found on CAcert's web site.
 </p>
 <p><a href="http://validator.w3.org/check?uri=referer"><img src="images/valid-html50-blue.png" alt="Valid HTML 5" height="31" width="88"></a></p>
 </body>
diff --git a/www/policy/RootDistributionLicense.html b/www/policy/RootDistributionLicense.html
index 5a8c5a9..43c588e 100644
--- a/www/policy/RootDistributionLicense.html
+++ b/www/policy/RootDistributionLicense.html
@@ -51,7 +51,7 @@ Editor: Mark Lipscombe
 <h2 id="g0.1">1. Terms </h2>
 
 <p>
-"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia.
+"CAcert Inc" means CAcert Incorporated, a non-profit association.
 <br>
 "CAcert Community Agreement" means the agreement entered into by each person wishing to RELY.
 <br>