Merge commit 'refs/pull/669/head' of https://github.com/xsf/xeps

This commit is contained in:
Jonas Wielicki 2018-07-30 13:09:56 +02:00
commit 97e4c70c62
1 changed files with 3 additions and 3 deletions

View File

@ -546,7 +546,7 @@ master key.</dd></di>
type='get' type='get'
id='getsecret'> id='getsecret'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<items node='urn:xmpp:openpgp:secret-key:0' <items node='urn:xmpp:openpgp:0:secret-key'
max_items='1'/> max_items='1'/>
</pubsub> </pubsub>
</iq>]]></example> </iq>]]></example>
@ -560,7 +560,7 @@ master key.</dd></di>
type='result' type='result'
id='getsecret'> id='getsecret'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<items node='urn:xmpp:openpgp:secret-key:0'> <items node='urn:xmpp:openpgp:0:secret-key'>
<item> <item>
<secretkey xmlns='urn:xmpp:openpgp:0'> <secretkey xmlns='urn:xmpp:openpgp:0'>
BASE64_OPENPGP_ENCRYPTED_SECRET_KEY BASE64_OPENPGP_ENCRYPTED_SECRET_KEY
@ -614,7 +614,7 @@ master key.</dd></di>
from='juliet@example.org/balcony' from='juliet@example.org/balcony'
id='create-node'> id='create-node'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<create node='urn:xmpp:openpgp:secret-key:0'/> <create node='urn:xmpp:openpgp:0:secret-key'/>
<configure> <configure>
<x xmlns='jabber:x:data' type='submit'> <x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'> <field var='FORM_TYPE' type='hidden'>