summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-09-23 23:24:35 +0200
committerBenny Baumann <BenBE@geshi.org>2014-09-23 23:24:35 +0200
commit5ab84243dc07d604bea4142fa245a7374b7cdea3 (patch)
treee91bacd967313cfaf44e32fe0576f1bd880070c1
parent886211b0f935afa70645329fb00f5ece7a26bee1 (diff)
downloadcacert-devel-5ab84243dc07d604bea4142fa245a7374b7cdea3.tar.gz
cacert-devel-5ab84243dc07d604bea4142fa245a7374b7cdea3.tar.xz
cacert-devel-5ab84243dc07d604bea4142fa245a7374b7cdea3.zip
bug 1131: And yet some more updates by the Policy Officer
-rw-r--r--www/policy/PolicyOnPolicy.html31
-rw-r--r--www/policy/RootDistributionLicense.html20
2 files changed, 28 insertions, 23 deletions
diff --git a/www/policy/PolicyOnPolicy.html b/www/policy/PolicyOnPolicy.html
index d4d548f..f50b415 100644
--- a/www/policy/PolicyOnPolicy.html
+++ b/www/policy/PolicyOnPolicy.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" lang="en">
<title>Policy on Policy</title>
<style type="text/css">
<!--
@@ -33,7 +33,7 @@ th {
<tbody>
<tr>
-
+
<td rowspan="2">
Name: PoP <a style="color: steelblue" href="https://svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD1</a>
<br>
@@ -49,11 +49,11 @@ th {
<td align="right" valign="top">
<a href="https://www.cacert.org/policy/PolicyOnPolicy.php">
-<img src="images/cacert-policy.png" alt="PoP Status - POLICY" style="border-style: none;" height="31" width="88">
-</a>
- </td>
- </tr>
- </tbody>
+ <img src="images/cacert-policy.png" alt="PoP Status - POLICY" style="border-style: none;" height="31" width="88">
+ </a>
+</td>
+</tr>
+</tbody>
</table>
</div>
@@ -65,7 +65,7 @@ th {
-<h2 id="g0.1">Preliminaries </h2>
+<h2 id="g0.1">0. Preliminaries </h2>
<p>
Policy on Policy adopts the IETF model of
'rough consensus' to create CAcert documents
@@ -73,7 +73,7 @@ th {
</p>
-<h2 id="g0.2">Scope and Purpose </h2>
+<h2 id="g0.2">1. Scope and Purpose </h2>
<p id="s1.1">
1.1
@@ -108,7 +108,7 @@ Community Members of CAcert.
</p>
-<h2 id="g0.3">Basic Model </h2>
+<h2 id="g0.3">2. Basic Model </h2>
<p id="s2.1">
2.1
@@ -172,6 +172,7 @@ must not be confusable with documents of higher status
Copies should be eliminated where not being worked on.
</p>
+<h2 id="g0.4">3. Work-In-Progress </h2>
<p id="s3.1">
3.1
@@ -201,7 +202,7 @@ Documents start with the status of
</p>
-<h2 id="g0.4">DRAFT status </h2>
+<h2 id="g0.5">4. DRAFT status </h2>
<p id="s4.1">
4.1
@@ -241,7 +242,7 @@ CAcert Inc. retains a veto over
policies that effect the running of CAcert Inc.
</p>
-<h2 id="g0.5">POLICY status </h2>
+<h2 id="g0.6">5. POLICY status </h2>
<p id="s5.1">
5.1
After DRAFT period has elapsed with no revision beyond
@@ -270,7 +271,7 @@ but must be clearly indicated within as DRAFT not POLICY.
POLICY documents are published on the CAcert website in plain HTML. Change control must be in place.
</p>
-<h2 id="g0.6">Open Process </h2>
+<h2 id="g0.7">6. Open Process </h2>
<p id="s6.1">
6.1
@@ -319,7 +320,7 @@ and important meetings should be minuted.
A record of decisions is to be maintained.
</p>
-<h2 id="g0.7">Disputes. </h2>
+<h2 id="g0.8">7. Disputes. </h2>
<p id="s7.1">
7.1
@@ -349,5 +350,7 @@ according to CAcert's
Dispute Resolution Policy</a>
DRP =&gt; COD7.
</p>
+
+
</body>
</html>
diff --git a/www/policy/RootDistributionLicense.html b/www/policy/RootDistributionLicense.html
index 2a2094b..388e745 100644
--- a/www/policy/RootDistributionLicense.html
+++ b/www/policy/RootDistributionLicense.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" lang="en">
<title> CAcert - Root Distribution License </title>
<style type="text/css">
<!--
@@ -17,7 +17,7 @@
<tbody>
<tr rowspan="2">
<td>
-Name: RDL <a style="color: steelblue" href="https://svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD14</a>
+Name: RDL <a style="color: steelblue" href="https://f.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD14</a>
<br>
Status: POLICY <a href="https://wiki.cacert.org/PolicyDecisions#p20140731">p20140731</a>
<br>
@@ -27,8 +27,8 @@ Editor: Mark Lipscombe
</td>
<td align="right" valign="top">
<a href="https://www.cacert.org/policy/PolicyOnPolicy.php">
-<img src="images/cacert-policy.png" alt="RDL Status - POLICY" style="border-style: none;" height="31" width="88">
-</a>
+ <img src="images/cacert-policy.png" alt="RDL Status - POLICY" style="border-style: none;" height="31" width="88">
+ </a>
</td>
</tr>
</tbody>
@@ -48,7 +48,7 @@ Editor: Mark Lipscombe
<h1> Root Distribution License </h1>
-<h2 id="g0.1">Terms </h2>
+<h2 id="g0.1">1. Terms </h2>
<p>
"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia.
@@ -72,13 +72,13 @@ application or system is distributed in binary form only.
<br>
</p>
-<h2 id="g0.2">Copyright </h2>
+<h2 id="g0.2">2. Copyright </h2>
<p>
CAcert Root Certificates are Copyright CAcert Incorporated. All rights reserved.
</p>
-<h2 id="g0.3">License </h2>
+<h2 id="g0.3">3. License </h2>
<p>
You may copy and distribute CAcert Root Certificates only in accordance with this license.
@@ -102,7 +102,7 @@ documentation provided with the distribution.
</li>
</ul>
-<h2 id="g0.4">Disclaimer </h2>
+<h2 id="g0.4">4. Disclaimer </h2>
<p>
THE CACERT ROOT CERTIFICATES ARE PROVIDED "AS IS" AND ANY EXPRESS OR
@@ -128,7 +128,7 @@ ISSUED BY CACERT INC, YOU MUST ENTER INTO A SEPARATE AGREEMENT WITH
CACERT INC.
</p>
-<h2 id="g0.5">Statutory Rights </h2>
+<h2 id="g0.5">5. Statutory Rights </h2>
<p>
Nothing in this license affects any statutory rights that cannot be
@@ -171,5 +171,7 @@ Root Distribution License
and do not incorporate.
</p>
</div>
+
+
</body>
</html>