diff options
authorMichael Tänzer <>2010-11-23 20:51:01 +0100
committerMichael Tänzer <>2010-11-23 20:51:01 +0100
commit01fd34e200f3427a0424e7ae8bd03ef448fb6378 (patch)
parent1ff27b7cd83f1e9f218918f5cdc3b617fd7735e3 (diff)
parent96448c95722cb358edc37ced9c70dc146dd5ad35 (diff)
Merge branch 'bug-876' into release2010-11-23
2 files changed, 11 insertions, 96 deletions
diff --git a/www/policy/NRPDisclaimerAndLicence.php b/www/policy/NRPDisclaimerAndLicence.php
index 6dbc647..bee8f26 100644
--- a/www/policy/NRPDisclaimerAndLicence.php
+++ b/www/policy/NRPDisclaimerAndLicence.php
@@ -1,99 +1,14 @@
-$id = intval($id);
-//showheader(_("CAcert - Non-Related Persons - Disclaimer and Licence"));
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+<head><title>NRP-DAL was replaced by the Root Distribution License</title></head>
<table border="1" bgcolor="#EEEEEE"><tr><td>
-<h1 align="center"> <?=_("Non-Related Persons")?> </h1>
-<h2 align="center"> <?=_("(Disclaimer and Licence)")?> </h2>
-<h2> <?=_("Definitions")?> </h2>
-<?=_("This is a Disclaimer and Licence from
-<u> CAcert Inc </u>,
-the 'issuer',
-to you, the 'user',
-being a general user of the Internet.")?>
-<h2> Disclaimer </h2>
-<?=_("The issuer has no other agreement with you,
-and has no control nor knowledge
-as to how you intend to use the products of the issuer.
-You alone take on all of the risk and all of the
-liability of your usage.
-The issuer makes no guarantee, warranty nor promise to you.")?>
-<?=_("Therefore, to the fullest extent possible in law,
-on behalf of itself and its related parties.")?>
-<h2> <?=_("Licence")?> </h2>
-<?=_("This licence offers you a non-exclusive, non-transferable
-'PERMISSION TO USE' certificates issued by issuer.")?>
- <?=_("You may 'USE' the certificates as facilitated
- by your software. For example,
- you may construct connections, read emails,
- load code or otherwise, as facilitated by your
- software.")?>
- </li><li>
- <?=_("You may NOT RELY on any statements or claims
- made by the certificates or implied in any way.")?>
- </li><li>
- <?=_("If your software is licensed under a separate
- third party agreement, it may be permitted
- to make statements or claims based on the certificates.
- You may NOT RELY on these statements or claims.")?>
- </li><li>
- <?=_("You may NOT distribute certificates or root keys
- under this licence, nor make representation
- about them.")?>
-<h2> <?=_("Alternatives")?> </h2>
-<?=_("If you find the terms of the above
-Non-Related Persons
-Disclaimer and Licence
-difficult or inadequate for your use, you may wish to")?>
- <?=sprintf(_("As an individual,
- %sregister with issuer%s
- and enter into the user agreement.
- This is free."),"<a href=''>","</a>")?>
- </li><li>
- <?=_("As a Third Party Distributor,
- enter into a separate third party agreement
- with issuer.")?>
- </li><li>
- <?=_("Delete issuer's roots from your software.
- Your software documentation should give
- directions and assistance for this.")?>
-<?=_("These alternatives are outside the above
-Non-Related Persons Disclaimer and Licence
-and do not incorporate.")?>
+The document "Non Related Persons - Disclaimer And Licence" was replaced by the Root Distribution Licence, which can be found <a href="/policy/RootDistributionLicense.php">here</a>.
diff --git a/www/policy/index.php b/www/policy/index.php
index 8506489..d3bfb06 100644
--- a/www/policy/index.php
+++ b/www/policy/index.php
@@ -25,7 +25,7 @@ showheader(_("CAcert - Policies"));
foreach (glob("*.php") as $filename)
- if($filename != "index.php")
+ if($filename != "index.php" && $filename != "NRPDisclaimerAndLicence.php")
echo "<li><a href='$filename'>$filename</a></li>\n";