From 9732f0429299953bb6b504d3342d29435e266430 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlyaGNr6H--NFCBqwTAjb7NOTD7BRIKF4E"
 <Alberto@web>
Date: Tue, 12 Jul 2011 12:49:49 -0400
Subject: [PATCH]

---
 design/trust-anchor.mdwn | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/design/trust-anchor.mdwn b/design/trust-anchor.mdwn
index f6f2f81..bfc0bdd 100644
--- a/design/trust-anchor.mdwn
+++ b/design/trust-anchor.mdwn
@@ -87,19 +87,24 @@ The server certificate hash field is mutually exclusive with the other fields.
   do something about naminge
 
 ## User Web Provisioning Format
-    <identities>
+<identities>
       <identity>
         <display-name>Unique Name</display-name>
         <user>username</user>
         <password>ENCRYPTEDPW</password>
         <realm>issuer name</realm>
         <services>
-          <service>xmpp@jabber.project-moonshot.org</service>
+          <service>xmpp@ja;bber.project-moonshot.org</service>
+          <service>email@project-moonshot.org</service>
         </services>
         <selection-rules>
           <rule>
             <pattern>PATTERN</pattern>
-            <always_confirm>true</always_confirm>
+            <always-confirm>true</always-confirm>
+          </rule>
+          <rule>
+            <pattern>ANOTHER_PATTERN</pattern>
+            <always-confirm>false</always-confirm>
           </rule>
         </selection-rules>
         <trust-anchor>
@@ -107,7 +112,11 @@ The server certificate hash field is mutually exclusive with the other fields.
           <subject>Foo</subject>
           <subject-alt>Bar</subject-alt>
           <!-- Or alternatively -->
-          <srv-cert>ABCDEFGHIJKLMNOPQRSTUVWXYZ123455678910</srv-cert>
+          <server-cert>ABCDEFGHIJKLMNOPQRSTUVWXYZ123455678910</server-cert>
         </trust-anchor>
       </identity>
+      <identity>
+        <display-name>ASD</display-name>
+        <username>ASD</username>
+      </identity>
     </identities> 
-- 
2.1.4