XEP-0393, XEP-0394: Accept two protoxeps

This commit is contained in:
Sam Whited 2017-11-22 11:58:33 -06:00
parent 3375a9bf96
commit d724be88c4
3 changed files with 22 additions and 8 deletions

View File

@ -2,8 +2,6 @@
<!DOCTYPE xep SYSTEM 'xep.dtd' [
<!ENTITY % ents SYSTEM 'xep.ent'>
%ents;
<!ENTITY rfc7764 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7764'>RFC 7764</link></span> <note>RFC 7764: Guidance on Markdown: Design Philosophies, Stability Strategies, and Select Registrations &lt;<link url='http://tools.ietf.org/html/rfc7764'>http://tools.ietf.org/html/rfc7764</link>&gt;.</note>" >
<!ENTITY uax9 "<span class='ref'>Unicode Standard Annex #9</span> <note>Unicode Standard Annex #9, &quot;Unicode Bidirectional Algorithm&quot;, edited by Mark Davis, Aharon Lanin, and Andrew Glass. An integral part of The Unicode Standard, &lt;<link url='http://unicode.org/reports/tr9/'>http://unicode.org/reports/tr9/</link>&gt;.</note>" >
]>
<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
<xep>
@ -14,8 +12,8 @@
messages with simple text styling.
</abstract>
&LEGALNOTICE;
<number>xxxx</number>
<status>ProtoXEP</status>
<number>0393</number>
<status>Experimental</status>
<type>Standards Track</type>
<sig>Standards</sig>
<approver>Council</approver>
@ -27,6 +25,12 @@
<supersededby/>
<shortname>styling</shortname>
&sam;
<revision>
<version>0.1.0</version>
<date>2017-11-22</date>
<initials>XEP Editor (ssw)</initials>
<remark><p>First draft approved by the XMPP Council.</p></remark>
</revision>
<revision>
<version>0.0.1</version>
<date>2017-10-28</date>

View File

@ -9,21 +9,27 @@
<title>Message Markup</title>
<abstract>This specification provides an alternative to XHTML-IM with rigid separation of content and markup information, improving the resilience against spoofing and injection attacks.</abstract>
&LEGALNOTICE;
<number>xxxx</number>
<status>ProtoXEP</status>
<number>0394</number>
<status>Experimental</status>
<type>Standards Track</type>
<sig>Standards</sig>
<approver>Council</approver>
<dependencies/>
<supersedes/>
<supersededby/>
<shortname>NOT_YET_ASSIGNED</shortname>
<shortname>markup</shortname>
<author>
<firstname>Jonas</firstname>
<surname>Wielicki</surname>
<email>jonas@wielicki.name</email>
<jid>jonas@wielicki.name</jid>
</author>
<revision>
<version>0.1.0</version>
<date>2017-11-22</date>
<initials>XEP Editor (ssw)</initials>
<remark><p>First draft approved by the XMPP Council.</p></remark>
</revision>
<revision>
<version>0.0.1</version>
<date>2017-11-07</date>

View File

@ -393,8 +393,9 @@ THE SOFTWARE.
<!ENTITY rhttp "<span class='ref'><link url='http://tools.ietf.org/html/draft-lentczner-rhttp'>Reverse HTTP</link></span> <note>Reverse HTTP &lt;<link url='http://tools.ietf.org/html/draft-lentczner-rhttp'>http://tools.ietf.org/html/draft-lentczner-rhttp</link>&gt;.</note>" >
<!ENTITY rtf "<span class='ref'><link url='http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp'>Rich Text Format (RTF)</link></span> <note>Rich Text Format (RTF) Version 1.5 Specification &lt;<link url='http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp'>http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp</link>&gt;.</note>" >
<!ENTITY SDN.801c "<span class='ref'>SDN.801c</span> <note>SDN.801c: Access Control Concept and Mechanism, US National Security Agency, Revision C, 12 May 1999.</note>" >
<!ENTITY unicode "<span class='ref'>Unicode</span> <note>The Unicode Standard, The Unicode Consortium &lt;<link url='http://www.unicode.org/versions/latest/'>http://www.unicode.org/versions/latest/</link>&gt;.</note>" >
<!ENTITY uax9 "<span class='ref'>Unicode Standard Annex #9</span> <note>Unicode Standard Annex #9, &quot;Unicode Bidirectional Algorithm&quot;, edited by Mark Davis, Aharon Lanin, and Andrew Glass. An integral part of The Unicode Standard, &lt;<link url='http://unicode.org/reports/tr9/'>http://unicode.org/reports/tr9/</link>&gt;.</note>" >
<!ENTITY unicode10 "<span class='ref'>Unicode 10.0.0</span> <note>The Unicode Consortium. The Unicode Standard, Version 10.0.0, (Mountain View, CA: The Unicode Consortium, 2017. ISBN 978-1-936213-16-0) &lt;<link url='https://www.unicode.org/versions/Unicode10.0.0/'>https://www.unicode.org/versions/Unicode10.0.0/</link>&gt;.</note>" >
<!ENTITY unicode "<span class='ref'>Unicode</span> <note>The Unicode Standard, The Unicode Consortium &lt;<link url='http://www.unicode.org/versions/latest/'>http://www.unicode.org/versions/latest/</link>&gt;.</note>" >
<!ENTITY wap "<span class='ref'><link url='http://www.wapforum.org/'>Wireless Access Protocol (WAP)</link></span> <note>Wireless Access Protocol (WAP) &lt;<link url='http://www.wapforum.org/'>http://www.wapforum.org/</link>&gt;.</note>" >
<!ENTITY wv-csp "<span class='ref'><link url='http://www.openmobilealliance.org/tech/affiliates/wv/wvindex.html'>WV Client-Server Protocol v1.1</link></span> <note>Wireless Village Client-Server Protocol v1.1 &lt;<link url='http://www.openmobilealliance.org/tech/affiliates/wv/wvindex.html'>http://www.openmobilealliance.org/tech/affiliates/wv/wvindex.html</link>&gt;.</note>" >
<!ENTITY xfn "<span class='ref'><link url='http://gmpg.org/xfn/index'>XHTML Friends Network (XFN)</link></span> <note>XHTML Friends Network (XFN) &lt;<link url='http://gmpg.org/xfn/index'>http://gmpg.org/xfn/index</link>&gt;.</note>" >
@ -680,6 +681,7 @@ THE SOFTWARE.
<!ENTITY rfc7564 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7564'>RFC 7564</link></span> <note>RFC 7564: PRECIS Framework: Preparation, Enforcement, and Comparison of Internationalized Strings in Application Protocols &lt;<link url='http://tools.ietf.org/html/rfc7564'>http://tools.ietf.org/html/rfc7564</link>&gt;.</note>" >
<!ENTITY rfc7700 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7700'>RFC 7700</link></span> <note>RFC 7700: Preparation, Enforcement, and Comparison of Internationalized Strings Representing Nicknames&lt;<link url='http://tools.ietf.org/html/rfc7700'>http://tools.ietf.org/html/rfc7700</link>&gt;.</note>" >
<!ENTITY rfc7712 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7712'>RFC 7712</link></span> <note>RFC 7712: Domain Name Associations (DNA) in the Extensible Messaging and Presence Protocol (XMPP)&lt;<link url='http://tools.ietf.org/html/rfc7712'>http://tools.ietf.org/html/rfc7712</link>&gt;.</note>" >
<!ENTITY rfc7764 "<span class='ref'><link url='http://tools.ietf.org/html/rfc7764'>RFC 7764</link></span> <note>RFC 7764: Guidance on Markdown: Design Philosophies, Stability Strategies, and Select Registrations &lt;<link url='http://tools.ietf.org/html/rfc7764'>http://tools.ietf.org/html/rfc7764</link>&gt;.</note>" >
<!-- Internet-Drafts -->
@ -1450,3 +1452,5 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
<!ENTITY xep0390 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0390.html'>Entity Capabilities 2.0 (XEP-0390)</link></span> <note>XEP-0390: Entity Capabilities 2.0 &lt;<link url='https://xmpp.org/extensions/xep-0390.html'>https://xmpp.org/extensions/xep-0390.html</link>&gt;.</note>" >
<!ENTITY xep0391 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0391.html'>Jingle Encrypted Transports (XEP-0391)</link></span> <note>XEP-0391: Jingle Encrypted Transports &lt;<link url='https://xmpp.org/extensions/xep-0391.html'>https://xmpp.org/extensions/xep-0391.html</link>&gt;.</note>" >
<!ENTITY xep0392 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0392.html'>Consistent Color Generation (XEP-0392)</link></span> <note>XEP-0392: Consistent Color Generation &lt;<link url='https://xmpp.org/extensions/xep-0392.html'>https://xmpp.org/extensions/xep-0392.html</link>&gt;.</note>" >
<!ENTITY xep0393 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0393.html'>Message Styling (XEP-0393)</link></span> <note>XEP-0393: Message Styling &lt;<link url='https://xmpp.org/extensions/xep-0393.html'>https://xmpp.org/extensions/xep-0393.html</link>&gt;.</note>" >
<!ENTITY xep0394 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0394.html'>Message Markup (XEP-0394)</link></span> <note>XEP-0394: Message Markup &lt;<link url='https://xmpp.org/extensions/xep-0394.html'>https://xmpp.org/extensions/xep-0394.html</link>&gt;.</note>" >