From 5e57b3edfbdfaf10c269897579443e118346ea8b Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Tue, 9 Sep 2008 15:42:12 +0000 Subject: [PATCH] SSI fixes git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2235 4b5297f7-1745-476d-ba37-a9c6900126ab --- all.shtml | 6 +++--- editor.shtml | 4 ++-- ipr-policy.shtml | 4 ++-- submit.shtml | 4 ++-- xep-0234.xml | 14 ++++++++++---- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/all.shtml b/all.shtml index c6ba3c2a..c0ab5916 100755 --- a/all.shtml +++ b/all.shtml @@ -2,7 +2,7 @@ XMPP Extensions - +

XMPP Extensions

ATOM  RSS

@@ -20,8 +20,8 @@ Date - + - + diff --git a/editor.shtml b/editor.shtml index a38d0d97..aec5aa5b 100755 --- a/editor.shtml +++ b/editor.shtml @@ -2,7 +2,7 @@ XMPP Extensions Editor - +

XMPP Extensions Editor

In accordance with XEP-0001, the XMPP Extensions Editor is responsible for overall management of the XMPP Standards Foundation's standards process and publication of XMPP Extension Protocols; in particular, the XMPP Extensions Editor:

Since the founding of the XMPP Standards Foundation in 2001, the XMPP Extensions Editor has been Peter Saint-Andre, who may be contacted via email or Jabber at <stpeter@jabber.org>.

- + diff --git a/ipr-policy.shtml b/ipr-policy.shtml index 21580b31..a3d820b1 100755 --- a/ipr-policy.shtml +++ b/ipr-policy.shtml @@ -2,7 +2,7 @@ XSF IPR Policy - +

XSF IPR Policy

This document defines the official policy of the XMPP Standards Foundation regarding intellectual property rights (IPR) pertaining to XMPP Extension Protocol specifications (XEPs).

Version 1.4

@@ -80,4 +80,4 @@

Version 1.2 (2006-10-04): Modified terminology to reflect protocol branding change from Jabber to XMPP (e.g., Jabber Enhancement Proposal to XMPP Extension Protocol).

Version 1.1 (2005-10-04): Replaced Open Publication License with Creative Commons Attribution License.

Version 1.0 (2002-10-29): Initial version approved by XSF Board of Directors.

- + diff --git a/submit.shtml b/submit.shtml index c1f68c64..e9a5ea81 100755 --- a/submit.shtml +++ b/submit.shtml @@ -2,7 +2,7 @@ How to Submit an XMPP Extension Protocol - +

How to Submit an XMPP Extension Protocol

Here is how to submit a proposal to the XMPP Standards Foundation for consideration as an XMPP Extension Protocol:

    @@ -12,4 +12,4 @@

  1. Email the XML file (or a URL for the file) to the XMPP Extensions Editor with a subject line of 'ProtoXEP: [your title here]'.

Note: It is the author's responsibility to provide a properly-formatted source file (see the template file maintained under source control). Proposals submitted in HTML, TXT, MS Word, Open Document Format, etc. will be returned to the proposal author for proper formatting.

- + diff --git a/xep-0234.xml b/xep-0234.xml index 25d58c7d..799acbf7 100644 --- a/xep-0234.xml +++ b/xep-0234.xml @@ -24,6 +24,12 @@ NOT_YET_ASSIGNED &stpeter; + + 0.6 + 2008-07-31 + psa +

Harmonized with XEP-0166; modified fallback to use transport-replace and transport-accept.

 + 0.5 2008-06-05 @@ -113,13 +119,13 @@ Claudius Laertes | ack | |<----------------------------| | [ SOCKS5 negotiation ] | - |<--------------------------->| + |<===========================>| | session-accept | |<----------------------------| | ack | |---------------------------->| | [ file transfer ] | - |---------------------------->| + |============================>| | terminate | |<----------------------------| | ack | @@ -264,7 +270,7 @@ Claudius Laertes | ack | |---------------------------->| | [ file transfer ] | - |---------------------------->| + |============================>| | terminate | |<----------------------------| | ack | @@ -433,7 +439,7 @@ Claudius Laertes | ack | |---------------------------->| | [ file transfer ] | - |---------------------------->| + |============================>| | terminate | |<----------------------------| | ack |