bug-1131: PolicyOnPolicy.html class/ID

1 files changed, 62 insertions, 28 deletions

diff --git a/www/policy/PolicyOnPolicy.html b/www/policy/PolicyOnPolicy.html
index be0ff2f..dc298a2 100644
--- a/www/policy/PolicyOnPolicy.html
+++ b/www/policy/PolicyOnPolicy.html
@@ -137,21 +137,48 @@ date / time of the last edit,
 Abstract.
 </p>
 
-<h2> 3. Work-In-Progress </h2>
+<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>
+
+<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).
+Copies should be eliminated where not being worked on.
+</p>
+
+<h2 id="s3"> 3. Work-In-Progress </h2>
+
+<p id="s3.1">
 3.1
 An Editor is identified.
 This person is responsible for
 drafting the document, following the consensus of the policy group.
 </p>
 
-<p>
+<p id="s3.2">
 3.2
 The Policy Officer resolves minor disputes and keeps order.
 </p>
 
-<p>
+<p id="s3.3">
 3.3
 The mail list of the policy group
 is used as the primary debating
@@ -160,27 +187,27 @@ but decision-taking
 should be visible on the main group.
 </p>
 
-<p>
+<p id="s3.4">
 3.4
 Documents start with the status of
 "Work-In-Progress" or WIP for short.
 </p>
 
 
-<h2> 4. DRAFT status </h2>
+<h2 id="s4"> 4. DRAFT status </h2>
 
-<p>
+<p id="s4.1">
 4.1
 On completion, a document moves to DRAFT status.
 </p>
 
-<p>
+<p id="s4.2">
 4.2
 A DRAFT is a policy-in-effect for the Community and is
 to be distributed and treated as such.
 </p>
 
-<p>
+<p id="s4.3">
 4.3
 As far as the Community is concerned, the DRAFT is policy.
 Challenges and concerns can be addressed to the policy group,
@@ -188,19 +215,19 @@ and policy group discussions on a DRAFT
 may be presented in Dispute Resolution.
 </p>
 
-<p>
+<p id="s4.4">
 4.4
 Revisions of DRAFTs
 must be treated as decisions on the policy group.
 </p>
 
-<p>
+<p id="s4.5">
 4.5
 The period of the DRAFT status is announced widely,
 which should be at least a month and no longer than a year.
 </p>
 
-<p>
+<p id="s4.6">
 4.6
 During the period of DRAFT,
 CAcert Inc. retains a veto over
@@ -208,8 +235,8 @@ policies that effect the running of CAcert Inc.
 </p>
 
 
-<h2> 5. POLICY status </h2>
-<p>
+<h2 id="s5"> 5. POLICY status </h2>
+<p id="s5.1">
 5.1
 After DRAFT period has elapsed with no revision beyond
 minor and editorial changes,
@@ -218,13 +245,13 @@ to move the document from
 DRAFT to POLICY status.
 </p>
 
-<p>
+<p id="s5.2">
 5.2
 Once POLICY, the Community may only challenge the document
 in Dispute Resolution.
 </p>
 
-<p>
+<p id="s5.3">
 5.3
 Policy group may propose changes to a POLICY document
 in order to update it.  When changes move to DRAFT status,
@@ -232,9 +259,15 @@ they may be included in the POLICY document,
 but must be clearly indicated within as DRAFT not POLICY.
 </p>
 
-<h2> 6. Open Process </h2>
+<p class="change">
+5.4
+POLICY documents are published on the CAcert website in plain HTML.  Change control must be in place.
+</p>
+
 
-<p>
+<h2 id="s6"> 6. Open Process </h2>
+
+<p id="s6.1">
 6.1
 All policy discussions and documents should be open
 processes.  There should be a fair chance for
@@ -243,7 +276,7 @@ to have their views heard.
 Rough Consensus is the working metric.
 </p>
 
-<p>
+<p id="s6.2">
 6.2
 Contributions to
 formally controlled documents such as Policies
@@ -261,12 +294,12 @@ contributions back to the community
 under an open licence.
 </p>
 
-<p>
+<p id="s6.3">
 6.3
 Contributors declare any conflicts of interest.
 </p>
 
-<p>
+<p id="s6.4">
 6.4
 Policies should be issued under free, open,
 non-restrictive,
@@ -274,39 +307,40 @@ irrevocable, non-exclusive,
 and clear licence by CAcert, Inc.
 </p>
 
-<p>
+<p id="s6.5">
 6.5
 Mailing lists should be archived,
 and important meetings should be minuted.
+<span class="change">A record of decisions is to be maintained.</span>
 </p>
 
-<h2> 7. Disputes. </h2>
+<h2 id="s7"> 7. Disputes. </h2>
 
-<p>
+<p id="s7.1">
 7.1
 Any questions not resolved by these rules
 may be voted on in the policy group, or
 may be dealt with in Dispute Resolution.
 </p>
 
-<p>
+<p id="s7.2">
 7.2
 The Policy Officer may decide a tight vote in a minor matter only.
 Failure of Rough Consensus may be declared by
 dissenting members.
 </p>
 
-<p>
+<p id="s7.3">
 7.3
 Matters unresolved refer back
 to further group discussion.
 </p>
 
-<p>
+<p id="s7.4">
 7.4
 The external avenue for disputes is to file a dispute
 according to CAcert's
-<a href="http://www.cacert.org/policy/DisputeResolutionPolicy.html">
+<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">
 Dispute Resolution Policy</a>
 DRP => COD7.
 </p>