0.5 RC2 fprint element not attribute

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@638 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Ian Paterson 2007-03-02 01:56:04 +00:00
parent ec1e5988a4
commit 844a7dd381
1 changed files with 8 additions and 16 deletions

View File

@ -25,9 +25,9 @@
&ianpaterson;
<revision>
<version>0.5</version>
<date>2007-03-01</date>
<date>2007-03-02</date>
<initials>ip</initials>
<remark><p>Merged node creation and first publish examples; recommended the value of each &lt;KeyName/&gt; element and id attribute is set to the key fingerprint; added more examples</p></remark>
<remark><p>Merged node creation and first publish examples; recommended the value of each &lt;KeyName/&gt; element and id attribute is set to the key fingerprint; added fprint element and more examples</p></remark>
</revision>
<revision>
<version>0.4</version>
@ -319,15 +319,15 @@
</error>
</iq>
]]></example>
<p>An entity MAY request one or more specific public keys by specifying their fingerprints (see <link url='#usecases-pub'>Public Key Publication via PEP</link>). The entity includes &lt;pubkey/&gt; child elements with 'fprint' attributes in its request:</p>
<p>An entity MAY request one or more specific public keys by specifying their fingerprints (see <link url='#usecases-pub'>Public Key Publication via PEP</link>) as the content of &lt;fprint/&gt; child elements:</p>
<example caption='Specific public keys request'><![CDATA[
<iq type='get'
id='keys2'
to='juliet@capulet.com/balcony'
from='romeo@montague.net/garden'>
<pubkeys xmlns='urn:xmpp:pubkeys'>
<pubkey fprint='julietRSAkey1hash'/>
<pubkey fprint='julietRSAkey2hash'/>
<fprint>julietRSAkey1hash</fprint>
<fprint>julietRSAkey2hash</fprint>
</pubkeys>
</iq>
]]></example>
@ -439,19 +439,11 @@
<xs:element name='pubkeys'>
<xs:complexType>
<xs:choice minOccurs='0' maxOccurs='unbounded'>
<xs:element ref='pubkey'/>
<any processContents='lax' namespace='##other'/>
<xs:element name='fprint' type='xs:string'/>
<xs:any processContents='lax' namespace='##any'/>
</xs:choice>
<xs:attribute name='jid' type='xs:string' use='optional'/>
</xs:complexType>
</xs:element>
<xs:element name='pubkey'>
<xs:complexType>
<xs:sequence minOccurs='0'>
<any processContents='lax' namespace='##other'/>
</xs:sequence>
<xs:attribute name='fprint' type='xs:string' use='optional'/>
<xs:anyAttribute namespace='##any' processContents='lax'/>
</xs:complexType>
</xs:element>