mirror of
https://github.com/moparisthebest/xeps
synced 2024-12-21 23:28:51 -05:00
Merge branch 'premerge' into 'main'
Premerge See merge request xsf/xeps!19
This commit is contained in:
Jonas Schäfer
commit
1a3e596be8
15
xep-0004.xml
15
xep-0004.xml
@ -27,6 +27,12 @@
|
||||
&jer;
|
||||
&temas;
|
||||
&stpeter;
|
||||
<revision>
|
||||
<version>2.11.0</version>
|
||||
<date>2020-09-29</date>
|
||||
<initials>fs, jsc</initials>
|
||||
<remark><p>Further clarify the presence requirements for the type attribute on fields.</p></remark>
|
||||
</revision>
|
||||
<revision>
|
||||
<version>2.10.0</version>
|
||||
<date>2020-05-05</date>
|
||||
@ -197,7 +203,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>submit</td>
|
||||
<td>The form-submitting entity is submitting data to the form-processing entity. The submission MAY include fields that were not provided in the empty form, but the form-processing entity MUST ignore any fields that it does not understand. Furthermore, the submission MAY omit fields not marked with >required/< by the form-processing entity.</td>
|
||||
<td>The form-submitting entity is submitting data to the form-processing entity. The submission MAY include fields that were not provided in the empty form, but the form-processing entity MUST ignore any fields that it does not understand. Furthermore, the submission MAY omit fields not marked with <required/> by the form-processing entity.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>cancel</td>
|
||||
@ -223,7 +229,12 @@
|
||||
<di><dt><value/></dt><dd>The XML character data of this element defines the default value for the field (according to the form-processing entity) in a data form of type "form", the data provided by a form-submitting entity in a data form of type "submit", or a data result in a data form of type "result". In data forms of type "form", if the form-processing entity provides a default value via the <value/> element, then the form-submitting entity SHOULD NOT attempt to enforce a different default value (although it MAY do so to respect user preferences or anticipate expected user input). Fields of type list-multi, jid-multi, text-multi, and hidden MAY contain more than one <value/> element; all other field types MUST NOT contain more than one <value/> element.</dd></di>
|
||||
<di><dt><option/></dt><dd>One of the options in a field of type "list-single" or "list-multi". The XML character of the <value/> child defines the option value, and the 'label' attribute defines a human-readable name for the option. The <option/> element MUST contain one and only one <value/> child. If the field is not of type "list-single" or "list-multi", it MUST NOT contain an <option/> element.</dd></di>
|
||||
</dl>
|
||||
<p>If the <field/> element type is anything other than "fixed" (see below), it MUST possess a 'var' attribute that uniquely identifies the field in the context of the form (if it is "fixed", it MAY possess a 'var' attribute). The <field/> element MAY possess a 'label' attribute that defines a human-readable name for the field. For data forms of type "form", each <field/> element SHOULD possess a 'type' attribute that defines the data "type" of the field data (if no 'type' is specified, the default is "text-single"); fields provided in the context of other forms types MAY possess a 'type' attribute as well. For data forms of type "submit", inclusion of the 'type' attribute is OPTIONAL, since the form-processing entity is assumed to understand the data types associated with forms that it processes.</p>
|
||||
<p>If the <field/> element type is anything other than "fixed" (see below), it MUST possess a 'var' attribute that uniquely identifies the field in the context of the form (if it is "fixed", it MAY possess a 'var' attribute). The <field/> element MAY possess a 'label' attribute that defines a human-readable name for the field.</p>
|
||||
<p>The 'type' attribute defines the data "type" of the field data. The following rules apply for that attribute:</p>
|
||||
<ul>
|
||||
<li>For data forms of type "form", each <field/> element SHOULD possess a 'type' attribute. If the 'type' attribute is absent, the default of "text-single" is to be applied.</li>
|
||||
<li>For data forms of type "submit", "result" or "error", the recieving entity can infer the 'type' attribute value from context. Nevertheless, the 'type' attribute MAY be present for clarity. Note that forms of type "error" SHOULD NOT have any <field/> elements.</li>
|
||||
</ul>
|
||||
<p>If fields are presented in a user interface (e.g., as items in a questionnaire or form result), the order of the field elements in the XML SHOULD determine the order of items presented to the user.</p>
|
||||
</section2>
|
||||
<section2 topic='Field Types' anchor='protocol-fieldtypes'>
|
||||
|
||||
@ -42,6 +42,12 @@
|
||||
&seanegan;
|
||||
&robmcqueen;
|
||||
&diana;
|
||||
<revision>
|
||||
<version>1.2.1</version>
|
||||
<date>2020-09-29</date>
|
||||
<initials>mar-v-in</initials>
|
||||
<remark><p>Add missing required attribute in schema for encryption element</p></remark>
|
||||
</revision>
|
||||
<revision>
|
||||
<version>1.2.0</version>
|
||||
<date>2020-04-22</date>
|
||||
@ -1816,6 +1822,7 @@ Romeo Juliet
|
||||
minOccurs='0'
|
||||
maxOccurs='unbounded'/>
|
||||
</xs:sequence>
|
||||
<xs:attribute name='required' type='xs:boolean' use='optional'/>
|
||||
</xs:complexType>
|
||||
|
||||
<xs:complexType name='payloadElementType'>
|
||||
|
||||
10
xep-0313.xml
10
xep-0313.xml
@ -28,6 +28,14 @@
|
||||
</schemaloc>
|
||||
&mwild;
|
||||
&ksmith;
|
||||
<revision>
|
||||
<version>0.7.2</version>
|
||||
<date>2020-09-29</date>
|
||||
<initials>mar-v-in</initials>
|
||||
<remark>
|
||||
<p>Clean up references after MAM split</p>
|
||||
</remark>
|
||||
</revision>
|
||||
<revision>
|
||||
<version>0.7.1</version>
|
||||
<date>2020-08-04</date>
|
||||
@ -852,7 +860,7 @@
|
||||
return an iq with type error, and the error condition SHOULD be 'forbidden'.</p>
|
||||
<p>A server SHOULD provide a mechanism for a user to disable archiving of
|
||||
messages with all or specific contacts, such as via the configuration
|
||||
protocol described in this document. This allows the user to prevent the
|
||||
protocol described in &xep0441;. This allows the user to prevent the
|
||||
archiving of potentially sensitive messages in the first place.</p>
|
||||
<p>A server MAY automatically prevent certain sensitive messages from being
|
||||
archived. How such messages are identified is beyond the scope of this
|
||||
|
||||
@ -75,6 +75,48 @@
|
||||
itself instead of list or chat archives serves future readers. -->
|
||||
<p>RECOMMENDED.</p>
|
||||
</section1>
|
||||
<section1 topic='XEP Styling Examples (1st Level Heading)' anchor='styling'>
|
||||
<p>PLEASE REMOVE THIS SECTION. These are just examples for the RECOMMENDED ways to style your XEP.</p>
|
||||
<section2 topic='2nd Level Heading' anchor='styling-examples'>
|
||||
<p>This is regular XEP text. It can contain <strong>strong</strong> and <em>emphasized</em> markup as well as <tt>fixed-width text</tt>.</p>
|
||||
<p>This is text with a line break.<br/>New line.</p>
|
||||
<p>This is text with a footnote<note>This is the footnote.</note>.</p>
|
||||
<p>This is a <link url='#styling-examples'>link to a section in this document</link>.</p>
|
||||
<p>This is a reference to another XEP: &xep0001;, it can be re-referenced as <cite>XEP-0001</cite> later in the text.</p>
|
||||
<code caption='Code block caption'>Code block content.</code>
|
||||
<ol>
|
||||
<li>This is an ordered list. First item</li>
|
||||
<li>Second item</li>
|
||||
</ol>
|
||||
<ul>
|
||||
<li>This is an unordered list. First item</li>
|
||||
<li>Second item</li>
|
||||
</ul>
|
||||
<dl>
|
||||
<di>
|
||||
<dt>Definition List</dt>
|
||||
<dd>
|
||||
A definition list contains definition items with a title and a description.
|
||||
</dd>
|
||||
</di>
|
||||
</dl>
|
||||
<p class='box'>Note: This is an informational box</p>
|
||||
<example caption='Example of embedding XMPP XML'><![CDATA[
|
||||
<iq from='hag66@shakespeare.lit/pda'
|
||||
id='h7ns81g'
|
||||
to='shakespeare.lit'
|
||||
type='get'>
|
||||
<query xmlns='http://jabber.org/protocol/disco#items'/>
|
||||
</iq>
|
||||
]]></example>
|
||||
<section3 topic='3rd Level Heading' anchor='syling-examples-3rd'>
|
||||
<p>Text in a Sub-Sub-Section.</p>
|
||||
<section4 topic='4th Level Heading' anchor='syling-examples-4th'>
|
||||
<p>Text in a Sub-Sub-Sub-Section.</p>
|
||||
</section4>
|
||||
</section3>
|
||||
</section2>
|
||||
</section1>
|
||||
<section1 topic='XML Schema' anchor='schema'>
|
||||
<p>REQUIRED for protocol specifications.</p>
|
||||
</section1>
|
||||
|
||||
6
xep.ent
6
xep.ent
@ -1574,6 +1574,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
|
||||
<!ENTITY xep0417 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0417.html'>E2E Authentication in XMPP: Certificate Issuance and Revocation (XEP-0417)</link></span> <note>XEP-0417: E2E Authentication in XMPP: Certificate Issuance and Revocation <<link url='https://xmpp.org/extensions/xep-0417.html'>https://xmpp.org/extensions/xep-0417.html</link>>.</note>" >
|
||||
<!ENTITY xep0418 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0418.html'>DNS Queries over XMPP (DoX) (XEP-0418)</link></span> <note>XEP-0418: DNS Queries over XMPP (DoX) <<link url='https://xmpp.org/extensions/xep-0418.html'>https://xmpp.org/extensions/xep-0418.html</link>>.</note>" >
|
||||
<!ENTITY xep0419 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0419.html'>Improving Baseline Security in XMPP (XEP-0419)</link></span> <note>XEP-0419: Improving Baseline Security in XMPP <<link url='https://xmpp.org/extensions/xep-0419.html'>https://xmpp.org/extensions/xep-0419.html</link>>.</note>" >
|
||||
|
||||
<!ENTITY xep0420 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0420.html'>Stanza Content Encryption (XEP-0420)</link></span> <note>XEP-0420: Stanza Content Encryption <<link url='https://xmpp.org/extensions/xep-0420.html'>https://xmpp.org/extensions/xep-0420.html</link>>.</note>" >
|
||||
<!ENTITY xep0421 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0421.html'>Anonymous unique occupant identifiers for MUCs (XEP-0421)</link></span> <note>XEP-0421: Anonymous unique occupant identifiers for MUCs <<link url='https://xmpp.org/extensions/xep-0421.html'>https://xmpp.org/extensions/xep-0421.html</link>>.</note>" >
|
||||
<!ENTITY xep0422 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0422.html'>Message Fastening (XEP-0422)</link></span> <note>XEP-0422: Message Fastening <<link url='https://xmpp.org/extensions/xep-0422.html'>https://xmpp.org/extensions/xep-0422.html</link>>.</note>" >
|
||||
@ -1584,6 +1585,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
|
||||
<!ENTITY xep0427 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0427.html'>MAM Fastening Collation (XEP-0427)</link></span> <note>XEP-0427: MAM Fastening Collation <<link url='https://xmpp.org/extensions/xep-0427.html'>https://xmpp.org/extensions/xep-0427.html</link>>.</note>" >
|
||||
<!ENTITY xep0428 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0428.html'>Fallback Indication (XEP-0428)</link></span> <note>XEP-0428: Fallback Indication <<link url='https://xmpp.org/extensions/xep-0428.html'>https://xmpp.org/extensions/xep-0428.html</link>>.</note>" >
|
||||
<!ENTITY xep0429 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0429.html'>Special Interests Group End to End Encryption (XEP-0429)</link></span> <note>XEP-0429: Special Interests Group End to End Encryption <<link url='https://xmpp.org/extensions/xep-0429.html'>https://xmpp.org/extensions/xep-0429.html</link>>.</note>" >
|
||||
|
||||
<!ENTITY xep0430 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0430.html'>Inbox (XEP-0430)</link></span> <note>XEP-0430: Inbox <<link url='https://xmpp.org/extensions/xep-0430.html'>https://xmpp.org/extensions/xep-0430.html</link>>.</note>" >
|
||||
<!ENTITY xep0431 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0431.html'>Full Text Search in MAM (XEP-0431)</link></span> <note>XEP-0431: Full Text Search in MAM <<link url='https://xmpp.org/extensions/xep-0431.html'>https://xmpp.org/extensions/xep-0431.html</link>>.</note>" >
|
||||
<!ENTITY xep0432 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0432.html'>Simple JSON Messaging (XEP-0432)</link></span> <note>XEP-0432: Simple JSON Messaging <<link url='https://xmpp.org/extensions/xep-0432.html'>https://xmpp.org/extensions/xep-0432.html</link>>.</note>" >
|
||||
@ -1593,3 +1595,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
|
||||
<!ENTITY xep0437 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0437.html'>Room Activity Indicators (XEP-0437)</link></span> <note>XEP-0437: Room Activity Indicators <<link url='https://xmpp.org/extensions/xep-0437.html'>https://xmpp.org/extensions/xep-0437.html</link>>.</note>" >
|
||||
<!ENTITY xep0438 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0438.html'>Best practices for password hashing and storage (XEP-0438)</link></span> <note>XEP-0438: Best practices for password hashing and storage <<link url='https://xmpp.org/extensions/xep-0438.html'>https://xmpp.org/extensions/xep-0438.html</link>>.</note>" >
|
||||
<!ENTITY xep0439 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0439.html'>Quick Response (XEP-0439)</link></span> <note>XEP-0439: Quick Response <<link url='https://xmpp.org/extensions/xep-0439.html'>https://xmpp.org/extensions/xep-0439.html</link>>.</note>" >
|
||||
|
||||
<!ENTITY xep0440 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0440.html'>SASL Channel-Binding Type Capability (XEP-0440)</link></span> <note>XEP-0440: SASL Channel-Binding Type Capability <<link url='https://xmpp.org/extensions/xep-0440.html'>https://xmpp.org/extensions/xep-0440.html</link>>.</note>" >
|
||||
<!ENTITY xep0441 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0441.html'>Message Archive Management Preferences (XEP-0441)</link></span> <note>XEP-0441: Message Archive Management Preferences <<link url='https://xmpp.org/extensions/xep-0441.html'>https://xmpp.org/extensions/xep-0441.html</link>>.</note>" >
|
||||
<!ENTITY xep0442 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0442.html'>Pubsub Message Archive Management (XEP-0442)</link></span> <note>XEP-0442: Pubsub Message Archive Management <<link url='https://xmpp.org/extensions/xep-0442.html'>https://xmpp.org/extensions/xep-0442.html</link>>.</note>" >
|
||||
|
||||
Loading…
Reference in New Issue
Block a user