From 1c7bf409d1d8d8fb6dd85b334cb0142b67cc76f9 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Fri, 23 May 2008 13:25:48 +0000 Subject: [PATCH] typo git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1864 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0095.xml | 2 +- xep-0106.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xep-0095.xml b/xep-0095.xml index b413cb8c..a3dc96bb 100644 --- a/xep-0095.xml +++ b/xep-0095.xml @@ -221,7 +221,7 @@

The <si/> element is the root element for this protocol. It is an identifiable container for all the information necessary for negotiation and signalling. It contains attributes for the identifier, intended MIME-type, and profile. The contents convey stream-negotation and profile information.

The "id" attribute is an opaque identifier. This attribute MUST be present on type='set', and MUST be a valid string. This SHOULD NOT be sent back on type='result', since the <iq/> "id" attribute provides the only context needed. This value is generated by the Sender, and the same value MUST be used throughout a session when talking to the Receiver.

-

The "mime-type" attribute identifies the MIME-type for the data across the stream. This attribute MUST be a valid MIME-type as registered with &IANA; (specifically, as listed at <http://www.iana.org/assignments/media-types>). During negotiation, this attribute SHOULD be present, and is otherwise not required. If not included during negotiation, its value is assumed to be "binary/octect-stream".

+

The "mime-type" attribute identifies the MIME-type for the data across the stream. This attribute MUST be a valid MIME-type as registered with &IANA; (specifically, as listed at <http://www.iana.org/assignments/media-types>). During negotiation, this attribute SHOULD be present, and is otherwise not required. If not included during negotiation, its value is assumed to be "binary/octet-stream".

The "profile" attribute defines the SI profile in use. This value MUST be present during negotiation, and is the namespace of the profile to use.

When the Sender first negotiates a Stream Initiation, all of the attributes SHOULD be present, and the id" and "profile" MUST be present. The contents MUST contain one profile, in the namespace declared in the "profile" attribute, and the feature negotiation for the stream. The feature negotiation MUST contain at least one option and use the field var "stream-method".

When the Receiver accepts a Stream Initiation, the <si/> element SHOULD NOT possess any attributes. The selected stream MUST be in the feature negotiation for the stream. There MUST only be one selected stream.

diff --git a/xep-0106.xml b/xep-0106.xml index 50af52cc..4895a857 100644 --- a/xep-0106.xml +++ b/xep-0106.xml @@ -389,7 +389,7 @@ CN=D'Artagnan Saint-André,O=Example & Company, Inc.,DC=example,DC=com -

&rfc2812; defines the address format for Internet Relay Chat (IRC) entities, which can be servers, channels, or users. The "user" portion of an IRC address may contain any octect except NUL, CR, LF, SP, and "@"; this includes the characters " & ' / : < > \ (which are disallowed in XMPP node identifiers and therefore MUST be escaped when transforming an IRC address into a JID).

+

&rfc2812; defines the address format for Internet Relay Chat (IRC) entities, which can be servers, channels, or users. The "user" portion of an IRC address may contain any octet except NUL, CR, LF, SP, and "@"; this includes the characters " & ' / : < > \ (which are disallowed in XMPP node identifiers and therefore MUST be escaped when transforming an IRC address into a JID).

\3address@example.com ]]>