From 12cc36901c071541d39ac7169ab6ebeb58758b46 Mon Sep 17 00:00:00 2001
From: source <source@cacert.org>
Date: Wed, 7 Jul 2010 14:20:34 +0000
Subject: [PATCH] Cleanup, Explanation

git-svn-id: http://svn.cacert.org/CAcert/Policies@1957 14b1bab8-4ef6-0310-b690-991c95c89dfd
---
 CertificationPracticeStatement.html | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/CertificationPracticeStatement.html b/CertificationPracticeStatement.html
index d2aca55..017976a 100755
--- a/CertificationPracticeStatement.html
+++ b/CertificationPracticeStatement.html
@@ -621,7 +621,7 @@ certificates.
 
 <p>
 <b>Roots.</b>
-The <span class="q"> (new) </span> CAcert root layout is as below.
+The new CAcert root layout is as below.
 These roots are pending Audit,
 and will be submitted to vendors via the (Top-level) Root.
 </p>
@@ -1010,7 +1010,6 @@ As per above.
   in any way, including but not limited to delivering these
   certificates with their products, e.g. browsers, mailers or servers.
   Vendors are covered under a separate licence.
-  <span class="q"> As of the moment, this licence is not written.</span>
 </p>
 <p>
 <b><a name="d_ccs" id="d_ccs">Configuration-Control Specification</a></b> "CCS".
@@ -1088,18 +1087,17 @@ The Subscriber Naming consists of:
 <ul>
   <li><tt>subjectAltName=</tt>
       One, or more, of the Subscriber's verified email addresses,
-      in rfc822Name format.
-
-  <ul class="q">
-    <li>SSO in subjectAltName?.</li>
-  </ul>
+      in rfc822Name format. Also includes a SHA1 hash of a random number if 
+      the member selects SSO (Single Sign On ID) during submission of CSR.
   <li><tt>EmailAddress=</tt>
-      One, or more, of the Subscriber's verified email addresses.
-      This is deprecated under 
+      One, or more, of the Subscriber's verified email addresses,
+      in rfc822Name format. Also includes a SHA1 hash of a random number if 
+      the member selects SSO (Single Sign On ID) during submission of CSR.
+      This field is deprecated under 
       RFC5280 <a href="http://tools.ietf.org/html/rfc5280#section-4.2.1.6">4
 .1.2.6</a>
-      and is to be phased out. Also includes a SHA1 hash of a random number if 
-      the member selects SSO (Single Sign On ID) during submission of CSR.
+      and is to be phased out. 
+
   </li>
   <li><tt>CN=</tt> The common name takes its value from one of:
     <ul><li>