From 16a05fff740ff8383bf323a506370960566a04f8 Mon Sep 17 00:00:00 2001 From: Brian McCullough 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"); ?>

-

+

-

+

-

http://www.cacert.org/cps.php

+

http://www.cacert.org/cps.php

From 5989e8adaded05914e9af1425f21385ece3d0240 Mon Sep 17 00:00:00 2001 From: Brian McCullough 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 @@ -
+
From c4b9c6370e2120ffd1e4a38780efbff26c7a170e Mon Sep 17 00:00:00 2001 From: Brian McCullough 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

1. Terms

-"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia. +"CAcert Inc" means CAcert Incorporated, a non-profit association.
"CAcert Community Agreement" means the agreement entered into by each person wishing to RELY.
From 2ca4b1aab868a619a72363f0a629bc229b902d12 Mon Sep 17 00:00:00 2001 From: Brian McCullough 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 @@

0.1 Terms

    -
  1. "CAcert" means CAcert Inc., a non-profit Association of Members - incorporated in New South Wales, Australia. Note that Association Members +
  2. "CAcert" means CAcert Inc., a non-profit Association of Members. + Note that Association Members are distinct from the Members defined here.
  3. "Member" means you, a registered participant within CAcert's Community, @@ -295,8 +295,7 @@

    3.1 Governing Law

    -

    This agreement is governed under the law of New South Wales, Australia, - being the home of the CAcert Inc. Association.

    +

    This agreement is governed under the law of New South Wales, Australia.

    3.2 Arbitration as Forum of Dispute Resolution

    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 http://www.privacy.gov.au/ 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.

    - -

    If you need to contact us in writing, address your mail to:

    -

    -CAcert Inc.
    -PO Box 66
    -Oatley NSW 2223
    -Australia +

    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.

    Valid HTML 5

    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

    1. Terms

    -"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia. +"CAcert Inc" means CAcert Incorporated, a non-profit association.
    "CAcert Community Agreement" means the agreement entered into by each person wishing to RELY.