From 77abba5e15696e9254b9d2ec85cc469ba5678658 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Tue, 29 Jan 2008 20:22:28 +0000 Subject: [PATCH] tweaks git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1612 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0115.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xep-0115.xml b/xep-0115.xml index be58129d..5477a8ff 100644 --- a/xep-0115.xml +++ b/xep-0115.xml @@ -275,10 +275,10 @@
  • For each identity, append the 'category/type/lang/name' to S, followed by the '<' character.
  • Sort the supported service discovery features. A registry of service discovery features is located at &DISCOFEATURES;.
  • For each feature, append the feature to S, followed by the '<' character.
    • -
  • If the service discovery information response includes XEP-0128 data forms, sort the forms by the FORM_TYPE field.
    • +
  • If the service discovery information response includes XEP-0128 data forms, sort the forms by the FORM_TYPE (i.e., by the XML character data of the <value/> element).
  • For each extended service discovery information form:
      -
    1. Append the value of the FORM_TYPE field, followed by the '<' character.
      2. +
    2. Append the XML character data of the FORM_TYPE field's <value/> element, followed by the '<' character.
    3. Sort the fields by the value of the "var" attribute.
    4. For each field:
        @@ -353,10 +353,10 @@
      1. Sort the extended service discovery forms by FORM_TYPE (there is only one: "urn:xmpp:dataforms:softwareinfo").
      2. S = 'client/pc/el/Ψ 0.9.1<client/pc/en/Psi 0.9.1<http://jabber.org/protocol/caps<http://jabber.org/protocol/disco#info
        <http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc<urn:xmpp:dataforms:softwareinfo<'
        3. -
      3. Sort the fields by var and append the value(s): "ip_version<ipv4<ipv6", "os<Mac", "os_version<OS X 10.5.1", "software<Psi", "software_version<0.11".
        4. +
      4. Sort the fields by var and append the value(s): "ip_version<ipv4<ipv6", "os<Mac", "os_version<10.5.1", "software<Psi", "software_version<0.11".
      5. S = 'client/pc/el/Ψ 0.9.1<client/pc/en/Psi 0.9.1<http://jabber.org/protocol/caps
        <http://jabber.org/protocol/disco#info<http://jabber.org/protocol/disco#items<http://jabber.org/protocol/muc -
        <urn:xmpp:dataforms:softwareinfo<ip_version<ipv4<ipv6<os<Mac<os_version<OS X 10.5.1<software<Psi<software_version<0.11<'
        6. +
        <urn:xmpp:dataforms:softwareinfo<ip_version<ipv4<ipv6<os<Mac<os_version<10.5.1<software<Psi<software_version<0.11<'
      6. ver = 8lu+88MRxmKM7yO3MEzY7YmTsWs=