This commit is contained in:
Peter Saint-Andre 2013-09-12 17:21:44 -06:00
parent c2392b53ce
commit f526d5398a
1 changed files with 170 additions and 104 deletions

View File

@ -10,7 +10,7 @@
<abstract>This document specifies an XMPP extension for use of the vCard4 XML format in XMPP systems, with the intent of obsoleting the vcard-temp format.</abstract>
&LEGALNOTICE;
<number>0292</number>
<status>Deferred</status>
<status>Experimental</status>
<type>Standards Track</type>
<sig>Standards</sig>
<approver>Council</approver>
@ -31,6 +31,12 @@
<email>samizzi@cisco.com</email>
<jid>samizzi@cisco.com</jid>
</author>
<revision>
<version>0.10</version>
<date>2013-09-12</date>
<initials>psa</initials>
<remark><p>Added information about determining support; corrected the XSLT; corrected data: URL example and added reference to RFC 2397; corrected mapping of middle name property.</p></remark>
</revision>
<revision>
<version>0.9</version>
<date>2011-10-09</date>
@ -162,7 +168,7 @@
type='result'>
<vcard xmlns="urn:ietf:params:xml:ns:vcard-4.0">
<fn><text>Peter Saint-Andre</text></fn>
<n><surname>Saint-Andre</surname><given>Peter</given><middle></middle></n>
<n><surname>Saint-Andre</surname><given>Peter</given><additional></additional></n>
<nickname><text>stpeter</text></nickname>
<nickname><text>psa</text></nickname>
<photo><uri>https://stpeter.im/images/stpeter_oscon.jpg</uri></photo>
@ -199,6 +205,12 @@
<parameters><type><text>work</text><text>fax</text></type></parameters>
<uri>tel:+1-303-308-3219</uri>
</tel>
<tel>
<parameters>
<type><text>cell</text><text>voice</text><text>text</text></type>
</parameters>
<uri>tel:+1-720-256-6756</uri>
</tel>
<tel>
<parameters><type><text>home</text><text>voice</text></type></parameters>
<uri>tel:+1-303-555-1212</uri>
@ -322,7 +334,7 @@
<n>
<surname>Mizzi</surname>
<given>Samantha</given>
<middle></middle>
<additional></additional>
</n>
<nickname><text>Sam</text></nickname>
<nickname><text>samizzi</text></nickname>
@ -356,7 +368,7 @@
<n>
<surname>Mizzi</surname>
<given>Samantha</given>
<middle></middle>
<additional></additional>
</n>
<nickname><text>Sam</text></nickname>
<nickname><text>samizzi</text></nickname>
@ -407,7 +419,7 @@
<n>
<surname>Mizzi</surname>
<given>Samantha</given>
<middle></middle>
<additional></additional>
</n>
<nickname><text>Sam</text></nickname>
<nickname><text>samizzi</text></nickname>
@ -443,7 +455,7 @@
<n>
<surname>Mizzi</surname>
<given>Samantha</given>
<middle></middle>
<additional></additional>
</n>
<nickname><text>Sam</text></nickname>
<nickname><text>samizzi</text></nickname>
@ -496,6 +508,31 @@
]]></example>
</section1>
<section1 topic='Determining Support' anchor='disco'>
<p>If an XMPP client or server supports the vCard4 namespace, it MUST advertise that fact in its responses to &xep0030; information ("disco#info") requests by returning a feature of "urn:ietf:params:xml:ns:vcard-4.0":</p>
<example caption='A disco#info query'><![CDATA[
<iq type='get'
from='stpeter@jabber.org/squire'
to='samizzi@cisco.com/foo'
id='disco1'>
<query xmlns='http://jabber.org/protocol/disco#info'/>
</iq>
]]></example>
<example caption='A disco#info response'><![CDATA[
<iq type='result'
from='samizzi@cisco.com/foo'
to='stpeter@jabber.org/squire'
id='disco1'>
<query xmlns='http://jabber.org/protocol/disco#info'>
...
<feature var='urn:ietf:params:xml:ns:vcard-4.0'/>
...
</query>
</iq>
]]></example>
<p>In order for an application to determine whether an entity supports this protocol, where possible it SHOULD use the dynamic, presence-based profile of service discovery defined in &xep0115;. However, if an application has not received entity capabilities information from an entity, it SHOULD use explicit service discovery instead.</p>
</section1>
<section1 topic='Security Considerations' anchor='security'>
<p>The vCard information published to one's XMPP server is world-readable; therefore, users should exercise due caution when determining what information to include (e.g., street addresses, personal telephone numbers, or email addresses).</p>
</section1>
@ -542,6 +579,9 @@
</impp>
]]></example>
</section3>
<section3 topic='MIDDLE' anchor='mapping-temponly-middle'>
<p>The vcard-temp specification defined a &lt;MIDDLE/&gt; element as the third allowable element within the &lt;N/&gt; ("name") element. This element was not part of the vCard3 schema, although the Dawson drafts did contain an &lt;other/&gt; element in the third position of child elements within the &lt;n/&gt; element. It is appropriate to map the vcard-temp &lt;MIDDLE/&gt; element to the vCard4 "Additional Name" part of the "N" structured property value, which in xCard is the &lt;additional/&gt; child of the &lt;n/&gt; element.</p>
</section3>
</section2>
<section2 topic='Properties Defined Incorrectly in vcard-temp' anchor='mapping-incorrect'>
<p>Several of the properties in vcard-temp are defined differently in vCard3. In fact, the definitions even differ from those provisionally made in the so-called "Dawson drafts" from which vcard-temp was supposedly derived (for reference, the last of these is archived at &lt;<link url='http://www.watersprings.org/pub/id/draft-dawson-vcard-xml-dtd-03.txt'>http://www.watersprings.org/pub/id/draft-dawson-vcard-xml-dtd-03.txt</link>&gt;). The reasons for these discrepancies are unknown. However, care must be taken in correctly mapping these properties from vcard-temp to vCard4.</p>
@ -621,7 +661,7 @@ property-key = element key {
<li>N</li>
<li>NICKNAME</li>
<li>NOTE</li>
<li>PHOTO</li>
<li>PHOTO (mapped to a 'data:' URI in vCard4, see &rfc2397;)</li>
<li>PRODID</li>
<li>REV</li>
<li>ROLE</li>
@ -685,14 +725,9 @@ OR OTHER DEALINGS IN THE SOFTWARE.
<!-- Author: stpeter@jabber.org -->
<!-- Version: 0.0.2 -->
<!-- Version: 0.0.3 -->
<!-- Last Updated: 2011-06-22 -->
<!-- NOTE: This is a provisional mapping with known
errors. It is subject to change without notice.
Please use this only for experimental purposes!
You have been warned!! -->
<!-- Last Updated: 2012-09-12 -->
<xsl:stylesheet
xmlns='urn:ietf:params:xml:ns:vcard-4.0'
@ -793,8 +828,6 @@ OR OTHER DEALINGS IN THE SOFTWARE.
<!-- one or more TEL elements can be included -->
<!-- FIXME -->
<xsl:apply-templates select='/vCard/TEL'/>
<!-- one or more EMAIL elements can be included -->
@ -848,7 +881,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
</xsl:when>
<xsl:otherwise>
<logo>
<uri><xsl:text>data:</xsl:text><xsl:value-of select='TYPE'/><xsl:text>;</xsl:text><xsl:value-of select='BINVAL'/>
<uri><xsl:text>data:</xsl:text><xsl:value-of select='TYPE'/><xsl:text>;base64,</xsl:text><xsl:value-of select='BINVAL'/>
</uri>
</logo>
</xsl:otherwise>
@ -985,7 +1018,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
<given><xsl:value-of select='GIVEN'/></given>
</xsl:if>
<xsl:if test='$MIDDLE.count=1'>
<middle><xsl:value-of select='MIDDLE'/></middle>
<additional><xsl:value-of select='MIDDLE'/></additional>
</xsl:if>
<xsl:if test='$PREFIX.count=1'>
<prefix><xsl:value-of select='PREFIX'/></prefix>
@ -1186,8 +1219,8 @@ OR OTHER DEALINGS IN THE SOFTWARE.
</N>
<NICKNAME>stpeter</NICKNAME>
<NICKNAME>psa</NICKNAME>
<PHOTO><EXTVAL>http://me.stpeter.im/images/stpeter_oscon.jpg</EXTVAL></PHOTO>
<PHOTO><EXTVAL>http://me.stpeter.im/images/stpeter_hell.jpg</EXTVAL></PHOTO>
<PHOTO><EXTVAL>http://stpeter.im/images/stpeter_oscon.jpg</EXTVAL></PHOTO>
<PHOTO><EXTVAL>http://stpeter.im/images/stpeter_hell.jpg</EXTVAL></PHOTO>
<BDAY>1966-08-06</BDAY>
<ADR>
<WORK/>
@ -1208,9 +1241,10 @@ OR OTHER DEALINGS IN THE SOFTWARE.
<PCODE>80138</PCODE>
<CTRY>USA</CTRY>
</ADR>
<TEL><PREF/><WORK/><VOICE/><NUMBER>303-308-3282</NUMBER></TEL>
<TEL><WORK/><FAX/><NUMBER>303-308-3219</NUMBER></TEL>
<TEL><HOME/><VOICE/><NUMBER>303-555-1212</NUMBER></TEL>
<TEL><PREF/><WORK/><VOICE/><NUMBER>+1-303-308-3282</NUMBER></TEL>
<TEL><WORK/><FAX/><NUMBER>+1-303-308-3219</NUMBER></TEL>
<TEL><CELL/><VOICE/><TEXT/><NUMBER>+1-720-256-6756</NUMBER></TEL>
<TEL><HOME/><VOICE/><NUMBER>+1-303-555-1212</NUMBER></TEL>
<EMAIL><INTERNET/><PREF/><USERID>stpeter@jabber.org</USERID></EMAIL>
<EMAIL><WORK/><USERID>psaintan@cisco.com</USERID></EMAIL>
<JABBERID>stpeter@jabber.org</JABBERID>
@ -1307,43 +1341,56 @@ aPYXq38EfnUbcfxXyFZWUMQch0LTP4SH+2nX/sn4VlZXqx/VEz7EF19/50bpf8SPgPzrKyuAO4P3
<KEY>
<CRED>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
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
=4sgL
mQINBFETDzsBEAC0FOv1N3ZJzIIxN6cKD475KVS9CHDPeYpegcOIPnL5eY1DCHeh
/IwS1S7RCePtmiybNoV9FsI4PKUknzXQxA6LVEdAR/LUlhgJKjq+gsgp8lqbEILh
g13ecH66HwLS9rarbQkC47T7kL8miIPBFC6E3A4Lq1L+eueO6UcLhKgoYkMxOjdi
WrMgKTnVpch5ydLkPm/z0Zo8zRgqlPuTLeCrXXZYnjHXLVFN2xy04UzOs7P5u5KV
fx5Z7uQisr8pXtyLd6SpTZo6SHgKBv15uz0rqXhsJojiGtOXfWznAjaS5FUOORq9
CklG5cMOUAT8TNftv0ktsxaWDL1ELDVQPy1m7mtzo+VREG+0xmU6AjMo/GHblW1U
U7MI9yCiuMLsp/HLrFuiosqLVZ85wuLQ2junPe3tK8h15UcxIXAcpQ1VqIaDQFbe
uLOXJTF8YHpHdpHYt/ZM1ll7ZBKGAo8yd7uF7wJ9D3gUazwdz9fFjWV7oIk7ATwO
lFllzmWDn+M2ygbHOGUGMX5hSaa8eDSieiR2QoLdn27Fip7kMBTJ2+GISrfnJTN/
OQvmj0DXXAdxHmu2C4QgmZbkge35n129yzXn9NcqzrGLroV62lL3LgX6cSbiH5i7
GgWY6CAPb1pMogV0K475n9FvOSDRiG4QSO5yqKiA3OP5aKrIRp2TNAk4IwARAQAB
tCZQZXRlciBTYWludC1BbmRyZSA8c3RwZXRlckBzdHBldGVyLmltPokCOQQTAQIA
IwUCURMPOwIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOoGpJErxa2p
6bgQAKpxu07cMDOLc4+EG8H19NWXIVVybOEvfGuHYZaLKkPrhrMZwJiOwBpyISNR
t9qzX1eLCVaojaoEVX6kD8MGc5zKFfiJZy3j7lBWl+Ybr7FfXYy2BbAXKx49e1n6
ci9LmBrmVfAEaxtDNPITZ9N9oUAb9vS0nrG036EwteEHAveQvlDjO7lhz6+Cv7lZ
QgBj9rZ6khfcQ4S3nSCQaKLQ9Iav4fqxI7SfuPKnx6quHX3JNLGnVo3wl+j/foCK
0iTrmtHxCI3kc/bx6g32pRjHEPX0ALMBhmzU2uca+TE0zCEC96mgYXAUCwdnCFWy
beIEbt6pz65iML13kAVAq0H/GqncnMGN0MbOatnw1Tdz/vkLojIy7QbPcQ0plUFx
v5491xPfIrHhOWdRXp6WUt88fcqhT6MHZpVRtusj2ornKVVn+Y0GLsMMCTcrXJRG
7Ao1YV72t/pJpzfGWSaaxolxDIZ6B+76jrIhUhiWgo/4nf+DN6BIlCZQ6j6xxjjx
462cu02kuhIILTk2pzaMOufTBWx0uJhZk/KP2Fay/41pX7pvVOwRC4uIlKsLnJKL
PS7EDa4BUUxENfd/9LqOGwlII8BbSe98PLMI8sXkcigc3UXMVda9ll0YhQa+lbP1
NaszmnBhwuiCsgnPGbImsJuRzgEEgckwP/dNeyr6MlFMyfaeuQINBFETDzsBEADB
zOsEHpUmhkRUjH9Tek87dn5P/Yh/L/HptgCGk40TL/C+kYdkd3HyteMEf061PNms
S/Rq8k37Fu3VODYb9SPYKxtgksKSYUtIkPKvao09K9QNWPqyWuNf0F+iAjVMUuda
EVFJ7bHF310RDwLY5IvLeCXxtvG+Vv/i+g77d2WdPDp+zLJ8306C4yBKjSJV8xW0
cn2fd7NviIEN6cNHTsZNDZVMlgYPrxnwSq8GTEPGC7HsLIwGcx3hIe9QjnPw9CpA
mQENpDEyWcxgF5uwo2NJECoDswKz1Nb0gfawF3ZIbD+GcLujTu94iJuVg25jATWm
9wTgcfZo4UPllRGXdIb8uWwUFQlLQgd4ROLZZtXNGmHIymJrV2crx53gxup+1j0X
qhlzKg8xbImWhEfS9oHZkRK8VHgmWSIt7TNwNir6N5j3lqwWVBhnu6GzF01sKGNy
SlqNRbd0fqhakCkK71b8ot8tYTcYG5Lg10z6HTbgQx2UwLthUjqbblDQ+GLmrOhi
WklLXRsnlnPMwnEyFePAnsT5tasy2Cn9qjpttNDah7PB8iFUi9mtTF/XDVgpFaB5
G3CDV7Q2NgbAI6g6QhLIAmXzSP635G83mda0TKXHQXHDyLJTTn+WVFU7t4m4uLt+
0DsWU8jXHQWyUTNG9WPUrXhusDUAPHxFCQ/n/lQVBwARAQABiQIfBBgBAgAJBQJR
Ew87AhsMAAoJEOoGpJErxa2pqfgP/ApN+TRu2bBIgaw1dr3AznSSha84DIpXUDh3
udZvQrGbUtz8/mA+e3iZEN/cmmBw2LGlAuQoJNILTZQ318yTP+E5QU7fJH7FVsoh
UyvrMfyt3IMA9jg0Z9MuloLezvIjjMfFeNa0ROgDb/ubOT7JQzi1kwN8Lu3lO80H
wqBHXEeOLoislUSnZajRKvITbKWkZ6PHRjlMw1Wk4oIi6VLHgGgj79zzL3uhML26
63m7imShvz1QcHTwvyR5i8cZbNOEkotZyERiA1p7YHuruS+QvTi3ZPoQbnMUB3a7
py9d11bw1+w3LiAUGZE/z5hBWOFxYtw+w/U/Vx0BwJGYlwU3M2W20uEXe+qxz7wn
akygKjmLiD2z4njfKjcNCiV3FmXrpmWgADln1c4jfxDh0NrndrsM8FPDf1TMPtOZ
gFDkKripc9xkZ/25P6xn27oTOHWKcAC0QhxSH+HuVBBRk8AgF+zAbDZe4/L6+kan
SrycIXW+wCzwBq61aWsz2QhhuKjozVkhk4dRG+CfjzAFjnyxwYERn3uXVKQAwTwc
dNcTI9RV98IsNrw9Y4lJEAg6CjNPmiD5+EASycqaOuToRSGukr8sOQLWLPyTnez/
aG8Xf7a+fntWzK2HuDYoSDhJJrylWw/lMklOBm4wtMeNA0zcQH6AQV/GzQVQkSGq
rLuMVIV/
=llGw
-----END PGP PUBLIC KEY BLOCK-----
</CRED>
</KEY>
@ -1354,7 +1401,7 @@ vg1b8xiNvBYs7KmcWkZMV+KlAloAn38KQv4WdVk2ugeCDCcVe9ARI3PE
</vCard>
]]></code>
</section2>
<section2 topic='Example of vCard XML Data' anchor='migration-vcard4'>
<section2 topic='Example of vCard4 XML Data' anchor='migration-vcard4'>
<code><![CDATA[
<vcard xmlns="urn:ietf:params:xml:ns:vcard-4.0">
<fn>
@ -1363,7 +1410,7 @@ vg1b8xiNvBYs7KmcWkZMV+KlAloAn38KQv4WdVk2ugeCDCcVe9ARI3PE
<n>
<surname>Saint-Andre</surname>
<given>Peter</given>
<middle></middle>
<additional></additional>
</n>
<nickname>
<text>stpeter</text>
@ -1372,10 +1419,10 @@ vg1b8xiNvBYs7KmcWkZMV+KlAloAn38KQv4WdVk2ugeCDCcVe9ARI3PE
<text>psa</text>
</nickname>
<photo>
<uri>http://me.stpeter.im/images/stpeter_oscon.jpg</uri>
<uri>http://stpeter.im/images/stpeter_oscon.jpg</uri>
</photo>
<photo>
<uri>http://me.stpeter.im/images/stpeter_hell.jpg</uri>
<uri>http://stpeter.im/images/stpeter_hell.jpg</uri>
</photo>
<bday>
<date>1966-08-06</date>
@ -1406,19 +1453,25 @@ vg1b8xiNvBYs7KmcWkZMV+KlAloAn38KQv4WdVk2ugeCDCcVe9ARI3PE
<type><text>work</text><text>voice</text></type>
<pref><integer>1</integer></pref>
</parameters>
<uri>tel:303-308-3282</uri>
<uri>tel:+1-303-308-3282</uri>
</tel>
<tel>
<parameters>
<type><text>work</text><text>fax</text></type>
</parameters>
<uri>tel:303-308-3219</uri>
<uri>tel:+1-303-308-3219</uri>
</tel>
<tel>
<parameters>
<type><text>cell</text><text>voice</text><text>text</text></type>
</parameters>
<uri>tel:+1-720-256-6756</uri>
</tel>
<tel>
<parameters>
<type><text>home</text><text>voice</text></type>
</parameters>
<uri>tel:303-555-1212</uri>
<uri>tel:+1-303-555-1212</uri>
</tel>
<email>
<text>stpeter@jabber.org</text>
@ -1445,7 +1498,7 @@ vg1b8xiNvBYs7KmcWkZMV+KlAloAn38KQv4WdVk2ugeCDCcVe9ARI3PE
<text>Patron Saint</text>
</role>
<logo>
<uri>data:image/jpeg;
<uri>data:image/jpeg;base64,
/9j/4AAQSkZJRgABAQEASABIAAD//gAXQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAIBgYHBgUI
BwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy
/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
@ -1535,43 +1588,56 @@ aPYXq38EfnUbcfxXyFZWUMQch0LTP4SH+2nX/sn4VlZXqx/VEz7EF19/50bpf8SPgPzrKyuAO4P3
<key>
<text>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
mQGiBEjXs/wRBADTAryt5hEaXweW+Xdu65otFdMJ7GaJYRhU/tKBLl8cZS2+1Bl9
TmSLfCaF6mnrdYFZzhTJ3W4qBNfT7sCVTQv3LOVPxq2cXiohS2Sjyjbx9eZPoVh7
xP4+T+hqtHYpGXoefHlC1+DRZu/gVhaF+7XqrBSCQ107+lnWGFckR+sLZwCg/UdG
ZeOpeFkKn+UyS473wHA47P8D/iqcBj6JM/fhiPW731SVgCM+uH/Qa5EOPjTKcmLS
Mx1Szyrt2XR+A4NAkwLwH206LI4kkARZM3uelDaLBwS7OdDbvbNlhrOfeUHEB/UW
XGWVSbRC4U+j/47AJwuSEHRsdJhkCVzkWh+pWKNRXmnD/1d81p0bDYUeI+eQVGFV
AfukA/0fY8MMGOlRgDwqbOrhfb00jvw5fRoLgPyVI5TewTU5WUzTIoW5lJ8c4vQc
BVC3J+E87N+j1I6pKrqaEBDIg6c+9fF2yARYH1NIo51rwwEWSa9MSUp6I0C8wosU
psq05MWQdCSM3M8lLdOvb20BW9ghj4MpRwc8JHVswvEKDnuB77QmUGV0ZXIgU2Fp
bnQtQW5kcmUgPHN0cGV0ZXJAc3RwZXRlci5pbT6IYAQTEQIAIAUCSNez/AIbAwYL
CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEDS/JOQNsP78O5IAn2PtteyhwNGYjwlF
NRCSm//iiRwgAJ9/3hGnczTUlJVjrwak0GKIux9J+rkEDQRI17P8EBAAid6FLUib
InjwgcwIRpUy+HnuJ3EgulF7WC25F5WNWbnCIKGJYkRaMa/RZ2hYhq16qX7hRkM0
ykv08s6WziXn7vxS+CBdr1SUVuFTrpEceZeT7mo5ZUtpiIxrOUpgpRJ/59754kpP
06bwpXvNyvrkzeckuZGn47mWGKdDU9Juj2XKDTN1WiC+Kkp+S8cMQ8HcnWOBp9v3
TqoJA/1KhKj9wGESDvk6jJ9InsMgIgGyV8RyXRnYY3oWbBvrjD4ntF3ny7qG3N6q
kxIHEDckWUPUsv1lLakDk/zxHD2n4G6VahF+NVYHy2HK63dRk8XCRnzEBX9HO0JA
aDDhJkeiyNeD8ujpFP55K2wuzWfm9Z8gKbM8JNIlUwKu+KeFneDCCHHdD1MUC4dk
nRePo5m1+5tc9FtTfX7QQCg3iQL/Xxy5xuiq5lh6nD15w+TCenxlpxky/6eTfVvP
o9MkOCqy66KGGn0OVbpDGJ2LIdvUWkkxnR1+nDZrNvIAZ58t4kMsNtHCcVENA2ub
nrvcqUK4/XnFk3SLXUM7gTwLGRBVOT4o10ski/VHrIFCXww7x8eDE/99kJXnfcKM
oTfghleUEYjmSIR/WX+LDynli3gfoH+ZFokeG0YOg1Ov54FaLuESqmNGUyCzSVuy
oez8hqw30vywIJnbvw2e3xNnvZDK+NuMyXsAAwYP/209yBMPxpt4lVrK6zgdMx/l
04F8pmHKpANRJ1urcwC9q/wQ7CE9qgrq3SZF7zxkw2d+WBni1bhJN+CtIGu3jT4u
D2v+Jc2QGkztlDXc/a9aF+3VHZ1ngAy9SL3ArieP/q59oUTu/Ju7JEFb25e+i7Za
l53O3fQQtsuwTMEUt4voDR3XXl8hlFJGMPVvzICb64uNP3u80Gt1uSDE4g+S5Lzy
OZGG/ITiassyuArE/5unxw9V8BXffvlQ0o/0OaoRW7110/AJZGvphmJkQDTZtaaJ
oPDMKVXdteSiT2ifnY4thIkAYs6ahhC3t5TN82auf33zWsZYeR8SbZnHrf2rr4ap
/8H23mrDyL5uzKJhmrgytN2IUYM2kfZwdXiVp4FFFhcUIkdCdQcXoQBaTIi/6R9u
60EhC3UQRdJzML4hl7ayTeXWbZAi+Uh5ZbonOpYTy7Kso/cO21VhJRCDVLV/1XeP
V67nkhRKC+pjcSL7LwRmFZ0Um+XF4PTvKIMK34z2WILjLvDGIR5Yc/5IopmQYvX8
vjEeX47ASFwgUQezJpzEV/2wOZWI3/avCQzctqjVvb7yKbjBiO8Q95ub8OvM05hK
kFJWx6KQXHUjKZ33ohhvXvpJmy54MF34/adrFLTHzMgjOhljinlp/OQso1l01eOQ
bAnQQjs8eWZr68R4VLDniEkEGBECAAkFAkjXs/wCGwwACgkQNL8k5A2w/vwbbQCg
vg1b8xiNvBYs7KmcWkZMV+KlAloAn38KQv4WdVk2ugeCDCcVe9ARI3PE
=4sgL
mQINBFETDzsBEAC0FOv1N3ZJzIIxN6cKD475KVS9CHDPeYpegcOIPnL5eY1DCHeh
/IwS1S7RCePtmiybNoV9FsI4PKUknzXQxA6LVEdAR/LUlhgJKjq+gsgp8lqbEILh
g13ecH66HwLS9rarbQkC47T7kL8miIPBFC6E3A4Lq1L+eueO6UcLhKgoYkMxOjdi
WrMgKTnVpch5ydLkPm/z0Zo8zRgqlPuTLeCrXXZYnjHXLVFN2xy04UzOs7P5u5KV
fx5Z7uQisr8pXtyLd6SpTZo6SHgKBv15uz0rqXhsJojiGtOXfWznAjaS5FUOORq9
CklG5cMOUAT8TNftv0ktsxaWDL1ELDVQPy1m7mtzo+VREG+0xmU6AjMo/GHblW1U
U7MI9yCiuMLsp/HLrFuiosqLVZ85wuLQ2junPe3tK8h15UcxIXAcpQ1VqIaDQFbe
uLOXJTF8YHpHdpHYt/ZM1ll7ZBKGAo8yd7uF7wJ9D3gUazwdz9fFjWV7oIk7ATwO
lFllzmWDn+M2ygbHOGUGMX5hSaa8eDSieiR2QoLdn27Fip7kMBTJ2+GISrfnJTN/
OQvmj0DXXAdxHmu2C4QgmZbkge35n129yzXn9NcqzrGLroV62lL3LgX6cSbiH5i7
GgWY6CAPb1pMogV0K475n9FvOSDRiG4QSO5yqKiA3OP5aKrIRp2TNAk4IwARAQAB
tCZQZXRlciBTYWludC1BbmRyZSA8c3RwZXRlckBzdHBldGVyLmltPokCOQQTAQIA
IwUCURMPOwIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOoGpJErxa2p
6bgQAKpxu07cMDOLc4+EG8H19NWXIVVybOEvfGuHYZaLKkPrhrMZwJiOwBpyISNR
t9qzX1eLCVaojaoEVX6kD8MGc5zKFfiJZy3j7lBWl+Ybr7FfXYy2BbAXKx49e1n6
ci9LmBrmVfAEaxtDNPITZ9N9oUAb9vS0nrG036EwteEHAveQvlDjO7lhz6+Cv7lZ
QgBj9rZ6khfcQ4S3nSCQaKLQ9Iav4fqxI7SfuPKnx6quHX3JNLGnVo3wl+j/foCK
0iTrmtHxCI3kc/bx6g32pRjHEPX0ALMBhmzU2uca+TE0zCEC96mgYXAUCwdnCFWy
beIEbt6pz65iML13kAVAq0H/GqncnMGN0MbOatnw1Tdz/vkLojIy7QbPcQ0plUFx
v5491xPfIrHhOWdRXp6WUt88fcqhT6MHZpVRtusj2ornKVVn+Y0GLsMMCTcrXJRG
7Ao1YV72t/pJpzfGWSaaxolxDIZ6B+76jrIhUhiWgo/4nf+DN6BIlCZQ6j6xxjjx
462cu02kuhIILTk2pzaMOufTBWx0uJhZk/KP2Fay/41pX7pvVOwRC4uIlKsLnJKL
PS7EDa4BUUxENfd/9LqOGwlII8BbSe98PLMI8sXkcigc3UXMVda9ll0YhQa+lbP1
NaszmnBhwuiCsgnPGbImsJuRzgEEgckwP/dNeyr6MlFMyfaeuQINBFETDzsBEADB
zOsEHpUmhkRUjH9Tek87dn5P/Yh/L/HptgCGk40TL/C+kYdkd3HyteMEf061PNms
S/Rq8k37Fu3VODYb9SPYKxtgksKSYUtIkPKvao09K9QNWPqyWuNf0F+iAjVMUuda
EVFJ7bHF310RDwLY5IvLeCXxtvG+Vv/i+g77d2WdPDp+zLJ8306C4yBKjSJV8xW0
cn2fd7NviIEN6cNHTsZNDZVMlgYPrxnwSq8GTEPGC7HsLIwGcx3hIe9QjnPw9CpA
mQENpDEyWcxgF5uwo2NJECoDswKz1Nb0gfawF3ZIbD+GcLujTu94iJuVg25jATWm
9wTgcfZo4UPllRGXdIb8uWwUFQlLQgd4ROLZZtXNGmHIymJrV2crx53gxup+1j0X
qhlzKg8xbImWhEfS9oHZkRK8VHgmWSIt7TNwNir6N5j3lqwWVBhnu6GzF01sKGNy
SlqNRbd0fqhakCkK71b8ot8tYTcYG5Lg10z6HTbgQx2UwLthUjqbblDQ+GLmrOhi
WklLXRsnlnPMwnEyFePAnsT5tasy2Cn9qjpttNDah7PB8iFUi9mtTF/XDVgpFaB5
G3CDV7Q2NgbAI6g6QhLIAmXzSP635G83mda0TKXHQXHDyLJTTn+WVFU7t4m4uLt+
0DsWU8jXHQWyUTNG9WPUrXhusDUAPHxFCQ/n/lQVBwARAQABiQIfBBgBAgAJBQJR
Ew87AhsMAAoJEOoGpJErxa2pqfgP/ApN+TRu2bBIgaw1dr3AznSSha84DIpXUDh3
udZvQrGbUtz8/mA+e3iZEN/cmmBw2LGlAuQoJNILTZQ318yTP+E5QU7fJH7FVsoh
UyvrMfyt3IMA9jg0Z9MuloLezvIjjMfFeNa0ROgDb/ubOT7JQzi1kwN8Lu3lO80H
wqBHXEeOLoislUSnZajRKvITbKWkZ6PHRjlMw1Wk4oIi6VLHgGgj79zzL3uhML26
63m7imShvz1QcHTwvyR5i8cZbNOEkotZyERiA1p7YHuruS+QvTi3ZPoQbnMUB3a7
py9d11bw1+w3LiAUGZE/z5hBWOFxYtw+w/U/Vx0BwJGYlwU3M2W20uEXe+qxz7wn
akygKjmLiD2z4njfKjcNCiV3FmXrpmWgADln1c4jfxDh0NrndrsM8FPDf1TMPtOZ
gFDkKripc9xkZ/25P6xn27oTOHWKcAC0QhxSH+HuVBBRk8AgF+zAbDZe4/L6+kan
SrycIXW+wCzwBq61aWsz2QhhuKjozVkhk4dRG+CfjzAFjnyxwYERn3uXVKQAwTwc
dNcTI9RV98IsNrw9Y4lJEAg6CjNPmiD5+EASycqaOuToRSGukr8sOQLWLPyTnez/
aG8Xf7a+fntWzK2HuDYoSDhJJrylWw/lMklOBm4wtMeNA0zcQH6AQV/GzQVQkSGq
rLuMVIV/
=llGw
-----END PGP PUBLIC KEY BLOCK-----
</text>
</key>
@ -1587,7 +1653,7 @@ personal website: https://stpeter.im/
</section1>
<section1 topic='Acknowledgements' anchor='acks'>
<p>Thanks to Joe Hildebrand, Waqas Hussain, and Matt Miller for their feedback.</p>
<p>Thanks to Dave Cridland, Todd Herman, Joe Hildebrand, Waqas Hussain, and Matt Miller for their feedback.</p>
</section1>
</xep>