From 2ad7289de50f0aa56e063856ff0712cd18e9433c Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Tue, 13 Apr 2010 21:23:08 +0000 Subject: [PATCH] text tweaks git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@4160 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0234.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xep-0234.xml b/xep-0234.xml index c271844e..0a9f884d 100644 --- a/xep-0234.xml +++ b/xep-0234.xml @@ -325,15 +325,15 @@ Initiator Responder ]]>

The parties would then complete a session negotiation flow similar to that outlined above for offering a file.

-

Note: If the requesting entity knows the hash of the file, then it can include only that metadata in its request. If not, the requesting entity needs include enough metadata to uniquely identify the file, such as the date, name, and size. For similar considerations, see &rfc5547;.

+

Note: If the requesting entity knows the hash of the file, then it can include only that metadata in its request. If not, the requesting entity needs to include enough metadata to uniquely identify the file, such as the date, name, and size. For similar considerations, see &rfc5547;.

-

All implementations MUST support the In-Band Bytestreams transport method as a reliable method of last resort. An implementation SHOULD support other transport methods as well, especially SOCKS5 Bytestreams.

+

All implementations MUST support the Jingle In-Band Bytestreams Transport Method (XEP-0261) as a reliable method of last resort. An implementation SHOULD support other transport methods as well, especially the Jingle SOCKS5 Bytestreams Transport Method (XEP-0260).

-

An application MAY present transport methods in any order, except that the In-Band Bytestreams method MUST be the lowest preference.

+

An application MAY present transport methods in any order, except that the Jingle In-Band Bytestreams Transport Method MUST be the lowest preference.

Support for Jingle file transfer can be determined through discovery of the 'urn:xmpp:jingle:apps:file-transfer:1' namespace &VNOTE;, via either service discovery (XEP-0030) or entity capabilities (XEP-0115). If the initiator knows that the responder supports Jingle file transfer, it SHOULD first attempt negotiation using Jingle rather than SI.

@@ -342,6 +342,7 @@ Initiator Responder

In order to secure the data stream, implementations SHOULD use encryption methods appropriate to the transport method being used. For example, end-to-end encryption can be negotiated over either SOCKS5 Bytestreams or In-Band Bytestreams as described in XEP-0260 and XEP-0261.

+

Refer to XEP-0047, XEP-0065, XEP-0096, XEP-0260, and XEP-0261 for related security considerations.