recent changes: Uli 20130223:

- incorporating suggestion to transfer section from CPS 9.16.1 to PoP 5.4 - added reworded p20100306 into #2.5 - header reformated to reflect new header style git-svn-id: http://svn.cacert.org/CAcert/Policies@2457 14b1bab8-4ef6-0310-b690-991c95c89dfd
12 years ago · 37d84668de
parent 7f988139b0
commit 37d84668de
1 changed files with 41 additions and 31 deletions
--- a/PolicyOnPolicy.html
+++ b/PolicyOnPolicy.html
@ -37,53 +37,47 @@ th {
 </head>
 <body lang="en-GB">
        <p>
-        <center>
+        <span style="align: center;">
        <big>
        <br /><b>WARNING:</b><br />
        The proper policy document is located<br />
        <a href="//www.cacert.org/policy/PolicyOnPolicy.php">
        on the CAcert website </a>.<br />
-        </big></b />
+        </big><br />
        This document is a <b>working draft</b> to include<br />
        future revisions only, and is currently<br />
        only relevant for the [policy] group.<br />
-        Suggested <span class="change">additions in BLUE</span>, <span class="strike">strikes in blue<span>.<br />
-        </center>
+        Suggested <span class="change">additions in BLUE</span>, <span class="strike">strikes in blue</span>.<br />
+        </span>
        Iang <span class="change">20100507</span>: fixed two errors being cacert-policy and 1.3 terminology.<br />
        Iang <span class="change">20100507</span>: incorporated suggestions from CCS - 2.3, 5.4, 6.5<br />
+        Uli <span class="change">20130223</span>: incorporating suggestion to transfer section from CPS 9.16.1 to PoP 5.4, added reworded p20100306 into #2.5, header reformated to reflect new header style<br />
        </p>
        <hr />

 <table width="100%">

 <tr>
-<td> PoP </td>
-<td> </td>
-<td width="20%"> Iang  </td>
-</tr>
-
-<tr>
-<td> POLICY&nbsp;<a href="//wiki.cacert.org/wiki/PolicyDecisions">p200800204.1</a> </td>
-<td>  </td>
-<td>
-  20080309<span class="change">, 20100507</span>
+<td>Name: PoP <a style="color: steelblue" href="https://svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD1</a><br />
+Status: POLICY&nbsp;<a href="//wiki.cacert.org/wiki/PolicyDecisions">p200800204.1</a><br />
+Editor: Iang 20080309<br />
+Changes: <span class="change">20100507, 20130223</span><br />
+Licence: <a style="color: steelblue" href="//wiki.cacert.org/Policy#Licence" title="this document is Copyright &copy; CAcert Inc., licensed openly under CC-by-sa with all disputes resolved under DRP.  More at wiki.cacert.org/Policy" > CC-by-sa+DRP </a>
+</td>
+<td align="right">
+  <a href="//www.cacert.org/policy/PolicyOnPolicy.php"><img src="/images/cacert-policy.png" alt="PoP Status - POLICY" height="31" width="88" style="border-style: none;" /></a><br />
+  <a href="//www.cacert.org/policy/PolicyOnPolicy.php"><img src="/images/cacert-draft.png" alt="PoP Status - DRAFT" height="31" width="88" style="border-style: none;" /></a>
 </td>
 </tr>

-<tr>
-<td> COD1 </td>
-<td> </td>
-<td> </td>
-</tr>

+</table>

-<tr>
-<td> </td>
-<td > <b>Policy&nbsp;on&nbsp;Policy</b> </td>
-<td> </td>
-</tr>

-</table>
+<p><br /></p>
+
+<h1> Policy&nbsp;on&nbsp;Policy </h1>
+

 <h2 id="s0"> 0. Preliminaries </h2>
 <p>
@ -163,6 +157,25 @@ Abstract.

 <p class="change">
 2.5
+Editors may make the following changes, where
+     it is clear that the change does not change the policy:</p>
+<ul><li>
+      <span class="change">fixes to errors in grammar and spelling,</span>
+    </li><li>
+      <span class="change">anchors, HTML errors, URLs &amp; formatting,</span>
+    </li><li>
+      <span class="change">COD numbers and other references, and</span>
+    </li><li>
+      <span class="change">other minutiae, as agreed under 2.3.</span>
+    </li>
+</ul>
+<p class="change">
+Such changes to be notified to the policy group, and to be folded into effect, etc, without further ado.
+</p>
+
+
+<p class="change">
+2.6
 Documents of lower status (work-in-progress or DRAFT)
 must not be confusable with documents of higher status
 (DRAFT or POLICY).
@ -266,13 +279,10 @@ but must be clearly indicated within as DRAFT not POLICY.

 <p class="change">
 5.4
-POLICY documents must be published on the CAcert website
-in plain HTML format,
-under the same change control as critical source code under
-<a href="//svn.cacert.org/CAcert/Policies/SecurityPolicy.html">Security Policy</a>
-SP => COD8.
+POLICY documents are published on the CAcert website in plain HTML.  Change control must be in place.
 </p>

+
 <h2 id="s6"> 6. Open Process </h2>

 <p id="s6.1">
@ -319,7 +329,7 @@ and clear licence by CAcert, Inc.
 6.5
 Mailing lists should be archived,
 and important meetings should be minuted.
-<span class="change">Policy Officer is to maintain a record of decisions.</span>
+<span class="change">A record of decisions is to be maintained.</span>
 </p>

 <h2 id="s7"> 7. Disputes. </h2>