From 2ac91f50c862f5ebccba409789c4a1c2f8dac461 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Mon, 2 Oct 2006 22:22:13 +0000
Subject: [PATCH] Initial revision

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 all.sh           |   31 +
 announce.py      |  187 ++
 archive.sh       |    9 +
 deferred.py      |  143 ++
 editor.shtml     |   21 +
 fo.xsl           |  399 +++
 gen.sh           |   12 +
 gps_datum.gif    |  Bin 0 -> 38166 bytes
 gps_datum.html   |   24 +
 index.shtml      |   29 +
 inxep.py         |  121 +
 ipr-policy.shtml |   91 +
 lastcall.py      |  146 ++
 protopage.xsl    |   73 +
 ref.xsl          |  122 +
 submit.shtml     |   15 +
 xep-0001.xml     |  688 +++++
 xep-0002.xml     |   42 +
 xep-0003.xml     |  347 +++
 xep-0004.xml     |  709 +++++
 xep-0005.xml     |  108 +
 xep-0006.xml     |   96 +
 xep-0007.xml     |   73 +
 xep-0008.xml     |  138 +
 xep-0009.xml     |  316 +++
 xep-0010.xml     |   55 +
 xep-0011.xml     |  483 ++++
 xep-0012.xml     |  159 ++
 xep-0013.xml     |  447 ++++
 xep-0014.xml     |   70 +
 xep-0015.xml     |  258 ++
 xep-0016.xml     |  236 ++
 xep-0017.xml     |   83 +
 xep-0018.xml     |  135 +
 xep-0019.xml     |   81 +
 xep-0020.xml     |  296 +++
 xep-0021.xml     |  343 +++
 xep-0022.xml     |  321 +++
 xep-0023.xml     |  175 ++
 xep-0024.xml     | 1132 ++++++++
 xep-0025.xml     |  386 +++
 xep-0026.xml     |  209 ++
 xep-0027.xml     |  183 ++
 xep-0028.xml     |   13 +
 xep-0029.xml     |  117 +
 xep-0030.xml     | 1032 ++++++++
 xep-0031.xml     | 2328 +++++++++++++++++
 xep-0032.xml     |  158 ++
 xep-0033.xml     |  667 +++++
 xep-0034.xml     |  249 ++
 xep-0035.xml     |  129 +
 xep-0036.xml     |  126 +
 xep-0037.xml     |  848 ++++++
 xep-0038.xml     |  365 +++
 xep-0039.xml     |  426 +++
 xep-0040.xml     |  270 ++
 xep-0041.xml     |  266 ++
 xep-0042.xml     | 1075 ++++++++
 xep-0043.xml     |  793 ++++++
 xep-0044.xml     |  172 ++
 xep-0045.xml     | 5206 +++++++++++++++++++++++++++++++++++++
 xep-0046.xml     |  216 ++
 xep-0047.xml     |  291 +++
 xep-0048.xml     |  171 ++
 xep-0049.xml     |  252 ++
 xep-0050.xml     |  983 +++++++
 xep-0051.xml     |  272 ++
 xep-0052.xml     |  387 +++
 xep-0053.xml     |   86 +
 xep-0054.xml     |  524 ++++
 xep-0055.xml     |  327 +++
 xep-0056.xml     |  181 ++
 xep-0057.xml     |  182 ++
 xep-0058.xml     |  173 ++
 xep-0059.xml     |  561 ++++
 xep-0060.xml     | 6429 ++++++++++++++++++++++++++++++++++++++++++++++
 xep-0061.xml     |   83 +
 xep-0062.xml     |  347 +++
 xep-0063.xml     |  107 +
 xep-0064.xml     |   78 +
 xep-0065.xml     |  827 ++++++
 xep-0066.xml     |  294 +++
 xep-0067.xml     |  200 ++
 xep-0068.xml     |  374 +++
 xep-0069.xml     |   51 +
 xep-0070.xml     |  385 +++
 xep-0071.xml     | 1178 +++++++++
 xep-0072.xml     | 1204 +++++++++
 xep-0073.xml     |  160 ++
 xep-0074.xml     |  169 ++
 xep-0075.xml     | 1821 +++++++++++++
 xep-0076.xml     |   95 +
 xep-0077.xml     |  900 +++++++
 xep-0078.xml     |  369 +++
 xep-0079.xml     | 1310 ++++++++++
 xep-0080.xml     |  524 ++++
 xep-0081.xml     |  270 ++
 xep-0082.xml     |  150 ++
 xep-0083.xml     |  154 ++
 xep-0084.xml     |  561 ++++
 xep-0085.xml     |  554 ++++
 xep-0086.xml     |  347 +++
 xep-0087.xml     |  429 ++++
 xep-0088.xml     |  215 ++
 xep-0089.xml     |   82 +
 xep-0090.xml     |  115 +
 xep-0091.xml     |  157 ++
 xep-0092.xml     |  114 +
 xep-0093.xml     |  135 +
 xep-0094.xml     |  142 +
 xep-0095.xml     |  376 +++
 xep-0096.xml     |  439 ++++
 xep-0097.xml     |  138 +
 xep-0098.xml     |  257 ++
 xep-0099.xml     |  396 +++
 xep-0100.xml     | 1028 ++++++++
 xep-0101.xml     |  124 +
 xep-0102.xml     | 1689 ++++++++++++
 xep-0103.xml     |  335 +++
 xep-0104.xml     |  239 ++
 xep-0105.xml     |  196 ++
 xep-0106.xml     |  396 +++
 xep-0107.xml     |  371 +++
 xep-0108.xml     |  483 ++++
 xep-0109.xml     |  203 ++
 xep-0110.xml     |  156 ++
 xep-0111.xml     |  335 +++
 xep-0112.xml     |  322 +++
 xep-0113.xml     |  383 +++
 xep-0114.xml     |  535 ++++
 xep-0115.xml     |  295 +++
 xep-0116.xml     | 1002 ++++++++
 xep-0117.xml     |  139 +
 xep-0118.xml     |  314 +++
 xep-0119.xml     |  181 ++
 xep-0120.xml     |  310 +++
 xep-0121.xml     |  196 ++
 xep-0122.xml     |  553 ++++
 xep-0123.xml     |  143 ++
 xep-0124.xml     | 1101 ++++++++
 xep-0125.xml     |  277 ++
 xep-0126.xml     |  424 +++
 xep-0127.xml     |  242 ++
 xep-0128.xml     |  170 ++
 xep-0129.xml     |  220 ++
 xep-0130.xml     | 1043 ++++++++
 xep-0131.xml     |  939 +++++++
 xep-0132.xml     |  243 ++
 xep-0133.xml     | 2656 +++++++++++++++++++
 xep-0134.xml     |  139 +
 xep-0135.xml     |  560 ++++
 xep-0136.xml     | 1226 +++++++++
 xep-0137.xml     |  320 +++
 xep-0138.xml     |  338 +++
 xep-0139.xml     |   90 +
 xep-0140.xml     |  231 ++
 xep-0141.xml     |  398 +++
 xep-0142.xml     | 1205 +++++++++
 xep-0143.xml     |  244 ++
 xep-0144.xml     |  323 +++
 xep-0145.xml     |  167 ++
 xep-0146.xml     |  740 ++++++
 xep-0147.xml     |  374 +++
 xep-0148.xml     |  244 ++
 xep-0149.xml     |  169 ++
 xep-0150.xml     |  353 +++
 xep-0151.xml     |  828 ++++++
 xep-0152.xml     |  240 ++
 xep-0153.xml     |  284 ++
 xep-0154.xml     | 1947 ++++++++++++++
 xep-0155.xml     |  560 ++++
 xep-0156.xml     |  160 ++
 xep-0157.xml     |  164 ++
 xep-0158.xml     |  759 ++++++
 xep-0159.xml     |  236 ++
 xep-0160.xml     |  130 +
 xep-0161.xml     |  227 ++
 xep-0162.xml     |  192 ++
 xep-0163.xml     |  767 ++++++
 xep-0164.xml     |  184 ++
 xep-0165.xml     |  141 +
 xep-0166.xml     |  826 ++++++
 xep-0167.xml     |  350 +++
 xep-0168.xml     |  341 +++
 xep-0169.xml     |  542 ++++
 xep-0170.xml     |  160 ++
 xep-0171.xml     |  467 ++++
 xep-0172.xml     |  401 +++
 xep-0173.xml     |  218 ++
 xep-0174.xml     |  307 +++
 xep-0175.xml     |  155 ++
 xep-0176.xml     |  522 ++++
 xep-0177.xml     |  163 ++
 xep-0178.xml     |  338 +++
 xep-0179.xml     |  188 ++
 xep-0180.xml     |  238 ++
 xep-0181.xml     |  176 ++
 xep-0182.xml     |   92 +
 xep-0183.xml     |  223 ++
 xep-0184.xml     |  569 ++++
 xep-0185.xml     |  253 ++
 xep-0186.xml     |  170 ++
 xep-0187.xml     |  422 +++
 xep-0188.xml     |  748 ++++++
 xep-0189.xml     |  287 +++
 xep-0190.xml     |  123 +
 xep-0191.xml     |  262 ++
 xep-0192.xml     |  451 ++++
 xep-0193.xml     |  260 ++
 xep-0194.xml     |  173 ++
 xep-0195.xml     |  179 ++
 xep-0196.xml     |  205 ++
 xep-0197.xml     |  257 ++
 xep-README.xml   |  274 ++
 xep-template.xml |   71 +
 xep.dtd          |   92 +
 xep.ent          |  761 ++++++
 xep.xsd          |  355 +++
 xep.xsl          |  844 ++++++
 219 files changed, 93420 insertions(+)
 create mode 100755 all.sh
 create mode 100755 announce.py
 create mode 100755 archive.sh
 create mode 100755 deferred.py
 create mode 100755 editor.shtml
 create mode 100644 fo.xsl
 create mode 100755 gen.sh
 create mode 100644 gps_datum.gif
 create mode 100644 gps_datum.html
 create mode 100755 index.shtml
 create mode 100755 inxep.py
 create mode 100755 ipr-policy.shtml
 create mode 100755 lastcall.py
 create mode 100644 protopage.xsl
 create mode 100644 ref.xsl
 create mode 100755 submit.shtml
 create mode 100644 xep-0001.xml
 create mode 100644 xep-0002.xml
 create mode 100644 xep-0003.xml
 create mode 100644 xep-0004.xml
 create mode 100644 xep-0005.xml
 create mode 100644 xep-0006.xml
 create mode 100644 xep-0007.xml
 create mode 100644 xep-0008.xml
 create mode 100644 xep-0009.xml
 create mode 100644 xep-0010.xml
 create mode 100644 xep-0011.xml
 create mode 100644 xep-0012.xml
 create mode 100644 xep-0013.xml
 create mode 100644 xep-0014.xml
 create mode 100644 xep-0015.xml
 create mode 100644 xep-0016.xml
 create mode 100644 xep-0017.xml
 create mode 100644 xep-0018.xml
 create mode 100644 xep-0019.xml
 create mode 100644 xep-0020.xml
 create mode 100644 xep-0021.xml
 create mode 100644 xep-0022.xml
 create mode 100644 xep-0023.xml
 create mode 100644 xep-0024.xml
 create mode 100644 xep-0025.xml
 create mode 100644 xep-0026.xml
 create mode 100644 xep-0027.xml
 create mode 100644 xep-0028.xml
 create mode 100644 xep-0029.xml
 create mode 100644 xep-0030.xml
 create mode 100644 xep-0031.xml
 create mode 100644 xep-0032.xml
 create mode 100644 xep-0033.xml
 create mode 100644 xep-0034.xml
 create mode 100644 xep-0035.xml
 create mode 100644 xep-0036.xml
 create mode 100644 xep-0037.xml
 create mode 100644 xep-0038.xml
 create mode 100644 xep-0039.xml
 create mode 100644 xep-0040.xml
 create mode 100644 xep-0041.xml
 create mode 100644 xep-0042.xml
 create mode 100644 xep-0043.xml
 create mode 100644 xep-0044.xml
 create mode 100644 xep-0045.xml
 create mode 100644 xep-0046.xml
 create mode 100644 xep-0047.xml
 create mode 100644 xep-0048.xml
 create mode 100644 xep-0049.xml
 create mode 100644 xep-0050.xml
 create mode 100644 xep-0051.xml
 create mode 100644 xep-0052.xml
 create mode 100644 xep-0053.xml
 create mode 100644 xep-0054.xml
 create mode 100644 xep-0055.xml
 create mode 100644 xep-0056.xml
 create mode 100644 xep-0057.xml
 create mode 100644 xep-0058.xml
 create mode 100644 xep-0059.xml
 create mode 100644 xep-0060.xml
 create mode 100644 xep-0061.xml
 create mode 100644 xep-0062.xml
 create mode 100644 xep-0063.xml
 create mode 100644 xep-0064.xml
 create mode 100644 xep-0065.xml
 create mode 100644 xep-0066.xml
 create mode 100644 xep-0067.xml
 create mode 100644 xep-0068.xml
 create mode 100644 xep-0069.xml
 create mode 100644 xep-0070.xml
 create mode 100644 xep-0071.xml
 create mode 100644 xep-0072.xml
 create mode 100644 xep-0073.xml
 create mode 100644 xep-0074.xml
 create mode 100644 xep-0075.xml
 create mode 100644 xep-0076.xml
 create mode 100644 xep-0077.xml
 create mode 100644 xep-0078.xml
 create mode 100644 xep-0079.xml
 create mode 100644 xep-0080.xml
 create mode 100644 xep-0081.xml
 create mode 100644 xep-0082.xml
 create mode 100644 xep-0083.xml
 create mode 100644 xep-0084.xml
 create mode 100644 xep-0085.xml
 create mode 100644 xep-0086.xml
 create mode 100644 xep-0087.xml
 create mode 100644 xep-0088.xml
 create mode 100644 xep-0089.xml
 create mode 100644 xep-0090.xml
 create mode 100644 xep-0091.xml
 create mode 100644 xep-0092.xml
 create mode 100644 xep-0093.xml
 create mode 100644 xep-0094.xml
 create mode 100644 xep-0095.xml
 create mode 100644 xep-0096.xml
 create mode 100644 xep-0097.xml
 create mode 100644 xep-0098.xml
 create mode 100644 xep-0099.xml
 create mode 100644 xep-0100.xml
 create mode 100644 xep-0101.xml
 create mode 100644 xep-0102.xml
 create mode 100644 xep-0103.xml
 create mode 100644 xep-0104.xml
 create mode 100644 xep-0105.xml
 create mode 100644 xep-0106.xml
 create mode 100644 xep-0107.xml
 create mode 100644 xep-0108.xml
 create mode 100644 xep-0109.xml
 create mode 100644 xep-0110.xml
 create mode 100644 xep-0111.xml
 create mode 100644 xep-0112.xml
 create mode 100644 xep-0113.xml
 create mode 100644 xep-0114.xml
 create mode 100644 xep-0115.xml
 create mode 100644 xep-0116.xml
 create mode 100644 xep-0117.xml
 create mode 100644 xep-0118.xml
 create mode 100644 xep-0119.xml
 create mode 100644 xep-0120.xml
 create mode 100644 xep-0121.xml
 create mode 100644 xep-0122.xml
 create mode 100644 xep-0123.xml
 create mode 100644 xep-0124.xml
 create mode 100644 xep-0125.xml
 create mode 100644 xep-0126.xml
 create mode 100644 xep-0127.xml
 create mode 100644 xep-0128.xml
 create mode 100644 xep-0129.xml
 create mode 100644 xep-0130.xml
 create mode 100644 xep-0131.xml
 create mode 100644 xep-0132.xml
 create mode 100644 xep-0133.xml
 create mode 100644 xep-0134.xml
 create mode 100644 xep-0135.xml
 create mode 100644 xep-0136.xml
 create mode 100644 xep-0137.xml
 create mode 100644 xep-0138.xml
 create mode 100644 xep-0139.xml
 create mode 100644 xep-0140.xml
 create mode 100644 xep-0141.xml
 create mode 100644 xep-0142.xml
 create mode 100644 xep-0143.xml
 create mode 100644 xep-0144.xml
 create mode 100644 xep-0145.xml
 create mode 100644 xep-0146.xml
 create mode 100644 xep-0147.xml
 create mode 100644 xep-0148.xml
 create mode 100644 xep-0149.xml
 create mode 100644 xep-0150.xml
 create mode 100644 xep-0151.xml
 create mode 100644 xep-0152.xml
 create mode 100644 xep-0153.xml
 create mode 100644 xep-0154.xml
 create mode 100644 xep-0155.xml
 create mode 100644 xep-0156.xml
 create mode 100644 xep-0157.xml
 create mode 100644 xep-0158.xml
 create mode 100644 xep-0159.xml
 create mode 100644 xep-0160.xml
 create mode 100644 xep-0161.xml
 create mode 100644 xep-0162.xml
 create mode 100644 xep-0163.xml
 create mode 100644 xep-0164.xml
 create mode 100644 xep-0165.xml
 create mode 100644 xep-0166.xml
 create mode 100644 xep-0167.xml
 create mode 100644 xep-0168.xml
 create mode 100644 xep-0169.xml
 create mode 100644 xep-0170.xml
 create mode 100644 xep-0171.xml
 create mode 100644 xep-0172.xml
 create mode 100644 xep-0173.xml
 create mode 100644 xep-0174.xml
 create mode 100644 xep-0175.xml
 create mode 100644 xep-0176.xml
 create mode 100644 xep-0177.xml
 create mode 100644 xep-0178.xml
 create mode 100644 xep-0179.xml
 create mode 100644 xep-0180.xml
 create mode 100644 xep-0181.xml
 create mode 100644 xep-0182.xml
 create mode 100644 xep-0183.xml
 create mode 100644 xep-0184.xml
 create mode 100644 xep-0185.xml
 create mode 100644 xep-0186.xml
 create mode 100644 xep-0187.xml
 create mode 100644 xep-0188.xml
 create mode 100644 xep-0189.xml
 create mode 100644 xep-0190.xml
 create mode 100644 xep-0191.xml
 create mode 100644 xep-0192.xml
 create mode 100644 xep-0193.xml
 create mode 100644 xep-0194.xml
 create mode 100644 xep-0195.xml
 create mode 100644 xep-0196.xml
 create mode 100644 xep-0197.xml
 create mode 100644 xep-README.xml
 create mode 100644 xep-template.xml
 create mode 100644 xep.dtd
 create mode 100644 xep.ent
 create mode 100644 xep.xsd
 create mode 100644 xep.xsl

diff --git a/all.sh b/all.sh
new file mode 100755
index 00000000..192295e1
--- /dev/null
+++ b/all.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# for each XEP, generates HTML file and IETF reference, then copies XML file
+# also generates HTML for the README and template
+# finally, copies the stylesheet, DTD, and schema
+# usage: ./all.sh
+
+xeppath=/var/www/stage.xmpp.org/extensions
+
+ls xep-0*.xml > tmp.txt
+sed s/xep-\(.*\).xml/\1/ tmp.txt > nums.txt
+rm tmp.txt
+
+while read f
+do
+    xsltproc xep.xsl xep-$f.xml > $xeppath/xep-$f.html
+    xsltproc ref.xsl xep-$f.xml > $xeppath/refs/reference.JSF.XEP-$f.xml
+    cp xep-$f.xml $xeppath/
+done < nums.txt
+
+rm nums.txt
+
+xsltproc xep.xsl xep-README.xml > $xeppath/README.html
+xsltproc xep.xsl xep-template.xml > $xeppath/template.html
+
+cp xep.dtd $xeppath/
+cp xep.ent $xeppath/
+cp xep.xsd $xeppath/
+cp xep.xsl $xeppath/
+
+# END
+
diff --git a/announce.py b/announce.py
new file mode 100755
index 00000000..113aa6ad
--- /dev/null
+++ b/announce.py
@@ -0,0 +1,187 @@
+#!/usr/bin/env python
+
+# File: announce.py
+# Version: 0.8
+# Description: a script for announcing XEPs
+# Last Modified: 2006-10-03
+# Author: Peter Saint-Andre (stpeter@jabber.org)
+# License: public domain
+# HowTo: ./announce.py xepnum dbuser dbpw 'cvsmodsurl'
+#        NOTE: the cvsmodsurl MUST be in quotes!
+
+# IMPORTS:
+#
+import glob
+import MySQLdb
+import os
+from select import select
+import smtplib
+import socket
+from string import split,strip,join,find
+import sys
+import time
+from xml.dom.minidom import parse,parseString,Document
+
+def getText(nodelist):
+    thisText = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE:
+            thisText = thisText + node.data
+    return thisText
+
+# get the seconds in the Unix era
+now = int(time.time())
+
+# READ IN ARGS: 
+#
+# 1. XEP number
+# 2. database user
+# 3. database password
+
+xepnum = sys.argv[1];
+dbuser = sys.argv[2];
+dbpw = sys.argv[3];
+mods = sys.argv[4];
+
+xepfile = 'xep-' + xepnum + '.xml'
+
+# PARSE XEP HEADERS:
+#
+# - title
+# - abstract
+# - version
+# - date
+# - initials
+# - remark
+
+thexep = parse(xepfile)
+xepNode = (thexep.getElementsByTagName("xep")[0])
+headerNode = (xepNode.getElementsByTagName("header")[0])
+titleNode = (headerNode.getElementsByTagName("title")[0])
+title = getText(titleNode.childNodes)
+abstractNode = (headerNode.getElementsByTagName("abstract")[0])
+abstract = getText(abstractNode.childNodes)
+statusNode = (headerNode.getElementsByTagName("status")[0])
+xepstatus = getText(statusNode.childNodes)
+typeNode = (headerNode.getElementsByTagName("type")[0])
+xeptype = getText(typeNode.childNodes)
+revNode = (headerNode.getElementsByTagName("revision")[0])
+versionNode = (revNode.getElementsByTagName("version")[0])
+version = getText(versionNode.childNodes)
+dateNode = (revNode.getElementsByTagName("date")[0])
+date = getText(dateNode.childNodes)
+initialsNode = (revNode.getElementsByTagName("initials")[0])
+initials = getText(initialsNode.childNodes)
+remNode = (revNode.getElementsByTagName("remark")[0])
+# could be <p> or <ul>
+testRemarkNode = remNode.firstChild.nodeName
+# print testRemarkNode
+if (testRemarkNode == "p"):
+    remarkNode = (remNode.getElementsByTagName("p")[0])
+    remark = getText(remarkNode.childNodes)
+else:
+    remark = "[See revision history]"
+
+# what kind of action are we taking?
+xepflag = ""
+if (version == "0.1"):
+    xepflag = "new"
+elif ((version == "1.0") & (xeptype == "Standards Track")):
+    xepflag = "draft"
+elif ((version == "1.0") & (xeptype != "Standards Track")):
+    xepflag = "active"
+elif (version == "2.0"):
+    xepflag = "final"
+elif (xepstatus == "Retracted"):
+    xepflag = "retract"
+elif (xepstatus == "Deferred"):
+    xepflag = "defer"
+
+# UPDATE DATABASE:
+#
+# number is $xepnum
+# name is $title
+# type is $xeptype
+# status is $xepstatus
+# notes is "Version $version of XEP-$xepnum released $date."
+# version is $version
+# last_modified is $now
+# abstract is $abstract
+# changelog is "$remark ($initials)"
+
+db = MySQLdb.connect("localhost", dbuser, dbpw, "foundation")
+cursor = db.cursor()
+theNotes = "Version " + version + " of XEP-" + xepnum + " released " + date + "."
+theLog = remark + " (" + initials + ")"
+if xepflag == "new":
+    theStatement = "INSERT INTO jeps VALUES ('" + str(xepnum) + "', '" + title + "', '" + xeptype + "', '" + xepstatus + "', '" + theNotes + "', '" + str(version) + "', '" + str(now) + "', '" + abstract + "', '" + theLog + "', '0', '5', 'Proposed', 'none');"
+    cursor.execute(theStatement)
+else:
+    theStatement = "UPDATE jeps SET name='" + title + "', type='" + xeptype + "', status='" + xepstatus + "', notes='" + theNotes + "', version='" + str(version) + "', last_modified='" + str(now) + "', abstract='" + abstract + "', changelog='" + theLog + "' WHERE number='" + str(xepnum) + "';"
+    cursor.execute(theStatement) 
+result = cursor.fetchall()
+
+## SEND MAIL:
+#
+# From: editor@jabber.org
+# To: standards-jig@jabber.org
+# Subject: UPDATED: XEP-$xepnum ($title)
+# [or "NEW..." if version 0.1]
+# Body:
+#    Version $version of XEP-$xepnum ($title) is now available.
+#    Abstract: $abstract
+#    Changelog: $remark ($initials)
+#    CVS Diff: $mods
+#    URL: http://www.xmpp.org/extensions/xep-$xepnum.html
+
+fromaddr = "editor@jabber.org"
+# for testing...
+# toaddrs = "stpeter@jabber.org"
+# for real...
+toaddrs = "standards-jig@jabber.org"
+
+if xepflag == "new":
+    thesubject = 'NEW: XEP-'
+elif xepflag == "draft":
+    thesubject = 'DRAFT: XEP-'
+    toaddrs = toaddrs + ", jdev@jabber.org"
+elif xepflag == "final":
+    thesubject = 'FINAL: XEP-'
+    toaddrs = toaddrs + ", jdev@jabber.org"
+elif xepflag == "active":
+    thesubject = 'ACTIVE: XEP-'
+elif xepflag == "retract":
+    thesubject = 'RETRACTED: XEP-'
+elif xepflag == "defer":
+    thesubject = 'DEFERRED: XEP-'
+else:
+    thesubject = 'UPDATED: XEP-'
+thesubject = thesubject + xepnum + ' (' + title + ')'
+
+versionline = 'Version ' + version + ' of XEP-' + xepnum + ' (' + title + ') has been released.' 
+abstractline = 'Abstract: ' + abstract
+changelogline = 'Changelog: ' + remark + ' (' + initials + ')'
+modsline = 'CVS Diff: ' + mods
+urlline = 'URL: http://www.xmpp.org/extensions/xep-' + xepnum + '.html'
+
+msg = "From: XMPP Extensions Editor <%s>\r\n" % fromaddr
+msg = msg + "To: %s\r\n" % toaddrs
+msg = msg + "Subject: %s\r\n" % thesubject
+msg = msg + versionline
+msg = msg + "\r\n\n"
+msg = msg + abstractline
+msg = msg + "\r\n\n"
+msg = msg + changelogline
+msg = msg + "\r\n\n"
+msg = msg + modsline
+msg = msg + "\r\n\n"
+msg = msg + urlline
+msg = msg + "\r\n\n"
+
+server = smtplib.SMTP('localhost')
+server.set_debuglevel(1)
+server.sendmail(fromaddr, toaddrs, msg)
+server.quit()
+
+# END
+
diff --git a/archive.sh b/archive.sh
new file mode 100755
index 00000000..12b94e56
--- /dev/null
+++ b/archive.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# archive an old version of a XEP (before publishing new version)
+# usage: ./archive.sh xepnum version 
+
+xeppath=/var/www/xmpp.org/extensions
+
+cp $xeppath/xep-$1.html $jeppath/attic/xep-$1-$2.html
+
+# end
diff --git a/deferred.py b/deferred.py
new file mode 100755
index 00000000..11134f31
--- /dev/null
+++ b/deferred.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python
+
+# File: deferred.py
+# Version: 0.2
+# Description: a script for setting a JEP to Deferred
+# Last Modified: 2006-04-24
+# Author: Peter Saint-Andre (stpeter@jabber.org)
+# License: public domain
+# HowTo: ./deferred.py jepnum dbuser dbpw 
+
+# IMPORTS:
+#
+import glob
+import MySQLdb
+import os
+from select import select
+import smtplib
+import socket
+from string import split,strip,join,find
+import sys
+import time
+from xml.dom.minidom import parse,parseString,Document
+
+def getText(nodelist):
+    thisText = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE:
+            thisText = thisText + node.data
+    return thisText
+
+# get the seconds in the Unix era
+now = int(time.time())
+
+# READ IN ARGS: 
+#
+# 1. JEP number
+# 2. database user
+# 3. database password
+
+jepnum = sys.argv[1];
+dbuser = sys.argv[2];
+dbpw = sys.argv[3];
+
+jepfile = jepnum + '/jep-' + jepnum + '.xml'
+
+# PARSE JEP HEADERS:
+#
+# - title
+# - abstract
+# - version
+# - date
+# - initials
+# - remark
+
+thejep = parse(jepfile)
+jepNode = (thejep.getElementsByTagName("jep")[0])
+headerNode = (jepNode.getElementsByTagName("header")[0])
+titleNode = (headerNode.getElementsByTagName("title")[0])
+title = getText(titleNode.childNodes)
+abstractNode = (headerNode.getElementsByTagName("abstract")[0])
+abstract = getText(abstractNode.childNodes)
+statusNode = (headerNode.getElementsByTagName("status")[0])
+jepstatus = getText(statusNode.childNodes)
+typeNode = (headerNode.getElementsByTagName("type")[0])
+jeptype = getText(typeNode.childNodes)
+revNode = (headerNode.getElementsByTagName("revision")[0])
+versionNode = (revNode.getElementsByTagName("version")[0])
+version = getText(versionNode.childNodes)
+dateNode = (revNode.getElementsByTagName("date")[0])
+date = getText(dateNode.childNodes)
+initialsNode = (revNode.getElementsByTagName("initials")[0])
+initials = getText(initialsNode.childNodes)
+remarkNode = (revNode.getElementsByTagName("remark")[0])
+remark = getText(remarkNode.childNodes)
+
+# UPDATE DATABASE:
+#
+# number is $jepnum
+# name is $title
+# type is $jeptype
+# status is $jepstatus
+# notes is "Version $version of JEP-$jepnum released $date."
+# version is $version
+# last_modified is $now
+# abstract is $abstract
+# changelog is "$remark ($initials)"
+
+db = MySQLdb.connect("localhost", dbuser, dbpw, "foundation")
+cursor = db.cursor()
+theNotes = "Version " + version + " of JEP-" + jepnum + " released " + date + "; consideration deferred because of inactivity."
+theLog = remark + " (" + initials + ")"
+theStatement = "UPDATE jeps SET name='" + title + "', type='" + jeptype + "', status='Deferred', notes='" + theNotes + "', version='" + str(version) + "', last_modified='" + str(now) + "', abstract='" + abstract + "', changelog='" + theLog + "' WHERE number='" + str(jepnum) + "';"
+cursor.execute(theStatement) 
+result = cursor.fetchall()
+
+# SEND MAIL:
+#
+# From: editor@jabber.org
+# To: standards-jig@jabber.org
+# Subject: DEFERRED: JEP-$jepnum ($title)
+# Body:
+#    JEP-$jepnum ($title) has been Deferred because of inactivity.
+#
+#    Abstract: $abstract
+#
+#    URL: http://www.jabber.org/jeps/jep-$jepnum.html
+#
+#    If and when a new revision of this JEP is published,
+#    its status will be changed back to Experimental.
+#
+
+fromaddr = "editor@jabber.org"
+# for testing...
+# toaddrs = "stpeter@jabber.org"
+# for real...
+toaddrs = "standards-jig@jabber.org"
+
+thesubject = 'DEFERRED: JEP-' + jepnum + " (" + title + ")"
+introline = 'JEP-' + jepnum + ' (' + title + ') has been Deferred because of inactivity.'
+abstractline = 'Abstract: ' + abstract
+urlline = 'URL: http://www.jabber.org/jeps/jep-' + jepnum + '.html'
+endline = 'If and when a new revision of this JEP is published, its status will be changed back to Experimental.'
+
+#msg = "From: %s\r\n" % fromaddr
+msg = "From: JEP Editor <%s>\r\n" % fromaddr
+msg = msg + "To: %s\r\n" % toaddrs
+msg = msg + "Subject: %s\r\n" % thesubject
+msg = msg + introline
+msg = msg + "\r\n\n"
+msg = msg + abstractline
+msg = msg + "\r\n\n"
+msg = msg + urlline
+msg = msg + "\r\n\n"
+msg = msg + endline
+msg = msg + "\r\n"
+
+server = smtplib.SMTP('localhost')
+server.set_debuglevel(1)
+server.sendmail(fromaddr, toaddrs, msg)
+server.quit()
+
+# END
+
diff --git a/editor.shtml b/editor.shtml
new file mode 100755
index 00000000..69b60df1
--- /dev/null
+++ b/editor.shtml
@@ -0,0 +1,21 @@
+<html>
+<head>
+<title>XEP Editor</title>
+<!--#include virtual="/includes/head.txt" -->
+<h2>XEP Editor</h2>
+<p>In accordance with <a href="jep-0001.html">XEP-0001</a>, the XEP Editor is responsible for overall management of the Jabber Software Foundation's standards process and publication of <a href="/extensions/">XMPP Extension Protocols</a>; in particular, the XEP Editor:</p>
+<ul>
+<li>works with XEP authors</li>
+<li>ensures that each XEP is properly formatted</li>
+<li>assigns a unique number to each XEP</li>
+<li>assigns or modifies the status of each XEP</li>
+<li>maintains each XEP under <a href="http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/jeps/">source control</a></li>
+<li>maintains the canonical <a href="/extensions/">list of XEPs</a></li>
+<li>publishes each XEP to the xmpp.org website</li>
+<li>publicly announces the existence and status of each XEP</li>
+<li>gathers and tallies the votes of the <a href="/council/">XMPP Council</a></li>
+<li>fulfills the responsibilities of the <a href="/registrar/">XMPP Registrar</a></li>
+</ul>
+<p>Since the founding of the Jabber Software Foundation in 2001, the XEP Editor has been  <a href="http://www.jabber.org/people/stpeter.shtml">Peter Saint-Andre</a>, who may be contacted via &lt;&#101;&#100;&#105;&#116;&#111;&#114;&#64;&#106;&#97;&#98;&#98;&#101;&#114;&#46;&#111;&#114;&#103&gt;.</p>
+</div>
+<!--#include virtual="/includes/foot.txt" -->
diff --git a/fo.xsl b/fo.xsl
new file mode 100644
index 00000000..dda73c45
--- /dev/null
+++ b/fo.xsl
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/XSL/Format">
+  <xsl:template match="/">
+    <root>
+      <layout-master-set>
+        <simple-page-master master-name="cover">
+          <region-body margin-left="1in" margin-right="1in" margin-top="2.5in" margin-bottom="1in"/>
+        </simple-page-master>
+        <!--<simple-page-master master-name="doc_info">
+          <region-body margin-left="1in" margin-top="1in" margin-right="1in" margin-bottom="1in"/>
+        </simple-page-master>
+        <simple-page-master master-name="toc_page">
+          <region-body margin-left="1in" margin-top="1in" margin-right="1in" margin-bottom="1in"/>
+        </simple-page-master>-->
+        <simple-page-master master-name="std_page">
+          <region-body margin-left="1in" margin-top="1in" margin-right="1in" margin-bottom="1in"/>
+          <region-before extent="1in" display-align="after"/>
+          <region-after extent="1in" display-align="before"/>
+        </simple-page-master>
+        <page-sequence-master master-name="jep_sequence">
+          <single-page-master-reference master-reference="cover"/>
+          <!--<single-page-master-reference master-reference="doc_info"/>
+          <single-page-master-reference master-reference="toc_page"/>-->
+          <repeatable-page-master-reference master-reference="std_page"/>
+        </page-sequence-master>
+      </layout-master-set>
+      <page-sequence master-reference="jep_sequence">
+        <flow flow-name="xsl-region-body" font-family="serif" color="black" font-size="10pt">
+          <block space-before="1.5in" text-align="right" font-family="sans-serif" font-size="18pt">
+            JEP-<xsl:value-of select="/jep/header/number"/>
+          </block>
+          <block text-align="right" font-family="sans-serif" font-size="18pt">
+            <xsl:value-of select="/jep/header/title"/>
+          </block>
+          <!--</flow>
+      </page-sequence>
+      <page-sequence master-reference="doc_info">
+        <flow flow-name="xsl-region-body" font-family="serif" font-size="10pt" color="black">-->
+          <block font-family="sans-serif" font-size="14pt" space-after=".5em" break-before="page">Document Information</block>
+          <block font-size="12pt" font-weight="bold">Document Author(s)</block>
+          <block>
+            <inline font-weight="bold">Name: </inline>
+            <inline>
+              <xsl:value-of select="/jep/header/author/firstname"/>
+              <xsl:value-of select="/jep/header/author/surname"/>
+            </inline>
+          </block>
+          <block>
+            <inline font-weight="bold">Email: </inline>
+            <inline>
+              <xsl:value-of select="/jep/header/author/email"/>
+            </inline>
+          </block>
+          <block space-after=".5em">
+            <inline font-weight="bold">JID: </inline>
+            <inline>
+              <xsl:value-of select="/jep/header/author/jid"/>
+            </inline>
+          </block>
+          <block font-size="12pt" font-weight="bold">Abstract</block>
+          <block space-after=".5em">
+            <xsl:value-of select="/jep/header/abstract"/>
+          </block>
+          <block font-size="12pt" font-weight="bold">Document Status</block>
+          <block space-after=".5em">
+            <xsl:value-of select="/jep/header/status"/>
+          </block>
+          <block font-size="12pt" font-weight="bold">Dependencies/References</block>
+          <block space-after=".5em">
+            <xsl:value-of select="/jep/header/dependencies"/>
+          </block>
+          <block font-size="12pt" font-weight="bold">Legal Notice</block>
+          <block space-after=".5em">
+            <xsl:value-of select="/jep/header/legal"/>
+          </block>
+          <block font-size="12pt" font-weight="bold" space-after=".5em">Revision History</block>
+          <table table-layout="fixed" border-width=".25pt" border-color="black" border-style="solid">
+            <table-column text-align="center" column-width=".625in" column-number="1"/>
+            <table-column text-align="center" column-width=".75in" column-number="2"/>
+            <table-column text-align="center" column-width=".5in" column-number="3"/>
+            <table-column column-width="4.125in" column-number="4"/>
+            <table-body>
+              <table-row background-color="black" color="white" font-weight="bold">
+                <table-cell padding="3pt">
+                  <block>Version</block>
+                </table-cell>
+                <table-cell padding="3pt">
+                  <block>Date</block>
+                </table-cell>
+                <table-cell padding="3pt">
+                  <block>Initials</block>
+                </table-cell>
+                <table-cell padding="3pt">
+                  <block>Comment</block>
+                </table-cell>
+              </table-row>
+              <xsl:apply-templates select="/jep/header"/>
+            </table-body>
+          </table>
+          <!--</flow>
+      </page-sequence>
+      <page-sequence master-reference="toc_page" force-page-count="no-force" format="i">
+        <flow flow-name="xsl-region-body" font-family="serif" font-size="10pt" color="black">-->
+          <xsl:call-template name="processTOC"/>
+        </flow>
+      </page-sequence>
+      <page-sequence master-reference="std_page" initial-page-number="1">
+        <!--<static-content flow-name="xsl-region-before" margin-top=".5in">
+                    <block margin-left="1in" margin-right="1in" text-align-last="justify" font-size="9pt" font-family="sans-serif" color="silver">
+                        <xsl:value-of select="/jep/header/customer"/>
+                        <leader leader-pattern="space"/>
+                    Requirements Proposal
+                    </block>
+                    <block margin-left="1in" margin-right="1in" padding-bottom="10pt" border-after-color="black" border-after-width=".25pt" border-after-style="solid" text-align-last="justify" font-size="9pt" font-family="sans-serif" color="silver">
+                        <xsl:value-of select="/jep/header/title"/>
+                        <leader leader-pattern="space"/>
+                        <xsl:value-of select="/jep/header/revision[last()]/date"/>
+                    </block>
+                </static-content>-->
+        <static-content flow-name="xsl-region-after">
+          <block margin-left="1in" margin-right="1in" padding-top="10pt" border-before-color="black" border-before-width=".125pt" border-before-style="solid" text-align-last="justify" font-size="8pt" font-family="sans-serif" color="black">
+                        IJEP-<xsl:value-of select="/jep/header/number"/>:<xsl:text> </xsl:text>
+            <xsl:value-of select="/jep/header/title"/>
+            <leader leader-pattern="space"/>
+                        Page <page-number/> of <page-number-citation ref-id="lastpage"/>
+          </block>
+        </static-content>
+        <flow flow-name="xsl-region-body" font-family="serif" font-size="10pt" color="black">
+          <xsl:apply-templates select="/jep/section1"/>
+          <block font-family="sans-serif" font-size="12pt" color="black" space-before=".5em" space-after=".5em">Notes:</block>
+          <xsl:apply-templates select="//note" mode="endlist"/>
+          <block id="lastpage"/>
+        </flow>
+      </page-sequence>
+    </root>
+  </xsl:template>
+  <!-- From the docbook XSL -->
+  <xsl:template name="object.id">
+    <xsl:param name="object" select="."/>
+    <xsl:choose>
+      <xsl:when test="$object/@id">
+        <xsl:value-of select="$object/@id"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="generate-id($object)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template name="processTOC">
+    <block font-family="sans-serif" font-size="14pt" space-after=".5em" break-before="page">Table of Contents</block>
+    <xsl:apply-templates select="//section1" mode="toc"/>
+  </xsl:template>
+  <xsl:template match="/jep/header/revision">
+    <table-row>
+      <table-cell padding="3pt">
+        <block>
+          <xsl:value-of select="version"/>
+        </block>
+      </table-cell>
+      <table-cell padding="3pt">
+        <block>
+          <xsl:value-of select="date"/>
+        </block>
+      </table-cell>
+      <table-cell padding="3pt">
+        <block>
+          <xsl:value-of select="initials"/>
+        </block>
+      </table-cell>
+      <table-cell padding="3pt">
+        <block>
+          <xsl:value-of select="remark"/>
+        </block>
+      </table-cell>
+    </table-row>
+  </xsl:template>
+  <xsl:template match="section1" mode="toc">
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="num">
+      <xsl:number level="multiple" count="section1"/>
+      <xsl:text>.</xsl:text>
+    </xsl:variable>
+    <xsl:variable name="sect2.count" select="count(section2)"/>
+    <xsl:value-of select="$num"/>
+    <xsl:text>  </xsl:text>
+    <block text-align-last="justify" font-variant="small-caps">
+      <xsl:value-of select="$num"/>
+      <xsl:value-of select="@topic"/>
+      <xsl:text> </xsl:text>
+      <leader leader-pattern="rule" space-end=".125in"/>
+      <xsl:text>   </xsl:text>
+      <page-number-citation ref-id="sect-{$oid}"/>
+    </block>
+    <xsl:if test="$sect2.count &gt; 0">
+      <xsl:apply-templates select="section2" mode="toc">
+        <xsl:with-param name="prevnum" select="$num"/>
+      </xsl:apply-templates>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="section1">
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="num">
+      <xsl:number level="multiple" count="section1"/>
+      <xsl:text>.</xsl:text>
+    </xsl:variable>
+    <!--<xsl:number level="single" count="section1"/>-->
+    <block id="sect-{$oid}" font-family="sans-serif" font-size="14pt" space-after="1em" space-before="1em" font-weight="bold">
+      <xsl:value-of select="$num"/>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="@topic"/>
+    </block>
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="section2" mode="toc">
+    <xsl:param name="prevnum" select='""'/>
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="num">
+      <xsl:value-of select="$prevnum"/>
+      <xsl:number level="multiple" count="section2"/>
+      <xsl:text>.</xsl:text>
+    </xsl:variable>
+    <xsl:variable name="sect3.count" select="count(section3)"/>
+    <block text-align-last="justify" margin-left="1em">
+      <xsl:value-of select="$num"/>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="@topic"/>
+      <xsl:text> </xsl:text>
+      <leader leader-pattern="rule" space-end=".125in"/>
+      <xsl:text>   </xsl:text>
+      <page-number-citation ref-id="sect-{$oid}"/>
+    </block>
+    <xsl:if test="$sect3.count &gt; 0">
+      <xsl:apply-templates select="section3" mode="toc">
+        <xsl:with-param name="prevnum" select="$num"/>
+      </xsl:apply-templates>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template match="section2">
+    <xsl:param name="prevnum" select='""'/>
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="num">
+      <xsl:number level="single" count="section1"/>.<xsl:number level="multiple" count="section2"/>
+      <xsl:text>.</xsl:text>
+    </xsl:variable>
+    <xsl:variable name="sect3.count" select="count(section3)"/>
+    <block id="sect-{$oid}" font-weight="bold" font-family="sans-serif">
+      <xsl:value-of select="$num"/>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="@topic"/>
+    </block>
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="section3" mode="toc">
+    <xsl:param name="prevnum" select='""'/>
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="num">
+      <xsl:value-of select="$prevnum"/>
+      <xsl:number level="multiple" count="section3"/>
+      <xsl:text>.</xsl:text>
+    </xsl:variable>
+    <block text-align-last="justify" margin-left="1em">
+      <xsl:value-of select="$num"/>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="@topic"/>
+      <xsl:text> </xsl:text>
+      <leader leader-pattern="rule" space-end=".125in"/>
+      <xsl:text>   </xsl:text>
+      <page-number-citation ref-id="sect-{$oid}"/>
+    </block>
+  </xsl:template>
+  <xsl:template match="section3">
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <block id="sect-{$oid}" margin-left=".5em">
+      <xsl:if test="../../@type='functional-spec'">FR-<xsl:number level="single" count="section2"/>.<xsl:number level="single" count="section3"/>
+      </xsl:if>
+      <xsl:if test="../../@type='supp-spec'">SS-<xsl:number level="single" count="section2"/>.<xsl:number level="single" count="section3"/>
+      </xsl:if>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="@topic"/>
+      <xsl:apply-templates/>
+    </block>
+  </xsl:template>
+  <xsl:template match="p">
+    <block space-before=".5em" space-after=".5em">
+      <xsl:apply-templates/>
+    </block>
+  </xsl:template>
+  <xsl:template match="code">
+    <block space-after="1em" margin-bottom="1em" margin-left="1em" font-family="monospace" font-size="8pt" font-weight="normal" white-space-collapse="false" keep-together.within-page="always">
+      <xsl:value-of select="."/>
+    </block>
+  </xsl:template>
+  <xsl:template match="example">
+    <table table-layout="fixed" width="100%" space-after="1em">
+      <table-column column-width="proportional-column-width(1)"/>
+      <table-body>
+        <table-row keep-with-next="always">
+          <table-cell>
+            <block margin-left=".5em" space-after=".5em" space-before=".5em" font-weight="600" font-size="9pt">
+        Example <xsl:number level="any" count="example"/>.<xsl:text> </xsl:text>
+              <xsl:value-of select="@caption"/>
+            </block>
+          </table-cell>
+        </table-row>
+        <table-row>
+          <table-cell>
+            <block margin-left="1em" font-family="monospace" font-size="8pt" font-weight="normal" white-space-collapse="false" keep-together.within-page="always">
+              <xsl:value-of select="."/>
+            </block>
+          </table-cell>
+        </table-row>
+      </table-body>
+    </table>
+  </xsl:template>
+  <xsl:template match="note">
+    <xsl:variable name="notenum">
+      <xsl:number level="any" count="note"/>
+    </xsl:variable>
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <inline>[<basic-link color="blue" font-weight="bold" internal-destination="nt-{$oid}">
+        <xsl:value-of select="$notenum"/>
+      </basic-link>]</inline>
+  </xsl:template>
+  <xsl:template match="note" mode="endlist">
+    <xsl:variable name="oid">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <block id="nt-{$oid}" margin=".5em" font-size="8pt">
+      <xsl:value-of select="position()"/>. <xsl:apply-templates/>
+    </block>
+  </xsl:template>
+  <xsl:template match="link">
+    <basic-link external-destination="{@url}" text-decoration="underline" color="blue">
+      <xsl:apply-templates/>
+    </basic-link>
+  </xsl:template>
+  <xsl:template match="strong">
+    <inline font-weight="bold">
+      <xsl:apply-templates/>
+    </inline>
+  </xsl:template>
+  <xsl:template match="em">
+    <inline font-style="italic">
+      <xsl:apply-templates/>
+    </inline>
+  </xsl:template>
+  <xsl:template match="ul">
+    <list-block provisional-distance-between-starts="10pt" provisional-label-separation="3pt" space-after=".5em" space-start="1em" margin-left="1em">
+      <xsl:apply-templates select="li" mode="ul"/>
+    </list-block>
+  </xsl:template>
+  <xsl:template match="ol">
+    <list-block provisional-distance-between-starts="10pt" provisional-label-separation="3pt" space-after=".5em" space-start="1em" margin-left="1em">
+      <xsl:apply-templates select="li" mode="ol"/>
+    </list-block>
+  </xsl:template>
+  <xsl:template match="li" mode="ul">
+    <list-item>
+      <list-item-label end-indent="label-end()">
+        <block>&#x2022;</block>
+      </list-item-label>
+      <list-item-body start-indent="body-start()">
+        <block>
+          <xsl:value-of select="."/>
+        </block>
+      </list-item-body>
+    </list-item>
+  </xsl:template>
+  <xsl:template match="li" mode="ol">
+    <xsl:variable name="num">
+      <xsl:number level="multiple" count="li"/>
+    </xsl:variable>
+    <list-item>
+      <list-item-label end-indent="label-end()">
+        <block>
+          <xsl:value-of select="$num"/>.</block>
+      </list-item-label>
+      <list-item-body start-indent="body-start()">
+        <block>
+          <xsl:value-of select="."/>
+        </block>
+      </list-item-body>
+    </list-item>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/gen.sh b/gen.sh
new file mode 100755
index 00000000..ec40ec9d
--- /dev/null
+++ b/gen.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# for one XEP, generates HTML file and IETF reference, then copies XML file
+# usage: ./gen.sh xxxx 
+# (where xxxx is the 4-digit XEP number)
+
+xeppath=/var/www/stage.xmpp.org/extensions
+
+xsltproc xep.xsl xep-$1.xml > $xeppath/jep-$1.html
+xsltproc ref.xsl xep-$1.xml > $xeppath/refs/reference.JSF.XEP-$1.xml
+cp xep-$1.xml $xeppath/
+
+# end
diff --git a/gps_datum.gif b/gps_datum.gif
new file mode 100644
index 0000000000000000000000000000000000000000..02148cb3a724db0df49fd7e2436dcdf0c91a2c5e
GIT binary patch
literal 38166
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
QGE*}-h=+Ip1Oxy8I~>NG>Hq)$

literal 0
HcmV?d00001

diff --git a/gps_datum.html b/gps_datum.html
new file mode 100644
index 00000000..d7d46197
--- /dev/null
+++ b/gps_datum.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<title>GPS Datum Example</title>
+</head>
+<body>
+<h1>GPS Datum Example</h1>
+<p>The following example of GPS datum differences was kindly provided by Randy Steele of Apollo, Pennsylvania (URL: &lt;<a href="http://www.nb.net/~resteele/">http://www.nb.net/~resteele/</a>&gt;) and is archived here so that a permanent link is available from <a href="http://www.jabber.org/jeps/jep-0080.html">JEP-0080: User Geolocation</a>.</p>
+<p>BEGIN EXAMPLE</p>
+<hr />
+<p>This is an example of the differences in the datums you can use with a GPS.
+Below is a site I was checking out. I marked it on my GPS in the field. When I got back
+home to find it on the topo map, I noticed something was not right. Using
+the UTM coordinates from the GPS, I located the site on the topo map. But
+the map site and the site I checked in the field did not match. The terrain
+was different, the site I actually checked was near the road (the top red
+circle). I then remembered about map datums. The topo map was made to NAD27, while
+my GPS was set to WGS84. After changing the GPS to the NAD27 datum, all was fine.
+So the moral of this story is: MAKE SURE THE GPS DATUM AND THE MAP DATUM MATCH!!!
+Note the difference in the circle locations. I also changed my GPS datum to NAD27.</p>
+<p><img src='gps_datum.gif' alt='GPS Datum Example' longdesc='An example of different GPS readings when using a datum of NAD27 vs. WGS84, provided by Randy Steele'/>
+<hr />
+<p>END EXAMPLE</p>
+</body>
+</html>
diff --git a/index.shtml b/index.shtml
new file mode 100755
index 00000000..11a6b05a
--- /dev/null
+++ b/index.shtml
@@ -0,0 +1,29 @@
+<html>
+<head>
+<title>XMPP Extensions</title>
+<!--#include virtual="/includes/head.txt" -->
+<h2>XMPP Extensions</h2>
+
+<p><a class="standardsButton" href="atom.xml">ATOM</a>&nbsp;&nbsp;<a class="standardsButton" href="rss.xml">RSS</a></p>
+
+<p>The <a href='http://www.jabber.org/jsf/'>Jabber Software Foundation</a> (JSF) develops extensions to <a href="http://www.xmpp.org/">XMPP</a> through a standards process centered around XMPP Extension Protocols (XEPs). The <a href="xep-0001.html">process</a> is managed by the <a href="editor.shtml">XMPP Extensions Editor</a> and involves intensive discussion on the <a href="http://mail.jabber.org/mailman/listinfo/standards-jig/">Standards-JIG mailing list</a>, formal review and <a href="/council/votes.shtml">voting</a> by the <a href="/council/">XMPP Council</a>, and modification based on implementation experience and interoperability testing. All documents in the XEP series are available under a liberal <a href="ipr-policy.shtml">IPR Policy</a> for wide implementation. Submissions are <a href='submit.shtml'>welcome</a> (see also the <a href="/extensions/inbox/">&quot;inbox&quot;</a>). Changes are tracked via a <a href="http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/jeps/">CVS repository</a> (see <a href='http://www.jabberstudio.org/cvs.php'>instructions</a>), <a href="/extensions/attic/">old versions</a> are available, and IETF-style <a href="/extensions/refs/">XML reference files</a> are provided.</p>
+
+<p>This page lists approved XMPP extensions as well as proposals that are under active consideration. A <a href="all.shtml">list of all XEPs</a> (including retracted, rejected, deprecated, and obsolete XEPs) is also available. Good places for developers to start are the <a href='xep-0073.html'>basic</a> and <a href='xep-0117.html'>intermediate</a> protocol suites.</p>
+
+<p><em>Note: The following table is sortable, just click on the headers (click twice to reverse the sort order).</em></p>
+
+<table border='1' cellpadding='3' cellspacing='0' class='sortable' id='xeplist'>
+  <tr class='jepheader'>
+    <th align='left'>Number</th>
+    <th align='left'>Name</th>
+    <th align='left'>Type</th>
+    <th align='left'>Status</th>
+    <th align='left'>Date</th>
+  </tr>
+
+<!--#include virtual="/includes/xeps-default.txt" -->
+
+</table>
+
+</div>
+<!--#include virtual="/includes/foot.txt" -->
diff --git a/inxep.py b/inxep.py
new file mode 100755
index 00000000..ddfc72e4
--- /dev/null
+++ b/inxep.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+
+# File: protojep.py
+# Version: 0.1
+# Description: a script for announcing proto-JEPs
+# Last Modified: 2004-09-14
+# Author: Peter Saint-Andre (stpeter@jabber.org)
+# License: public domain
+# HowTo: ./protojep.py filename
+# (note: do not include extension!)
+
+# IMPORTS:
+#
+import glob
+import os
+from select import select
+import smtplib
+import socket
+from string import split,strip,join,find
+import sys
+import time
+from xml.dom.minidom import parse,parseString,Document
+
+def getText(nodelist):
+    thisText = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE:
+            thisText = thisText + node.data
+    return thisText
+
+# READ IN ARGS: 
+#
+# 1. JEP filename (sans extension)
+
+jepname = sys.argv[1];
+
+jepfile = 'inbox/' + jepname + '.xml'
+
+# PARSE JEP HEADERS:
+#
+# - title
+# - abstract
+# - version
+# - date
+# - initials
+# - remark
+
+thejep = parse(jepfile)
+jepNode = (thejep.getElementsByTagName("jep")[0])
+headerNode = (jepNode.getElementsByTagName("header")[0])
+titleNode = (headerNode.getElementsByTagName("title")[0])
+title = getText(titleNode.childNodes)
+abstractNode = (headerNode.getElementsByTagName("abstract")[0])
+abstract = getText(abstractNode.childNodes)
+statusNode = (headerNode.getElementsByTagName("status")[0])
+jepstatus = getText(statusNode.childNodes)
+typeNode = (headerNode.getElementsByTagName("type")[0])
+jeptype = getText(typeNode.childNodes)
+revNode = (headerNode.getElementsByTagName("revision")[0])
+versionNode = (revNode.getElementsByTagName("version")[0])
+version = getText(versionNode.childNodes)
+dateNode = (revNode.getElementsByTagName("date")[0])
+date = getText(dateNode.childNodes)
+initialsNode = (revNode.getElementsByTagName("initials")[0])
+initials = getText(initialsNode.childNodes)
+remarkNode = (revNode.getElementsByTagName("remark")[0])
+remark = getText(remarkNode.childNodes)
+
+# SEND MAIL:
+#
+# From: editor@jabber.org
+# To: standards-jig@jabber.org
+# Subject: LAST CALL: JEP-$jepnum ($title)
+# Body:
+#    The JEP Editor has received a proposal for a new JEP.
+#
+#    Title: $title
+#
+#    Abstract: $abstract
+#
+#    URL: http://www.jabber.org/jeps/inbox/$jepname.html
+#
+#    The Jabber Council will now consider whether to accept
+#    this proposal as a full JEP.
+#
+
+fromaddr = "editor@jabber.org"
+# for testing...
+# toaddrs = "stpeter@jabber.org"
+# for real...
+toaddrs = "standards-jig@jabber.org"
+
+thesubject = 'proto-JEP: ' + title
+introline = 'The JEP Editor has received a proposal for a new JEP.'
+titleline = 'Title: ' + title
+abstractline = 'Abstract: ' + abstract
+urlline = 'URL: http://www.jabber.org/jeps/inbox/' + jepname + '.html'
+actionline = 'The Jabber Council will decide within 7 days (or at its next meeting) whether to accept this proposal as an official JEP.'
+
+#msg = "From: %s\r\n" % fromaddr
+msg = "From: JEP Editor <%s>\r\n" % fromaddr
+msg = msg + "To: %s\r\n" % toaddrs
+msg = msg + "Subject: %s\r\n" % thesubject
+msg = msg + introline
+msg = msg + "\r\n\n"
+msg = msg + titleline
+msg = msg + "\r\n\n"
+msg = msg + abstractline
+msg = msg + "\r\n\n"
+msg = msg + urlline
+msg = msg + "\r\n\n"
+msg = msg + actionline
+msg = msg + "\r\n\n"
+
+server = smtplib.SMTP('localhost')
+server.set_debuglevel(1)
+server.sendmail(fromaddr, toaddrs, msg)
+server.quit()
+
+# END
+
diff --git a/ipr-policy.shtml b/ipr-policy.shtml
new file mode 100755
index 00000000..23f41d48
--- /dev/null
+++ b/ipr-policy.shtml
@@ -0,0 +1,91 @@
+<html>
+<head>
+<title>JSF IPR Policy</title>
+<!--#include virtual="/includes/head.txt" -->
+<h2>JSF IPR Policy</h2>
+<p>This document defines the official policy of the <a href='http://www.jabber.org/jsf/'>Jabber Software Foundation</a> regarding intellectual property rights (IPR) pertaining to <a href='http://www.xmpp.org/extensions/'>XMPP Extension Protocol</a> (XEPs) specifications.</p>
+<p><em>Version 1.2</em></p>
+<p><hr></p>
+<strong>Table of Contents:</strong><br><dl>
+<dt>1.  <a href="#intro">Introduction</a></dt>
+<dl>
+<dt>1.1.  <a href="#intro-history">History</a></dt>
+<dt>1.2.  <a href="#intro-role">Purpose</a></dt>
+</dl>
+<dt>2.  <a href="#terms">Terms</a></dt>
+<dl>
+<dt>2.1.  <a href="#xmpp">XMPP</a></dt>
+<dt>2.2.  <a href="#extension">XMPP Extension Protocol</a></dt>
+<dt>2.3.  <a href="#implementation">Implementation</a></dt>
+<dt>2.4.  <a href="#claim">Intellectual Property Claim</a></dt>
+</dl>
+<dt>3.  <a href="#contributing">Terms of Contributing to XMPP Extensions</a></dt>
+<dl>
+<dt>3.1.  <a href="#contrib-ownership">Ownership</a></dt>
+<dt>3.2.  <a href="#contrib-approval">Approval of XMPP Extensions</a></dt>
+<dt>3.3.  <a href="#contrib-private">A Note about Private Extensions</a></dt>
+</dl>
+<dt>4.  <a href="#legal">Legal Notice</a>
+</dt>
+</dl>
+<p><hr></p>
+<h2>1.  <a name="intro"></a>Introduction</h2>
+  <p>This document defines the official policy of the Jabber Software Foundation (JSF) regarding intellectual property rights (IPR) as they pertain to extensions to XMPP in the form of XMPP Extension Protocol specifications (XEPs). [<a href="#note1">1</a>]</p>
+  <blockquote>
+<h3>1.1 <a name="intro-history"></a>History</h3>
+  <p>The Jabber/XMPP protocols have been under development since 1998 and have been discussed and documented in public forums since January 1999 in the open-source projects that were a precursor to the JSF. Through force of history and activity since its founding in the summmer of 2001, the JSF has assumed responsibility for managing the evolution of the Jabber/XMPP protocols in two ways: (1) through working with the IETF to standardize the core protocols under the name Extensible Messaging and Presence Protocol (XMPP); and (2) through the definition of extensions to the core protocol in the JSF's XMPP Extension Protocol (XEP) specification series. Through this work, the JSF has in effect "homesteaded" the domain of XMPP Extensions and has acted as a trusted third party or "intellectual property conservancy" [<a href="#note2">2</a>] to which new and established participants in the Jabber community have entrusted their XMPP Extensions.</p>
+<h3>1.2 <a name="intro-role"></a>Purpose</h3>
+  <p>The JSF does not seek to disparage the legitimate rights of any individual or organization to assert ownership over an Implementation of XMPP or of any XMPP Extension. However, the JSF must ensure that XMPP Extensions do not pollute the free and open nature of the protocols. Preventing such pollution means that in perpetuity any entity may independently, and without payment or hindrance, create, use, sell, distribute, or dispose of implementations of XMPP and of any XMPP Extension. Such is the intent of this policy.</p>
+  </blockquote>
+<h2>2.  <a name="terms"></a>Terms</h2>
+  <blockquote>
+<h3>2.1 <a name="xmpp"></a>XMPP</a>
+</h3>
+    <p>The core XML streaming, instant messaging, and presence protocols developed by the Jabber community have been contributed by the JSF to the Internet Engineering Task Force (IETF) under the name Extensible Messaging and Presence Protocol (XMPP). XMPP is all and only these core protocols, as currently defined in <a href='http://www.ietf.org/rfc/rfc3920.txt'>RFC 3920</a> and <a href='http://www.ietf.org/rfc/rfc3921.txt'>RFC 3921</a>.</p>
+  </blockquote>
+  <blockquote>
+<h3>2.2 <a name="extension"></a>XMPP Extension</h3>
+    <p>For the purposes of this IPR policy, an XMPP Extension is any specification approved by, or submitted for approval or consideration by, the JSF or its constituent committees (most particularly the <a href='/council/'>XMPP Council</a>). Such a specification must exist in the form of a standards-track XMPP Extension Protocol (XEP) specification in order to be considered an official submission. (Also referred to as an Extension.)</p>
+  </blockquote>
+  <blockquote>
+<h3>2.3 <a name="implementation"></a>Implementation</h3>
+    <p>Any software that implements XMPP or XMPP Extensions for the purpose of providing the functionality defined by the relevant specification(s).</p>
+  </blockquote>
+  <blockquote>
+<h3>2.4 <a name="claim"></a>Intellectual Property Claim</h3>
+    <p>Any patent, copyright, or other proprietary claim or claims made by an entity regarding a XMPP Extension. (Also referred to as a Claim.)</p>
+  </blockquote>
+<h2>3.  <a name="contributing"></a>Terms of Contributing an XMPP Extension</h2>
+  <p>The JSF recognizes the possibility that the creator of an XMPP Extension may make an Intellectual Property Claim regarding an XMPP Extension. Therefore, the JSF takes the following positions:</p>
+  <blockquote>
+<h3>3.1 <a name="contrib-ownership"></a>Ownership</h3>
+    <p>By submitting an XMPP Extension for consideration by the JSF, the author of the Extension shall assign any ownership rights or other Claims asserted over the Extension to the JSF. This does not apply to Claims regarding any Implementations of the Extension, but rather to the Extension itself. Any documentation of the Extension (in the form of a XEP specification) shall be copyrighted by the JSF. Once an author assigns ownership to the JSF, the JSF shall in turn make the Extension available to all entities so that they may create, use, sell, distribute, or dispose of implementations of XMPP and all XMPP Extensions in perpetuity and without payment or hindrance.</p>
+    </p>
+<h3>3.3 <a name="contrib-approval"></a>Approval of Extensions</h3>
+    <p>No Extension shall be approved by the JSF or its constituent committees if there are Claims to the Extension itself, or any Claims that would prevent perpetual, unrestricted, royalty-free use of the Extension in a compliant Implementation by any interested party. If Claims preventing such use are discovered, the JSF shall immediately seek to replace the Extension with unencumbered protocols that may be implemented without condition by any entity.</p>
+<h3>3.3 <a name="contrib-private"></a>A Note about Private Extensions</h3>
+    <p>By its nature as XML, XMPP enables implementers to create their own private extensions to XMPP within custom XML namespaces. Such extensions may be kept private, and there is no compulsion for implementers to contribute such extensions to the Jabber community. It is only when an implementer seeks to have an extension standardized through the JSF's public standards process that ownership over such an extension must be transferred to the JSF. If an implementer wishes to keep its extensions private, it may simply refrain from submitting them to the JSF. However, private extensions exist outside the boundaries of XMPP and approved XMPP Extensions and must not be considered or described as part of XMPP or JSF-approved XMPP Extensions.</p>
+  </blockquote>
+<h2>5.  <a name="legal"></a>Legal Notice</h2>
+  <p>All XMPP Extension Protocol (XEP) specifications shall contain the following Legal Notice:</p>
+  <blockquote><pre>
+This XMPP Extension Protocol is copyright 1999 - [year] 
+by the Jabber Software Foundation (JSF) and is in full
+conformance with the JSF's Intellectual Property Rights 
+Policy (&lt;http://www.xmpp.org/extensions/ipr-policy.shtml&gt;). 
+This material may be distributed only subject to the terms and
+conditions set forth in the Creative Commons Attribution
+License (&lt;http://creativecommons.org/by/2.5/&gt;).
+  </pre></blockquote>
+<p><hr></p>
+<h3>Notes</h3>
+<p><a name="note1"></a>1. For information about XMPP Extension Protocols, see &lt;<a href="http://www.xmpp.org/extensions/">http://www.xmpp.org/extensions/</a>&gt; and <a href="http://www.xmpp.org/extensions/xep-0001.html">JEP-0001</a>.</p>
+<p><a name="note2"></a>2. For information about intellectual property conservancies, see &lt;<a href="http://www.creativecommons.org/concepts/#ip">http://www.creativecommons.org/concepts/#ip</a>&gt; and M. van Houweling, "Cultivating Open Information Platforms: A Land Trust Model." <cite>Journal of Telecommunications &amp; High Technology Law</cite> 1, no. 1 (2002): 309-23.</p>
+<h3>Acknowledgements</h3>
+<p>Many thanks to Lawrence Lessig and Molly van Houweling for their assistance in formulating this policy.</p>
+<h3>Changelog</h3>
+<p>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).</p>
+<p>Version 1.1 (2005-10-04): Replaced Open Publication License with Creative Commons Attribution License.</p>
+<p>Version 1.0 (2002-10-29): Initial version approved by JSF Board of Directors.</p>
+</div>
+<!--#include virtual="/includes/foot.txt" -->
diff --git a/lastcall.py b/lastcall.py
new file mode 100755
index 00000000..1c35caa3
--- /dev/null
+++ b/lastcall.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python
+
+# File: lastcall.py
+# Version: 0.2
+# Description: a script for announcing JEP Last Calls
+# Last Modified: 2004-09-29
+# Author: Peter Saint-Andre (stpeter@jabber.org)
+# License: public domain
+# HowTo: ./lastcall.py jepnum enddate dbuser dbpw
+
+# IMPORTS:
+#
+import glob
+import MySQLdb
+import os
+from select import select
+import smtplib
+import socket
+from string import split,strip,join,find
+import sys
+import time
+from xml.dom.minidom import parse,parseString,Document
+
+def getText(nodelist):
+    thisText = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE:
+            thisText = thisText + node.data
+    return thisText
+
+# get the seconds in the Unix era
+now = int(time.time())
+
+# READ IN ARGS: 
+#
+# 1. JEP number
+# 2. end date
+# 3. database user
+# 4. database password
+
+jepnum = sys.argv[1];
+enddate = sys.argv[2];
+dbuser = sys.argv[3];
+dbpw = sys.argv[4];
+
+jepfile = jepnum + '/jep-' + jepnum + '.xml'
+
+# PARSE JEP HEADERS:
+#
+# - title
+# - abstract
+# - version
+# - date
+# - initials
+# - remark
+
+thejep = parse(jepfile)
+jepNode = (thejep.getElementsByTagName("jep")[0])
+headerNode = (jepNode.getElementsByTagName("header")[0])
+titleNode = (headerNode.getElementsByTagName("title")[0])
+title = getText(titleNode.childNodes)
+abstractNode = (headerNode.getElementsByTagName("abstract")[0])
+abstract = getText(abstractNode.childNodes)
+statusNode = (headerNode.getElementsByTagName("status")[0])
+jepstatus = getText(statusNode.childNodes)
+typeNode = (headerNode.getElementsByTagName("type")[0])
+jeptype = getText(typeNode.childNodes)
+revNode = (headerNode.getElementsByTagName("revision")[0])
+versionNode = (revNode.getElementsByTagName("version")[0])
+version = getText(versionNode.childNodes)
+dateNode = (revNode.getElementsByTagName("date")[0])
+date = getText(dateNode.childNodes)
+initialsNode = (revNode.getElementsByTagName("initials")[0])
+initials = getText(initialsNode.childNodes)
+remarkNode = (revNode.getElementsByTagName("remark")[0])
+remark = getText(remarkNode.childNodes)
+
+# UPDATE DATABASE:
+#
+# number is $jepnum
+# name is $title
+# type is $jeptype
+# status is $jepstatus
+# notes is "Version $version of JEP-$jepnum released $date."
+# version is $version
+# last_modified is $now
+# abstract is $abstract
+# changelog is "$remark ($initials)"
+
+db = MySQLdb.connect("localhost", dbuser, dbpw, "foundation")
+cursor = db.cursor()
+theNotes = "Version " + version + " of JEP-" + jepnum + " released " + date + "; Last Call ends " + enddate + "."
+theLog = remark + " (" + initials + ")"
+theStatement = "UPDATE jeps SET name='" + title + "', type='" + jeptype + "', status='Proposed', notes='" + theNotes + "', version='" + str(version) + "', last_modified='" + str(now) + "', abstract='" + abstract + "', changelog='" + theLog + "' WHERE number='" + str(jepnum) + "';"
+cursor.execute(theStatement) 
+result = cursor.fetchall()
+
+# SEND MAIL:
+#
+# From: editor@jabber.org
+# To: standards-jig@jabber.org
+# Subject: LAST CALL: JEP-$jepnum ($title)
+# Body:
+#    This message constitutes notice of a Last Call
+#    for JEP-$jepnum ($title).
+#
+#    Abstract: $abstract
+#
+#    URL: http://www.jabber.org/jeps/jep-$jepnum.html
+#
+#    This Last Call begins now and shall end at the close
+#    of business on $enddate.
+#
+
+fromaddr = "editor@jabber.org"
+# for testing...
+# toaddrs = "stpeter@jabber.org"
+# for real...
+toaddrs = "standards-jig@jabber.org"
+
+thesubject = 'LAST CALL: JEP-' + jepnum + " (" + title + ")"
+introline = 'This message constitutes notice of a Last Call for JEP-' + jepnum + ' (' + title + ').'
+abstractline = 'Abstract: ' + abstract
+urlline = 'URL: http://www.jabber.org/jeps/jep-' + jepnum + '.html'
+schedline = 'This Last Call begins today and shall end at the close of business on ' + enddate + '.'
+
+#msg = "From: %s\r\n" % fromaddr
+msg = "From: JEP Editor <%s>\r\n" % fromaddr
+msg = msg + "To: %s\r\n" % toaddrs
+msg = msg + "Subject: %s\r\n" % thesubject
+msg = msg + introline
+msg = msg + "\r\n\n"
+msg = msg + abstractline
+msg = msg + "\r\n\n"
+msg = msg + urlline
+msg = msg + "\r\n\n"
+msg = msg + schedline
+msg = msg + "\r\n"
+
+server = smtplib.SMTP('localhost')
+server.set_debuglevel(1)
+server.sendmail(fromaddr, toaddrs, msg)
+server.quit()
+
+# END
+
diff --git a/protopage.xsl b/protopage.xsl
new file mode 100644
index 00000000..8711ba4a
--- /dev/null
+++ b/protopage.xsl
@@ -0,0 +1,73 @@
+
+<!-- Author: stpeter -->
+
+<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+  <xsl:output method='html'/>
+
+  <xsl:template match='/'>
+    <html>
+      <head>
+        <title><xsl:value-of select='/jep/header/shortname'/></title>
+        <link rel='stylesheet' type='text/css' href='/jeps/jep.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link>
+          <xsl:attribute name='rel'><xsl:text>alternate</xsl:text></xsl:attribute>
+          <xsl:attribute name='href'><xsl:text>http://www.jabber.org/jeps/jep-</xsl:text><xsl:value-of select='/jep/header/number'/><xsl:text>.html</xsl:text></xsl:attribute>
+        </link>
+        <!-- BEGIN META TAGS FOR DUBLIN CORE -->
+        <meta>
+          <xsl:attribute name='name'><xsl:text>DC.Title</xsl:text></xsl:attribute>
+          <xsl:attribute name='content'><xsl:value-of select='/jep/header/shortname'/></xsl:attribute>
+        </meta>
+        <meta>
+          <xsl:attribute name='name'><xsl:text>DC.Publisher</xsl:text></xsl:attribute>
+          <xsl:attribute name='content'>Jabber Software Foundation</xsl:attribute>
+        </meta>
+        <meta>
+          <xsl:attribute name='name'><xsl:text>DC.Date</xsl:text></xsl:attribute>
+          <xsl:attribute name='content'><xsl:value-of select='/jep/header/revision/date'/></xsl:attribute>
+        </meta>
+        <!-- END META TAGS FOR DUBLIN CORE -->
+      </head>
+      <body>
+        <h1><xsl:value-of select='/jep/header/shortname'/></h1>
+        <p>This page provides information about the XML namespaces defined in 
+        <a>
+          <xsl:attribute name='href'>
+            <xsl:text>http://www.jabber.org/jeps/jep-</xsl:text>
+            <xsl:value-of select='/jep/header/number'/>
+            <xsl:text>.html</xsl:text>
+          </xsl:attribute>
+          <xsl:text>JEP-</xsl:text><xsl:value-of select='/jep/header/number' />:<xsl:text> </xsl:text><xsl:value-of select='/jep/header/title' />
+        </a>
+        (part of the <a href="http://www.jabber.org/jeps/">JEP series</a> published by the <a href="http://www.jabber.org/jsf/">Jabber Software Foundation</a>).</p>
+
+        <xsl:variable name='schema.count' select='count(/jep/header/schemaloc)'/>
+        <xsl:if test='$schema.count &gt; 0'>
+          <p>The following XML schemas are available for the <xsl:value-of select='/jep/header/title' /> protocol:</p>
+          <ul>
+            <xsl:apply-templates select='/jep/header/schemaloc'/>
+          </ul>
+        </xsl:if>
+
+        <p>Last Updated: <xsl:value-of select='/jep/header/revision/date'/></p>
+
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match='schemaloc'>
+    <xsl:variable name='this.url' select='url'/>
+    <xsl:variable name='ns.count' select='count(ns)'/>
+    <xsl:choose>
+      <xsl:when test="$ns.count &gt; 0">
+        <li><a href='{$this.url}'><xsl:value-of select='url'/></a></li>
+      </xsl:when>
+      <xsl:otherwise>
+        <li><a href='{$this.url}'><xsl:value-of select='url'/></a></li>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ref.xsl b/ref.xsl
new file mode 100644
index 00000000..ca0ced1f
--- /dev/null
+++ b/ref.xsl
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Author: stpeter
+     Description: transforms XEP meta-data into IETF reference
+-->
+
+<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+  <xsl:output method='xml' indent='yes'/>
+
+  <xsl:template match='/'>
+    <reference>
+      <xsl:attribute name='anchor'><xsl:text>XEP-</xsl:text><xsl:value-of select='/xep/header/number'/></xsl:attribute>
+      <front>
+        <title><xsl:value-of select='/xep/header/title' /></title>
+        <xsl:apply-templates select='/xep/header/author'/>
+        <xsl:variable name='fulldate' select='/xep/header/revision[position()=1]/date'/>
+        <xsl:variable name='year' select='substring-before($fulldate,"-")'/>
+        <xsl:variable name='monthday' select='substring-after($fulldate,"-")'/>
+        <xsl:variable name='month' select='substring-before($monthday,"-")'/>
+        <xsl:variable name='day' select='substring-after($monthday,"-")'/>
+        <date>
+          <xsl:attribute name='day'><xsl:value-of select='$day'/></xsl:attribute>
+          <xsl:choose>
+            <xsl:when test='$month = "01"'>
+              <xsl:attribute name='month'><xsl:text>January</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "02"'>
+              <xsl:attribute name='month'><xsl:text>February</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "03"'>
+              <xsl:attribute name='month'><xsl:text>March</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "04"'>
+              <xsl:attribute name='month'><xsl:text>April</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "05"'>
+              <xsl:attribute name='month'><xsl:text>May</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "06"'>
+              <xsl:attribute name='month'><xsl:text>June</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "07"'>
+              <xsl:attribute name='month'><xsl:text>July</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "08"'>
+              <xsl:attribute name='month'><xsl:text>August</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "09"'>
+              <xsl:attribute name='month'><xsl:text>September</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "10"'>
+              <xsl:attribute name='month'><xsl:text>October</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "11"'>
+              <xsl:attribute name='month'><xsl:text>November</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:when test='$month = "12"'>
+              <xsl:attribute name='month'><xsl:text>December</xsl:text></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name='month'><xsl:text></xsl:text></xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:attribute name='year'><xsl:value-of select='$year'/></xsl:attribute>
+        </date>
+      </front>
+      <seriesInfo>
+        <xsl:attribute name='name'><xsl:text>JSF XEP</xsl:text></xsl:attribute>
+        <xsl:attribute name='value'><xsl:value-of select='/xep/header/number'/></xsl:attribute>
+      </seriesInfo>
+      <format>
+        <xsl:attribute name='type'><xsl:text>HTML</xsl:text></xsl:attribute>
+        <xsl:attribute name='target'><xsl:text>http://www.xmpp.org/extensions/xep-</xsl:text><xsl:value-of select='/xep/header/number'/><xsl:text>.html</xsl:text></xsl:attribute>
+      </format>
+    </reference>
+  </xsl:template>
+
+  <xsl:template match='author'>
+    <author>
+      <xsl:variable name='fname' select='firstname'/>
+      <xsl:choose>
+        <xsl:when test='starts-with($fname,"A")'><xsl:attribute name='initials'><xsl:text>A.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"B")'><xsl:attribute name='initials'><xsl:text>B.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"C")'><xsl:attribute name='initials'><xsl:text>C.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"D")'><xsl:attribute name='initials'><xsl:text>D.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"E")'><xsl:attribute name='initials'><xsl:text>E.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"F")'><xsl:attribute name='initials'><xsl:text>F.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"G")'><xsl:attribute name='initials'><xsl:text>G.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"H")'><xsl:attribute name='initials'><xsl:text>H.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"I")'><xsl:attribute name='initials'><xsl:text>I.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"J")'><xsl:attribute name='initials'><xsl:text>J.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"K")'><xsl:attribute name='initials'><xsl:text>K.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"L")'><xsl:attribute name='initials'><xsl:text>L.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"M")'><xsl:attribute name='initials'><xsl:text>M.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"N")'><xsl:attribute name='initials'><xsl:text>N.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"O")'><xsl:attribute name='initials'><xsl:text>O.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"P")'><xsl:attribute name='initials'><xsl:text>P.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"Q")'><xsl:attribute name='initials'><xsl:text>Q.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"R")'><xsl:attribute name='initials'><xsl:text>R.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"S")'><xsl:attribute name='initials'><xsl:text>S.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"T")'><xsl:attribute name='initials'><xsl:text>T.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"U")'><xsl:attribute name='initials'><xsl:text>U.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"V")'><xsl:attribute name='initials'><xsl:text>V.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"W")'><xsl:attribute name='initials'><xsl:text>W.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"X")'><xsl:attribute name='initials'><xsl:text>X.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"Y")'><xsl:attribute name='initials'><xsl:text>Y.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:when test='starts-with($fname,"Z")'><xsl:attribute name='initials'><xsl:text>Z.</xsl:text></xsl:attribute></xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name='initals'><xsl:text></xsl:text></xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:attribute name='surname'><xsl:value-of select='surname'/></xsl:attribute>
+      <xsl:attribute name='fullname'><xsl:value-of select='firstname'/><xsl:text> </xsl:text><xsl:value-of select='surname'/></xsl:attribute>
+      <organization/>
+      <address>
+        <email><xsl:value-of select='email'/></email>
+      </address>
+    </author>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/submit.shtml b/submit.shtml
new file mode 100755
index 00000000..d7dbcef3
--- /dev/null
+++ b/submit.shtml
@@ -0,0 +1,15 @@
+<html>
+<head>
+<title>How to Submit an XMPP Extension Protocol</title>
+<!--#include virtual="/includes/head.txt" -->
+<h2>How to Submit an XMPP Extension Protocol</h2>
+<p>Here is how to submit a proposal to the Jabber Software Foundation for consideration as an XMPP Extension Protocol:</p>
+<ol>
+<li><p>Contact the <a href="editor.shtml">XMPP Extensions Editor</a> so that he knows to expect your submission.</p></li>
+<li><p>Write your proposal following the guidelines described in <a href="/extensions/xep-0143.html">XEP-0143: Guidelines for Authors of XMPP Extension Protocols</a>.</p></li>
+<li>Make sure you read, understand, and agree to the JSF's <a href="/extensions/ipr-policy.shtml">IPR Policy</a> before you submit your proposal!</li>
+<li><p>Email the XML file (or a URL for the file) to the <a href="editor.shtml">XMPP Extensions Editor</a> with a subject line of "ProtoJEP: [your title here]".</li>
+</ol>
+<p><strong>Note:</strong> It is the author's responsibility to provide a properly-formatted source file (see the <a href='template.xml'>template</a> and <a href='http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/jeps/'>CVS repository</a>). Proposals submitted in HTML, TXT, MS Word, Open Document Format, etc. will be returned to the proposal author for proper formatting.</p>
+</div>
+<!--#include virtual="/includes/foot.txt" -->
diff --git a/xep-0001.xml b/xep-0001.xml
new file mode 100644
index 00000000..e553b7e0
--- /dev/null
+++ b/xep-0001.xml
@@ -0,0 +1,688 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Jabber Enhancement Proposals (JEPs)</title>
+  <abstract>This document defines the standards process followed by the Jabber Software Foundation.</abstract>
+  &LEGALNOTICE;
+  <number>0001</number>
+  <status>Active</status>
+  <type>Procedural</type>
+  <jig>None</jig>
+  <approver>Board</approver>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  <shortname>N/A</shortname>
+  &stpeter;
+  <revision>
+    <version>1.16</version>
+    <date>2006-06-23</date>
+    <initials>psa</initials>
+    <remark><p>Clarified and simplified the state charts based on implementation experience; summarized state definitions.</p></remark>
+  </revision>
+  <revision>
+    <version>1.15</version>
+    <date>2004-11-02</date>
+    <initials>psa</initials>
+    <remark><p>Specified that a Standards Track JEP defines either (1) a wire protocol or (2) a protocol suite.</p></remark>
+  </revision>
+  <revision>
+    <version>1.14</version>
+    <date>2004-09-28</date>
+    <initials>psa</initials>
+    <remark><p>Defined Procedural JEP type as the union of JIG Formation JEPs and certain Informational JEPs in order to clarify the JEP categories; added Modifications to Approved JEPs section in order to make explicit existing Council practices regarding Active and Final JEPs; specified that JEPs on which voting was not complete at the end of a Council term shall undergo a second Last Call and subsequent vote by the new Council; modified Proposal Process to specify that the Jabber Council shall issue Last Calls on JEPs for which it is the approving body, with all discussion to occur on the Standards-JIG list; updated the schema.</p></remark>
+  </revision>
+  <revision>
+    <version>1.13</version>
+    <date>2004-08-24</date>
+    <initials>psa</initials>
+    <remark><p>Further specified the goals of the JEP process; mentioned Board-approved JEPs.</p></remark>
+  </revision>
+  <revision>
+    <version>1.11</version>
+    <date>2004-07-14</date>
+    <initials>psa</initials>
+    <remark><p>Specified the procedure for changing a JEP from Historical to Standards Track.</p></remark>
+  </revision>
+  <revision>
+    <version>1.10</version>
+    <date>2004-03-24</date>
+    <initials>psa</initials>
+    <remark><p>Specified the procedure for acceptance of a proposal as a JEP; clarified the JEP types; completed editorial review.</p></remark>
+  </revision>
+  <revision>
+    <version>1.9</version>
+    <date>2003-12-22</date>
+    <initials>psa</initials>
+    <remark><p>Added rule about automatic deferral of inactive JEPs.</p></remark>
+  </revision>
+  <revision>
+    <version>1.8</version>
+    <date>2003-10-06</date>
+    <initials>psa</initials>
+    <remark><p>Clarified the definition of informational JEP.</p></remark>
+  </revision>
+  <revision>
+    <version>1.7</version>
+    <date>2003-04-11</date>
+    <initials>psa</initials>
+    <remark><p>Added status of Retracted; corrected several errors related to the Jabber Registrar.</p></remark>
+  </revision>
+  <revision>
+    <version>1.6</version>
+    <date>2003-01-08</date>
+    <initials>psa</initials>
+    <remark><p>Further clarified the proposal process per discussion on the JSF members list.</p></remark>
+  </revision>
+  <revision>
+    <version>1.5</version>
+    <date>2002-10-29</date>
+    <initials>psa</initials>
+    <remark><p>Major revision based on experience. In addition to a reorganization of the content to improve the clarity of the presentation, changes include: (1) no anonymous authors; (2) proposal must be seconded by at least 5% of JSF members before being proposed for a Council vote; (3) clarification that the Council votes only on a particular revision of a JEP (e.g., version 1.3 when proceeding from Draft to Final); (4) added information about the "Call for Experience" phase before proceeding from Draft to Final; (5) added reference to RFC 2119; (6) added sections for security considerations, IANA considerations, and Jabber Registrar considerations. Approved by the JSF Board and Jabber Council on 2002-11-20.</p></remark>
+  </revision>
+  <revision>
+    <version>1.4</version>
+    <date>2002-01-16</date>
+    <initials>psa</initials>
+    <remark><p>Added information about the new "Experimental" state for Standards Track JEPs and made appropriate changes to the JEP process.</p></remark>
+  </revision>
+  <revision>
+    <version>1.3.1</version>
+    <date>2002-01-11</date>
+    <initials>psa</initials>
+    <remark><p>Added link to DTD.</p></remark>
+  </revision>
+  <revision>
+    <version>1.3</version>
+    <date>2001-10-23</date>
+    <initials>psa</initials>
+    <remark><p>(1) Added information about the "cooling off" period before a Standards Track JEP may be advanced from Draft to Final; (2) Added a link to the JEP template file; (3) Performed several minor fixes.</p></remark>
+  </revision>
+  <revision>
+    <version>1.2</version>
+    <date>2001-09-27</date>
+    <initials>psa</initials>
+    <remark><p>(1) Added information about expiration dates; (2) Added a status of Deprecated to Standards Track JEPs.</p></remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2001-09-09</date>
+    <initials>psa</initials>
+    <remark><p>(1) Changed "Jabber Foundation" to "Jabber Software Foundation"; (2) Changed "JIG Proposal JEP" to "JIG Formation JEP"; (3) Removed reference to the Secretary of the Jabber Software Foundation in connection with the role of JEP Editor; (4) Clarified the possible states of acceptance of each kind of JEP and described in greater detail the criteria for advancement from one state to another.</p></remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-07-09</date>
+    <initials>psa</initials>
+    <remark><p>Changed status to Active.</p></remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-06-28</date>
+    <initials>psa</initials>
+    <remark><p>Initial release -- a simplified and updated version of Rahul Dave's Jabberization of the process and format for Python Enhancement Proposals</p></remark>
+  </revision>
+</header>
+<section1 topic='Introduction' anchor='intro'>
+  <p>The &JSF; adheres to an open standards process that enables interested parties to document existing protocols used within the Jabber/XMPP developer community and to submit proposals that define new protocols; with a few exceptions, <note>Effectively the only such exceptions are protocols that were superseded by <cite>RFC 3920</cite> and <cite>RFC 3921</cite>.</note> such protocols can be considered extensions to the Extensible Messaging and Presence Protocol (XMPP) approved by the &IETF; in &xmppcore; and &xmppim;. Advancement through the JSF's standards process is subject to open discussion on public discussion lists and approval by a technical steering committee elected by the members of the JSF. The focal point of the process is a series of protocol specifications called Jabber Enhancement Proposals or JEPs. <note>The JEP concept as exemplified in version 1.0 of this document (approved in July of 2001) was borrowed from the Python community (see <link url="http://python.sourceforge.net/peps/pep-0001.html">PEP-1</link>). Subsequent revisions have been based on the Jabber/XMPP developer community's experience with the JEP process, as well as insights gleaned from the standards processes followed by the IETF (&rfc2026;), the &W3C; (&w3process;), and other standards development organizations.</note> The nature of JEPs and the mechanisms for managing and advancing them within the Jabber Software Foundation's standards process are canonically described in the current document, which represents the first document in the JEP series.</p>
+</section1>
+<section1 topic='Objectives' anchor='objectives'>
+  <p>The Jabber Software Foundation was founded in the year 2001 to openly document, safeguard, manage, and extend the wire protocols used within the Jabber/XMPP developer community. The work of the Jabber Software Foundation has several objectives:</p>
+  <ol start='1'>
+    <li>To produce practical, technically excellent solutions to important problems of real-time communication based on the set of streaming XML technologies known as Jabber/XMPP.</li>
+    <li>To document Jabber protocols and XMPP extensions in a clear, concise manner so that the task of implementing the protocols is straightforward.</li>
+    <li>To ensure interoperability among the disparate technologies used on Jabber/XMPP networks.</li> 
+    <li>To guarantee that any person or entity may implement the protocols without encumbrance.</li>
+    <li>To work in an fair, open, objective manner.</li>
+  </ol>
+  <p>The standards process specified herein has been developed and refined in order to meet these objectives.</p>
+</section1>
+<section1 topic='JEP Types' anchor='types'>
+  <p>The five JEP types are described in the following sections.</p>
+  <p>The approving body for all Standards Track, Informational, Historical, and Humorous JEPs is the &COUNCIL;; the approving body for Procedural JEPs may be either the &BOARD; or the Jabber Council.</p>
+  <p>This document focuses primarily on Standards Track JEPs since they are the vehicle for defining new protocols, but also discusses the other JEP types.</p>
+  <section2 topic='Standards Track' anchor='types-Standards-Track'>
+    <p>A <span class='ref'>Standards Track JEP</span> defines one of the following:</p>
+    <ol>
+      <li>A wire protocol intended to be used as a standard part of Jabber/XMPP technologies.
+        <note>Note well that a protocol defined in a Standards Track JEP is not considered a full standard of the Jabber Software Foundation until it achieves a status of Final within the standards process defined herein (a Standards Track JEP that has achieved a status of Draft may be referred to as a Draft Standard; a Standards Track JEP that has a status of Experimental must not be referred to as a standard, but instead should be referred to as a work in progress).</note>
+      </li>
+      <li>A protocol suite that determines conformance requirements (e.g., &jep0073;).</li>
+    </ol>
+  </section2>
+  <section2 topic='Informational' anchor='types-Informational'>
+    <p>An <span class='ref'>Informational JEP</span> defines one of the following:</p>
+    <ol start='1'>
+      <li>Best practices for protocol development (e.g., &jep0128;).</li>
+      <li>A usage profile for an existing protocol (e.g., &jep0126;).</li>
+    </ol>
+  </section2>
+  <section2 topic='Historical' anchor='types-Historical'>
+    <p>An <span class='ref'>Historical JEP</span> documents a protocol that was developed before the JEP process was instituted, but that is still in use within the Jabber/XMPP developer community; such a JEP may or may not be obsoleted by a Standards Track JEP, or upgraded to Standards Track.</p>
+  </section2>
+  <section2 topic='Humorous' anchor='types-Humorous'>
+    <p>A <span class='ref'>Humorous JEP</span> attempts to be funny by defining a protocol that would never be used in the real world; such JEPs are usually published on April 1 and automatically have a status of Active.</p>
+  </section2>
+  <section2 topic='Procedural' anchor='types-Procedural'>
+    <p>A <span class='ref'>Procedural JEP</span> defines a process or activity to be followed by the JSF, including JIG charters as specified by &jep0002;.</p>
+  </section2>
+</section1>
+<section1 topic='Submission Process' anchor='submission'>
+  <p>The JSF welcomes and encourages the submission of protocols to the JSF's standards process. <note>It is important to understand that private extensions to XMPP are also allowed. The JSF does not, and cannot, require such private extensions to be added to the public, official set of protocols recognized by the JSF. The processes and procedures in this document apply only to protocols that are submitted to the JSF, not to private protocol extensions used for custom functionality in particular applications. However, such private extensions must not be considered part of the protocols recognized by the JSF.</note> Any individual or group of individuals may author a proposal and submit it to the JSF for consideration as a JEP, and there is no requirement that a JEP author shall be an elected member of the JSF. However, proposals to define official JSF protocols must be presented in the JEP format and must follow the rules defined herein. The JEP authoring and submission process is defined in &jep0143; (see also &lt;<link url="http://www.jabber.org/jeps/submit.shtml">http://www.jabber.org/jeps/submit.shtml</link>&gt;). All inquiries related to the JEP process, and all submissions, should be directed to the &EDITOR;.</p> 
+  <p>Note well that JEP authors must transfer ownership of their protocols (but not implementations thereof) to the JSF. Refer to the &JSFIPR; for details. JEP authors must make sure that they have read, understood, and agreed to the JSF IPR Policy before submitting a proposal to the JEP Editor!</p>
+  <p>All proposals submitted to the JSF for consideration as JEPs must contain the following information:</p>
+  <ol start='1'>
+    <li><p>Legal Notice -- the legal notice must be exactly that which is specified in the JSF IPR Policy</p></li>
+    <li><p>Author Information -- first name, last name, email address, and Jabber ID are all required and must be provided for all authors</p></li>
+  </ol>
+  <p>Finally, Standards Track, Informational, and Historical JEPs must conform to &rfc2119; in the use of terminology regarding requirements levels.</p>
+</section1>
+<section1 topic='Publication Process' anchor='publication'>
+  <p>The approving body for almost all JEPs is the Jabber Council; therefore, in order to be published as a JEP, a proposal must first be accepted by the Jabber Council (the only exceptions are certain kinds of Procedural JEPs, for which the approving body may be the JSF Board of Directors and which may be accepted for publication by the JEP Editor in consultation with the Board). Upon receiving a proposal, the JEP Editor shall do the following:</p>
+  <ul>
+    <li>ensure that its format is correct</li>
+    <li>publish it to &lt;<link url='http://www.jabber.org/jeps/inbox/'>http://www.jabber.org/jeps/inbox/</link>&gt;</li>
+    <li>publicly announce its existence by sending a message to the discussion list of the &SJIG;</li>
+    <li>request acceptance of the proposal as a JEP by the Jabber Council</li>
+  </ul>
+  <p>If no member of the Jabber Council objects to publication of the proposal within seven (7) days or at the next meeting of the Council, the JEP Editor shall accept it as a JEP. If objections are raised by the Council on the Standards-JIG list or in its meeting, the JEP author is encouraged to address the feedback of the Council and to submit a revised version of the proposal and/or confer with the JEP Editor or objecting Council member(s) regarding how to proceed.</p>
+  <p>If the proposal is accepted as a JEP, the JEP Editor shall do the following:</p>
+  <ul>
+    <li>assign it a number</li>
+    <li>specify an appropriate type</li>
+    <li>specify a status of Experimental</li>
+    <li>add it to source control <note>JEPs are kept under source control in the 'jeps' module of the CVS repository maintained at the jabberstudio.org service. Instructions for accessing these files can be found at &lt;<link url='http://www.jabberstudio.org/cvs.php'>http://www.jabberstudio.org/cvs.php</link>&gt;, and a web interface to these files is available at &lt;<link url='http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/jeps/'>http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/jeps/</link>&gt;.</note></li>
+    <li>add tracking information to the JEPs database</li>
+    <li>publish version 0.1 of the JEP to the JSF website <note>The canonical URL for accessing JEPs is &lt;<link url='http://www.jabber.org/jeps/'>http://www.jabber.org/jeps/</link>&gt;.</note></li>
+    <li>publicly announce the existence of the JEP by sending a message to the Standards-JIG list</li>
+  </ul>
+  <p>Note well that no special criteria (other than acceptance by the Jabber Council and minimal formatting compliance) need to be met in order for a JEP to be granted a status of Experimental. The granting of Experimental status must not be construed as indicating any level of approval by the JSF, the Jabber Council, or the Jabber/XMPP developer community. Implementation of Experimental JEPs is encouraged in an exploratory fashion (e.g., in a proof of concept) in order to gain experience with and iteratively improve the protocol defined therein, but such implementations may not be appropriate for deployment in production systems.</p>
+</section1>
+<section1 topic='Discussion Process' anchor='discussion'>
+  <p>Once a JEP is published, it becomes available for public discussion within the Standards JIG and the broader Jabber/XMPP developer community. The JEP author is responsible for collecting feedback from the Jabber/XMPP developer community during the life of the JEP and for incorporating such feedback into the proposal. In order to fully participate in discussion of the proposal, the JEP author should be subscribed to the Standards-JIG list, which is the primary venue for discussion of JEPs. Changes made based on feedback received by the JEP author must be captured in updated versions of the JEP (e.g., 0.2 after 0.1), each of which must be put under source control and subsequently published and announced by the JEP Editor.</p>
+  <p>If an Experimental JEP is inactive (i.e., no updated versions are published) for a period of six (6) months, the JEP Editor shall automatically change the status of the JEP to Deferred unless it is in the queue of JEPs under active consideration for advancement by the Jabber Council; upon submission of an updated version, the JEP Editor shall change the status back to Experimental.</p>
+</section1>
+<section1 topic='Proposal Process' anchor='proposal'>
+  <p>Before an Experimental JEP may be proposed to the Jabber Council for advancement to Draft (Standards Track JEPs) or Active (Historical, Informational, and Procedural JEPs), the Jabber Council must agree that the JEP is ready to be considered for advancement. Once the Council so agrees, it shall instruct the JEP Editor to (1) change the status of the JEP from Experimental to Proposed and (2) issue a Last Call for open discussion on the Standards JIG list. The Last Call shall expire not less than 10 days after the date of issue.</p>
+  <p>Once the consensus of the Standards JIG has been incorporated into the JEP and all issues of substance raised during the Last Call have been addressed by the JEP author, the JEP Editor shall formally propose a specific revision of the JEP to the Jabber Council for its vote. If necessary, the JEP Editor may, at his discretion and in consultation with the Jabber Council, extend the Last Call or issue a new Last Call if the JEP requires further discussion.</p>
+  <p>Last Calls regarding Procedural JEPs for which the approving body is the JSF Board of Directors may be issued directly by the JEP Editor once instructed by the Board.</p>
+</section1>
+<section1 topic='Approval Process' anchor='approval'>
+  <p>After a JEP has been proposed to the Jabber Council, any change in its status shall be determined by a vote of the Jabber Council. All members of the Council must vote, with the possible values being +1 (approve), 0 (neutral), or -1 (disapprove, with reasons). A JEP shall not be advanced to the next stage in the approval process so long as any Council Member continues to vote -1; that Council Member's written concerns must be addressed in order for the JEP to advance. A majority of Council members must vote +1 in order for a JEP to advance. (Additional voting policies, such as voting periods and defaults if a member does not vote, may be set by the Jabber Council.) A vote of the Jabber Council is final and binding, although a JEP author is free to address the concerns of the Council and to resubmit the JEP for future consideration.</p>
+  <p>If the Jabber Council does not complete voting on a JEP before the end of its term, the JEP Editor shall issue a new Last Call on the Standards JIG list and the newly-elected Council shall vote anew on the JEP after completion of the Last Call. This provides an opportunity for any member of the previous Council who had voted -1 to voice his or her concerns in a public forum before the new Council votes on the JEP.</p>
+  <p>A vote of the Jabber Council applies only to the specific revision of the JEP that has been presented to it. Further revisions may need to be re-submitted for approval.</p>
+  <p>Any change in the status of a JEP must be announced on the Standards-JIG list by the JEP Editor. If a JEP advances to a status of Final, it shall be so announced and also published as one of the official JSF protocols <note>A list of official JSF protocols is maintained at &lt;<link url='http://www.jabber.org/protocol/'>http://www.jabber.org/protocol</link>&gt;.</note> on the website of the Jabber Software Foundation.</p>
+  <p>Approval of Procedural JEPs for which the approving body is the JSF Board of Directors shall occur upon approval by the Board in accordance with the rules defined in the &BYLAWS;.</p>
+  <p>More detailed information about the approval process is provided below, including criteria for Standards Track JEPs and for Historical, Informational, and Procedural JEPs.</p>
+  <section2 topic='Standards Track JEPs' anchor='approval-std'>
+    <p>The possible states for a Standards Track JEP are as follows:</p>
+      <code>
+
+     +--> Retracted
+     |
+     |
+     +--> Deferred    +--> Rejected
+     |                |
+     |                |
+Experimental ----> Proposed ----> Draft ----> Final
+                                    |           |
+                                    |           |
+                                    +-----------+---> Deprecated ---> Obsolete
+      </code>
+    <p>The ideal path is for a Standards Track JEP is to be advanced by the Jabber Council from Proposed to Draft to Final (the criteria for this advancement are described in the following paragraphs). However, an Experimental JEP shall be assigned a status of Deferred if it has not been updated in six (6) months (e.g., because of a lack of interest or because it depends on other specifications that have yet to move forward). In addition, rather than being advanced from Proposed to Draft, a Standards Track JEP may be voted to a status of Rejected if the Jabber Council deems it unacceptable. (Note that if a JEP is Deferred, the JEP Editor may at some point re-assign it to Experimental status, and that, even if a JEP is Rejected, it is retained in source control and on the Jabber Software Foundation website for future reference.) Finally, a JEP author may voluntarily remove an Experimental JEP from further consideration, resulting in a status of Retracted.</p>
+    <p>In order for a Standards Track JEP to advance from Proposed to Draft, it must:</p>
+    <ol>
+      <li>fill known gaps in Jabber/XMPP technologies or deficiencies with existing protocols</li>
+      <li>be clearly described and accurately documented so that it can be understood and implemented by interested and knowledgeable members of the Jabber/XMPP developer community</li>
+      <li>document any known security considerations with the proposed technology</li>
+      <li>be generally stable and appropriate for further field experience</li>
+      <li>have achieved rough consensus (though not necessarily unanimity) within the Standards JIG</li>
+      <li>be formally defined by an XML schema</li>
+      <li>receive the requisite votes from the Jabber Council</li>
+    </ol>
+    <p>Elevation to Draft status (version 1.0) is a major advancement for the JEP, indicating a strong sense on the part of the Jabber Council and Jabber/XMPP developer community that the specification will be of lasting value. Since a Draft standard must be well-understood and must be known to be reasonably stable, it is relatively safe to use it as the basis for implementations and production deployments. However, note that because a Draft standard may still require additional field experience and may be subject to change based on such experience, mission-critical or large-scale implementations of the Draft standard may not be advisable (although every effort shall be made to ensure that any changes to a Draft JEP will be backwards-compatible with the 1.0 version). Note also that any changes to a Draft JEP must be provisionally published at &lt;<link url='http://www.jabber.org/jeps/tmp/'>http://www.jabber.org/jeps/tmp/</link>&gt;, announced on the Standards-JIG mailing list, and formally approved by the Jabber Council before being officially published at the canonical URL for the JEP.</p>
+    <p>In order for a JEP to advance from Draft status to Final status (version 2.0), it must be shown to be stable and well-received by the Jabber/XMPP developer community. Before presenting a Draft standard to the Jabber Council for consideration as a Final standard, the JEP Editor shall issue a Call for Experience on the Standards-JIG list so that feedback can be gathered from those who have implemented the Draft standard (the Call for Experience shall expire not less than 14 days after the date of issue, and shall not be issued until at least 60 days have passed since advancement to Draft). In addition, at least two implementations of the JEP must exist, at least one of which must be free software (in accordance with the &GPL; or &LGPL;) or open-source software (in accordance with the definition provided by &OSI;). Until two implementations are produced, a Standards Track JEP shall retain a status of Draft. Once (1) two implementations have been presented to the Jabber Council, (2) feedback provided during the Call for Experience has been incorporated into the JEP, and (3) the JEP has been fully checked for accuracy, the status of the JEP may be changed to Final upon a vote of the Council.</p> 
+    <p>Finally, a Standards Track JEP that has been granted a status of Final may be superseded by a future JEP approved by the Jabber Council. In such cases, the status of the earlier JEP shall be changed to Deprecated, possibly with an expiration date assigned by the Jabber Council (see the <link url='#expiration'>Expiration Dates</link> section below). After a reasonable period of time or upon the passing of the expiration date, the status of the JEP shall be changed to Obsolete.</p>
+  </section2>
+  <section2 topic='Historical, Informational, and Procedural JEPs' anchor='approval-info'>
+    <p>The possible states for a Historical, Informational, or Procedural JEP are as follows:</p>
+    <code>
+
+     +--> Retracted
+     |
+     |
+     +--> Deferred    +--> Rejected
+     |                |
+     |                |
+Experimental ----> Proposed ----> Active
+                                    |
+                                    |
+                                    +--> Deprecated --> Obsolete
+    </code>
+    <p>Because such JEPs do not seek to define standard protocols, in general they are less controversial and tend to proceed from Proposed to Active without controversy on a vote of the Jabber Council. However, some of these JEPs may be remanded from the Council to the JEP author and/or JEP Editor for revision in order to be suitable for advancement from Proposed to Active (e.g., documentation of protocols in use must be accurate and describe any existing security concerns). As with Standards Track JEPs, the JEP author may retract such a JEP when it is Experimental, and the Council may reject such a JEP when it is Proposed.</p> 
+    <p>Once approved, Historical, Informational, and Procedural JEPs will have a status of Active. Such a JEP may be replaced by a new JEP on the same or a similar topic, thus rendering the earlier JEP out of date; in such cases, the earlier JEP shall be assigned a status of Deprecated (and eventually Obsolete) with a note specifying the superseding JEP.</p> 
+    <p>The Jabber Council may, at its discretion, decide to convert an Historical JEP into a Standards Track JEP if the protocol defined in the JEP has been in long use, is deemed stable and uncontroversial, and is unlikely to be superseded by a newer protocol. The Historical JEP shall be treated in the same way as a Standards Track JEP that has a status of Experimental, beginning with the <link url="#proposal">Proposal Process</link>. If after the Last Call and voting by the Jabber Council the JEP is approved for advancement on the standards track, its type shall be changed to Standards Track and its status shall be changed to Draft.</p>
+  </section2>
+</section1>
+<section1 topic='Summary of JEP States' anchor='states'>
+  <p>The possible states for a JEP are summarized in the following sections.</p>
+  <section2 topic='Experimental' anchor='states-Experimental'>
+    <p>A JEP of any type is in the Experimental state after it has been accepted by the Jabber Council and published by the Jabber Software Foundation but before it has advanced within the standards process to a state of Active or Draft.</p>
+  </section2>
+  <section2 topic='Proposed' anchor='states-Proposed'>
+    <p>A JEP of any type is in the Proposed state while it is in Last Call or under consideration by the Jabber Council for advancement from Experimental to Draft or Active.</p>
+  </section2>
+  <section2 topic='Draft' anchor='states-Draft'>
+    <p>A Standards Track JEP is in the Draft state after it has undergone extensive discussion and technical review on the Standards-JIG list and has been voted forward on the standards track by the Jabber Council.</p>
+  </section2>
+  <section2 topic='Final' anchor='states-Final'>
+    <p>A Standards Track JEP is in the Final state after it has been in the Draft state for at least 60 days, has been implemented in at least two separate codebases, and has been voted forward on the standards track by the Jabber Council.</p>
+  </section2>
+  <section2 topic='Active' anchor='states-Active'>
+    <p>A JEP of any type other than Standards Track is advanced to a status of Active after it has been voted forward from Experimental by the Jabber Council.</p>
+  </section2>
+  <section2 topic='Deferred' anchor='states-Deferred'>
+    <p>An Experimental JEP of any type is changed to the Deferred state if it has not been updated in six (6) months.</p>
+  </section2>
+  <section2 topic='Retracted' anchor='states-Retracted'>
+    <p>A JEP of any type is in the Retracted state if the authors have asked the JEP Editor to remove the JEP from further consideration in the JSF's standards process.</p>
+  </section2>
+  <section2 topic='Rejected' anchor='states-Rejected'>
+    <p>A JEP of any type is in the Rejected state if the Jabber Council has deemed it unacceptable and has voted to not move it forward within the standards process.</p>
+  </section2>
+  <section2 topic='Deprecated' anchor='states-Deprecated'>
+    <p>A JEP of any type is in the Deprecated state if the Jabber Council has determined that the protocol defined therein is out of date and that new implementations are no longer encouraged (e.g., because it has been superseded by a more modern protocol).</p>
+  </section2>
+  <section2 topic='Obsolete' anchor='states-Obsolete'>
+    <p>A JEP of any type is changed from Deprecated to Obsolete if the Jabber Council has determined that the protocol defined therein should no longer be implemented or deployed.</p>
+  </section2>
+</section1>
+<section1 topic='Modification of Final and Active JEPs' anchor='mods'>
+  <p>Sometimes it is necessary to modify JEPs that have received final approval by the Jabber Council or JSF Board of Directors (e.g., to correct errors, incorporate the lessons of experience, or document new security concerns). This section describes the process for doing so with regard to Standards Track JEPs that have achieved a status of Final and Historical, Informational, and Procedural JEPs that have achieved a status of Active.</p>
+  <p>With regard to Standards Track JEPs, the Jabber Software Foundation (in particular, the Jabber Council) strives to ensure that such JEPs are accurate, complete, and stable before advancing them to a status of Final (corresponding to document version 2.0 of the JEP). The Call for Experience and discussion within the Standards JIG help to ensure this result, but final responsibility rests with the Jabber Council. Despite the best efforts of all concerned, errors are sometimes discovered in Final JEPs (the individual who discovers such an error should inform the Council via the Standards-JIG mailing list or communicate directly with the JEP Editor). Whereas other standards development organizations may issue errata while leaving the specification itself unchanged, the JSF makes changes to the Final JEP and publishes a revised document version (e.g., version 2.1). In general the changes are made by the JEP Editor or JEP author in consultation with the Jabber Council, discussed within the Standards JIG if appropriate, and agreed upon by the full Jabber Council. Upon agreement regarding the exact changes, the Jabber Council shall instruct the JEP Editor to publish a revised version of the JEP and announce the existence of the revised version through the normal channels (e.g., on the JSF website and to the Standards-JIG list). Naturally, if members of the Jabber/XMPP developer community have concerns regarding the changes made, they are free to discuss the matter in the relevant forum (usually the Standards-JIG list) before or after the revised version has been published.</p>
+  <p>The process is similar with regard to Historical and Informational JEPs that have achieved a status of Active (corresponding to document version 1.0 of the JEP): the Jabber Council agrees on the exact changes to be made and instructs the JEP Editor to publish and announce a revised version (e.g., version 1.1). Here again the Jabber Council bears responsibility for any changes and public discussion is welcome.</p>
+  <p>Procedural JEPs may be modified more frequently as the Jabber Software Foundation gains experience with the processes defined therein. For example, JEP-0001 is modified periodically in order to document processes previously not made explicit or to modify existing processes based on experience with the JEP process; similar changes are sometimes made to the &jep0053; JEP and to various JIG-related JEPs. Changes to these JEPs are discussed by the Jabber Council, JSF Board of Directors, JSF membership, and Standards JIG as appropriate, and exact changes are agreed to by the relevant approving body (Jabber Council or JSF Board of Directors). The approving body then instructs the JEP Editor to publish and announce the revised version as described above.</p>
+</section1>
+<section1 topic='Expiration Dates' anchor='expiration'>
+  <p>In rare cases, a protocol enhancement may be accepted as an interim solution, especially when it is recognized that expected future improvements in technology or the underlying Jabber/XMPP protocols will make possible a much better solution to the problem at hand (e.g., a better protocol for user avatars may be contingent upon the development of a robust protocol for publish/subscribe functionality). In such cases, a JEP may be approved provisionally and be assigned an expiration date.</p>
+  <p>The exact form of such an expiration date shall be left up to the discretion of the Jabber Council. However, the preferred form is to assign an expiration date of six (6) months in the future, at which time the Jabber Council must re-affirm the status of the JEP and, if desired, extend the expiration date for another six (6) months. While this process may continue indefinitely (although that is unlikely), it has the virtue of forcing the Jabber Council and Jabber/XMPP developer community to re-examine the provisional protocol on a fairly regular basis in the light of technological changes. Alternatively, a JEP may be assigned a "soft" expiration date: that is, the JEP will expire when an expected future protocol comes into existence, whenever that may be. In either case, the status of the JEP shall be changed to Deprecated when it expires.</p>
+  <p>In addition, an expiration date may be assigned when the status of a JEP is changed from Final (or, potentially, Draft) to Deprecated. In this case, the expiration date applies to the date when the JEP is expected to change from Deprecated to Obsolete. These dates may be flexible; however it is expected that they will follow the same six-month rule as provisional protocol enhancements.</p>
+</section1>
+<section1 topic='Security Considerations' anchor='security'>
+  <p>Every JEP must contain a section entitled "Security Considerations", detailing security concerns or features related to the proposal; in particular, a Standards Track JEP should list the security threats that the protocol addresses and does not address, as well as security issues related to implementation of the protocol. JEP authors should refer to &rfc3552; for helpful information about documenting security considerations and should also confer with the JEP Editor and/or Jabber Council regarding this important task.</p>
+</section1>
+<section1 topic='IANA Considerations' anchor='iana'>
+  <p>Some JEPs may require interaction with &IANA;. The IANA acts as a clearinghouse to assign and coordinate the use of numerous Internet protocol parameters, such as MIME types and port numbers (e.g., the TCP ports 5222 and 5269 used by the Jabber/XMPP developer community are registered with the IANA). Whether or not a JEP requires registration of parameters with the IANA, that fact must be noted and explained in a distinct section of the JEP entitled "IANA Considerations". Registration with the IANA should not occur until a JEP advances to a status of Draft (Standards Track JEPs) or Active (Informational and Historical JEPs), and should be initiated by the Jabber Registrar in consultation with the JEP author, not by the JEP author directly with the IANA.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations' anchor='registrar'>
+  <p>The &REGISTRAR; performs a function similar to the IANA, although limited to the Jabber/XMPP developer community. It does so by reserving protocol namespaces and by uniquely assigning parameters for use in the context of Jabber/XMPP protocols (for example, the categories and types used in &jep0030;).</p>
+  <p>Whether or not a JEP requires registration of protocol namespaces or parameters with the Jabber Registrar, that fact must be noted and explained in a distinct section of the JEP entitled "Jabber Registrar Considerations". Such registration should not occur until a JEP advances to a status of Draft (Standards Track JEPs) or Active (Informational and Historical JEPs). Registration of protocol namespaces is initiated by the JEP Editor when a JEP advances to Draft or Active. Registration of particular parameters used within a specification may be initiated by a JEP author within the text of the JEP, or by an implementor of the JEP after it has advanced to Draft or Active. For details regarding the Jabber Registrar and its processes, refer to &jep0053;.</p>
+  <p>A JEP may also request that a new registry is to be created by the Jabber Registrar. The JEP author must clearly define the nature of the new registry as well as the process for submitting data to the registry, and must do so in collaboration with the Registrar.</p>
+</section1>
+<section1 topic='XML Schema' anchor='schema'>
+  <p>JEPs that define official JSF protocols must include a schema that conforms to &w3xmlschema1; and &w3xmlschema2;.</p>
+  <p>The schema for the JEP format itself is as follows:</p>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://www.jabber.org/jeps'
+    xmlns='http://www.jabber.org/jeps'
+    elementFormDefault='qualified'>
+
+  <xs:element name='jep'>
+    <xs:annotation>
+      <xs:documentation>
+
+        This schema defines the document format for Jabber Enhancement 
+        Proposals (JEPs). For further information about JEPs, visit:
+
+           http://www.jabber.org/jeps/ 
+        
+        The canonical URL for this schema is:
+        
+           http://www.jabber.org/jeps/jep.xsd
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='header'/>
+        <xs:element ref='section1' maxOccurs='unbounded'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='header'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='title' type='xs:string'/>
+        <xs:element name='abstract' type='xs:string'/>
+        <xs:element name='legal' type='xs:string'/>
+        <xs:element name='number' type='xs:byte'/>
+        <xs:element ref='status'/>
+        <xs:element ref='type'/> 
+        <xs:element name='jig' type='xs:string'/>
+        <xs:element name='approver' type='xs:string'/>
+        <xs:element ref='dependencies'/>
+        <xs:element ref='supersedes'/>
+        <xs:element ref='supersededby'/>
+        <xs:element name='shortname' type='xs:NCNAME'/>
+        <xs:element ref='schemaloc' minOccurs='0' maxOccurs='unbounded'/> 
+        <xs:element name='registry' type='empty' minOccurs='0'/> 
+        <xs:element name='expires' type='xs:string'/>
+        <xs:element ref='author' minOccurs='0' maxOccurs='unbounded'/> 
+        <xs:element ref='revision' minOccurs='0' maxOccurs='unbounded'/> 
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='status'>
+    <xs:simpleType>
+      <xs:restriction base='xs:NCNAME'>
+        <xs:enumeration value='Active'/>
+        <xs:enumeration value='Deferred'/>
+        <xs:enumeration value='Deprecated'/>
+        <xs:enumeration value='Draft'/>
+        <xs:enumeration value='Experimental'/>
+        <xs:enumeration value='Final'/>
+        <xs:enumeration value='Obsolete'/>
+        <xs:enumeration value='Proposed'/>
+        <xs:enumeration value='ProtoJEP'/>
+        <xs:enumeration value='Rejected'/>
+        <xs:enumeration value='Retracted'/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name='type'>
+    <xs:simpleType>
+      <xs:restriction base='xs:string'>
+        <xs:enumeration value='Historical'/>
+        <xs:enumeration value='Humorous'/>
+        <xs:enumeration value='Informational'/>
+        <xs:enumeration value='Organizational'/>
+        <xs:enumeration value='Standards Track'/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name='dependencies'>
+    <xs:complexType>
+      <xs:sequence minOccurs='0' maxOccurs='unbounded'>
+        <xs:element name='spec' type='xs:string'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='supersedes'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='spec' type='xs:string'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='supersededby'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='spec' type='xs:string'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='schemaloc'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='ns' type='xs:string' minOccurs='0'/>
+        <xs:element name='url' type='xs:string'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='author'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='firstname' type='xs:string'/>
+        <xs:element name='surname' type='xs:string'/>
+        <xs:element name='authornote' type='empty' minOccurs='0'/>
+        <xs:element name='org' type='xs:string' minOccurs='0'/>
+        <xs:element name='email' type='xs:string'/>
+        <xs:element name='jid' type='xs:string' minOccurs='0'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='revision'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='version' type='xs:string'/>
+        <xs:element name='date' type='xs:dateTime'/>
+        <xs:element name='initials' type='xs:NCName'/>
+        <xs:element ref='remark'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='remark'>
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref='p' minOccurs='0' maxOccurs='1'/>
+        <xs:element ref='ul' minOccurs='0' maxOccurs='1'/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='section1'>
+    <xs:complexType>
+      <xs:choice maxOccurs='unbounded'>
+        <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='section2' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ul' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:choice>
+      <xs:attribute name='topic' type='xs:string' use='required'/>
+      <xs:attribute name='anchor' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='section2'>
+    <xs:complexType>
+      <xs:choice maxOccurs='unbounded'>
+        <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='section3' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ul' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:choice>
+      <xs:attribute name='topic' type='xs:string' use='required'/>
+      <xs:attribute name='anchor' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='section3'>
+    <xs:complexType>
+      <xs:choice maxOccurs='unbounded'>
+        <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='section4' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element name='code' type='xs:string' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ul' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:choice>
+      <xs:attribute name='topic' type='xs:string' use='required'/>
+      <xs:attribute name='anchor' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='section4'>
+    <xs:complexType>
+      <xs:choice maxOccurs='unbounded'>
+        <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ul' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:choice>
+      <xs:attribute name='topic' type='xs:string' use='required'/>
+      <xs:attribute name='anchor' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='div'>
+    <xs:complexType>
+      <xs:choice maxOccurs='unbounded'>
+        <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ul' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:choice>
+      <xs:attribute name='class' type='xs:string' use='optional'/>
+      <xs:attribute name='style' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='p' type='markup'/>
+
+  <xs:element name='ul'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='li' minOccurs='1' maxOccurs='unbounded'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='ol'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='li' minOccurs='1' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='start' type='xs:byte' use='optional'/>
+      <xs:attribute name='type' type='xs:NCName' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='li' type='markup'/>
+
+  <xs:element name='img'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='source' use='required'/> 
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='link'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='url' use='required'/> 
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='note' type='markup'/>
+
+  <xs:element name='example'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='caption' use='optional'/> 
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='code'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='caption' use='optional'/> 
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='table'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='tr' minOccurs='1' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='caption' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='tr'>
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref='th' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='td' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='th'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='colspan' use='optional'/> 
+          <xs:attribute name='rowspan' use='optional'/> 
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='td'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='colspan' use='optional'/> 
+          <xs:attribute name='rowspan' use='optional'/> 
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name='markup' type='mixed'>
+    <xs:choice minOccurs='0' maxOccurs='unbounded'>
+      <xs:element name='cite' type='xs:token'/>
+      <xs:element name='em' type='xs:token'/>
+      <xs:element ref='img'/>
+      <xs:element ref='link'/>
+      <xs:element ref='note'/>
+      <xs:element name='span' type='xs:token'/>
+      <xs:element name='strong' type='xs:token'/>
+      <xs:element name='tt' type='xs:token'/>
+    </xs:choice>
+    <xs:attribute name='class' type='xs:string' use='optional'/>
+    <xs:attribute name='style' type='xs:string' use='optional'/>
+  </xs:complexType>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+  ]]></code>
+</section1>
+</jep>
diff --git a/xep-0002.xml b/xep-0002.xml
new file mode 100644
index 00000000..bed42a95
--- /dev/null
+++ b/xep-0002.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Jabber Interest Groups (JIGs)</title>
+  <abstract>A definition of Jabber Interest Groups, including their structure and role within the Jabber Software Foundation.</abstract>
+  &LEGALNOTICE;
+  <number>0002</number>
+  <status>Active</status>
+  <type>Procedural</type>
+  <jig>None</jig>
+  <approver>Board</approver>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  &stpeter;
+  <revision>
+    <version>1.1</version>
+    <date>2002-01-11</date>
+    <initials>psa</initials>
+    <remark>Clarified some details and added information about cut-offs for inactivity.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-06-28</date>
+    <initials>psa</initials>
+    <remark>First release, modified from Rahul Dave's modification of my original post.</remark>
+  </revision>
+</header>
+<section1 topic='Short Definition'>
+  <p>A Jabber Interest Group (JIG) is a working group approved by the Jabber Council to address specific areas of growth or concern within the Jabber community, usually by means of developing and publishing Jabber Enhancements Proposals (JEPs).</p>
+</section1>
+<section1 topic='Explanation'>
+  <p>The main function of most JIGs is to produce acceptable enhancements to the Jabber protocol (delivered in the form of Jabber Enhancement Proposals or JEPs <note>For information about Jabber Enhancement Proposals, see <link url="http://foundation.jabber.org/jeps/jep-0001.html">http://foundation.jabber.org/jeps/jep-0001.html</link>.</note>) within a reasonably limited period of time. However, at the discretion of the Jabber Council, a handful of standing JIGs may be approved (e.g., to address security or standards compliance).</p>
+  <p>Anyone (not limited to members of the Jabber Software Foundation) may propose the formation of a JIG by completing a Jabber Enhancement Proposal outlining the need for the JIG and its proposed focus. However, JIG leaders must be members of the Jabber Software Foundation. The number of leaders for a JIG is flexible, and shall be determined by each JIG, in consultation with the Jabber Council if necessary. The concept of "membership" with regard to JIGs is loose, and is essentially co-extensive with membership in the appropriate mailing list (each JIG has its own mailing list, which is archived for public review). JIG members do not need to be members of the Jabber Software Foundation, and any member of the general public may subscribe to JIG mailing lists.</p>
+  <p>It is expected that all JIGs (other than certain standing JIGs) will remain active for as long as necessary in order to produce one or more standards-track JEPs for review by the Jabber Council in the JIG's area of focus. However, if a JIG does not show signs of activity for an extended period of time (usually six months of inactivity on the JIG's mailing list), the JIG may be disbanded at the discretion of the Jabber Council with appropriate warning to the JIG members (usually in the form of an email sent to the JIG's mailing list).</p>
+</section1>
+</jep>
diff --git a/xep-0003.xml b/xep-0003.xml
new file mode 100644
index 00000000..2726f6a8
--- /dev/null
+++ b/xep-0003.xml
@@ -0,0 +1,347 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Proxy Accept Socket Service (PASS)</title>
+  <abstract>A proposal for proxy support in Jabber.</abstract>
+  &LEGALNOTICE;
+  <number>0003</number>
+  <status>Active</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>pass</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/pass/pass.xsd</url>
+  </schemaloc>
+  &jer;
+  &reatmon;
+  <revision>
+    <version>1.2</version>
+    <date>2004-01-22</date>
+    <initials>psa</initials>
+    <remark>Editorial revisions.</remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2004-01-06</date>
+    <initials>psa</initials>
+    <remark>Added XML schema.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-10-15</date>
+    <initials>psa</initials>
+    <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2001-07-02</date>
+    <initials>rwe</initials>
+    <remark>Error codes update</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2001-06-29</date>
+    <initials>rwe</initials>
+    <remark>Protocol update</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2001-06-28</date>
+    <initials>psa</initials>
+    <remark>DocBook version</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-06-01</date>
+    <initials>jer</initials>
+    <remark>Initial release</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>Complete direct client-to-client file transfers presents a major problem for clients that are behind a firewall or NAT. Proxy Accept Socket Service (PASS) enables clients to do real-time file transfers via a third party; in addition, it does not limit clients to file transfers but enables any two clients to create a raw TCP socket between them for any purpose, such as VoIP (SIP/RTP), BEEP, or binary game data.</p>
+</section1>
+<section1 topic='Registration/Setup'>
+  <p>The first step is to communicate with a PASS service to set it up.</p>
+  <example caption='Registration request'>
+&#60;iq id='pass1' type='set' to='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;expire&#62;600&#60;/expire&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+  </example>
+  <example caption='Result from PASS Service'>
+&#60;iq id='pass1' type='result' from='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;server port='43253'&#62;1.2.3.4&#60;/server&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+  </example>
+  <p>At this point, the PASS service is now listening on the given IP and port for incoming connections on behalf of the Jabber Entity. The provided IP and port can now be sent to any other entity as a connection point, for file transfers or any other use.</p>
+  <p>The default behavior for the PASS service is to listen on the port forever, unless the requesting client specifies an &lt;expire/&gt; value (in seconds).  If the service is not configured with an expire value, it will not timeout the connection, and will start listening on the port again after one of the two sides disconnects.</p>
+  <table caption='Error Codes'>
+    <tr>
+      <th>Code</th>
+      <th>Message</th>
+      <th>Cause</th>
+    </tr>
+    <tr>
+      <td>502</td>
+      <td>No more ports available. Try again later.</td>
+      <td>The PASS service is listening on all of its available ports.</td>
+    </tr>
+  </table>
+</section1>
+<section1 topic='Incoming Connections'>
+  <p>When an incoming connection is attempted to that IP and port, the PASS service MUST send an IQ request to the entity on whose behalf it is listening:</p>
+  <example caption='Request to entity'>
+&#60;iq type='set'
+    id='pass2'
+    to='user@jabber.org/resource'
+    from='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;client port='1234'&#62;4.3.2.1&#60;/client&#62;
+    &#60;proxy port='43523'&#62;1.2.3.4&#60;/proxy&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+  </example>
+  <example caption='IQ result to accept connection'>
+&#60;iq type='result'
+    id='pass2'
+    from='user@jabber.org/resource'
+    to='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'/&#62;
+&#60;/iq&#62;
+  </example>
+  <p>The entity SHOULD now immediately connect to the given proxy IP and port, and upon connection all data written to that socket will be copied to the client connection, and vice-versa. Any disconnect on either side MUST cause a disconnect on the other (initiated by the service). If the IQ set to the entity fails or returns an error, the client socket MUST be dropped as well. The client XML element provides the information about the remote end of the incoming socket.</p>
+  <p>Abuse in bandwidth or resources could become an issue, so PASS implementations SHOULD include strict and detailed rate and usage limits, allowing only limited usage by single entities and rate-limiting bandwidth used if necessary for both single connections or overall usage. These limits are implementation-specific.</p>
+</section1>
+<section1 topic='Controls'>
+  <p>A Jabber client can send various controls to the PASS service via the set to control how the PASS service behaves, how the server handles a listening port.</p>
+  <section2 topic='&#60;expire/&#62;'>
+    <p>This tells the server to shut down the port after a specified number of seconds.  After the timeout period, the PASS service MUST send an &#60;iq/&#62; to the JID to tell it that the port has been closed down.  It notifies the client with:</p>
+    <example caption='Notification of expiration'>
+&#60;iq type='set'
+    id='pass3'
+    to='user@jabber.org/resource'
+    from='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;expire/&#62;
+    &#60;close/&#62;
+    &#60;proxy port='43253'&#62;1.2.3.4&#60;/proxy&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+    </example>
+    <example caption='Acknowledgement of expiration'>
+&#60;iq type='result'
+    id='pass3'
+    from='user@jabber.org/resource'
+    to='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'/&#62;
+&#60;/iq&#62;
+    </example>
+  </section2>
+  <section2 topic='&#60;oneshot/&#62;'>
+    <p>This tells the server to listen once, and then close the port.  Even if the &#60;expire/&#62; has not been met, the &#60;oneshot/&#62; overrides that and shuts down the listening port.  When this happens the server notifies the client with the following packet:</p>
+    <example caption='Server notifies client of oneshot port closing'>
+&#60;iq type='set'
+    id='pass4'
+    to='user@jabber.org/resource'
+    from='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;oneshot/&#62;
+    &#60;close/&#62;
+    &#60;proxy port='43253'&#62;1.2.3.4&#60;/proxy&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+    </example>
+    <example caption='Client acknowledges closing of oneshot port'>
+&#60;iq type='result'
+    id='pass4'
+    from='user@jabber.org/resource'
+    to='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'/&#62;
+&#60;/iq&#62;
+    </example>
+  </section2>
+  <section2 topic='&#60;close/&#62;'>
+    <p>This tells the server to explicitly shut down a listening port.  Useful for when the client shuts down and can tell the PASS service to recycle the port. The server sends back:</p>
+    <example caption='Client request to shut down port'>
+&#60;iq type='set'
+    id='pass5'
+    to='pass.jabber.org'
+    from='user@jabber.org/resource'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;close/&#62;
+    &#60;proxy port='43253'&#62;1.2.3.4&#60;/proxy&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+    </example>
+    <example caption='Server acknowledges port closing request'>
+&#60;iq type='result'
+    id='pass5'
+    to='user@jabber.org/resource'
+    from='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'/&#62;
+&#60;/iq&#62;
+    </example>
+    <table caption='Error Codes'>
+      <tr>
+        <th>Code</th>
+        <th>Message</th>
+        <th>Cause</th>
+      </tr>
+      <tr>
+        <td>400</td>
+        <td>Missing &#60;proxy/&#62; specification.</td>
+        <td>Sent a &#60;close/&#62; w/o a &#60;proxy/&#62;</td>
+      </tr>
+      <tr>
+        <td>401</td>
+        <td>Port not registered to your JID.</td>
+        <td>You did not register this port with the server.</td>
+      </tr>
+      <tr>
+        <td>404</td>
+        <td>Port not found in registry.</td>
+        <td>The &#60;proxy port=''/&#62; was not a defined port.</td>
+      </tr>
+      <tr>
+        <td>405</td>
+        <td>Proxy IP does not match.</td>
+        <td>The IP sent in the &#60;proxy/&#62; does not match the IP of the pass-service</td>
+      </tr>
+    </table>
+  </section2>
+</section1>
+<section1 topic='Security Considerations'>
+  <section2 topic='Client Authentication'>
+    <p>The PASS protocol can be used for clients to talk to each other and find out information about each other.  When a client wants to send a file to another client, it can use the jabber:iq:pass namespace to query the IP address of the other client.  For example:</p>
+    <p>You send the other client:</p>
+    <example>
+&#60;iq type='get'
+    id='pass6'
+    to='them@jabber.org/resource'
+    from='you@jabber.org/resource'&#62;
+  &#60;query xmlns='jabber:iq:pass'/&#62;
+&#60;/iq&#62;
+    </example>
+    <p>The other client SHOULD send back:</p>
+    <example>
+&#60;iq type='result'
+    id='pass6'
+    to='you@jabber.org/resource'
+    from='them@jabber.org/resource'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;client&#62;4.3.2.1&#60;/client&#62;
+  &#60;query&#62;
+&#60;/iq&#62;
+    </example>
+    <p>Obviously the port is not going to be known, but the IP address will let you authenticate the JID via the PASS service since the PASS service tells you the &#60;client/&#62; information upon a connection.</p>
+  </section2>
+  <section2 topic='Denying a Connection'>
+    <p>When a server gets an Incoming Connection notification the client has the right to deny that connection based on the &#60;client/&#62; information that it receives.  It can return an error to the PASS service specifying the &#60;proxy/&#62; port and hangup on the active &#60;client/&#62; connection and start listening again.  This does not affect the &#60;oneshot/&#62; control.  For example:</p>
+    <p>The PASS service sends you:</p>
+    <example>
+&#60;iq type='set'
+    id='pass7'
+    to='user@jabber.org/resource'
+    from='pass.jabber.org'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;client port='1234'&#62;4.3.2.1&#60;/client&#62;
+    &#60;proxy port='43523'&#62;1.2.3.4&#60;/proxy&#62;
+  &#60;query&#62;
+&#60;/iq&#62;
+    </example>
+    <p>Your client would send back:</p>
+    <example>
+&#60;iq type='error'
+    id='pass7'
+    to='pass.jabber.org'
+    from='user@jabber.org/resource'&#62;
+  &#60;query xmlns='jabber:iq:pass'&#62;
+    &#60;client port='1234'&#62;4.3.2.1&#60;/client&#62;
+    &#60;proxy port='43523'&#62;1.2.3.4&#60;/proxy&#62;
+  &#60;query&#62;
+  &#60;error code='401' type='auth'&#62;
+    &#60;not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/&gt;
+  &#60;/error&#62;
+&#60;/iq&#62;
+    </example>
+    <table caption='Error Codes'>
+      <tr>
+        <th>Code</th>
+        <th>Message</th>
+        <th>Cause</th>
+      </tr>
+      <tr>
+        <td>401</td>
+        <td>Unauthorized</td>
+        <td>The incoming &#60;client/&#62; does not match the &#60;client/&#62; from the client you want to exchange data with.</td>
+      </tr>
+    </table>
+  </section2>
+</section1>
+<section1 topic='IANA Considerations'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations'>
+  <p>No action on the part of the &REGISTRAR; is necessary as a result of this JEP, since 'jabber:iq:pass' is already a registered protocol namespace.</p>
+</section1>
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:iq:pass'
+    xmlns='jabber:iq:pass'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0003: http://www.jabber.org/jeps/jep-0003.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='query'>
+    <xs:complexType>
+      <xs:choice minOccurs='0' maxOccurs='unbounded'>
+        <xs:element name='client' type='PassEntity'/>
+        <xs:element name='close' type='empty'/>
+        <xs:element name='expire' type='xs:unsignedLong'/>
+        <xs:element name='oneshot' type='empty'/>
+        <xs:element name='proxy' type='PassEntity'/>
+        <xs:element name='server' type='PassEntity'/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name='PassEntity'>
+    <xs:simpleContent>
+      <xs:extension base='xs:NMTOKEN'>
+        <xs:attribute name='port' type='xs:short' use='optional'/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+    ]]></code>
+</section1>
+</jep>
diff --git a/xep-0004.xml b/xep-0004.xml
new file mode 100644
index 00000000..ff912db2
--- /dev/null
+++ b/xep-0004.xml
@@ -0,0 +1,709 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+  <header>
+    <title>Data Forms</title>
+    <abstract>This JEP defines a protocol for data forms and generic data description in Jabber/XMPP.</abstract>
+    &LEGALNOTICE;
+    <number>0004</number>
+    <status>Final</status>
+    <type>Standards Track</type>
+    <jig>Standards JIG</jig>
+    <dependencies>
+      <spec>XMPP Core</spec>
+    </dependencies>
+    <supersedes/>
+    <supersededby/>
+    <shortname>x-data</shortname>
+    <schemaloc>
+      <url>http://jabber.org/protocol/x-data/x-data.xsd</url>
+    </schemaloc>
+    &reatmon;
+    &hildjj;
+    &jer;
+    &temas;
+    &stpeter;
+    <revision>
+      <version>2.7</version>
+      <date>2006-01-25</date>
+      <initials>psa</initials>
+      <remark>Incorporated errata: (1) clarified rules regarding inclusion of option and value elements depending on field type; (2) clarified handling of default values; (3) added value elements to list-multi field in Example 2; (4) harmonized spelling of form-processing entity and form-submitting entity.</remark>
+    </revision>
+    <revision>
+      <version>2.6</version>
+      <date>2004-10-13</date>
+      <initials>psa</initials>
+      <remark>Incorporated errata: (1) corrected syntax of &lt;reported/&gt; element (&lt;field/&gt; element should not contain a &lt;value/&gt; child); (2) corrected Example 8.</remark>
+    </revision>
+    <revision>
+      <version>2.5</version>
+      <date>2004-05-07</date>
+      <initials>psa</initials>
+      <remark>Clarified terminology regarding form-processing entities and form-submitting entities; corrected several small errors in the schema.</remark>
+    </revision>
+    <revision>
+      <version>2.4</version>
+      <date>2004-05-04</date>
+      <initials>psa</initials>
+      <remark>Per discussion by the JEP authors and Jabber Council, specified that the 'var' attribute is required for all field types except "fixed", for which the 'var' attribute is optional.</remark>
+    </revision>
+    <revision>
+      <version>2.3</version>
+      <date>2004-03-31</date>
+      <initials>psa</initials>
+      <remark>Formalization and further editorial revisions.</remark>
+    </revision>
+    <revision>
+      <version>2.2</version>
+      <date>2004-01-22</date>
+      <initials>psa</initials>
+      <remark>Editorial revisions.</remark>
+    </revision>
+    <revision>
+      <version>2.1</version>
+      <date>2003-02-16</date>
+      <initials>psa</initials>
+      <remark>Added schema.</remark>
+    </revision>
+    <revision>
+      <version>2.0</version>
+      <date>2002-12-09</date>
+      <initials>psa</initials>
+      <remark>Per a vote of the Jabber Council, changed status to Final.</remark>
+    </revision>
+    <revision>
+      <version>1.1</version>
+      <date>2002-10-15</date>
+      <initials>rwe</initials>
+      <remark>Call for Experience changes (see <link url="#draft-to-final">Changes Between Draft and Final</link> section). This version voted to Final on 2002-12-09.</remark>
+    </revision>
+    <revision>
+      <version>1.0</version>
+      <date>2002-04-24</date>
+      <initials>psa</initials>
+      <remark>Per a vote of the Jabber Council, changed status to Draft.</remark>
+    </revision>
+    <revision>
+      <version>0.6</version>
+      <date>2002-03-15</date>
+      <initials>rwe</initials>
+      <remark>Protocol tweaks based on standards-jig discussion.</remark>
+    </revision>
+    <revision>
+      <version>0.5</version>
+      <date>2002-02-06</date>
+      <initials>rwe</initials>
+      <remark>Protocol tweaks based on implementation and discussion.</remark>
+    </revision>
+    <revision>
+      <version>0.4</version>
+      <date>2001-11-16</date>
+      <initials>rwe</initials>
+      <remark>Major redesign to attempt to clarify the scope of this JEP and limit what it is trying to solve.</remark>
+    </revision>
+    <revision>
+      <version>0.3</version>
+      <date>2001-07-23</date>
+      <initials>rwe</initials>
+      <remark>Protocol update</remark>
+    </revision>
+    <revision>
+      <version>0.2</version>
+      <date>2001-06-29</date>
+      <initials>rwe</initials>
+      <remark>Protocol update and DocBook version</remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2001-01-25</date>
+      <initials>rwe</initials>
+      <remark>Initial release</remark>
+    </revision>
+  </header>
+<section1 topic='Introduction' anchor='intro'>
+  <p>Several existing Jabber/XMPP protocols involve the exchange of structured data between users and applications for common tasks such as registration (&jep0077;) and searching (&jep0055;). Unfortunately, these early protocols were "hard coded" and thus place significant restrictions on the range of information that can be exchanged. Furthermore, other protocols (e.g., &jep0045;) may need to exchange data for purposes such as configuration, but the configuration options may differ depending on the specific implementation or deployment. Finally, developers may want to extend other protocols (e.g., &jep0030;) in a flexible manner in order to provide information that is not defined in the base protocol. In all of these cases, it would be helpful to use a generic data description format that can be used for dynamic forms generation and data "modelling" in a variety of circumstances.</p>
+  <p>An example may be helpful. Let us imagine that when a user creates a multi-user chatroom on a text conferencing service, the service allows the user to configure the room in various ways. While most implementations will probably provide a somewhat common set of configurable features (discussion logging, maximum number of room occupants, etc.), there will be some divergence: perhaps one implementation will enable archiving of the room log in a variety of file types (XML, HTML, PDF, etc.) and for a variety of time periods (hourly, daily, weekly, etc.), whereas another implementation may present a boolean on/off choice of logging in only one format (e.g., daily logs saved in HTML). Obviously, the first implementation will have more configuration options than the second implementation. Rather than "hard-coding" every option via distinct XML elements (e.g., &lt;room_logging_period/&gt;), a better design would involve a more flexible format.</p>
+  <p>The 'jabber:x:data' protocol described herein defines such a flexible format for use by Jabber/XMPP entities, steering a middle course between the simplicity of "name-value" pairs and the complexity of &w3xforms; (on which development had just begun when this protocol was designed). In many ways, 'jabber:x:data' is similar to the Forms Module of &w3xhtml;; however, it provides several Jabber-specific data types, enables applications to require data fields, integrates more naturally into the "workflow" semantics of IQ stanzas, and can be included as an extension of existing Jabber/XMPP protocols in ways that the XHTML Forms Module could not when this protocol was developed (especially because &w3xhtmlmod; did not exist at that time).</p>
+</section1>
+<section1 topic='Requirements' anchor='reqs'>
+  <p>This JEP addresses the following requirements:</p>
+  <ol>
+    <li><strong>Data Gathering</strong> -- the protocol should enable a form-processing entity (commonly a server, service, or bot) to gather data from a form-submitting entity (commonly a client controlled by a human user); this should be done via distinct data fields (e.g., items in a questionnaire or configuration form), each of which can be a different data "type" and enable free-form input or a choice between multiple options (as is familiar from HTML forms).</li>
+    <li><strong>Data Reporting</strong> -- the protocol should enable a form-processing entity to report data (e.g., search results) to a form-submitting entity, again via distinct data fields.</li>
+    <li><strong>Portability</strong> -- the protocol should as much as possible define generic data formats and basic datatypes only; hints may be provided regarding the user interface, but they should be hints only and not hard-and-fast requirements.</li>
+    <li><strong>Simplicity</strong> -- the protocol should be simple for clients to implement, and most of the complexity (e.g., data validation and processing) should be the responsibility of servers and components rather than clients.</li>
+    <li><strong>Flexibility</strong> -- the protocol should be flexible and extensible rather than "hard-coded".</li>
+    <li><strong>Compatibility</strong> -- the protocol should define an extension to existing Jabber/XMPP protocols and not break existing implementations unless absolutely necessary.</li>
+  </ol>
+</section1>
+<section1 topic='Protocol' anchor='protocol'>
+  <p>The base syntax for the 'jabber:x:data' namespace is as follows (a formal description can be found in the <link url="#schema">XML Schema</link> section below):</p>
+  <code><![CDATA[
+<x xmlns='jabber:x:data'
+   type='{form-type}'>
+  <title/>
+  <instructions/>
+  <field var='field-name'
+         type='{field-type}'
+         label='description'>
+    <desc/>
+    <required/>
+    <value>field-value</value>
+    <option label='option-label'><value>option-value</value></option>
+    <option label='option-label'><value>option-value</value></option>
+  </field>
+</x>
+  ]]></code>
+  <p>The &X; element qualified by the 'jabber:x:data' namespace SHOULD be included as a first-level child of an XML stanza; the stanza MAY be of any kind (&IQ;, &MESSAGE;, or &PRESENCE;), although it is RECOMMENDED to use &IQ; or &MESSAGE; (see also the restrictions enumerated below).</p>
+  <p>The OPTIONAL &lt;title/&gt; and &lt;instructions/&gt; elements enable the form-processing entity to label the form as a whole and specify natural-language instructions to be followed by the form-submitting entity. The XML character data for these elements SHOULD NOT contain newlines (the \n and \r characters), and any handling of newlines (e.g., presentation in a user interface) is unspecified herein; however, multiple instances of the &lt;instructions/&gt; element MAY be included.</p>
+  <section2 topic='Form Types' anchor='protocol-formtypes'>
+    <p>The data gathered or provided in a 'jabber:x:data' form can be situated in a number of different contexts. Examples include an empty form that needs to be filled out, a completed form, the results of a submission, a search result, or simply a set of data that is encapsulated using the 'jabber:x:data' namespace. The full context for the data is provided by three things:</p>
+    <ol>
+      <li>the "wrapper" protocol (i.e., the namespace whose root element is the direct child of the &IQ; stanza and the parent of the &X; element qualified by the 'jabber:x:data' namespace)</li>
+      <li>the place of the form within a transaction (e.g., an IQ "set" or "result") or structured conversation (e.g., a message &lt;thread/&gt;)</li>
+      <li>the 'type' attribute on the form's root &X; element</li>
+    </ol>
+    <p>The first two pieces of contextual information are provided by other protocols, whereas the form types are described in the following table.</p>
+    <table caption='Form Types'>
+      <tr>
+        <th>Type</th>
+        <th>Description</th>
+      </tr>
+      <tr>
+        <td>form</td>
+        <td>The form-processing entity is asking the form-submitting entity to complete a form.</td>
+      </tr>
+      <tr>
+        <td>submit</td>
+        <td>The form-submitting entity is submitting data to the form-processing entity.</td>
+      </tr>
+      <tr>
+        <td>cancel</td>
+        <td>The form-submitting entity has cancelled submission of data to the form-processing entity.</td>
+      </tr>
+      <tr>
+        <td>result</td>
+        <td>The form-processing entity is returning data (e.g., search results) to the form-submitting entity, or the data is a generic data set.</td>
+      </tr>
+    </table>
+    <p>In order to maintain the context of the data as captured in the form type, the following rules MUST be observed:</p>
+    <ul>
+      <li><p>For &IQ; stanzas, the root element qualified by the "wrapper" namespace in a form of type "form" or "submit" MUST be returned in a form of type "result". The &X; element qualified by the 'jabber:x:data' namespace MUST be a child of the "wrapper" namespace's root element. As defined in &xmppcore;, the 'id' attribute MUST be copied in the IQ result. For data forms of type "form" or "result", the &IQ; stanza SHOULD be of type "result".  For data forms of type "submit" or "cancel", the &IQ; stanza SHOULD be of type "set".</p></li>
+      <li><p>For &MESSAGE; stanzas, the &lt;thread/&gt; SHOULD be copied in the reply if provided. The &X; element qualified by the 'jabber:x:data' namespace MUST be a child of the &MESSAGE; stanza.</p></li>
+      <li><p>The only data form type allowed for &lt;presence/&gt; stanzas is "result". The &X; element qualified by the 'jabber:x:data' namespace MUST be a child of the &PRESENCE; stanza. In accordance with <strong>XMPP Core</strong>, use of data forms is not recommended unless necessary to provide information that is directly related to an entity's network availability.</p></li>
+    </ul>
+  </section2>
+  <section2 topic='The Field Element' anchor='protocol-field'>
+    <p>A data form of type "form", "submit", or "result" SHOULD contain at least one &lt;field/&gt; element; a data form of type "cancel" SHOULD NOT contain any &lt;field/&gt; elements.</p>
+    <p>The &lt;field/&gt; element MAY contain any of the following child elements:</p>
+    <ul>
+      <li><p><strong>&lt;desc/&gt;</strong> -- The XML character data of this element provides a natural-language description of the field, intended for presentation in a user-agent (e.g., as a "tool-tip", help button, or explanatory text provided near the field). The &lt;desc/&gt; element SHOULD NOT contain newlines (the \n and \r characters), since layout is the responsibility of a user agent, and any handling of newlines (e.g., presentation in a user interface) is unspecified herein. (Note: To provide a description of a field, it is RECOMMENDED to use a &lt;desc/&gt; element rather than a separate &lt;field/&gt; element of type "fixed".)</p></li>
+      <li><p><strong>&lt;required/&gt;</strong> -- This element, which MUST be empty, flags the field as required in order for the form to be considered valid.</p></li>
+      <li><p><strong>&lt;value/&gt;</strong> -- The XML character data of this element defines the default value for the field (according to the form-processing entity), the data provided by a form-submitting entity, or a data result. In data forms of type "form", if the form-processing entity provides a default value via the &lt;value/&gt; 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 &lt;value/&gt; element; all other field types MUST NOT contain more than one &lt;value/&gt; element.</p></li>
+      <li><p><strong>&lt;option/&gt;</strong> -- One of the options in a field of type "list-single" or "list-multi". The XML character of the &lt;value/&gt; child defines the option value, and the 'label' attribute defines a human-readable name for the option. The &lt;option/&gt; element MUST contain one and only one &lt;value/&gt; child. If the field is not of type "list-single" or "list-multi", it MUST NOT contain an &lt;option/&gt; element.</p></li>
+    </ul>
+    <p>If the &lt;field/&gt; 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 &lt;field/&gt; element MAY possess a 'label' attribute that defines a human-readable name for the field. For data forms of type "form", each &lt;field/&gt; 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.</p>
+    <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'>
+    <p>The following field types represent data "types" that are commonly exchanged between Jabber/XMPP entities. These field types are not intended to be as comprehensive as the datatypes defined in, for example, &w3xmlschema2;, nor do they define user interface elements.</p>
+    <table caption='Field Types'>
+      <tr>
+        <th>Type</th>
+        <th>Description</th>
+      </tr>
+      <tr>
+        <td>boolean</td>
+        <td>The field enables an entity to gather or provide an either-or choice between two options. The default value is "false". &BOOLEANNOTE;</td>
+      </tr>
+      <tr>
+        <td>fixed</td>
+        <td>The field is intended for data description (e.g., human-readable text such as "section" headers) rather than data gathering or provision. The &lt;value/&gt; child SHOULD NOT contain newlines (the \n and \r characters); instead an application SHOULD generate multiple fixed fields, each with one &lt;value/&gt; child.</td>
+      </tr>
+      <tr>
+        <td>hidden</td>
+        <td>The field is not shown to the form-submitting entity, but instead is returned with the form.</td>
+      </tr>
+      <tr>
+        <td>jid-multi *</td>
+        <td>The field enables an entity to gather or provide multiple Jabber IDs.</td>
+      </tr>
+      <tr>
+        <td>jid-single *</td>
+        <td>The field enables an entity to gather or provide a single Jabber ID.</td>
+      </tr>
+      <tr>
+        <td>list-multi</td>
+        <td>The field enables an entity to gather or provide one or more options from among many.</td>
+      </tr>
+      <tr>
+        <td>list-single</td>
+        <td>The field enables an entity to gather or provide one option from among many.</td>
+      </tr>
+      <tr>
+        <td>text-multi **</td>
+        <td>The field enables an entity to gather or provide multiple lines of text.</td>
+      </tr>
+      <tr>
+        <td>text-private</td>
+        <td>The field enables an entity to gather or provide a single line or word of text, which shall be obscured in an interface (e.g., *****).</td>
+      </tr>
+      <tr>
+        <td>text-single</td>
+        <td>The field enables an entity to gather or provide a single line or word of text, which may be shown in an interface. This field type is the default and MUST be assumed if a form-submitting entity receives a field type it does not understand.</td>
+      </tr>
+    </table>
+    <p>* Note: Data provided for fields of type "jid-single" or "jid-multi" MUST contain one or more valid Jabber IDs, where validity is determined by the addressing rules defined in <strong>XMPP Core</strong> (see the <link url='#validation'>Data Validation</link> section below).</p>
+    <p>** Note: Data provided for fields of type "text-multi" SHOULD NOT contain any newlines (the \n and \r characters). Instead, the application SHOULD split the data into multiple strings (based on the newlines inserted by the platform), then specify each string as the XML character data of a distinct &lt;value/&gt; element. Similarly, an application that receives multiple &lt;value/&gt; elements for a field of type "text-multi" SHOULD merge the XML character data of the value elements into one text block for presentation to a user, with each string separated by a newline character as appropriate for that platform.</p>
+  </section2>
+  <section2 topic='Multiple Items in Form Results' anchor='protocol-results'>
+    <p>In some contexts (e.g., the results of a search request), it may be necessary to communicate multiple items. Therefore, a data form of type "result" MAY contain two child elements not described in the basic syntax above: one &lt;reported/&gt; element followed by zero or more &lt;item/&gt; elements. The syntax is as follows:</p>
+    <code><![CDATA[
+<x xmlns='jabber:x:data'
+   type='result'>
+  <reported>
+    <field var='field-name' label='description' type='{field-type}'/>
+  </reported>
+  <item>
+    <field var='field-name'>
+      <value>field-value</value>
+    </field>
+  </item>
+  <item>
+    <field var='field-name'>
+      <value>field-value</value>
+    </field>
+  </item>
+  .
+  .
+  .
+</x>
+    ]]></code>
+    <p>Each of these elements MUST contain one or more &lt;field/&gt; children. The &lt;reported/&gt; element defines the data format for the result items by specifying the fields to be expected for each item; for this reason, the &lt;field/&gt; elements SHOULD possess a 'type' attribute and 'label' attribute in addition to the 'var' attribute, and SHOULD NOT contain a &lt;value/&gt; element. Each &lt;item/&gt; element defines one item in the result set, and MUST contain each field specified in the &lt;reported/&gt; element (although the XML character data of the &lt;value/&gt; element MAY be null).</p>
+  </section2>
+</section1>
+<section1 topic='Data Validation' anchor='validation'>
+  <p>Data validation is the responsibility of the form-processing entity (commonly a server, service, or bot) rather than the form-submitting entity (commonly a client controlled by a human user). This helps to meet the requirement for keeping client implementations simple. If the form-processing entity determines that the data provided is not valid, it SHOULD return a "Not Acceptable" error, optionally providing a textual explanation in the XMPP &lt;text/&gt; element or an application-specific child element that identifies the problem (see &jep0086; for information about mappings and formats).</p>
+</section1>
+<section1 topic='Examples' anchor='examples'>
+  <p>For the sake of the following examples, let us suppose that there exists a bot hosting service on the Jabber network, located at &lt;botster.shakespeare.lit&gt;. This service enables registered users to create and configure new bots, find and interact with existing bots, and so on. We will assume that these interactions occur using the &jep0050; protocol, which is used as a "wrapper" protocol for data forms qualified by the 'jabber:x:data' namespace. The examples in the sections that follow show most of the features of the data forms protocol described above.</p>
+  <p>Note: Additional examples can be found in the specifications for various using protocols, such as <strong>JEP-0045: Multi-User Chat</strong> and <strong>JEP-0055: Jabber Search</strong>.</p>
+  <section2 topic='Configuration' anchor='examples-config'>
+    <p>The first step is for a user to create a new bot on the hosting service. We will assume that this is done by sending a "create" command to the desired bot:</p>
+    <example caption="User Requests Bot Creation"><![CDATA[
+<iq from='romeo@montague.net/home'
+    to='joogle@botster.shakespeare.lit'
+    type='get'
+    xml:lang='en'
+    id='create1'>
+  <command xmlns='http://jabber.org/protocol/commands' 
+           node='create'
+           action='execute'/>
+</iq>
+    ]]></example>
+    <p>The hosting service then returns a data form to the user:</p>
+    <example caption="Service Returns Bot Creation Form"><![CDATA[
+<iq from='joogle@botster.shakespeare.lit'
+    to='romeo@montague.net/home'
+    type='result'
+    xml:lang='en'
+    id='create1'>
+  <command xmlns='http://jabber.org/protocol/commands'
+           node='create'
+           sessionid='create:20040408T0128Z'
+           status='executing'>
+    <x xmlns='jabber:x:data' type='form'>
+      <title>Bot Configuration</title>
+      <instructions>Fill out this form to configure your new bot!</instructions>
+      <field type='hidden'
+             var='FORM_TYPE'>
+        <value>jabber:bot</value>
+      </field>
+      <field type='fixed'><value>Section 1: Bot Info</value></field>
+      <field type='text-single'
+             label='The name of your bot'
+             var='botname'/>
+      <field type='text-multi'
+             label='Helpful description of your bot'
+             var='description'/>
+      <field type='boolean'
+             label='Public bot?'
+             var='public'>
+        <required/>
+      </field>
+      <field type='text-private'
+             label='Password for special access'
+             var='password'/>
+      <field type='fixed'><value>Section 2: Features</value></field>
+      <field type='list-multi'
+             label='What features will the bot support?'
+             var='features'>
+        <option label='Contests'><value>contests</value></option>
+        <option label='News'><value>news</value></option>
+        <option label='Polls'><value>polls</value></option>
+        <option label='Reminders'><value>reminders</value></option>
+        <option label='Search'><value>search</value></option>
+        <value>news</value>
+        <value>search</value>
+      </field>
+      <field type='fixed'><value>Section 3: Subscriber List</value></field>
+      <field type='list-single'
+             label='Maximum number of subscribers'
+             var='maxsubs'>
+        <value>20</value>
+        <option label='10'><value>10</value></option>
+        <option label='20'><value>20</value></option>
+        <option label='30'><value>30</value></option>
+        <option label='50'><value>50</value></option>
+        <option label='100'><value>100</value></option>
+        <option label='None'><value>none</value></option>
+      </field>
+      <field type='fixed'><value>Section 4: Invitations</value></field>
+      <field type='jid-multi'
+             label='People to invite'
+             var='invitelist'>
+        <desc>Tell all your friends about your new bot!</desc>
+      </field>
+    </x>
+  </command>
+</iq>
+    ]]></example>
+    <p>The user then submits the configuration form:</p>
+    <example caption="User Submits Bot Creation Form"><![CDATA[
+<iq from='joogle@botster.shakespeare.lit'
+    to='romeo@montague.net/home'
+    type='set'
+    xml:lang='en'
+    id='create2'>
+  <command xmlns='http://jabber.org/protocol/commands'
+           node='create'
+           sessionid='create:20040408T0128Z'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field type='hidden' var='FORM_TYPE'>
+        <value>jabber:bot</value>
+      </field>
+      <field type='text-single' var='botname'>
+        <value>The Jabber Google Bot</value>
+      </field>
+      <field type='text-multi' var='description'>
+        <value>This bot enables you to send requests to</value>
+        <value>Google and receive the search results right</value>
+        <value>in your Jabber client. It&apos; really cool!</value>
+        <value>It even supports Google News!</value>
+      </field>
+      <field type='boolean' var='public'>
+        <value>0</value>
+      </field>
+      <field type='text-private' var='password'>
+        <value>v3r0na</value>
+      </field>
+      <field type='list-multi' var='features'>
+        <value>news</value>
+        <value>search</value>
+      </field>
+      <field type='list-single' var='maxsubs'>
+        <value>50</value>
+      </field>
+      <field type='jid-multi' var='invitelist'>
+        <value>juliet@capulet.com</value>
+        <value>benvolio@montague.net</value>
+      </field>
+    </x>
+  </command>
+</iq>
+    ]]></example>
+    <p>The service then returns the results to the user:</p>
+    <example caption="Service Returns Bot Creation Result"><![CDATA[
+<iq from='joogle@botster.shakespeare.lit'
+    to='romeo@montague.net/home'
+    type='result'
+    xml:lang='en'
+    id='create2'>
+  <command xmlns='http://jabber.org/protocol/commands'
+           node='create'
+           sessionid='create:20040408T0128Z'
+           status='completed'>
+    <x xmlns='jabber:x:data' type='result'>
+      <field type='hidden' var='FORM_TYPE'>
+        <value>jabber:bot</value>
+      </field>
+      <field type='text-single' var='botname'>
+        <value>The Jabber Google Bot</value>
+      </field>
+      <field type='boolean' var='public'>
+        <value>0</value>
+      </field>
+      <field type='text-private' var='password'>
+        <value>v3r0na</value>
+      </field>
+      <field type='list-multi' var='features'>
+        <value>news</value>
+        <value>search</value>
+      </field>
+      <field type='list-single' var='maxsubs'>
+        <value>50</value>
+      </field>
+      <field type='jid-multi' var='invitelist'>
+        <value>juliet@capulet.com</value>
+        <value>benvolio@montague.net</value>
+      </field>
+    </x>
+  </command>
+</iq>
+    ]]></example>
+  </section2>
+  <section2 topic='Search' anchor='examples-search'>
+    <p>Now that the user has created this search bot, let us suppose that one of the friends he has invited decides to try it out by sending a search request:</p>
+    <example caption="User Requests Search Form"><![CDATA[
+<iq from='juliet@capulet.com/chamber'
+    to='joogle@botster.shakespeare.lit'
+    type='get'
+    xml:lang='en'
+    id='search1'>
+  <command xmlns='http://jabber.org/protocol/commands' 
+           node='search'
+           action='execute'/>
+</iq>
+    ]]></example>
+    <example caption="Service Returns Search Form"><![CDATA[
+<iq from='joogle@botster.shakespeare.lit'
+    to='juliet@capulet.com/chamber'
+    type='result'
+    xml:lang='en'
+    id='search1'>
+  <command xmlns='http://jabber.org/protocol/commands' 
+           node='search'
+           status='executing'>
+    <x xmlns='jabber:x:data' type='form'>
+      <title>Joogle Search</title>
+      <instructions>Fill out this form to search for information!</instructions>
+      <field type='text-single'
+             var='search_request'>
+        <required/>
+      </field>
+    </x>
+  </command>
+</iq>
+    ]]></example>
+    <example caption="User Submits Search Form"><![CDATA[
+<iq from='juliet@capulet.com/chamber'
+    to='joogle@botster.shakespeare.lit'
+    type='get'
+    xml:lang='en'
+    id='search2'>
+  <command xmlns='http://jabber.org/protocol/commands' 
+           node='search'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field type='text-single' var='search_request'>
+        <value>verona</value>
+      </field>
+    </x>
+  </command>
+</iq>
+    ]]></example>
+    <example caption="Service Returns Search Results"><![CDATA[
+<iq from='joogle@botster.shakespeare.lit'
+    to='juliet@capulet.com/chamber'
+    type='result'
+    xml:lang='en'
+    id='search2'>
+  <command xmlns='http://jabber.org/protocol/commands' 
+           node='search'
+           status='completed'>
+    <x xmlns='jabber:x:data' type='result'>
+      <title>Joogle Search: verona</title>
+      <reported>
+        <field var='name'/>
+        <field var='url'/>
+      </reported>
+      <item>
+        <field var='name'>
+          <value>Comune di Verona - Benvenuti nel sito ufficiale</value>
+        </field>
+        <field var='url'>
+          <value>http://www.comune.verona.it/</value>
+        </field>
+      </item>
+      <item>
+        <field var='name'>
+          <value>benvenuto!</value>
+        </field>
+        <field var='url'>
+          <value>http://www.hellasverona.it/</value>
+        </field>
+      </item>
+      <item>
+        <field var='name'>
+          <value>Universita degli Studi di Verona - Home Page</value>
+        </field>
+        <field var='url'>
+          <value>http://www.univr.it/</value>
+        </field>
+      </item>
+      <item>
+        <field var='name'>
+          <value>Aeroporti del Garda</value>
+        </field>
+        <field var='url'>
+          <value>http://www.aeroportoverona.it/</value>
+        </field>
+      </item>
+      <item>
+        <field var='name'>
+          <value>Veronafiere - fiera di Verona</value>
+        </field>
+        <field var='url'>
+          <value>http://www.veronafiere.it/</value>
+        </field>
+      </item>
+    </x>
+  </command>
+</iq>
+    ]]></example>
+  </section2>
+</section1>
+<section1 topic='Security Considerations' anchor='security'>
+  <p>There are no security concerns related to this specification above and beyond those described in the relevant section of <strong>XMPP Core</strong>.</p>
+</section1>
+<section1 topic='IANA Considerations' anchor='iana'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations' anchor='registrar'>
+  <section2 topic='Protocol Namespaces' anchor='registrar-namespaces'>
+    <p>The &REGISTRAR; includes the 'jabber:x:data' namespace in its registry of protocol namespaces.</p>
+  </section2>
+  <section2 topic='Parameter Values' anchor='registrar-parameters'>
+    <p>The Jabber Registrar maintains a registry of parameter values related to the 'jabber:x:data' namespace, specifically as defined in &jep0068;; the registry is located at &lt;<link url="http://www.jabber.org/registrar/formtypes.html">http://www.jabber.org/registrar/formtypes.html</link>&gt;.</p>
+  </section2>
+</section1>
+<section1 topic='XML Schema' anchor='schema'>
+  <p>This schema is descriptive, not normative.</p>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:x:data'
+    xmlns='jabber:x:data'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0004: http://www.jabber.org/jeps/jep-0004.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='x'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='instructions' 
+                    minOccurs='0' 
+                    maxOccurs='unbounded' 
+                    type='xs:string'/>
+        <xs:element name='title' minOccurs='0' type='xs:string'/>
+        <xs:element ref='field' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='reported' minOccurs='0' maxOccurs='1'/>
+        <xs:element ref='item' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='type' use='required'>
+        <xs:simpleType>
+          <xs:restriction base='xs:NCName'>
+            <xs:enumeration value='cancel'/>
+            <xs:enumeration value='form'/>
+            <xs:enumeration value='result'/>
+            <xs:enumeration value='submit'/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='field'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='desc' minOccurs='0' type='xs:string'/>
+        <xs:element name='required' minOccurs='0' type='empty'/>
+        <xs:element ref='value' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='option' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='label' type='xs:string' use='optional'/>
+      <xs:attribute name='type' use='optional' default='text-single'>
+        <xs:simpleType>
+          <xs:restriction base='xs:NCName'>
+            <xs:enumeration value='boolean'/>
+            <xs:enumeration value='fixed'/>
+            <xs:enumeration value='hidden'/>
+            <xs:enumeration value='jid-multi'/>
+            <xs:enumeration value='jid-single'/>
+            <xs:enumeration value='list-multi'/>
+            <xs:enumeration value='list-single'/>
+            <xs:enumeration value='text-multi'/>
+            <xs:enumeration value='text-private'/>
+            <xs:enumeration value='text-single'/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name='var' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='option'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='value'/>
+      </xs:sequence>
+      <xs:attribute name='label' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='value' type='xs:string'/>
+
+  <xs:element name='reported'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='field' maxOccurs='unbounded'/>
+      </xs:sequence>
+    </xs:complexType>
+    <xs:annotation>
+      <xs:documentation>
+        When contained in a "reported" element, the "field" element
+        SHOULD NOT contain a "value" child.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name='item'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='field' maxOccurs='unbounded'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+  ]]></code>
+</section1>
+<section1 topic='Changes Between Draft and Final' anchor='draft-to-final'>
+  <p>The following protocol changes were incorporated in the Final specification as a result of experience with the Draft specification (described in version 1.0 of this document):</p>
+  <ul>
+    <li>The &lt;x/&gt; element MAY be included in &lt;message/&gt; and &lt;presence/&gt; elements.</li>
+    <li>The &lt;x/&gt; element MAY contain a &lt;title/&gt; child for forms and results.</li>
+    <li>The &lt;x/&gt; element MUST possess a 'type' attribute.</li>
+    <li>A &lt;field/&gt; element MAY be of type='jid-single'.</li>
+    <li>Results MAY be reported back in &lt;item/&gt; tags.</li>
+    <li>Results MAY contain a &lt;reported/&gt; element with result set.</li>
+    <li>The &lt;reported/&gt; fields MAY possess a 'type' attribute to provide hints about how to interact with the data (type='jid-single' being the most useful).</li>
+  </ul>
+</section1>
+</jep>
diff --git a/xep-0005.xml b/xep-0005.xml
new file mode 100644
index 00000000..9820bc7b
--- /dev/null
+++ b/xep-0005.xml
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Jabber Interest Groups</title>
+  <abstract>This is the official list and summary information of the Jabber Interest Groups.</abstract>
+  &LEGALNOTICE;
+  <number>0005</number>
+  <status>Obsolete</status>
+  <type>Informational</type>
+  <jig>None</jig>
+  <author>
+    <firstname>Jeremie</firstname>
+    <surname>Miller</surname>
+    <email>jer@jabber.org</email>
+  </author>
+  <revision>
+    <version>1.1</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Changed Status to Obsolete per approval of JEP-0019.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-07-03</date>
+    <initials>jer</initials>
+    <remark>First Post! ;)</remark>
+  </revision>
+</header>
+
+<section1 topic='Standards Compliance'>
+  <ul>
+    <li>Michael Bauer / bauer@jabber.com</li>
+    <li>Julian Missig / julian@jabber.org</li>
+    <li>Terry Smelser / tsmelser@sltscommunications.net</li>
+    <li>DJ Adams / dj.adams@pobox.com</li>
+    <li>Mike Szczerban / mikeszcz@delanet.com</li>
+  </ul>
+  <p>Determine standards for implementing derivative trademarks (e.g., "100% Jabber Protocol Compliant") and test software and services for compliance.</p>
+</section1>
+
+<section1 topic='File Transfer and Out Of Band data (OOB)'>
+  <ul>
+    <li>Ryan Eatmon / reatmon@jabber.org</li>
+    <li>Jer / jer@jabber.org</li>
+    <li>Stephen Lee / srlee@myjabber.org</li>
+    <li>Jim Powell / PowellJF@navair.navy.mil</li>
+    <li>Zad / zadk@mynet.com</li>
+    <li>Michael J. Emswiler / memswiler@hotmail.com</li>
+  </ul>
+  <p>Resolve issues around using the jabber:*:oob namespaces, and explore extending them to support additional requirements for managing multimedia streams (SIP).
+Create additional protocols and methods to assist exchanging OOB data in heterogeneous environments where direct connections are not possible (PASS).</p>
+</section1>
+
+<section1 topic='Security'>
+  <ul>
+    <li>Thomas Muldowney / temas@jabber.org</li>
+    <li>Al Sutton / al@alsutton.com</li>
+    <li>Rahul Dave / rahul@mozdev.org</li>
+  </ul>
+  <p>Focusing on authentication, message encryption, connection security, etc.</p>
+</section1>
+
+<section1 topic='Forms'>
+  <ul>
+    <li>Ryan Eatmon / reatmon@jabber.org</li>
+    <li>Thomas Muldowney / temas@jabber.org</li>
+    <li>Adam Theo / adamtheo@theoretic.com</li>
+    <li>Mike Szczerban / mikeszcz@delanet.com</li>
+    <li>Michael J. Emswiler / memswiler@hotmail.com</li>
+  </ul>
+  <p>To define a new namespace for dynamic forms.  Minimally to supplant jabber:iq:register and jabber:iq:search.</p>
+</section1>
+
+<section1 topic='Text Formatting'>
+  <ul>
+    <li>Julian Missig / julian@jabber.org</li>
+    <li>Michael J. Emswiler / memswiler@hotmail.com</li>
+  </ul>
+  <p>Will determine the protocol for sending and receiving formatted messages in Jabber (XHTML-Basic)</p>
+</section1>
+
+<section1 topic='Browsing'>
+  <ul>
+    <li>Jer / jer@jabber.org</li>
+    <li>Peter Millard / me@pgmillard.com</li>
+    <li>David Waite / dwaite@jabber.com</li>
+  </ul>
+  <p>The replacement for agents, including extensible directory lookups and namespace feature negotiation. Defined as a draft protocol but needs additional work.</p>
+</section1>
+
+<section1 topic='Presence Management'>
+  <ul>
+    <li>Dave Smith / dave@jabber.org</li>
+    <li>Oliver Wing / owing@vianetworks.co.uk</li>
+    <li>David Waite / dwaite@jabber.com</li>
+    <li>Rahul Dave / rahul@mozdev.org</li>
+    <li>Peter Millard / me@pgmillard.com</li>
+  </ul>
+  <p>Describe in detail how presence management currently works, and work on proposals for things like invisibility.</p>
+</section1>
+
+</jep>
+
diff --git a/xep-0006.xml b/xep-0006.xml
new file mode 100644
index 00000000..2afa9927
--- /dev/null
+++ b/xep-0006.xml
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Profiles</title>
+  <abstract>A proposal for a more powerful and extensible protocol for the management of personal information within Jabber.</abstract>
+  &LEGALNOTICE;
+  <number>0006</number>
+  <status>Obsolete</status>
+  <type>JIG Formation</type>
+  <jig>Forms, Security</jig>
+  <author>
+    <firstname>Adam</firstname>
+    <surname>Theo</surname>
+    <email>adamtheo@theoretic.com</email>
+    <jid>adamtheo@theoretic.com</jid>
+  </author>
+  <author>
+    <firstname>Michael</firstname>
+    <surname>Hearn</surname>
+    <email>mhearn@subdimension.com</email>
+    <jid>tweedledee@jabber.org</jid>
+  </author>
+  <author>
+    <firstname>Eric</firstname>
+    <surname>Murphy</surname>
+    <email>ericmurphy@jabber.org</email>
+    <jid>ericmurphy@jabber.org</jid>
+  </author>
+  <revision>
+    <version>1.1</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Changed Status to Obsolete per approval of JEP-0019.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-07-30</date>
+    <initials>at</initials>
+    <remark>Initial release</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>Although popular, the vCard spec is too inflexible and limited. These problems become apparent when a User wants to set information outside the scope of the vCard in a standard format others will know is there. The so called 'IQ-Set' in custom namespaces is not sufficient because set information is often not in a standard format that others recognize or support. A short list of problems with vCard:</p>
+  <ul>
+    <li>It is inflexible, as you can only store information that is defined by a subset of the vCard format.</li>
+    <li>It is inefficient, as the whole vCard must be retrieved even if all you want to know is the name of a user.</li>
+    <li>It is impersonal, as the vCard format was designed for electronic business cards, and as such is focused on things like business contact details. We believe that people should be able to describe themselves in much greater detail than this.</li>
+    <li>It is unreliable, as the data is not controlled or verified by any program. I have had many problems in the past with corrupted vCards.</li>
+  </ul>
+  <p>But instead of bringing down the entire customization of the 'IQ-Set' to only pre-defined schemas, it is important to keep the flexibility and power of it.</p>
+  <p>Therefore, we propose that Jabber needs a very flexible, extensible, and powerful information structure and retrieval system. There exist four aspects to solve for when designing an improved information storage and retrieval system for any platform, especially Jabber: Interface, Structure, Storage, and Gate.</p>
+</section1>
+<section1 topic='Specification'>
+  <section2 topic='Interface'>
+    <p>Interface is the process, steps, and protocol a Service has to go through to access the information with the User's approval, for the User to approve or reject the access, and the User's Server to manage and secure it all.</p>
+    <p>Although it will be part of the Jabber protocol, it is still undecided how heavily the Profiles specification will rely on and use the Jabber system. This is the first thing that will have to be decided on, but thankfully there are some plans we have already outlined as possibilities, listed at the <link url="http://www.theoretic.com/identity">Theoretic Identity</link> website.</p>
+  </section2>
+  <section2 topic='Structure'>
+    <p>Structure is the format that the information will be stored in and accessed by. It will have to be very flexible, likely eventually allowing the User to specify the info-sets they want to use instead of having them all set by this project.</p>
+    <p>The personal information will be stored in XML documents or info-sets, called 'Profiles', possibly making use of RDF, and usually following Schema specifications, although that should not be a requirement.</p>
+  </section2>
+  <section2 topic='Storage'>
+    <p>Storage is describing and accessing the physical location where the Profiles are kept. It will likely start off being only the Jabber Server, but will eventually allow for remote (specialized network hard drive services) and local (on the User's local machine or a portable floppy) storage. It also describes how this data will be transferred between computers and networks in an efficient and secure manner.</p>
+    <p>This will likely be the most other-JIG dependent part of the system, since we will have to make heavy use of encryption in Jabber, and likely file transfers. So we may want to help out those related JIGs when we get to this point to make sure their results can be used by this system.</p>
+  </section2>
+  <section2 topic='Gate'>
+    <p>Gate gives the User complete control at all times of others' access to and power over their Profiles. Since this system is designed to hold the bulk, if not all, of a User's personal information, they *must* have a powerful way to prevent unwanted others to access their data. So there must exist a powerful access regulation framework to precisely control which, when, and how other parties can get this information.</p>
+    <p>Since we want this kept flexible and very secure, the techniques used in this system will likely be a new Jabber server module that receives special 'jabber:profiles' namespaces, compares the sending JID to a User-stored list of permission-granted JIDs, and acts upon the message accordingly, either following through or rejecting the requested transfer of information.</p>
+  </section2>
+</section1>
+<section1 topic='Road-map'>
+  <p>To make sure this project progresses smoothly and orderly, it has been decided it will be split up into steps, or 'Phases'. Each of the above four aspects will be split into two to four Phases, and the Road-map for the entire project will follow along these Phases. Version 1.0 of the Profiles system will be little more than an expanded vCard schema with simple rules and permissions to regulate access to it. It will progress up to Version 4.0 or 5.0, adding in advanced verification to persuade Services to use a User's Jabber Profiles instead of forcing them to set up a local account, and also adding write permissions so Services can set receipts of purchases and similar information in a User's Account.</p>
+  <p>This Road-map will be produced soon after the JIG is set up, and will give a good feature list and time-line to follow.</p>
+</section1>
+<section1 topic='Benefits'>
+  <p>Such an improved system would obviously provide for more types of information storage and management, but there are some other side-benefits that can be conceived of.</p>
+  <ul>
+    <li>Since the User will have all personal information in their one account, and Services can retrieve this information with permission, this could mean no more having to fill out forms, especially account sign-up forms with Services. The information can be automatically retrieved and filled in for you. This is similar to client-side form-filler applications, except it can be used from any computer, no matter what software it has installed on it.</li>
+    <li>With write permission allowed to Services by the User, the Service can store their own Profiles about you in your Jabber Account. Information such as your Amazon wish list, receipts of purchases, calendar events, etc. This is similar to what Services do now, except you have control over where and how this information is physically stored and accessed.</li>
+    <li>Also, with an advanced authentication system (which will be the focus of a future JIG), a Service could use your Jabber Account to verify you are who you say you are, instead of requiring you set up a new account just with them. This is often called 'Universal Accounts', and similar to Microsoft's Passport and AOL's new Magic Carpet services.</li>
+    <li>With cookies and other auto-detection methods allowed by the User, Services can automatically detect their JID from the web browser or other tool. This eliminates the step of the User having to type in their JID, and can make this system all the more seamless to them. Combined with the above universal account benefit, this is similar to single sign-on systems such as Microsoft's Passport or AOL's new Magic Carpet.</li>
+  </ul>
+</section1>
+<section1 topic='Conclusion'>
+  <p>Eventually we would like this Profiles specification to completely replace the strict vCard schema that is 'hard-coded' into the protocol. We do not expect vCard to disappear from Jabber at all, simply be one possible Profile among many in a User's Account. At the end of this JIGs existence, we would like to see it integrate the Profiles and special 'jabber:profiles' namespaces fully into the rest of the Jabber protocol, having it become the method by which all User information (such as Roster, client-side preferences, and filters) is stored and retrieved.</p>
+  <p>It is important to note that this JIG will not be a stand-alone JIG. It will draw upon many other JIGs (that currently exist and that have yet to be created). It will need encryption from the Security JIG for safe transfer of the information, a versatile forms format from the Forms JIG for Profiles administration, and advanced authentication from a future JIG for Services to authenticate the User against their Jabber account.</p>
+</section1>
+<section1 topic='History'>
+  <p>The concept of Jabber Profiles was started by Eric Murphy and Mike Hearn. They both had begun to come up with similar ideas, but did not meet and exchange ideas until around early 2001. Adam Theo also came across them soon after that, and after some discussion, the three authors of this JEP agreed to start a serious effort on developing it. We started it as a project at Theoretic Solutions (<link url="http://www.theoretic.com/identity/">http://www.theoretic.com/identity/</link>), although at that time it was as a full-fledged identity specification, complete with Profiles, Authentication, and Trust. It was not until we have now moved to set it up as an official JIG that we have split the individual parts up, to make it easier to develop.</p>
+</section1>
+</jep>
diff --git a/xep-0007.xml b/xep-0007.xml
new file mode 100644
index 00000000..8c883609
--- /dev/null
+++ b/xep-0007.xml
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Conferencing JIG</title>
+  <abstract>A proposal for a Jabber Interest Group that will discuss the protocol for implementing many-to-many communications.</abstract>
+  &LEGALNOTICE;
+  <number>0007</number>
+  <status>Obsolete</status>
+  <type>JIG Proposal</type>
+  <jig>Conferencing</jig>
+  <author>
+    <firstname>David</firstname>
+    <surname>Waite</surname>
+    <email>akuma@jabber.org</email>
+    <jid>akuma@jabber.org</jid>
+  </author>
+  <revision>
+    <version>1.1</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Changed Status to Obsolete per approval of JEP-0019.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-08-03</date>
+    <initials>akuma</initials>
+    <remark>Initial version</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>The following proposal is for the formation of a Jabber Interest Group that will create a new conferencing protocol, as well as create additional functionality and standardize communications on top of said conferencing protocol.</p>
+</section1>
+<section1 topic='Base conferencing protocol'>
+  <p>The initial task of the Conferencing JIG will be to propose a Jabber Conferencing specification that will solve various problems which exist in the current "groupchat" specification. This specification is meant to be a foundation for additional functionality; it defines the framework needed to provide additional features, without requiring changes to the framework specification itself. There is also to be a certain amount of feature-negotiation included; the conferencing service can define what features can be declared for a room, both as optional and required client features for room participation.</p>
+  <p>The framework's scope consists of the following minimum functionality:</p>
+  <ul>
+    <li>Browsing a list of public rooms</li>
+    <li>Finding a public room based on search parameters</li>
+    <li>Creating new rooms</li>
+    <li>Destroying rooms</li>
+    <li>Entering existing rooms</li>
+    <li>Altering functionality of a room</li>
+    <li>Querying a room for public information</li>
+    <li>Sending and accepting invitations to a room</li>
+    <li>Changing a participant's nickname within a room</li>
+    <li>Discovering and changing features on a running room</li>
+    <li>Changing a participant's status within a room</li>
+    <li>Sending a message to a room or a specific participant within a room</li>
+  </ul>
+  <p>In addition to these basic functions, we can imagine numerous different types of conferencing features; for example, hidden rooms created on the fly for discussions between a Jabber user and their friends or co-workers, transports providing access to similar foreign systems such as IRC, additional client functionality such as shared-location (URL/Co-browsing) and whiteboarding, and so on. There might also be requirements for security levels (for instance, normal participant, moderator, and room admin).  Additional information may also be conveyed to users about one another, such as a user's real Jabber ID. Room entry or participation within a discussion might also have restrictions on some systems.</p>
+  <p>The framework protocol is meant to provide a basis for designing these additional features. Some features, such as co-browsing, could be implemented entirely client-side; others may require significant logic within the conferencing implementation. In addition, some features may be optional for participation within a room, while other features could be required in order for a client to participate within a room.</p>
+</section1>
+<section1 topic='Justification for new Conferencing protocol'>
+  <p>While the current "groupchat" specification is rather simple to implement, it is rather inflexible and cannot easily be extended; specifically, it has the following disadvantages:</p>
+  <ul>
+    <li>There is no control over how you enter a room - for instance, you can not specify a password for entering a password-protected room.</li>
+    <li>There is no way to create a room without entering it, and no way to tell the state of the room without being a participant within it. This means among other things that a client can not transparently use groupchat for starting multi-user chats.</li>
+    <li>Changes in room state are often conveyed via text messages rather than XML.  Among other things, this limits the display of messages to the English language and limits a client author's freedom in displaying this information.</li>
+    <li>A Participant's entry into a room is abstracted from their real Jabber account in both the old and new protocols; however, "groupchat" provides no way of tracking users across nickname changes or across sessions within a conference room.</li>
+    <li>The "groupchat" protocol has no way of performing feature negotiation (e.g., specifying the additional protocol elements needed to participate in a room, or optionally allowed from participants within a room). If there were participants with clients sending custom data through the room (such as XHTML or whiteboarding), you would receive that information even without your client being able to support it, and have no way of distinguishing altered behavior due to additional features of a "groupchat" implementation.</li>
+  </ul>
+  <p>This new conferencing protocol will be designed to solve these problems.</p>
+  <p>Because of the prevalence of the existing "groupchat" specification for multi-user chats, a long conversion process is anticipated.  A server implementation which supports both protocols will simply not allow "groupchat"-only clients to participate in rooms with required features.</p> 
+</section1>
+<section1 topic='Continuing Development'>
+  <p>As listed above, there is a fairly large number of features that could be developed on top of a well-designed framework. The Conferencing JIG will first be established to develop a framework, with features mainly being compared against the framework for feasibility of implementation. After a proposal has been formalized as a specification, the JIG will become a group for discussing and proposing new features, and for formally specifying those features.</p>
+</section1>
+</jep>
diff --git a/xep-0008.xml b/xep-0008.xml
new file mode 100644
index 00000000..d79e21bc
--- /dev/null
+++ b/xep-0008.xml
@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>IQ-Based Avatars</title>
+  <abstract>This JEP provides historical documentation of an IQ-based protocol for exchanging user avatars.</abstract>
+  &LEGALNOTICE;
+  <number>0008</number>
+  <status>Deferred</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <approver>Council</approver>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XMPP IM</spec>
+  </dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>None</supersededby>
+  <shortname>None</shortname>
+  &temas;
+  &xvirge;
+  <author>
+    <firstname>Jens</firstname>
+    <surname>Alfke</surname>
+    <email>jens@mac.com</email>
+  </author>
+  &pgmillard;
+  <revision>
+    <version>0.3</version>
+    <date>2005-06-16</date>
+    <initials>psa</initials>
+    <remark>Coincident with publication of JEP-0153, changed type to Historical.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2003-05-06</date>
+    <initials>psa</initials>
+    <remark>At the request of the authors, the status of this JEP has been changed to Retracted, to be superseded by a forthcoming JEP. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-09-14</date>
+    <initials>tm</initials>
+    <remark>Initial release</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>Many communication applications now allow for the association of a small image or buddy icon (avatar) with a user of that application. The avatar is not intended to be a defining portrait of the user, but rather a simple expression of the user's appearance, mood, status, and the like. This proposal outlines a way to incorporate avatars into the current Jabber platform.</p>
+</section1>
+<section1 topic='Image Requirements'>
+  <p>Certain restrictions are placed upon the image. First, the image height and width must be between thirty-two (32) and sixty-four (64) pixels. The suggested size is sixty-four (64) pixels high and sixty-four (64) pixels wide <note>It is highly recommended that clients never scale up images when displaying them.</note>. Images should be square, but this is not required. Images should be in GIF, JPEG, or PNG format, although it is possible that in future revisions of this spec more formats will be allowed. Finally, images must use less than eight (8) kilobytes of data.</p>
+</section1>
+<section1 topic='Avatar Availability'>
+  <p>There are two methods of showing that a client has an avatar available:</p>
+  <ol>
+    <li>Embedding the jabber:x:avatar namespace within &#60;presence/&#62; packets using Jabber's &#60;x/&#62; element</li>
+    <li>Displaying the jabber:iq:avatar namespace in browse requests</li>
+  </ol>
+  <p>Partly because Jabber browsing is relatively undeveloped, this proposal focuses on the first option.</p>
+  <p>The &#60;x/&#62; element in the jabber:x:avatar namespace contains a SHA1 hash (hexadecimal, not base64) of the image data itself (not the base64-encoded version) in a &#60;hash/&#62; element. (Because the odds of creating an identical hash are small, the hash is considered unique to the image and can be used to cache images between client sessions, resulting in fewer requests for the image.) The initial announcement of the availability of an avatar is done by sending a presence packet with the jabber:x:avatar information, as follows:</p>
+  <example>
+&#60;presence&#62;
+  &#60;x xmlns='jabber:x:avatar'&#62;
+    &#60;hash&#62;SHA1 of image data&#60;/hash&#62;
+  &#60;/x&#62;
+&#60;/presence&#62;
+  </example>
+  <p>If the avatar-generating user changes the avatar, a new presence packet is sent out with the updated information:</p>
+  <example>
+&#60;presence&#62;
+  &#60;x xmlns='jabber:x:avatar'&#62;
+    &#60;hash&#62;SHA1 of new image data&#60;/hash&#62;
+  &#60;/x&#62;
+&#60;/presence&#62;
+  </example>
+  <p>To disable the avatar, the avatar-generating user's client will send a presence packet with the jabber:x:avatar namespace but with no hash information:</p>
+  <example>
+&#60;presence&#62;
+  &#60;x xmlns='jabber:x:avatar'/&#62;
+&#60;/presence&#62;
+  </example>
+  <p>Clients should send the current avatar hash in every &#60;presence/&#62; packet even if the avatar has not changed. Remember that other clients logging in will receive a copy of the most recent &#60;presence/&#62; element, which should therefore always contain the most recent avatar hash. However, if the client's connection is lost unexpectedly or the client disconnects without sending an unavailable presence, the server will send other clients a &#60;presence/&#62; element containing no jabber:x:avatar extension. Therefore if, after receiving one or more presence packets containing jabber:x:avatar information, an avatar-receiving client receives a presence packet that does not include the jabber:x:avatar namespace, it is recommended that the client save the avatar image until the next set of information is received. In this case the avatar-generating client might send something as simple as the following:</p>
+  <example>
+&#60;presence/&#62;
+  </example>
+</section1>
+<section1 topic='Avatar Retrieval'>
+  <p>There are two methods for retrieving the actual avatar data:</p>
+  <ol>
+    <li>An exchange between clients of &#60;iq/&#62; elements in the jabber:iq:avatar namespace</li>
+    <li>Public XML storage from the avatar-generating client to the server and public XML retrieval from the server to the avatar-requesting client <note>Refer to the <link url="http://docs.jabber.org/draft-proto/html/xml.html">Generic XML Namespace Storage</link> draft protocol.</note></li>
+  </ol>
+  <p>The first of these methods is preferred. On this model, a query is sent directly to the avatar-generating client using an &#60;iq/&#62; element of type "get" in the jabber:iq:avatar namespace <note>Whenever possible, the avatar-requesting client should attempt to determine if the avatar-generating client has an avatar available before requesting it.</note> <note>It is suggested that no request be made if it is known (such as through a browse reply) that a client does not support the jabber:iq:avatar namespace.</note>:</p>
+  <example>
+&#60;iq id='2' type='get' to='user@server/resource'&#62;
+  &#60;query xmlns='jabber:iq:avatar'/&#62;
+&#60;/iq&#62;
+  </example>
+  <p>The avatar-generating client will reply with an &#60;iq/&#62; element of type "result" in the jabber:iq:avatar namespace; this reply will contain a query element that in turn contains a &#60;data/&#62; element with the MIME type in the 'mimetype' attribute and the data base64-encoded in the body of the &#60;data/&#62; element:</p>
+  <example>
+&#60;iq id='2' type='result' to='user@server/resource'&#62;
+  &#60;query xmlns='jabber:iq:avatar'&#62;
+    &#60;data mimetype='image/jpeg'&#62;
+      Base64-Encoded Data
+    &#60;/data&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+  </example>
+  <p>If the first method fails, the second method that should be attempted by sending a request to the server for the avatar-generating user's public XML containing the avatar data. This data is to be stored in the storage:client:avatar namespace. This method presumes that the avatar-generating client has already stored its avatar data on the server:</p>
+  <example>
+&#60;iq id='0' type='set' to='user@server'&#62;
+  &#60;query xmlns='storage:client:avatar'&#62;
+    &#60;data mimetype='image/jpeg'&#62;
+      Base64 Encoded Data
+    &#60;/data&#62;
+  &#60;/query&#62;
+&#60;/iq&#62;
+  </example>
+  <p>Once such data has been set, the avatar can be retrieved by any requesting client from the avatar-generating client's public XML storage:</p>
+  <example>
+&#60;iq id='1' type='get' to='user@server'&#62;
+  &#60;query xmlns='storage:client:avatar'/&#62;
+&#60;/iq&#62;
+  </example>
+</section1>
+<section1 topic='Future Considerations'>
+  <p>It is acknowledged that sending avatar information within presence packets is less than desirable in many respects (e.g., in network traffic generated); however, there currently exists in Jabber no generic framework for addressing these shortcomings. Possible solutions on the horizon include live browsing and a pub/sub model, but these are still embryonic and experimental. Once something of that nature is accepted by the Council, the avatar spec will be modified to work within that framework rather than by attaching to presence.</p>
+</section1>
+
+<section1 topic='Author Note' anchor='authornote'>
+  <p>Peter Millard, a co-author of this specification from version 0.1 through version 0.3, died on April 26, 2006.</p>
+</section1>
+
+</jep>
diff --git a/xep-0009.xml b/xep-0009.xml
new file mode 100644
index 00000000..c1a05303
--- /dev/null
+++ b/xep-0009.xml
@@ -0,0 +1,316 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>	
+  <title>Jabber-RPC</title>
+  <abstract>This JEP defines a method for transporting XML-RPC encoded requests and responses over Jabber/XMPP.</abstract>
+  &LEGALNOTICE;
+  <number>0009</number>
+  <status>Final</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XML-RPC</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>jabber-rpc</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/jabber-rpc/jabber-rpc.xsd</url>
+  </schemaloc>
+  <author>
+    <firstname>DJ</firstname>
+    <surname>Adams</surname>
+    <email>dj.adams@pobox.com</email>
+    <jid>dj@gnu.mine.nu</jid>
+  </author>
+  <revision>
+    <version>2.1</version>
+    <date>2006-02-09</date>
+    <initials>psa</initials>
+    <remark>Defined error handling, service discovery, security considerations, and Jabber Registrar considerations.</remark>
+  </revision>
+  <revision>
+    <version>2.0</version>
+    <date>2002-12-09</date>
+    <initials>psa</initials>
+    <remark>Per a vote of the Jabber Council, changed status to Final.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-09-27</date>
+    <initials>psa</initials>
+    <remark>Changed status to Draft</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-09-14</date>
+    <initials>dja</initials>
+    <remark>Initial version</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>&xmlrpc; is a method of encoding RPC requests and responses in XML. The original specification defines HTTP (see &rfc2068;) as the only valid transport for XML-RPC payloads.</p>
+  <p>Various initiatives exist already to transport XML-RPC payloads over Jabber. These initiatives were independent of each other and used slightly differing methods (e.g. carrying the payload in a <message/> element as opposed to an &IQ; stanza), resulting in potential interoperability problems.</p>
+  <p>A working session during JabberCon 2001 resulted in a <link url="http://www.pipetree.com/jabber/jrpc.html">formalisation</link> of a single method. This JEP describes that method, which is labelled as Jabber-RPC to differentiate it from XML-RPC itself.</p>
+</section1>
+<section1 topic='Jabber-RPC'>
+  <p>The &IQ; stanza is used to transport XML-RPC payloads. XML-RPC requests are transported using an &IQ; stanza of type "set", and XML-RPC responses are transported using an &IQ; stanza of type "result". An &IQ; stanza MUST NOT contain more than one request or response.</p>
+  <p>The &IQ; stanza contains a single &QUERY; sub-element in the jabber:iq:rpc namespace. The direct child of the &QUERY; element will be either a single &lt;methodCall/&gt; element (in the case of a request) or a single &lt;methodResponse/&gt; element (in the case of a response). This child element will contain the XML-RPC payload. Note that the XML declaration that normally appears at the head of an XML-RPC request or response when transported as the payload of an HTTP POST request MUST BE omitted when it is transported via a Jabber &IQ; stanza.</p>
+  <p>The encoding of the Jabber XML stream is UTF-8. It is assumed that the encoding of the XML-RPC payload is also UTF-8.</p>
+  <p>Application-level errors will be indicated within the XML-RPC payload (as is the case with the traditional HTTP-based XML-RPC mechanism). Transport level errors will be indicated in the normal way for &IQ; stanzas -- namely, by an &IQ; stanza of type "error" and the addition of an &lt;error/&gt; tag as a direct child of the &IQ; stanza. There are no specific XML-RPC-related, transport-level errors.</p>
+</section1>
+<section1 topic='Examples'>
+  <example caption='A typical request'><![CDATA[
+<iq type='set' 
+    from='requester@company-b.com/jrpc-client' 
+    to='responder@company-a.com/jrpc-server' 
+    id='rpc1'>
+  <query xmlns='jabber:iq:rpc'>
+    <methodCall>
+      <methodName>examples.getStateName</methodName>
+      <params>
+        <param>
+          <value><i4>6</i4></value>
+        </param>
+      </params>
+    </methodCall>
+  </query>
+</iq>
+  ]]></example>
+  <example caption='A typical response'><![CDATA[
+<iq type='result' 
+    from='responder@company-a.com/jrpc-server' 
+    to='requester@company-b.com/jrpc-client' 
+    id='rpc1'>
+  <query xmlns='jabber:iq:rpc'>
+    <methodResponse>
+      <params>
+        <param>
+          <value><string>Colorado</string></value>
+        </param>
+      </params>
+    </methodResponse>
+  </query>
+</iq>
+  ]]></example>
+  <p>If the requesting entity does not have sufficient permissions to perform remote procedure calls, the responding entity MUST return a &forbidden; error:</p>
+  <example caption='Requesting entity is forbidden to perform remote procedure calls'><![CDATA[
+<iq type='error' 
+    from='responder@company-a.com/jrpc-server' 
+    to='requester@company-b.com/jrpc-client' 
+    id='rpc1'>
+  <query xmlns='jabber:iq:rpc'>
+    <methodCall>
+      <methodName>examples.getStateName</methodName>
+      <params>
+        <param>
+          <value><i4>6</i4></value>
+        </param>
+      </params>
+    </methodCall>
+  </query>
+  <error code='403' type='auth'>
+    <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</iq>
+  ]]></example>
+</section1>
+<section1 topic='Service Discovery' anchor='disco'>
+  <p>If an entity supports the Jabber-RPC protocol, it SHOULD advertise that fact in response to &jep0030; information ("diso#info") requests by returning an identity of "automation/rpc" and a feature of "jabber:iq:rpc":</p>
+  <example caption='A disco#info query'><![CDATA[
+<iq type='get' 
+    from='requester@company-b.com/jrpc-client' 
+    to='responder@company-a.com/jrpc-server' 
+    id='disco1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+  ]]></example>
+  <example caption='A disco#info response'><![CDATA[
+<iq type='result' 
+    to='requester@company-b.com/jrpc-client' 
+    from='responder@company-a.com/jrpc-server' 
+    id='disco1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity category='automation' type='rpc'/>
+    <feature var='jabber:iq:rpc'/>
+  </query>
+</iq>
+  ]]></example>
+</section1>
+<section1 topic='Security Considerations' anchor='security'>
+  <p>An entity that supports Jabber-RPC SHOULD establish a "whitelist" of entities that are allowed to perform remote procedure calls and MUST return a &forbidden; error if entities with insufficient permissions attempt such calls.</p>
+</section1>
+<section1 topic='IANA Considerations' anchor='iana'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic="Jabber Registrar Considerations" anchor='registrar'>
+  <section2 topic='Protocol Namespaces' anchor='registrar-ns'>
+    <p>The &REGISTRAR; includes 'jabber:iq:rpc' in its registry of protocol namespaces.</p>
+  </section2>
+  <section2 topic='Service Discovery Identity' anchor='registrar-disco'>
+    <p>The Jabber Registrar includes a Service Discovery type of "rpc" within the "automation" category in its registry of service discovery identities.</p>
+  </section2>
+</section1>
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:iq:rpc'
+    xmlns='jabber:iq:rpc'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0009: http://www.jabber.org/jeps/jep-0009.html
+
+      There is no official XML schema for XML-RPC. The main body 
+      of this schema has been borrowed from an unofficial schema 
+      representation contained in the book "Processing XML With 
+      Java" by Elliotte Rusty Harold, as located at:
+
+      http://www.ibiblio.org/xml/books/xmljava/chapters/ch02s05.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='query'>
+    <xs:complexType>
+      <xs:choice minOccurs='0' maxOccurs='1'>
+        <xs:element ref='methodCall'/>
+        <xs:element ref='methodResponse'/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="methodCall">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="methodName">
+          <xs:simpleType>
+            <xs:restriction base="ASCIIString">
+              <xs:pattern value="([A-Za-z0-9]|/|\.|:|_)*" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="params" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="param"  type="ParamType" 
+                           minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+         </xs:element>
+      </xs:all>
+    </xs:complexType>  
+  </xs:element>
+
+  <xs:element name="methodResponse">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element name="params">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="param" type="ParamType"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="fault">
+          <!-- What can appear inside a fault is very restricted -->
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="value">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="struct"> 
+                      <xs:complexType> 
+                        <xs:sequence> 
+                          <xs:element name="member" 
+                                       type="MemberType">
+                          </xs:element>
+                          <xs:element name="member" 
+                                       type="MemberType">
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+         </xs:element>
+      </xs:choice>
+    </xs:complexType>  
+  </xs:element>
+
+  <xs:complexType name="ParamType">
+    <xs:sequence>
+      <xs:element name="value" type="ValueType"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ValueType" mixed="true">
+    <xs:choice>
+      <xs:element name="i4"            type="xs:int"/>
+      <xs:element name="int"           type="xs:int"/>
+      <xs:element name="string"        type="ASCIIString"/>
+      <xs:element name="double"        type="xs:decimal"/>
+      <xs:element name="Base64"        type="xs:base64Binary"/>
+      <xs:element name="boolean"       type="NumericBoolean"/>
+      <xs:element name="dateTime.iso8601" type="xs:dateTime"/>
+      <xs:element name="array"         type="ArrayType"/>
+      <xs:element name="struct"        type="StructType"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="StructType">
+    <xs:sequence>
+      <xs:element name="member" type="MemberType" 
+                   maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="MemberType">
+    <xs:sequence>
+      <xs:element name="name"  type="xs:string" />
+      <xs:element name="value" type="ValueType"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ArrayType">
+    <xs:sequence>
+      <xs:element name="data">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="value"  type="ValueType" 
+                         minOccurs="0" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="ASCIIString">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([ -~]|\n|\r|\t)*" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="NumericBoolean">
+    <xs:restriction base="xs:boolean">
+      <xs:pattern value="0|1" />
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+  ]]></code>
+</section1>
+</jep>
diff --git a/xep-0010.xml b/xep-0010.xml
new file mode 100644
index 00000000..9d613eb9
--- /dev/null
+++ b/xep-0010.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Whiteboarding JIG</title>
+  <abstract>A proposal to form a JIG to develop a protocol for whiteboarding over Jabber.</abstract>
+  &LEGALNOTICE;
+  <number>0010</number>
+  <status>Obsolete</status>
+  <type>JIG Formation</type>
+  <jig>None</jig>
+  <author>
+    <firstname>Niklas</firstname>
+    <surname>Gustavsson</surname>
+    <email>niklas@protocol7.com</email>
+    <jid>nikgus@jabber.org</jid>
+  </author>
+  <revision>
+    <version>1.1</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Changed Status to Obsolete per approval of JEP-0019.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2001-09-30</date>
+    <initials>ng</initials>
+    <remark>Initial release</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>Jabber is often thought of simply as a system for instant messaging, albeit an open one. However, Jabber technology can be used, and is being used, in applications quite different from simple IM. One of these applications is whiteboarding. In collaborative work, the ability to draw (for example, to design sketches, UML schemas, house architectures, and organizational plans) is essential, as exemplified by the success of real-world whiteboarding applications such as Microsoft NetMeeting. Whiteboarding can also be used for entertainment purposes such as games and quizzes. Because of the value of whiteboarding as an important real-time collaboration tool, other IM services are beginning to offer these capabilities. For these and other reasons, I believe that a good protocol for whiteboarding in Jabber would be of great value.</p>
+  <p>There exists today a protocol draft for sending streaming XPM over Jabber <note>XPM over Jabber (<link url="http://docs.jabber.org/draft-proto/html/sxpm.html">http://docs.jabber.org/draft-proto/html/sxpm.html</link>)</note>. XPM is a bitmap format, which makes it well-suited for certain applications (e.g., smaller drawings and sketches). However, significant changes in an XPM image will require sending large amounts of XML data (even with the compression described in the protocol draft). Also, for example, XPM does not scale without loss of resolution, nor does it support metadata. In addition, the current draft specifies the data format only, not the way the data will be sent or handled by Jabber servers and clients.</p>
+  <p>Therefore, the Whiteboard JIG should develop a standard way of handling whiteboards in Jabber and a format for data transfer. This might be based on vector graphics, bitmap data, or a combination of these two. In addition, the protocol should work in the context of both regular messaging and conferencing. The protocol for whiteboarding during conferencing might depend on the new protocol proposal to come from the Conferencing JIG <note>Conferencing protocol draft (<link url="http://jabber.org/?oid=1538">http://jabber.org/?oid=1538</link>)</note>.</p>
+</section1>
+<section1 topic='Deliverables'>
+  <p>The Whiteboarding JIG should produce the following deliverables (these deliverables will be presented to the Jabber Council as a JEP):</p>
+  <section2 topic='Requirements'>
+    <p>A set of requirements that the proposed protocol should fulfill.</p>
+  </section2>
+  <section2 topic='Analysis of existing work'>
+    <p>There are today at least four different attempts <note>Distributed SVG documents (<link url="http://www.jabber.org/?oid=1025">http://www.jabber.org/?oid=1025</link>)</note> <note>SVG over Jabber (<link url="http://www.protocol7.com/jabber/whiteboard_proposal.txt">http://www.protocol7.com/jabber/whiteboard_proposal.txt</link>)</note> <note>Jabberzilla Whiteboard (<link url="http://jabberzilla.mozdev.org/">http://jabberzilla.mozdev.org/</link>)</note> to create a whiteboarding protocol in Jabber. The Whiteboarding JIG should evaluate them all and see which features of each are worth keeping.</p>
+  </section2>
+  <section2 topic='Graphics data format'>
+    <p>One or more data formats for the graphics data, presented both as a description and as a DTD or XML schema.</p>
+  </section2>
+  <section2 topic='Jabber protocol'>
+  <p>The actual protocol for how the graphics data is sent over Jabber. This will also include an analysis of any associated functionality that must be performed by Jabber servers and clients.</p>
+  </section2>
+</section1>
+</jep>
diff --git a/xep-0011.xml b/xep-0011.xml
new file mode 100644
index 00000000..c125870f
--- /dev/null
+++ b/xep-0011.xml
@@ -0,0 +1,483 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Jabber Browsing</title>
+  <abstract>This JEP defines a way to describe information about Jabber entities and the relationships between entities. Note: This JEP is superseded by JEP-0030: Service Discovery.</abstract>
+  &LEGALNOTICE;
+  <number>0011</number>
+  <status>Deprecated</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby>
+    <spec>JEP-0030</spec>
+  </supersededby>
+  <shortname>iq-browse</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/iq-browse/iq-browse.xsd</url>
+  </schemaloc>
+  &jer;
+  &xvirge;
+  &temas;
+  <revision>
+    <version>1.2</version>
+    <date>2004-11-12</date>
+    <initials>psa</initials>
+    <remark>Per a vote of the Jabber Council, changed status to Deprecated.</remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2004-01-06</date>
+    <initials>psa</initials>
+    <remark>Added schema.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2002-04-15</date>
+    <initials>jer</initials>
+    <remark>Changed the suggested use of category to an attribute of item instead of the element names.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-01-16</date>
+    <initials>psa</initials>
+    <remark>Added additional category/type combinations from the protocol draft (also created new category 'validate' as a bucket for the grammar and spelling checkers, which formerly were under the 'render' category).</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-01-04</date>
+    <initials>jkm</initials>
+    <remark>Updated to JEP format and revised description.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-01-25</date>
+    <initials>jm</initials>
+    <remark>Initial draft version.</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>The Jabber world is a diverse place, with lots of services, transports, software agents, users, groupchat rooms, translators, headline tickers, and just about anything that might interact on a real-time basis using conversational messages or presence. Every JabberID (JID) is a node that can be interacted with via messages, presence, and special purpose IQ namespaces. Some JIDs are parents (such as transports), and often many JIDs have relationships with other JIDs (such as a user to their resources, a server to its services, etc.). We need a better way to structure and manage this culture of multi-namespace JID stew. The answer: Jabber Browsing.</p>
+  <p><em>Note well that implementors are encouraged to implement &jep0030; instead of Jabber Browsing.</em></p>
+</section1>
+<section1 topic='JID-Types'>
+  <p>One of the concepts in browsing which helps to extend the interaction between JIDs is a "JID-Type", a simple heirarchy for identifying the role of any JabberID that is similar to the mime-type format. Many programmers are comfortable with the concept of identifying file types by mime-types, which use the format "category/type". A JID-Type, once discovered, is to be used in the same way that a mime-type would be for a file, to alter the user interface representing that JID or provide alternative functionality for interacting with it (either automatically or driven by user interaction). The following categories and types are proposed as the canonical list for the purpose of JID-Types:</p>
+  <table caption='Official List of JID-Type Categories and Types'>
+    <tr>
+      <th>Category</th>
+      <th>Type</th>
+      <th>Description</th>
+    </tr>
+    <tr>
+      <td rowspan="7">application/</td>
+      <td> </td>
+      <td>Specific applications running as a resource on a user@host</td>
+    </tr>
+    <tr>
+      <td>bot</td>
+      <td>Automated conversations</td>
+    </tr>
+    <tr>
+      <td>calendar</td>
+      <td>Calendaring and scheduling service</td>
+    </tr>
+    <tr>
+      <td>editor</td>
+      <td>Collaborative editor</td>
+    </tr>
+    <tr>
+      <td>fileserver</td>
+      <td>Available files</td>
+    </tr>
+    <tr>
+      <td>game</td>
+      <td>Multi-player game</td>
+    </tr>
+    <tr>
+      <td>whiteboard</td>
+      <td>Whiteboard tool</td>
+    </tr>
+    <tr>
+      <td rowspan="7">conference/</td>
+      <td> </td>
+      <td>Nodes of this category provide multi-user chat facilities (a.k.a. conference rooms).</td>
+    </tr>
+    <tr>
+      <td>irc</td>
+      <td>IRC rooms (note: this enables Jabber users to connect to Internet Relay Chat rooms)</td>
+    </tr>
+    <tr>
+      <td>list</td>
+      <td>Mailing-list-style conferences</td>
+    </tr>
+    <tr>
+      <td>private</td>
+      <td>Private, dynamically-generated conference rooms</td>
+    </tr>
+    <tr>
+      <td>public</td>
+      <td>Public, permanent conference rooms</td>
+    </tr>
+    <tr>
+      <td>topic</td>
+      <td>Topic-based conferences</td>
+    </tr>
+    <tr>
+      <td>url</td>
+      <td>Website-hosted conferences</td>
+    </tr>
+    <tr>
+      <td rowspan="5">headline/</td>
+      <td> </td>
+      <td>Recognize different sources of headlines, GUI hints</td>
+    </tr>
+    <tr>
+      <td>logger</td>
+      <td>Log messages (usually presented in a scrolling GUI)</td>
+    </tr>
+    <tr>
+      <td>notice</td>
+      <td>Alerts and warnings (usually presented as popup messages)</td>
+    </tr>
+    <tr>
+      <td>rss</td>
+      <td>Rich Site Summary syndication</td>
+    </tr>
+    <tr>
+      <td>stock</td>
+      <td>Stock market information by symbol (ticker)</td>
+    </tr>
+    <tr>
+      <td rowspan="7">keyword/</td>
+      <td> </td>
+      <td>Keyword-based lookup services (search engines, etc.)</td>
+    </tr>
+    <tr>
+      <td>dictionary</td>
+      <td>Dictionary lookup service</td>
+    </tr>
+    <tr>
+      <td>dns</td>
+      <td>DNS resolver</td>
+    </tr>
+    <tr>
+      <td>software</td>
+      <td>Software search</td>
+    </tr>
+    <tr>
+      <td>thesaurus</td>
+      <td>Thesaurus lookup service</td>
+    </tr>
+    <tr>
+      <td>web</td>
+      <td>Web search</td>
+    </tr>
+    <tr>
+      <td>whois</td>
+      <td>Whois query service</td>
+    </tr>
+    <tr>
+      <td rowspan="4">render/</td>
+      <td> </td>
+      <td>Automated translation services</td>
+    </tr>
+    <tr>
+      <td>en2fr</td>
+      <td>English to French</td>
+    </tr>
+    <tr>
+      <td>*2*</td>
+      <td>Other language to language (using standard language codes)</td>
+    </tr>
+    <tr>
+      <td>tts</td>
+      <td>Text to Speech</td>
+    </tr>
+    <tr>
+      <td rowspan="12">service/</td>
+      <td> </td>
+      <td>Nodes of this category provide a link to another Instant Messaging network or messaging gateway. The 'jabber:iq:register' namespace can be used to gain access to such networks, and the 'jabber:iq:search' namespace may also be available.</td>
+    </tr>
+    <tr>
+      <td>aim</td>
+      <td>AIM transport</td>
+    </tr>
+    <tr>
+      <td>icq</td>
+      <td>ICQ transport</td>
+    </tr>
+    <tr>
+      <td>irc</td>
+      <td>IRC gateway (note: this enables IRC users to connect to Jabber)</td>
+    </tr>
+    <tr>
+      <td>jabber</td>
+      <td>A Jabber server which conforms to the specification for the 'jabber:client' namespace</td>
+    </tr>
+    <tr>
+      <td>jud</td>
+      <td>Jabber User Directory</td>
+    </tr>
+    <tr>
+      <td>msn</td>
+      <td>MSN transport</td>
+    </tr>
+    <tr>
+      <td>pager</td>
+      <td>Pager gateway</td>
+    </tr>
+    <tr>
+      <td>serverlist</td>
+      <td>A list of servers. It is assumed that this node has service/* children</td>
+    </tr>
+    <tr>
+      <td>sms</td>
+      <td>SMS gateway</td>
+    </tr>
+    <tr>
+      <td>smtp</td>
+      <td>SMTP gateway</td>
+    </tr>
+    <tr>
+      <td>yahoo</td>
+      <td>Yahoo! transport</td>
+    </tr>
+    <tr>
+      <td rowspan="6">user/</td>
+      <td> </td>
+      <td>Nodes of this category are Jabber users, typically implementing enough of the 'jabber:client' namespace to be compliant.</td>
+    </tr>
+    <tr>
+      <td>client</td>
+      <td>A standard or fully-featured Jabber client compliant with the 'jabber:client' namespace</td>
+    </tr>
+    <tr>
+      <td>forward</td>
+      <td>A forward alias</td>
+    </tr>
+    <tr>
+      <td>inbox</td>
+      <td>An alternate inbox</td>
+    </tr>
+    <tr>
+      <td>portable</td>
+      <td>A portable device implementing some of the 'jabber:client' namespace</td>
+    </tr>
+    <tr>
+      <td>voice</td>
+      <td>A node providing phone or voice access</td>
+    </tr>
+    <tr>
+      <td rowspan="4">validate/</td>
+      <td> </td>
+      <td>Validation services</td>
+    </tr>
+    <tr>
+      <td>grammar</td>
+      <td>Grammar-checking tool</td>
+    </tr>
+    <tr>
+      <td>spell</td>
+      <td>Spell-checking tool</td>
+    </tr>
+    <tr>
+      <td>xml</td>
+      <td>XML validator</td>
+    </tr>
+  </table>
+  <p>Historically each category was used as the name of an element, and the type was an attribute, such as <![CDATA[<service type="aim"/>]]>. The proper expression for all new implementations supporting this specification is to express the type information as attributes on a generic item element: <![CDATA[<item category="service" type="aim"/>]]>. When processing returned browse information this new syntax should always be handled first, and the old syntax only used if it is important to be able to access older implementations.</p>
+  <p>Additional unofficial categories or types may be specified by prefixing their name with an "x-", such as "service/x-virgeim" or "x-location/gps". Changes to the official categories and subtypes may be defined either by revising this JEP or by activating another JEP. Removal of a category or subtype must be noted in this document.</p>
+</section1>
+<section1 topic='The jabber:iq:browse Namespace'>
+  <p>The namespace containing the Jabber Browsing data is jabber:iq:browse. The primary element within this namespace is 'item' (again, historically every category listed above would also be an element).</p>
+  <section2 topic='Browsing to a JabberID'>
+    <p>The common way to browse to a JabberID using IQ is:</p>
+    <example caption='Browsing to a JabberID'>
+&lt;iq type="get" to="jer@jabber.org" id="browse1"/&gt;
+  &lt;query xmlns="jabber:iq:browse"/&gt;
+&lt;/iq&gt;
+    </example>
+  </section2>
+  <section2 topic='Generic Attributes for Browse Results'>
+    <p>The item element has these attributes in a browse result:</p>
+    <ul>
+      <li>jid [required] -- The full JabberID of the entity described.</li>
+      <li>category [optional] -- One of the categories from the list above, or a non-standard category prefixed with the string "x-".</li>
+      <li>type [optional] -- One of the official types from the specified category, or a non-standard type prefixed with the string "x-".</li>
+      <li>name [optional] -- A friendly name that may be used in a user interface.</li>
+      <li>version [optional] -- A string containing the version of the node, equivalent to the response provided to a query in the 'jabber:iq:version' namespace. This is useful for servers, especially for lists of services (see the 'service/serverlist' category/type above).</li>
+    </ul>
+  </section2>
+  <section2 topic='Expressing Relationships'>
+    <p>Any item may contain any number of additional items as a child, which describes the hierarchical relationship between the parent and the child items. This relationship could be represented as a "link" in a wizard or page-based user interface, or as a branch in a tree as it is expanded. Browse results usually only contain the direct children of a node, not the grandchildren. Browsing to a user, but not a resource, will return results from the server (still with the user's JID) containing the list of resources.</p>
+    <p>For example, this could be the result of browsing to jer@jabber.org:</p>
+    <example caption='Result of Browsing to a User'>
+&lt;iq type="result" from="jer@jabber.org" id="browse1"&gt;
+  &lt;query
+      xmlns="jabber:iq:browse"
+      category="user"
+      jid="jer@jabber.org"
+      name="jer"&gt;
+    &lt;item
+        category="user"
+        jid="jer@jabber.org/foxy"
+        type="client"/&gt;
+    &lt;item
+        category="application"
+        jid="jer@jabber.org/chess"
+        name="XChess"/
+        type="game"&gt;
+    &lt;item
+        category="user"
+        jid="jer@jabber.org/palm"
+        type="client"/&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+    </example>
+    <p>More definitively, throughout all of browsing, a parent describes the children, and the children when browsed to fully describe themselves. The browse data received from the child takes precedence.</p>
+    <p>Parents should list children only if they are available. This means that if for a user a child client goes offline, the parent should remove it from its browse result.</p>
+  </section2>
+  <section2 topic='Namespace Advertising'>
+    <p>On top of the browsing framework, a simple form of "feature advertisement" can be built. This enables any entity to advertise which features it supports, based on the namespaces associated with those features. The &#60;ns/&#62; element is allowed as a subelement of the item. This element contains a single namespace that the entity supports, and multiple &#60;ns/&#62; elements can be included in any item. For a connected client this might be &#60;ns&#62;jabber:iq:oob&#60;/ns&#62;, or for a service &#60;ns&#62;jabber:iq:search&#60;/ns&#62;. This list of namespaces should be used to present available options for a user or to automatically locate functionality for an application.</p>
+    <p>The children of a browse result may proactively contain a few &#60;ns/&#62; elements (such as the result of the service request to the home server), which advertises the features that the particular service supports. This list may not be complete (it is only for first-pass filtering by simpler clients), and the JID should be browsed if a complete list is required.</p>
+    <p>Clients should answer incoming browsing requests to advertise the namespaces they support.</p>
+    <example caption='Result of Browsing to a Resource'>
+&lt;iq type="result" from="jer@jabber.org/foxy" id="browse2"&gt;
+  &lt;query
+      xmlns="jabber:iq:browse"
+      category="user"
+      jid="jer@jabber.org/foxy"
+      name="laptop"
+      type="client"&gt;
+    &lt;ns&gt;jabber:client&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:browse&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:conference&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:time&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:version&lt;/ns&gt;
+    &lt;ns&gt;jabber:x:roster&lt;/ns&gt;
+    &lt;ns&gt;jabber:x:signed&lt;/ns&gt;
+    &lt;ns&gt;jabber:x:encrypted&lt;/ns&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+    </example>
+  </section2>
+  <section2 topic='Empty Results'>
+    <p>When a JabberID is browsed, the result may contain children or it may be empty. An empty result means there are no further relationships or links under that JID, which could be represented as a page containing a list of functions available for the JID, such as vCard, message, register, etc. When the result contains children, they may also be empty (as in the first result from jer@jabber.org above). An empty child does not mean anything, and to determine the namespaces supported or if there are more children, it must be browsed to directly.</p>
+  </section2>
+</section1>
+<section1 topic='Supplanting jabber:iq:agents'>
+  <p>The first important use of jabber:iq:browse is to replace the jabber:iq:agents namespace. When a client connects, it may optionally browse to the server to which it connected in order to retrieve a list of available services. The resulting iq might look like the following example:</p>
+    <example caption='Result of Browsing to a Server'>
+&lt;iq type="result" from="jabber.org" id="browse3"&gt;
+  &lt;query
+      xmlns="jabber:iq:browse"
+      category="service"
+      type="jabber"
+      jid="jabber.org"
+      name="Jabber.org Public Server"&gt;
+    &lt;ns&gt;jabber:client&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:browse&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:conference&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:time&lt;/ns&gt;
+    &lt;ns&gt;jabber:iq:version&lt;/ns&gt;
+    &lt;item
+        category="service"
+        jid="icq.jabber.org"
+        name="ICQ Transport"
+        type="icq"&gt;
+      &lt;ns&gt;jabber:iq:register&lt;/ns&gt;
+      &lt;ns&gt;jabber:iq:search&lt;/ns&gt;
+      &lt;ns&gt;jabber:iq:gateway&lt;/ns&gt;
+    &lt;/item&gt;
+    &lt;item
+      category="conference"
+      type="private"
+      jid="conference.jabber.org"
+      name="Private Chatrooms"/&gt;
+    &lt;item
+        category="application"
+        jid="jabber.org/help"
+        name="Assistance Agent"
+        type="bot"/&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+  </example>
+  <p>To determine any further details from this list, each child would have to be browsed. The elements within the icq service are only hints to a client for building user interface elements. The icq.jabber.org service would still need to be browsed in order to determine any relationships or additional namespaces. This top-level list is the master "services" list available from the server, and should be used for any default functionality when available. This list could also serve as the "home page" for a page-based browsing user interface.</p>
+</section1>
+<section1 topic='Implementation Notes'>
+  <p>A client should not just blindly request browse information every time the user requests it, rather, a client should cache the browse results based on JabberID. Any display or use of the browse data should then be returned from the cache. This model is similiar to that of presence.</p>
+</section1>
+<section1 topic='Security Considerations'>
+  <p>There are no security features or concerns related to this proposal.</p>
+</section1>
+<section1 topic='IANA Considerations'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations'>
+  <p>No action on the part of the &REGISTRAR; is necessary as a result of this JEP, since 'jabber:iq:browse' is already a registered protocol namespace.</p>
+</section1>
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:iq:browse'
+    xmlns='jabber:iq:browse'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0011: http://www.jabber.org/jeps/jep-0011.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='query'>
+    <xs:complexType>
+      <xs:choice minOccurs='0' maxOccurs='unbounded'>
+        <xs:element ref='item'/>
+        <xs:element ref='ns'/>
+      </xs:choice>
+      <xs:attribute name='category' type='xs:string' use='optional'/>
+      <xs:attribute name='jid' type='xs:string' use='optional'/>
+      <xs:attribute name='name' type='xs:string' use='optional'/>
+      <xs:attribute name='type' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='item'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='ns' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='category' type='xs:string' use='optional'/>
+      <xs:attribute name='jid' type='xs:string' use='optional'/>
+      <xs:attribute name='name' type='xs:string' use='optional'/>
+      <xs:attribute name='type' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='ns' type='xs:string'/>
+
+</xs:schema>
+    ]]></code>
+</section1>
+<section1 topic='Future Considerations'>
+  <p>The 'jabber:iq:browse' namespace has been in use for quite some time. However, live browsing still needs to be better defined by a generic publication/subscription system. It is assumed that when such a system is defined, updates to this JEP will be made. It is, however, possible that no futher changes to jabber:iq:browse itself may be needed.</p>
+</section1>
+</jep>
diff --git a/xep-0012.xml b/xep-0012.xml
new file mode 100644
index 00000000..b2a9e6f9
--- /dev/null
+++ b/xep-0012.xml
@@ -0,0 +1,159 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Last Activity</title>
+  <abstract>This JEP defines a protocol for retrieving information about the last activity associated with a Jabber entity.</abstract>
+  &LEGALNOTICE;
+  <number>0012</number>
+  <status>Active</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XMPP IM</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>iq-last</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/iq-last/iq-last.xsd</url>
+  </schemaloc>
+  &jer;
+  &temas;
+  &stpeter;
+  <revision>
+    <version>1.1</version>
+    <date>2004-01-22</date>
+    <initials>psa</initials>
+    <remark>Editorial revisions.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-01-22</date>
+    <initials>psa</initials>
+    <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-01-14</date>
+    <initials>psa</initials>
+    <remark>Made appropriate changes to reflect this JEP's status as informational.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-01-04</date>
+    <initials>tjm</initials>
+    <remark>JEP form for standardization.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-01-25</date>
+    <initials>jm</initials>
+    <remark>Initial version from website.</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>It is often helpful to know the time of the last activity associated with a Jabber Entity. The canonical usage is to discover when a disconnected user last accessed the server (a closely related usage is to discover when a connected user was last active on the server, i.e., the user's idle time). The 'jabber:iq:last' namespace provides a method for retrieving this kind of information. In historical usage, the 'jabber:iq:last' namespace has also been used to query Jabber servers and components about their current uptime; however, this is an extension to the core usage of the 'jabber:iq:last' namespace and may require the addition of a separate namespace in the future.</p>
+  <p>Although the 'jabber:iq:last' namespace has been in use since January 2001, it is still not considered one of the standard Jabber protocols. While the &jabberd; server, many components, and some clients already implement this namespace, it is often overlooked by new developers because of the lack of standardization. This informational JEP defines the protocol as it is used today in order to more fully document it for historical purposes.</p>
+</section1>
+<section1 topic='Basic Protocol'>
+  <p>The 'jabber:iq:last' namespace is used as the value of the 'xmlns' attribute of a &#60;query&#62; element contained within an &#60;iq/&#62; element. When requesting last activity information, a Jabber Entity sends an &#60;iq&#62; element of type='get' to another Jabber Entity (i.e., a JID). When responding to such a request, a Jabber Entity sends an &#60;iq&#62; element of type='result'. The &#60;query&#62; element never has any children and contains only one attribute and CDATA, depending on the scenario in which it is used.</p>
+  <p>As currently implemented, the Jabber Entity receiving an IQ reply in the 'jabber:iq:last' namespace must interpret it based on the sending JID's type in order to determine the meaning of the information. Specifically, currently the information means something different depending on whether the JID sending the reply is of the form 'host', 'user@host', or 'user@host/resource'. These differences and established usage are explained more fully below.</p>
+</section1>
+<section1 topic='Offline User Query'>
+  <p>As noted above, the primary usage of the 'jabber:iq:last' namespace is to find out how long ago a user logged out (and, additionally, what their status message was at that time). This primary usage assumes that the IQ get is sent to (and the IQ reply is received from) a JID of the form 'user@host'. When used in this way, the &#60;query&#62; element contained in the IQ reply has a 'seconds' attribute, which is the number of seconds that have passed since the user last logged out, and the element CDATA is the status message of the last unavailable presence received from the user. An example is shown below:</p>
+  <example caption='Offline User Last Query'><![CDATA[
+<iq id='l4' type='get' to='user@host'>
+  <query xmlns='jabber:iq:last'/>
+</iq>
+
+<iq id='l4' type='result' from='user@host'>
+  <query xmlns='jabber:iq:last' seconds='903'>
+    Heading home
+  </query>
+</iq>
+  ]]></example>
+  <p>In this example, the user logged out fifteen minutes and three seconds ago, and when they logged out they sent a presence packet of type='unavailable' whose &lt;status/&gt; element contained the text "Heading home".</p>
+  <p>If the user has at least one available resource when the server receives the request, the response SHOULD contain an empty &lt;query/&gt; element whose 'seconds' attribute is set to a value of '0'.</p>
+  <p>Note well that, as specified in &xmppcore; and &xmppim;, an IQ query sent to a JID of the form user@host is handled by a server on the user's behalf, not forwarded to one or more active resources. In addition, a server MUST NOT return last activity information to an entity that is not authorized to view the user's presence information (normally via presence subscription), and MUST return a "Forbidden" error in response to such a request (for information about error conditions, refer to &jep0086;).</p>
+</section1>
+<section1 topic='Online User Query'>
+  <p>When the IQ get in the 'jabber:iq:last' namespace is sent to a specific resource of an online user (i.e., a JID of the form of 'user@host/resource'), the JID sending the reply MAY respond with the idle time of the user. This is not a required protocol for clients to support, so clients sending such requests MUST NOT depend on receiving a meaningful result from the target user (although a client that does not support the protocol, or that does not wish to divulge this information, SHOULD return a "Service Unavailable" error). The standard does not specify what resolution the clients must use for the idle times, so the result SHOULD NOT be used as a precise measurement. Here is an example:</p>
+    <example caption='Online User Last Query'><![CDATA[
+<iq id='l67' type='get' to='user@host/resource'>
+  <query xmlns='jabber:iq:last'/>
+</iq>
+     
+<iq id='l67' type='result' from='user@host/resource'>
+  <query xmlns='jabber:iq:last' seconds='123'/>
+</iq>
+  ]]></example>
+  <p>In this example, the user has been idle for about two minutes.</p>
+  <p>If there is no available resource matching the user@host/resource in the 'to' attribute of the request, the server MUST follow the rules in <strong>XMPP IM</strong> in order to determine what error stanza to return.</p>
+</section1>
+<section1 topic='Server and Component Query'>
+  <p>When the IQ get in the 'jabber:iq:last' namespace is sent to a server or component (i.e., to a JID of the form 'host'), the information contained in the IQ reply reflects the uptime of the JID sending the reply. The seconds attribute is how long the host has been up, and the CDATA is unused.</p>
+  <example caption='Server/Component Last Query'><![CDATA[
+<iq id='l5' type='get' to='server'>
+  <query xmlns='jabber:iq:last'/>
+</iq>
+
+<iq id='l5' type='result' from='server'>
+  <query xmlns='jabber:iq:last' seconds='123456'/>
+</iq>
+  ]]></example>
+  <p>In this example, the server has been up for a little more than 34 hours.</p>
+</section1>
+<section1 topic='Security Considerations'>
+  <p>A server MUST NOT allow an unauthorized entity to learn a user's network availability by sending a Last Activity request to a JID of the form user@host or user@host/resource; Last Activity information MAY be divulged only to those entities that have permission to view the user's presence (normally via presence subscription), potentially as restricted by privacy rules (as defined in <strong>XMPP IM</strong> and further profiled in &jep0126;).</p>
+</section1>
+<section1 topic='IANA Considerations'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations'>
+  <p>No action on the part of the &REGISTRAR; is necessary as a result of this JEP, since 'jabber:iq:last' is already a registered protocol namespace.</p>
+</section1>
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:iq:last'
+    xmlns='jabber:iq:last'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0012: http://www.jabber.org/jeps/jep-0012.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='query'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute
+              name='seconds'
+              type='xs:unsignedLong'
+              use='optional'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
+    ]]></code>
+</section1>
+<section1 topic='Future Considerations'>
+  <p>The 'jabber:iq:last' namespace has been used intensively (in the jabberd server, components such as most transports, and some Jabber clients), and no major faults have been found in the current implementations. However, as noted, it has not necessarily been used widely, and many Jabber clients lack support for this namespace. For this reason it is probably best to consider it a non-core namespace.</p>
+  <p>The current specification assumes that the 'resource' portion of a JID is equivalent to a device or connection (laptop, PDA, etc.). While in that context it makes sense to interpret the information returned by an IQ reply in the 'jabber:iq:last' namespace as client idle time, such an assumption will make less sense in a future world where a resource may be not a device or connection but truly a more generic resource such as a calendar or weblog. The current interpretation of 'jabber:iq:last' for 'user@host/resource' as idle time may not be appropriate for the more diverse Jabber resources of the future.</p>
+  <p>The most significant point of contention regarding the 'jabber:iq:last' namespace is the perceived ambiguity of the information contained in an IQ reply for this namespace. Specifically, for a 'user@host' the information is the time since the JID was last connected to the host, for a 'user@host/resource' the information is the time since the resource was last active (i.e., in most circumstances the client idle time), and for a 'host' the information is the uptime for the server or component. Because of this ambiguity (real or perceived), there is some sentiment in the Jabber community that it would be better to create a separate 'jabber:iq:uptime' namespace (and perhaps even a 'jabber:iq:idletime' namespace), leaving the 'jabber:iq:last' namespace for last disconnection time only. These potential namespaces may be proposed in one or more future JEPs if needed.</p>
+</section1>
+</jep>
diff --git a/xep-0013.xml b/xep-0013.xml
new file mode 100644
index 00000000..66081514
--- /dev/null
+++ b/xep-0013.xml
@@ -0,0 +1,447 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Flexible Offline Message Retrieval</title>
+  <abstract>This JEP defines a protocol for flexible, POP3-like handling of offline messages in Jabber/XMPP.</abstract>
+  &LEGALNOTICE;
+  <number>0013</number>
+  <status>Draft</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XMPP IM</spec>
+    <spec>JEP-0030</spec>
+    <spec>JEP-0082</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>offline</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/offline/offline.xsd</url>
+  </schemaloc>
+  &stpeter;
+  <author>
+    <firstname>Craig</firstname>
+    <surname>Kaes</surname>
+    <email>ckaes@jabber.com</email>
+    <jid>ckaes@corp.jabber.com</jid>
+  </author>
+  <revision>
+    <version>1.2</version>
+    <date>2005-07-14</date>
+    <initials>psa</initials>
+    <remark>Added use case for retrieving number of messages; defined registar considerations more completely.</remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2004-01-22</date>
+    <initials>psa</initials>
+    <remark>Editorial revisions.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2003-09-09</date>
+    <initials>psa</initials>
+    <remark>Per a vote of the Jabber Council, advanced status to Draft.</remark>
+  </revision>
+  <revision>
+    <version>0.8</version>
+    <date>2003-08-25</date>
+    <initials>psa</initials>
+    <remark>More changes to address Council feedback: removed bandwidth rationale in requirements; added protocol flow section; adjusted semantics for node values (opaque, but dictionary ordering allowed). Also added &lt;fetch/&gt; and &lt;purge/&gt; elements.</remark>
+  </revision>
+  <revision>
+    <version>0.7</version>
+    <date>2003-08-21</date>
+    <initials>psa</initials>
+    <remark>Changes to address Council feedback: added error codes; enhanced the security considerations; clarified the nature of the node IDs and removed the protocol URI string (leaving only the timestamp).</remark>
+  </revision>
+  <revision>
+    <version>0.6</version>
+    <date>2003-06-10</date>
+    <initials>psa</initials>
+    <remark>Slight fixes to JEP-0082 reference and XML schema.</remark>
+  </revision>
+  <revision>
+    <version>0.5</version>
+    <date>2003-04-28</date>
+    <initials>psa</initials>
+    <remark>Added reference to JEP-0082; changed timestamp format to use milliseconds rather than ten-thousandths of a second; made several small editorial changes throughout.</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2003-02-27</date>
+    <initials>psa</initials>
+    <remark>Major overhaul: clarified requirements, incorporated disco, simplified and updated the protocol, specified syntax and semantics for nodes, defined business rules, and added XML schema.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-10-02</date>
+    <initials>cak</initials>
+    <remark>Reworked to exclude XDBID performace hack, thereby maximizing palatability.  Removed all changes made by psa.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-10-02</date>
+    <initials>psa</initials>
+    <remark>Changed type and added information about scope.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-01-11</date>
+    <initials>cak</initials>
+    <remark>Initial version</remark>
+  </revision>
+</header>
+<section1 topic='Introduction' anchor='intro'>
+  <p>Although not required to do so by &rfc3920; and &rfc3921;, many existing Jabber/XMPP instant messaging servers will store messages received while a user is offline and deliver them when the user is next online. Such messages are commonly called "offline messages". The current means of retrieving one's offline messages is simple: one sends available presence to the server and, as a consequence, the server sends a one-time "flood" of all the messages that have been stored while one was offline. This simplification has the following deficiencies:</p>
+  <ol>
+    <li><p>It can be overwhelming, which is undesirable for the vacationer or heavy user. Many individuals upon returning to work from a weeklong vacation spend the first few hours wading through the dozens, even hundreds, of emails that they received during their absence. Unlucky, however, is this user who then logs onto their Jabber server and is bombarded by hundreds of instant messages, possibly in scores of popup dialogs, simultaneously. Should their client crash, they have lost all communication that occurred while they were away.</p></li>
+    <li><p>It can be difficult to integrate with web-based email clients, which is undesirable for some portals. Several large portals are currently trying to blur the distinction between IM and email -- providing both through one web interface. With offline retrieval semantics so vastly different between the two, this is quite difficult.</p></li>
+  </ol>
+  <p>What is needed is a flexible semantic for offline message handling, similar to POP3 in the email world (see &rfc1939;). This would enable the wireless user to view header information for all offline messages and select only those from their boss and important clients for viewing. It would enable the vacationer to read and delete their messages one at a time, minimizing the possibility of losing all correspondence. And it would provide for seamless integration with existing web-based email clients.</p>
+  <p>In particular, such a protocol should support the following use cases:</p>
+    <ol>
+      <li>Client determines server support for this protocol.</li>
+      <li>Client requests number of messages.</li>
+      <li>Client requests message "header" information (thereby choosing flexible offline message retrieval as opposed to old-fashioned "flood" mode).</li>
+      <li>Client retrieves specific messages.</li>
+      <li>Client removes specific messages.</li>
+      <li>Client retrieves all messages.</li>
+      <li>Client removes all messages.</li>
+    </ol>
+</section1>
+<section1 topic='Use Cases' anchor='usecases'>
+  <section2 topic='Discovering Server Support' anchor='discover'>
+    <p>In order to discover whether one's server supports this protocol, one uses &jep0030;.</p>
+    <example caption='User Requests Service Discovery Information'><![CDATA[
+<iq type='get' to='montague.net'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/> 
+</iq>
+    ]]></example>
+    <example caption='Server Reply to Discovery Request'><![CDATA[
+<iq type='result' 
+    from='montague.net' 
+    to='romeo@montague.net/orchard'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+    ...
+    <feature var='http://jabber.org/protocol/offline'/>
+    ...
+  </query>
+</iq>
+    ]]></example>
+    <p>If the server supports this protocol, it MUST return a &lt;feature/&gt; element in the disco result with the 'var' attribute set to the namespace name for this protocol: 'http://jabber.org/protocol/offline'.</p>
+  </section2>
+  <section2 topic='Requesting Number of Messages' anchor='request-number'>
+    <p><cite>RFC 1939</cite> includes a feature (the "STAT" command) that enables a user to determine how many messages are waiting to be retrieved (without retrieving all of the headers). Such a feature would be helpful in Jabber/XMPP as well, especially if the client is constrained with regard to storage capacity or available bandwidth.</p>
+    <p>In order to determine the number of messages in the offline message queue, the user sends a disco#info request without a 'to' address (i.e., implicitly to the user himself) and with the disco node specified as 'http://jabber.org/protocol/offline':</p>
+    <example caption='User Requests Information About Offline Message Node'><![CDATA[
+<iq type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info' 
+         node='http://jabber.org/protocol/offline'/>
+</iq>
+    ]]></example>
+    <p>If the server supports retrieval of the number of messages, it MUST include &jep0128; data specifying the number of messages:</p>
+    <example caption='Server Returns Information About Offline Message Node, Including Number of Messages'><![CDATA[
+<iq type='result' to='romeo@montague.net/orchard'>
+  <query xmlns='http://jabber.org/protocol/disco#info'
+         node='http://jabber.org/protocol/offline'>
+    <identity
+        category='automation'
+        type='message-list'/>
+    <feature var='http://jabber.org/protocol/offline'/>
+    <x xmlns='jabber:x:data' type='result'>
+      <field var='FORM_TYPE' type='hidden'>
+        <value>http://jabber.org/protocol/offline</value>
+      </field>
+      <field var='number_of_messages'>
+        <value>66</value>
+      </field>
+    </x>
+  </query>
+</iq>
+    ]]></example>
+    <p>Upon receiving a service discovery request addressed to a node of "http://jabber.org/protocol/offline" (either a disco#info request as in this use case or a disco#items request as in the next use case), the server MUST NOT send a flood of offline messages if the user subsequently sends initial presence to the server during this session. Thus the user is now free to send initial presence (if desired) and to engage in normal IM activities while continuing to read through offline messages. However, once the user sends presence, the user's server MUST deliver in-session messages as usual; this JEP applies to offline messages only. In addition, if the user authenticates and provides presence for another resource while the first (non-flood) resource still has an active session, the server MUST NOT flood the second resource with the offline message queue.</p>
+  </section2>
+  <section2 topic='Requesting Message Headers' anchor='request-headers'>
+    <p>In order to retrieve headers for all of the messages in the queue, the user sends a disco#items request without a 'to' address (i.e., implicitly to the user himself) and with the disco node specified as 'http://jabber.org/protocol/offline'.</p>
+    <example caption='User Requests Offline Message Headers'><![CDATA[
+<iq type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='http://jabber.org/protocol/offline'/>
+</iq>
+    ]]></example>
+    <p>The server now MUST return headers for all of the user's offline messages. So that the user may determine whether to view a full message, the header information provided MUST include the full Jabber ID of the sender (encoded in the 'name' attribute) and a unique identifier for the message within the user's "inbox" (encoded in the 'node' attribute), so that the user may appropriately manage (view or remove) the message.</p>
+    <example caption='Server Provides Offline Message Headers'><![CDATA[
+<iq type='result' to='romeo@montague.net/orchard'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='http://jabber.org/protocol/offline'>
+    <item 
+        jid='romeo@montague.net'
+        node='2003-02-27T22:49:17.008Z'
+        name='mercutio@shakespeare.lit/pda'/>
+    <item 
+        jid='romeo@montague.net'
+        node='2003-02-27T22:52:37.225Z'
+        name='juliet@capulet.com/balcony'/>
+    <item 
+        jid='romeo@montague.net'
+        node='2003-02-27T22:52:51.270Z'
+        name='juliet@capulet.com/balcony'/>
+    <item 
+        jid='romeo@montague.net'
+        node='2003-02-27T22:53:03.421Z'
+        name='juliet@capulet.com/balcony'/>
+    <item 
+        jid='romeo@montague.net'
+        node='2003-02-27T22:53:13.925Z'
+        name='juliet@capulet.com/balcony'/>
+  </query>
+</iq>
+    ]]></example>
+    <p>If the requester is a JID other than an authorized resource of the user (i.e., the user@host of the requester does not match the user@host of the user), the server MUST return a &forbidden; error. If the requester is authorized but the node does not exist, the server MUST return an &notfound; error. If there are no offline messages for this user, the server MUST return an empty query as defined in JEP-0030. (For information about the syntax of error conditions, refer to &jep0086;.)</p>
+    <p>The syntax and semantics of the attributes are as follows:</p>
+    <ul>
+      <li>The 'jid' attribute is the Jabber ID with which the item nodes are associated, i.e., the user himself.</li>
+      <li>The 'name' attribute is the full JID of the sender as received in the 'from' address of the message itself.</li>
+      <li>The 'node' attribute is a unique identifier for the message. The value SHOULD be considered opaque, but applications MAY perform character-by-character dictionary ordering on the values. This enables applications to implement ordering on messages, such as that shown above, wherein the node values are UTC timestamps (if timestamps are used, they MUST conform to the 'Datetime' profile defined in &jep0082;).</li>
+    </ul>
+  </section2>
+  <section2 topic='Retrieving Specific Messages' anchor='retrieve-specific'>
+    <p>Messages are viewed based on the value of the 'node' attribute as provided for each item returned by the server in the header information. A user MAY request one or more messages in the same IQ get.</p>
+    <example caption='User Requests Offline Messages'><![CDATA[
+<iq type='get' id='view1'>
+  <offline xmlns='http://jabber.org/protocol/offline'>
+    <item action='view'
+          node='2003-02-27T22:52:37.225Z'/>
+  </offline>
+</iq>
+    ]]></example>
+    <p>If the requester is a JID other than an authorized resource of the user, the server MUST return a &forbidden; error. If the requester is authorized but the node does not exist, the server MUST return an &notfound; error. Otherwise, the server MUST send the requested message(s) plus an IQ result:</p>
+    <example caption='Server Provides Offline Messages'><![CDATA[
+<message to='romeo@montague.net' from='juliet@capulet.com/balcony'>
+  <body>O Romeo, Romeo! wherefore art thou Romeo?</body>
+  <offline xmlns='http://jabber.org/protocol/offline'>
+    <item node='2003-02-27T22:52:37.225Z'/>
+  </offline>
+</message>
+
+<iq type='result' to='user@domain/resource' id='view1'/>
+    ]]></example>
+    <p>In order to distinguish incoming messages, each message MUST contain the node value. It is RECOMMENDED for the server to include &jep0091; information in the message.</p>
+  </section2>
+  <section2 topic='Removing Specific Messages' anchor='remove-specific'>
+    <p>A server MUST NOT remove a message simply because it has been requested by and delivered to the user; instead, the user must specifically request to remove a message. This further implies that the user's offline message queue SHOULD NOT be automatically cleared out by the server if there are offline messages remaining when the user's session ends. However, an implementation or deployment MAY remove messages according to its own algorithms (e.g., storage timeouts based on a "first in first out" rule) or policies (e.g., message queue size limits) if desired.</p>
+    <p>As with viewing, messages are removed based on the value of the 'node' attribute as provided for each item returned by the server in the header information. The user MAY request the removal of one or more messages in the same IQ set.</p>
+    <example caption='User Requests Removal of Offline Messages'><![CDATA[
+<iq type='set' id='remove1'>
+  <offline xmlns='http://jabber.org/protocol/offline'>
+    <item action='remove'
+          node='2003-02-27T22:49:17.008Z'
+    <item action='remove'
+          node='2003-02-27T22:52:37.225Z'/>
+  </offline>
+</iq>
+    ]]></example>
+    <p>If the requester is a JID other than an authorized resource of the user, the server MUST return a &forbidden; error. If the requester is authorized but the node does not exist, the server MUST return a &notfound; error. Otherwise, the server MUST remove the messages and inform the user:</p>
+    <example caption='Server Informs User of Removal'><![CDATA[
+<iq type='result' to='romeo@montague.net/orchard' id='remove1'/>
+    ]]></example>
+  </section2>
+  <section2 topic='Retrieving All Messages' anchor='retrieve-all'>
+    <p>The user retrieves all message by sending the "fetch" command:</p>
+    <example caption='User Retrieval of All Offline Messages'><![CDATA[
+<iq type='get' id='fetch1'>
+  <offline xmlns='http://jabber.org/protocol/offline'>
+    <fetch/>
+  </offline>
+</iq>
+    ]]></example>
+    <p>If the requester is a JID other than an authorized resource of the user, the server MUST return a &forbidden; error. If the requester is authorized but the node does not exist, the server MUST return a &notfound; error. Otherwise, the server MUST retrieve all messages and inform the user:</p>
+    <example caption='Server Sends All Messages and Informs User of Successful Fetch'><![CDATA[
+<message to='romeo@montague.net' from='juliet@capulet.com/balcony'>
+  <body>O Romeo, Romeo! wherefore art thou Romeo?</body>
+  <offline xmlns='http://jabber.org/protocol/offline'>
+    <item node='2003-02-27T22:52:37.225Z'/>
+  </offline>
+</message>
+
+...
+
+<iq type='result' to='romeo@montague.net/orchard' id='fetch1'/>
+    ]]></example>
+    <p>A client MAY retrieve all messages without first requesting message headers. In this case, the server MUST return all of the user's offline messages and also MUST NOT send a flood of offline messages if the user subsequently sends initial presence to the server during this session. That is, the semantics here are the same as for requesting message headers.</p>
+  </section2>
+  <section2 topic='Removing All Messages' anchor='remove-all'>
+    <p>The user removes all message by sending the "purge" command:</p>
+    <example caption='User Requests Removal of Offline Messages'><![CDATA[
+<iq type='set' id='purge1'>
+  <offline xmlns='http://jabber.org/protocol/offline'>
+    <purge/>
+  </offline>
+</iq>
+    ]]></example>
+    <p>If the requester is a JID other than an authorized resource of the user, the server MUST return a &forbidden; error. If the requester is authorized but the node does not exist, the server MUST return a &notfound; error. Otherwise, the server MUST remove all messages and inform the user:</p>
+    <example caption='Server Informs User of Successful Purge'><![CDATA[
+<iq type='result' to='romeo@montague.net/orchard' id='purge1'/>
+    ]]></example>
+  </section2>
+</section1>
+<section1 topic='Protocol Flow' anchor='flow'>
+  <p>This section shows the flow of protocol between client (C:) and server (S:) for the existing (flood) scenario and the improved (POP3-like) scenario.</p>
+    <example caption='Existing Protocol Flow (Flood)'><![CDATA[
+C: <stream:stream ...>
+
+S: <stream:stream ...>
+
+C: authentication (SASL in XMPP, non-SASL in older systems)
+
+S: acknowledge successful authentication 
+
+C: <presence/>
+
+S: send message flood to Client
+
+C: receive flood, send and receive messages, etc.
+
+... and so on]]></example>
+    <p>The semantics change with POP-like offline message handling, and server behavior changes as well...</p>
+    <example caption='Improved Protocol Flow (POP3-Like)'><![CDATA[
+C: <stream:stream ...>
+
+S: <stream:stream ...>
+
+C: authentication (SASL in XMPP, non-SASL in older systems)
+
+S: acknowledge successful authentication 
+
+C: request message headers
+
+S: send message headers to Client
+
+NOTE: Server now MUST NOT flood Client with offline messages.
+
+C: <presence/>
+
+NOTE: Server does not flood Client with offline messages, but 
+      sends in-session messages as usual.
+
+C: request and remove offline messages, send and receive messages, etc.
+
+... and so on]]></example>
+</section1>
+<section1 topic='Security Considerations' anchor='sec'>
+  <p>A server MUST NOT deliver a user's offline messages to any JID except one of the user's authorized resources.</p>
+</section1>
+<section1 topic='IANA Considerations' anchor='iana'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations' anchor='registrar'>
+  <section2 topic='Protocol Namespaces' anchor='registrar-ns'>
+    <p>The &REGISTRAR; includes 'http://jabber.org/protocol/offline' in its registry of protocol namespaces.</p>
+  </section2>
+  <section2 topic='Service Discovery Identities' anchor='registrar-disco-identity'>
+    <p>The Jabber Registrar includes "automation" in its registry of Service Discovery categories for use for any entities and nodes that provide automated or programmed interaction. This JEP specifies the following new types for the "automation" category:</p>
+    <table caption='Types for Category "automation"'>
+      <tr>
+        <th>Type</th>
+        <th>Description</th>
+      </tr>
+      <tr>
+        <td>message-list</td>
+        <td>The node for the offline message queue; valid only for the node "http://jabber.org/protocol/offline".</td>
+      </tr>
+      <tr>
+        <td>message-node</td>
+        <td>A node for a specific offline message if service discovery is provided for messages.</td>
+      </tr>
+    </table>
+    <p>The registry submission is as follows:</p>
+    <code caption='Registry Submission'><![CDATA[
+    <type>
+      <name>message-list</name>
+      <desc>
+        The node for the offline message queue; valid only for the node 
+        "http://jabber.org/protocol/offline"
+      </desc>
+      <doc>JEP-0013</doc>
+    </type>
+    <type>
+      <name>message-node</name>
+      <desc>A node for a specific offline message if service discovery is provided for messages</desc>
+      <doc>JEP-0013</doc>
+    </type>
+  </category>
+    ]]></code>
+  </section2>
+  <section2 topic='Well-Known Service Discovery Nodes' anchor='registrar-disco-nodes'>
+    <p>The Jabber Registrar includes "http://jabber.org/protocol/offline" in its registry of well-known Service Discovery nodes.</p>
+  </section2>
+  <section2 topic='Field Standardization' anchor='registrar-formtype'>
+    <p>&jep0068; defines a process for standardizing the fields used within Data Forms qualified by a particular namespace. There is one uses of such forms in offline message retrieval as described in the <link url='#request-number'>Requesting Number of Messages</link> section of this JEP. The registry submission is as follows:</p>
+    <code caption='Registry Submission'><![CDATA[
+<form_type>
+  <name>http://jabber.org/protocol/offline</name>
+  <doc>JEP-0013</doc>
+  <desc>
+    Service Discovery extension for number of messages
+    in an offline message queue.
+  </desc>
+  <field
+      var='number_of_messages'
+      type='text-single'
+      label='N/A'/>
+</form_type>
+    ]]></code>
+  </section2>
+</section1>
+<section1 topic='XML Schema' anchor='schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://jabber.org/protocol/offline'
+    xmlns='http://jabber.org/protocol/offline'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0013: http://www.jabber.org/jeps/jep-0013.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='offline'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='item' minOccurs='1' maxOccurs='unbounded'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='item'>
+    <xs:complexType>
+      <xs:attribute name='action' use='optional'>
+        <xs:simpleType>
+          <xs:restriction base='xs:NCName'>
+            <xs:enumeration value='remove'/>
+            <xs:enumeration value='view'/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name='jid' type='xs:string' use='optional'/>
+      <xs:attribute name='node' type='xs:string' use='required'/>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
+  ]]></code>
+</section1>
+</jep>
diff --git a/xep-0014.xml b/xep-0014.xml
new file mode 100644
index 00000000..1ea01435
--- /dev/null
+++ b/xep-0014.xml
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Message Tone</title>
+  <abstract>A proposal for including the sender's tone in messages.</abstract>
+  &LEGALNOTICE;
+  <number>0014</number>
+  <status>Rejected</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <author>
+    <firstname>Mike</firstname>
+    <surname>Mintz</surname>
+    <email>psicoder@yahoo.com</email>
+    <jid>mikem@jabber.org</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2002-01-16</date>
+    <initials>psa</initials>
+    <remark>First release to CVS, including editorial changes by the JEP Editor and assignment of JEP number.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2001-11-17</date>
+    <initials>mm</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>When people speak to one another, they use various tones of voice and body language to express themselves. When communicating online, people have no easy way of expressing themselves clearly. By incorporating message tones into Jabber, people will be able to convey tones such as anger, sarcasm, and confusion.</p>
+</section1>
+<section1 topic='Protocol Implementation'>
+  <p>Tone can be added only to messages, and it is added as an &#60;x&#62; tag inside a message. The &#60;x&#62; tag will look something like this:</p>
+  <example>
+&#60;x xmlns='jabber:x:tone'&#62;angry&#60;/x&#62;
+  </example>
+  <p>The specified tone is included as CDATA within the &#60;x&#62; element.</p>
+  <section2 topic='Example'>
+    <p>Here is an example of a message with a tone:</p>
+    <example>
+&#60;message to='mikem@jabber.org'&#62;
+  &#60;body&#62;
+    Why the hell did they reject my idea?
+  &#60;/body&#62;
+  &#60;x xmlns='jabber:x:tone'&#62;angry&#60;/x&#62;
+&#60;/message&#62;
+    </example>
+  </section2>
+</section1>
+<section1 topic='Representing Tones'>
+  <p>Tones are not meant to be sent with every message. They should be used only in cases where a tone dramatically applies. The overuse of tones will cause them to lose their effect.</p>
+  <p>Because tones are abstract and not clearly defined, there is no standard list of tones. Clients should receive the tone as it is and display it as plain text, in such a way that it is linked to a specific message. Clients may want to have a specified list of tones that a user can select from when sending a message.</p>
+  <p>Tones should be short and simple. Here is a list of good tones:</p>
+  <ul>
+    <li>angry</li>
+    <li>confused</li>
+    <li>excited</li>
+    <li>joking</li>
+    <li>sad</li>
+    <li>sarcastic</li>
+    <li>serious</li>
+  </ul>
+</section1>
+</jep>
diff --git a/xep-0015.xml b/xep-0015.xml
new file mode 100644
index 00000000..805cf124
--- /dev/null
+++ b/xep-0015.xml
@@ -0,0 +1,258 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+  <header>
+    <title>Account Transfer</title>
+    <abstract>A proposal for enabling the ability to transfer an account from one Jabber server to another.</abstract>
+    &LEGALNOTICE;
+    <number>0015</number>
+    <status>Rejected</status>
+    <type>Standards Track</type>
+    <jig>Standards JIG</jig>
+    <author>
+      <firstname>Casey</firstname>
+      <surname>Crabb</surname>
+      <email>crabbkw@nafai.dyndns.org</email>
+      <jid>airog@floobin.cx</jid>
+    </author>
+    <revision>
+      <version>0.4</version>
+      <date>2002-04-18</date>
+      <initials>cwc</initials>
+      <remark>Cleaned up the open issues and concerns section.</remark>
+    </revision>
+    <revision>
+      <version>0.3</version>
+      <date>2002-04-16</date>
+      <initials>cwc</initials>
+      <remark>Added more specific details to the protocol. Added more examples. Tried to make the whole JEP more readable.</remark>
+    </revision>
+    <revision>
+      <version>0.2</version>
+      <date>2002-02-26</date>
+      <initials>cwc</initials>
+      <remark>Setting scope, adding discussion about using jabber:iq:browse in the future for transports</remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2002-01-24</date>
+      <initials>cwc</initials>
+      <remark>Added more pseudo-protocol information. Added a known issues section.</remark>
+    </revision>
+    <revision>
+      <version>1.0</version>
+      <date>2002-01-16</date>
+      <initials>psa</initials>
+      <remark>First release to CVS, including editorial changes by the JEP Editor and assignment of JEP number.</remark>
+    </revision>
+    <revision>
+      <version>0.9</version>
+      <date>2001-12-04</date>
+      <initials>cwc</initials>
+      <remark>Initial version.</remark>
+    </revision>
+  </header>
+  <section1 topic='Introduction'>
+
+    <p>I have found the need in the past to migrate an account from
+    one server to another for various reasons. Many of the people who
+    ask me about Jabber ask if there is a way to migrate their account
+    from one server to another if the need arises. There is no reason
+    Jabber can not handle this internally and update all the
+    JID-references appropriately.</p>
+
+    <p>Jabber servers come and go, especially ones run by people who
+    are just playing with the technology. Computers also die and
+    funding runs out. It can be hard on users to have to re-create
+    their rosters every time they have to change to a different
+    server. Administrators also want to provide an 'out' for their
+    users, so that they feel more secure in the time spent setting up
+    rosters. For these reasons there should be a way to migrate an
+    account from one server to another. </p>
+
+  </section1>
+  <section1 topic='Main Body'>
+
+    <p>A basic overview of the behavior would be as follows.</p>
+    <section2 topic='Preconditions'>
+      <ul>
+        <li>Bob has a jabber account on a server, floobin.cx
+          specifically: olduser@floobin.cx.</li>
+
+        <li>Bob knows that the floobin.cx server is going to go down soon
+          and therefore needs to find a new jabber server.</li>
+
+        <li>He realizes that jabber.org offers accounts to anyone, so he
+          sets out to migrate his account to jabber.org.</li>
+
+        <li>Bob does not yet have an account on jabber.org.</li>
+      </ul>
+    </section2>
+    <section2 topic='Order of events'>
+      <p>Throughout most of the account transfer the server hosting
+        the old account will be acting for the user. The end client
+        should have very little to do with the actual transfer.</p>
+
+      <ol>
+        <li>Bob creates an account on Jabber.org:
+          bobsnewaccount@jabber.org.</li>
+
+        <li>Bob logs into both bobsnewaccount@jabber.org and
+          olduser@floobin.cx.</li>
+
+        <li>From olduser@floobin.cx he sends the 'I want to migrate my
+          account' packet to Floobin.cx. This packet includes the JID
+          to migrate to.</li>
+
+        <li>Floobin.cx sends the 'user wants to migrate account to
+          you' packet to bobsnewaccount@jabber.org. This packet contains
+          the JID of the old account.</li>
+
+        <li>bobsnewsaccount@jabber.org receives the 'user wants to
+          migrate account to you' packet and authorizes the
+          transfer.</li>
+
+        <li>Once the migration is authorized the floobin.cx server
+          will start the migration process. The first part is to
+          notify each person subscribed to olduser@floobin.cx's
+          presence that the account has moved to
+          bobsnewaccount@jabber.org.</li>
+
+        <li>Once that is complete the roster itself
+          must be added into bobsnewaccount@jabber.cx's roster. There are
+          many issues with that remain and should be dealt with in the
+          future. See the section on scope for more information.</li>
+
+        <li>finally floobin.cx informs olduser@floobin.cx that the
+          transfer was completed.</li>
+      </ol>
+    </section2>
+
+    <section2 topic='Protocol Example'>
+
+      <example caption="User initiates process">
+        &#60;iq id='initacctxfer' to='floobin.cx' from='airog@floobin.cx' type='ask'&#62;
+          &#60;query xmlns='jabber:iq:accountxfer'&#62;
+            &#60;oldaccount&#62;airog@jabber.org&#60;/oldaccount&#62;
+            &#60;newaccount&#62;newaccount@jabber.org&#60;/newaccount&#62;
+          &#60;/query&#62;
+        &#60;/iq&#62;
+      </example>
+
+      <example caption='Server asks for permission from newaccount@jabber.org'>
+        &#60;iq id='acctxfer1' type='ask' from='floobin.cx' to='newaccount@jabber.org'&#62;
+          &#60;query xmlns='jabber:iq:accountxfer'&#62;
+            &#60;oldaccount&#62;airog@jabber.org&#60;/oldaccount&#62;
+          &#60;/query&#62;
+        &#60;/iq&#62;
+      </example>
+
+      <example caption="XML received at user's new account">
+        &#60;iq id='acctxfer1' type='ask' from='floobin.cx' to='newaccount@jabber.org'&#62;
+          &#60;query xmlns='jabber:iq:accountxfer'&#62;
+            &#60;oldaccount&#62;airog@jabber.org&#60;/oldaccount&#62;
+          &#60;/query&#62;
+        &#60;/iq&#62;
+      </example>
+
+      <example caption="newaccount@jabber.org accepts the migration">
+        &#60;iq id='acctxfer1' type='result' to='floobin.cx' from='newaccount@jabber.org'&#62;
+          &#60;query xmlns='jabber:iq:accountxfer'&#62;
+            &#60;allowed/&#62;
+          &#60;/query&#62;
+        &#60;/iq&#62;
+      </example>
+
+      <p>On acceptance the server on which the old account resides
+        starts the migration process by sending this to each person
+        subscribed to the user's presence.</p>
+      <example caption="XML sent to each JID subscribed to airog@floobin.cx's presence">
+        &#60;iq id='acctxferss1' type='set' from='floobin.cx' to='jabber.org'&#62;
+          &#60;query xmlns='jabber:iq:accountxfer'&#62;
+            &#60;oldaccount&#62;airog@jabber.org&#60;/oldaccount&#62;
+            &#60;newaccount&#62;newaccount@jabber.org&#60;/newaccount&#62;
+            &#60;rosteritem jid='frienduser@jabber.org'/&#62;
+          &#60;/query&#62;
+        &#60;/iq&#62;
+      </example>
+
+      <example caption="The server hosting the account of the roster item responds">
+        &#60;iq id='acctxferss1' type='result' to='floobin.cx' from='jabber.org'/&#62;
+      </example>
+
+      <p>Once that update has been sent to all the contacts on the
+        roster the floobin.cx server sends to the jabber.org server airog@floobin.cx's roster as follows:</p>
+      <example caption="airog@floobin.cx's roster is transferred into newuser@jabber.org's roster">
+        &#60;iq type='set' id='acctxferss2' from='floobin.cx' to='jabber.org'&#62;
+          &#60;query xmlns='jabber:iq:accountxfer'&#62;
+            &#60;oldaccount&#62;airog@jabber.org&#60;/oldaccount&#62;
+            &#60;newaccount&#62;newaccount@jabber.org&#60;/newaccount&#62;
+            &#60;item jid='frienduser@jabber.org' name='friend1' subscription='both'/&#62;
+            &#60;item jid='annoyuser@jabber.org' ask='subscribe'/&#62;
+            &#60;item jid='someone@jabber.org' subscription='from'/&#62;
+          &#60;/query&#62;
+        &#60;/iq&#62;
+      </example>
+
+      <example caption="floobin.cx responds saying the roster transfer was successful">
+        &#60;iq type='set' id='acctxferss2' to='floobin.cx' from='jabber.org'&#62;
+      </example>
+
+      <p>Once the migration finishes a notification is sent to the user:</p>
+      <example caption="Process completed">
+        &#60;iq id='initacctxfer' from='floobin.cx' to='airog@floobin.cx' type='result'/&#62;
+      </example>
+    </section2>
+  </section1>
+  <section1 topic='Open Issues, Concerns and Scoping'>
+    <section2 topic='How do we handle transferring transport stuff?'>
+      <p>Because we cannot determine easily if the new server will
+        support the same transports as the old server we cannot
+        easily transfer entities that pass through the
+        transport. Therefore, until jabber:iq:browse matures, or
+        some other solution for determining if two transports
+        support the same functionality we should not attempt to
+        migrate transport information.</p>
+
+      <p>I propose the following algorithm for determining if a
+        particular roster item is a sub-item of a transport. There are
+        jabber roster items for each of the transports themselves,
+        something to the effect of icq.jabber.org or
+        aim.jabber.org. They contain no user portion of the jid. We
+        record all of these in a list that we will call the
+        'transport-list'. Then for each roster item we want to migrate
+        we compare its 'host' part of the jid to all items in the
+        'transport-list'. If the roster item matches, then the roster
+        item is a hosted through the transport and shouldn't be
+        migrated.</p>
+    </section2>
+
+    <section2 topic='Empty Pointer Accounts'>
+      <p>Does the server keep an empty account that redirects requests
+        to the new account?  I've been hearing mass rumblings of 'NO'
+        here.</p>
+    </section2>
+
+    <section2 topic='vCards and private storage data'>
+      <p>How do we handle vCard information or server side stored
+        preferences? Since the account we're migrating to can be any
+        account some of that information might already be there, how do
+        we resolve conflicts?</p>
+
+      <p>Also, we cannot be sure that the new server supports
+        storage of private data. This again needs some sort of
+        features negotiation, discovery which could be provided by
+        jabber:iq:browse.</p>
+
+      <p> Until jabber:iq:browse is in the 'standards' stage, I
+        recommend we only transfer regular jabber users, and not
+        transfer anything but the roster. All the client software will
+        have to set their preferences for themselves on the new
+        server.</p>
+    </section2>
+  </section1>
+</jep>
diff --git a/xep-0016.xml b/xep-0016.xml
new file mode 100644
index 00000000..3f0f4ba3
--- /dev/null
+++ b/xep-0016.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+	<header>
+		<title>Server-Based Privacy Rules</title>
+		<abstract>Note: This JEP has been superseded by the XMPP IM Internet-Draft; please refer to that document for the most up-to-date protocol.</abstract>
+                &LEGALNOTICE;
+		<number>0016</number>
+		<status>Retracted</status>
+		<type>Standards Track</type>
+		<jig>Standards JIG</jig>
+		<dependencies>None</dependencies>
+                <supersedes>None</supersedes>
+                <supersededby>XMPP IM</supersededby>
+                <shortname>None</shortname>
+		&pgmillard;
+                <revision>
+                        <version>1.3</version>
+                        <date>2004-07-26</date>
+                        <initials>psa</initials>
+                        <remark>Formally retracted this proposal in favor of XMPP IM.</remark>
+                </revision>
+		<revision>
+			<version>1.2</version>
+			<date>2003-03-12</date>
+			<initials>psa</initials>
+			<remark>Changed status to Deprecated since this protocol is now included in the XMPP IM Internet-Draft.</remark>
+		</revision>
+		<revision>
+			<version>1.1</version>
+			<date>2002-11-17</date>
+			<initials>pgm</initials>
+			<remark>Added remarks about default handling, and where list processing should take place.</remark>
+		</revision>
+		<revision>
+			<version>1.0</version>
+			<date>2002-10-22</date>
+			<initials>psa</initials>
+			<remark>Changed status to Draft.</remark>
+		</revision>
+		<revision>
+			<version>0.4</version>
+			<date>2002-10-03</date>
+			<initials>pgm</initials>
+			<remark>Elaborated on various JID possibilities.</remark>
+		</revision>
+		<revision>
+			<version>0.3</version>
+			<date>2002-07-31</date>
+			<initials>pgm</initials>
+			<remark>Added info describing current session issues</remark>
+		</revision>
+		<revision>
+			<version>0.2</version>
+			<date>2002-07-30</date>
+			<initials>pgm</initials>
+			<remark>Added whitelists, subscription filtering, and multiple list capabilities. Changed block to deny.</remark>
+		</revision>
+		<revision>
+			<version>0.1</version>
+			<date>2002-01-18</date>
+			<initials>pgm</initials>
+			<remark>Initial version.</remark>
+		</revision>
+	</header>
+	<section1 topic="Introduction">
+          <p><em>Note: This JEP has been superseded by &xmppim;; please refer to that document for the most up-to-date protocol!</em></p>
+		<p>Almost all types of Instant Messaging (IM) applications have found it necessary to develop some method for a user to block the receipt of messages and packets from other users (the rationale for such blockage depends on the needs of the individual user). The method for implementing this functionality in the current Jabber system is for each client application to keep its own "blacklist" of the Jabber IDs from which the user does not wish to receive messages. This current implementation has the following drawbacks:</p>
+		<ol>
+			<li>The XML packets are blocked at the client network endpoint. The unwanted packets need to traverse the entire Jabber network before they are blocked from being delivered. However, these packets could be blocked at the server and never delivered "across the wire" to the client, which becomes especially important for clients that have bandwidth restrictions or in situations where bandwidth is expensive.</li>
+			<li>Currently there exists no Jabber standard enabling clients to share their individual blacklists. Thus blacklist entries are not portable across clients and if a user accesses their account with a different client, the user must re-enter the blacklist entries.</li>
+			<li>Most implementations have no way of blocking specific types of packets -- they typically block only message packets.</li>
+		</ol>
+		<p>The solution to these shortfalls is to have a common blacklist which is stored on the Jabber server along with the other information which clients receive from the server (primarily the roster).</p>
+	</section1>
+	<section1 topic="Protocol Details">
+		<p>This document proposes the addition of a new namespace to handle the storage and retrieval of the server-side blacklist and whitelist information. The proposed 'jabber:iq:privacy' namespace would be consistent with the existing jabber:* namespaces and use the &lt;query/&gt; element as a direct child under the main &lt;iq/&gt; element. A client application would use &lt;iq type="get"&gt; to retrieve the lists from the server, and use &lt;iq type="set"&gt; to add or edit items in a specific list. Each list is a combination of multiple items. Each item can be of type allow or deny. For this document, these lists will be called &quot;zebra lists&quot;.</p>
+		<p>Each &lt;query/&gt; element would have one or more &lt;list&gt; elements which would contain the information for an entire zebra list. The &lt;query&gt; element also contains an &lt;active&gt; element and a &lt;default&gt; element. These elements contain the name of the currently active zebra list or the name of the default zebra list. A client application may perform a get request with an empty &lt;active&gt; element and/or and empty &lt;default&gt; which indicates that it only wants to know which list is currently active or the default list. A client application may also specify a default list to be used for offline processing and when no active list is directly specified. To fetch the currently active list and the rules for each list, the client application performs a simple blank get request.</p>
+		<p>The &lt;default&gt; element is used when processing packets and the client is offline, and is used whenver the client connection (session) does not specify a specific list to be active.</p>
+		<p>Each &lt;item&gt; element in the zebra list MAY contain a jid attribute (the Jabber ID, i.e. user@host, of the contact which is to be blocked or allowed), MAY contain a subscription attribute, and MUST contain a type attribute. If no jid attribute is specified, then the rule MUST apply to all jids. The possible values of the type attribute would be either "deny", "allow". To remove items from the list, simply send back the list tag with the various &lt;item&gt; elements missing.</p>
+		<p>If the &lt;item&gt; element contains a subscription attribute, it means that the rule applies to all jids in the current users roster which have matching subscription elements. Note that a subscription of "both" MUST be treated the same as "from" and "to" together. </p>
+		<p>If the &lt;item&gt; element contains no child elements, then all packets would be blocked or allowed. This includes: messages, presence packets, and iq packets. The &lt;item&gt; elements MAY contain the following empty child elements:</p>
+		<ul>
+			<li>The &lt;message/&gt; element (blocks or allows all message packets).</li>
+			<li>The &lt;presence/&gt; element (blocks or allows all presence packets).</li>
+			<li>The &lt;iq/&gt; element (blocks or allows all iq packets).</li>
+		</ul>
+		<p>When a message or other XML packet is blocked according to the entries in the list, the server MUST bounce the packet back to the original sender. The bounced packet MUST be of type="error" and contain a child &lt;error/&gt; element with a code attribute of 405.</p>
+		<p>If a &lt;list&gt; element is sent that contains no child elements, the list of that name is removed. If the active list is not reset during the list removal, and the list removed was the active list, the user is returned back to a default state of allow all packets.</p>
+	</section1>
+	<section1 topic="Implementation Notes and Rules">
+		<p>Setting your active zebra list is effective for the current session only, but the storage of the lists is for the user. During usage, a client application should set the active list before sending available presence or fetching the roster. If a client does not set the active zebra list for the current session, the default rules of allowing all packets would apply to that session.
+		</p>
+		<p>When changing or editing in a specific zebra list, the client application MUST send back all items in the list in the desired order. Server side components that are performing the packet filtering MUST preserve the order of the individual &lt;item&gt; tags and process the rules in that order. All lists MUST have at least one rule that SHOULD specify the default action. The client application MAY send back an &lt;active&gt; element indicating the new currently active list. If no &lt;active&gt; element is sent, the currently active list is used.</p>
+		<p>When a client application wishes to just change the currently active zebra list, they MUST NOT send back all of the lists and their contents. The client application SHOULD send back just the new &lt;active&gt; element. If the named list does not exist, the server MUST send back an error using error code 406 (Not Acceptable).</p>
+		<p>Client applications can NOT set the default or active list, and alter the actual lists in the same packet. If a client connection attempts to modify both things at once, the server implementation must send back a iq-error using error code 406.</p>
+		<p>Implementations of zebra lists MAY choose to allow specific packet types to be checked. If a client attempts to set an item with a specific packet type (message, presence, or iq) and the implementation does not support that feature, the server MUST send back the &lt;iq/&gt; as a type="error" using an error code of 406 (Not Acceptable).</p>
+		<p>Implementation of zebra lists SHOULD NOT "push" new lists and additions to existing clients already connected using the same JID (as you would get jabber:iq:roster pushes). If a client application wants to know the current zebra list information, it SHOULD send a get request.</p>
+		<p>When a jabber ID is specified on a rule and the ID does not conform to user@host, the following rules apply:</p>
+		<ul>
+			<li>JIDs of the form 'domain.com' must apply to all users from that domain (ie, *@domain.com). Note that the asterisk (*) is a legal user character, thus, 'domain.com' is different from '*@domain.com'</li>
+			<li>JIDs of the form 'user@domain.com/resource' apply to that specific resource. Packets from other resources from that user MUST not match the rule.</li>
+			<li>JIDs of the form 'service.domain.com/resource' apply to that specific resource of that service. (As opposed to 'service.domain.com', which matches for '*@service.domain.com'.)</li>
+		</ul>
+		<p>If a packet does not match any rules in the active list, the default action is to allow.</p>
+	</section1>
+	<section1 topic="Retrieving the zebra lists">
+		<p>The following protocol segments illustrate the exchange of packets between the client application and the server in order to retrieve the zebra list information.</p>
+		<example caption="Client Requests the zebra lists"><![CDATA[
+<iq type="get" id="1">
+  <query xmlns="jabber:iq:privacy"/>
+</iq>]]></example>
+		<example caption="Server Replies to the zebra lists request"><![CDATA[
+<iq type="result" id="1">
+  <query xmlns="jabber:iq:privacy">
+    <active name="home"/>
+    <list name="home">
+      <item jid="romeo@jabber.org" type="deny"/>
+      <item jid="juliet@jabber.org" type="deny"/>
+      <item type="allow"/>
+    </list>
+    <list name="work">
+    	<item type="allow" subscription="from"/>
+    	<item type="allow" subscription="to"/>
+    	<item type="deny"/>
+    </list>
+  </query>
+</iq>]]></example>
+	</section1>
+	<section1 topic="Changing the currently active zebra list">
+		<p>The following protocol segments illustrate the exchange of packets used to change the active zebra list.</p>
+		<example caption="Client changes active list"><![CDATA[
+<iq type="set" id="2">
+  <query xmlns="jabber:iq:privacy">
+    <active name="work"/>
+  </query>
+</iq>]]></example>
+		<example caption="Server Replies to the change request">
+&lt;iq type="result" id="2"/&gt;
+    </example>
+	</section1>
+	<section1 topic="Adding or Changing a zebra list">
+		<p>The following protocol segments illustrate the exchange of packets used to add or edit a zebra list.</p>
+		<example caption="Changing a zebra list"><![CDATA[
+<iq type="set" id="3">
+  <query xmlns="jabber:iq:privacy">
+    <list name="home">
+      <item jid="romeo@jabber.org" type="deny"/>
+      <item jid="juliet@jabber.org" type="deny"/>
+      <item jid="mercutio@jabber.org" type="deny"/>
+      <item type="allow"/>
+    </list>
+  </query>
+</iq>]]></example>
+		<example caption="Server Replies to the change request">
+&lt;iq type="result" id="3"/&gt;
+    </example>
+	</section1>
+	<section1 topic="Removing an entire zebra list">
+		<p>The following protocol segments illustrate how a client application would remove a zebra list.</p>
+		<example caption="Client Requests Removal of a zebra list"><![CDATA[
+<iq type="set" id="4">
+  <query xmlns="jabber:iq:privacy">
+    <list name="home"/>
+  </query>
+</iq>]]></example>
+		<example caption="Server replies to remove request">
+&lt;iq type="result" id="4"/&gt;
+    </example>
+	</section1>
+	<section1 topic="Blocked User Sending a Message">
+		<p>The following protocol segments illustrate the exchange of message packets when the sender is blocked by the currently active zebra list.</p>
+		<example caption="Blocked User Sends a Message"><![CDATA[
+<message to="jill@jabber.org" id="msg_1">
+  <body>Hey, I just wanted to chat!</body>
+</message>]]></example>
+		<example caption="Recipient's Server Bounces Message Back to Blocked Sender"><![CDATA[
+<message id="msg_1" type="error">
+  <body>Hey, I just wanted to chat!</body>
+  <error code="405">Not Allowed</error>
+</message>]]></example>
+	</section1>
+	<section1 topic="Protocol DTD">
+		<example caption="jabber:iq:privacy DTD"><![CDATA[<!ELEMENT query (active?, list*)>
+<!ATTLIST query
+	xmlns CDATA #REQUIRED
+>
+<!ELEMENT active (#PCDATA)>
+<!ATTLIST active
+	name CDATA #REQUIRED
+>
+<!ELEMENT list (item*)>
+<!ATTLIST list
+	name CDATA #REQUIRED
+>
+<!ELEMENT item (iq?, message?, presence?)>
+<!ATTLIST item
+	jid CDATA #IMPLIED
+	type (allow | deny) #REQUIRED
+	subscription (from | to) #IMPLIED
+>
+<!Element iq (#PCDATA)>
+<!Element message (#PCDATA)>
+<!Element presence (#PCDATA)>
+
+]]></example>
+	</section1>
+	<section1 topic="Future considerations">
+		<p>In the future, it may be desirable at some point to allow clients to filter specific iq namespaces. The protocol could easily handle this capability by doing something like the following:</p>
+		<example caption="Client Requests to Filter a Specific IQ Namespace"><![CDATA[<iq type="set" id="6">
+  <query xmlns="jabber:iq:privacy">
+    <list name="home">
+      <item jid="romeo@jabber.org" type="deny"/>
+      <item jid="juliet@jabber.org" type="deny"/>
+      <item jid="mercutio@jabber.org" type="deny">
+      	<iq>jabber:iq:oob</iq>
+      <item type="allow"/>
+    </list>
+  </query>
+</iq>]]></example>
+		<example caption="Server Replies to Filter Namespace Request">
+&lt;iq type="result" id="6"/&gt;
+    </example>
+        <p>In the future, it may be desirable to have be able to block normal presence/availability packets, while still allowing subscription packets through the zebra list.</p>
+		<p>In the current open source Jabber server, there is a JSM module called mod_filter which has the capability to implement this type of functionality. However, most servers with large user bases have found it impossible to use mod_filter because of the load that it imposes on packet processing. Using normal whitelist/blacklist operations should make the processing much simpler than mod_filter's processing of an unknown set of rules various rules (not just blocking).</p>
+	</section1>
+
+<section1 topic='Author Note' anchor='authornote'>
+  <p>Peter Millard, the author of this specification from version 0.1 through version 0.3, died on April 26, 2006.</p>
+</section1>
+
+</jep>
diff --git a/xep-0017.xml b/xep-0017.xml
new file mode 100644
index 00000000..5c99553f
--- /dev/null
+++ b/xep-0017.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+<title>Naive Packet Framing Protocol</title>
+<abstract>An intermediate method for more efficient framing of the Jabber XML Stream.</abstract>
+<legal>This document has been placed in the public domain.</legal>
+<number>0017</number>
+<status>Rejected</status>
+<type>Informational</type>
+<jig>Standards JIG</jig>
+<author>
+<firstname>Mike</firstname>
+<surname>Lin</surname>
+<email>mikelin@mit.edu</email>
+<jid>mlin@mlin.mit.edu</jid>
+</author>
+<author>
+<firstname>Julian</firstname>
+<surname>Missig</surname>
+<email>julian@jabber.org</email>
+<jid>julian@jabber.org</jid>
+</author>
+<revision>
+<version>0.3</version>
+<date>2002-02-19</date>
+<initials>mfl</initials>
+<remark>Continued improvement and specification.</remark>
+</revision>
+<revision>
+<version>0.2</version>
+<date>2002-01-31</date>
+<initials>mfl</initials>
+<remark>Added various clarifications and implementation notes.</remark>
+</revision>
+<revision>
+<version>0.1</version>
+<date>2002-01-23</date>
+<initials>mfl</initials>
+<remark>Initial revision.</remark>
+</revision>
+</header>
+<section1 topic='Introduction'>
+<p>Framing is the mechanism by which a listener is able to separate a stream of information into discrete semantic units. In Jabber, each of these semantic units is a fragment of a &lt;stream:stream&gt; document consisting of a direct (depth=1) child element of the &lt;stream:stream&gt; document element, and all its attributes and child nodes. These semantic units are hereafter called packets. A Jabber session document, excluding the document element start tag and end tag which are handled as special cases, is implicitly encoded into these packets and transmitted across the network.</p>
+<p>This JEP describes a framing method that may provide performance and code simplicity advantages over the framing method currently used.</p>
+</section1>
+<section1 topic='Framing in Jabber'> <p>The current scheme for framing in Jabber relies on the inherent structure of XML to determine packet boundaries. Since each packet is a well-formed XML fragment, the start of the packet is unambiguously denoted by the element start tag at depth=1, and the end of the packet is unambiguously denoted by the corresponding close tag at depth=1.</p>
+<p>This method of framing is elegant because all the necessary framing information is inherent in the XML; it makes framing independent of the underlying transport layer so long as that transport layer guarantees per-session FIFO delivery. However, it has significant performance and implementation disadvantages, as it requires any Jabber node (endpoint or router) to XML-parse the packet as it is still being received in order to determine the packet boundary. Many XML parsing suites are not designed to be used in this manner, and various hacks and workarounds have emerged in current Jabber software in order to adapt them for this purpose.</p>
+</section1>
+<section1 topic='Byte Length Framing'>
+<p>Consider a simple method that prefixes the byte length of each packet as an XML text node at depth=1. Put more simply, the transmitting agent calculates the byte length of the element it wishes to transmit. It then transmits this integer length encoded as text, immediately followed by the element.</p>
+<p>This technique has the following advantages:</p>
+<ul>
+<li>The receiving agent is able to anticipate the size of the incoming packet. It can then buffer the element without having to parse it while it is only partially received, which is significantly more straightforward and more efficient to implement given the design of most current XML parsing suites. For large packets, this also allows the receiving agent to reduce potentially expensive memory realocation and copying.</li>
+<li>A router needs not load the entire packet payload into a DOM; it has the option of parsing only the element start tag and retransmitting the rest of the packet verbatim after checking for well-formedness.</li>
+<li>Since the framing data are just XML text nodes, their addition should be largely backwards compatible with current Jabber software, which should be made to ignore the extraneous depth=1 text with few, or possibly no, modifications.</li>
+<li>Implementation of the protocol takes very little effort. Transmitting agents generally should know the size of the packets they are about to transmit. In comparison to the work they must currently do, receiving agents are only helped by the addition of framing data; in any case, interpretation of the framing data is optional.</li>
+</ul>
+<p>This technique has the following disadvantages:</p>
+<ul>
+<li>The simple insertion of framing data into the streaming XML document does not pay attention to the logical distinction between the XML document and the framing transport over which it is being transmitted.</li>
+<li>Error-handling semantics must be arbitrarily defined in the event that a transmitting agent misframes a packet (that is, sends the incorrect packet size).</li>
+</ul>
+</section1>
+<section1 topic='Implementation Notes'>
+<p>Framing data is included for the &lt;stream:stream&gt; and &lt;/stream:stream&gt; tags as if they were their own packets, although they are not independently well-formed XML. These should be handled as special cases in a Jabber XML streams implementation.</p>
+<p>The connecting agent (client) implicitly requests that the receiving agent (server) use JEP-0017 framing by transmitting JEP-0017 framing data in its own outgoing stream (the connecting agent always "goes first"). Servers should detect the presence of framing data in the client's stream (by testing whether the first character received is a digit or a &lt;) and, if it is detected, activate outgoing framing for that session.</p>
+<p>Regardless of the use of framing data, all nodes must verify the well-formedness of XML payloads in order to avoid propagating misframes.</p>
+</section1>
+<section1 topic='Example'>
+<example caption='A Trivial And Nearly Meaningless Example'>
+94&lt;message to="whomever@mlin.mit.edu" from="mlin@mlin.mit.edu"&gt;some opaque information&lt;/message&gt;
+  </example>
+</section1>
+<section1 topic='Philosophical Notes and Conclusion'>
+<p>This framing method is not intended as a fully satisfactory or permanent solution to XML stream framing. In the "distant" (longer than one year) time span, it may be desirable to consider more thorough systems such as BEEP. The intent of this JEP is to establish an intermediate solution that will provide code simplicity advantages to new implementations in the near term without requiring fundamental changes to the Jabber transport or protocol (as adopting BEEP would almost certainly require).</p>
+</section1>
+</jep>
+
diff --git a/xep-0018.xml b/xep-0018.xml
new file mode 100644
index 00000000..4952a796
--- /dev/null
+++ b/xep-0018.xml
@@ -0,0 +1,135 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Invisible Presence</title>
+  <abstract>Documentation of invisible presence.</abstract>
+  &LEGALNOTICE;
+  <number>0018</number>
+  <status>Rejected</status>
+  <type>Informational</type>
+  <jig>Standards JIG</jig>
+  <dependencies>XMPP Core, XMPP IM</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>None</supersededby>
+  <shortname>N/A</shortname>
+  <author>
+    <firstname>Ben</firstname>
+    <surname>Schumacher</surname>
+    <email>ben@blahr.com</email>
+    <jid>rynok@jabber.com</jid>
+  </author>
+  <author>
+    <firstname>Jeremie</firstname>
+    <surname>Miller</surname>
+    <email>jer@jabber.org</email>
+    <jid>jer@jabber.org</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2003-09-26</date>
+    <initials>bs</initials>
+    <remark>Updated to focus solely on &lt;presence type='invisible'/&gt;.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-01-28</date>
+    <initials>jmm</initials>
+    <remark>Initial draft.</remark>
+  </revision>
+</header>
+  <section1 topic="Introduction">
+    <p>Jabber users have long wanted the ability to come online using Jabber, but appear "unavailable" to a subset of their roster, an ability which is commonly referred to as invisible mode. While several current implementations have various ways of providing this functionality, the systems currently in place often lack clear behavior and documentation. This document provides requirements for invisible mode and clarifies the existing protocol-in-use to provide the desired functionality.</p>
+    <p><strong>Note well:</strong> The functionality described herein can and should be implemented by means of the Privacy Rules namespace defined in &xmppim;. This document is provided for historical purposes only.</p>
+  </section1>
+  <section1 topic="Requirements">
+    <p>The requirements for invisible mode are basic:</p>
+    <ol>
+      <li>A user should be able to become visible or invisible at any time.</li>
+      <li>When in either mode, users should be able to selectively allow or block presence updates to be distributed to their contacts.</li>
+    </ol>
+  </section1>
+  <section1 topic="Use Cases">
+    <p>For the purposes of this discussion, we will assume this terminology.</p>
+    <ul>
+      <li>Undirected Presence - A presence stanza without a "to" attribute.</li>
+      <li>Directed Presence - A presence stanza with a "to" attribute.</li>
+    </ul>
+    <section2 topic="User Becomes Invisible to All Contacts">
+      <p>Assuming the user's client has authenticated with the system normally, it would send the following presence stanza to become invisible (note: this can be the initial presence stanza sent by the user). To do so, the client will send undirected presence with a type="invisible" attribute.</p>
+      <example caption="Invisible presence stanza"><![CDATA[<presence type="invisible"/>]]></example>
+    </section2>
+    <section2 topic="User Becomes Visible to All Contacts">
+      <p>If a user chooses to become visible after being invisible, the client will send undirected presence with a type="visible" attribute.</p>
+      <example caption="Visible presence stanza"><![CDATA[<presence type="visible"/>]]></example>
+    </section2>
+    <section2 topic="User Becomes Invisible to Selected Contact">
+      <p>If a user is visible to all of their contacts, and wishes to become invisible to selected contacts on their roster, then their client will send the following directed presence stanza.</p>
+      <example caption="User becomes invisible to joe@foo.com"><![CDATA[<presence to="joe@foo.com" type="invisible"/>]]></example>
+      <p>In this case, the server begins to track that the user is invisible to the contact joe@foo.com, and does not forward further presence updates to joe@foo.com. If the user wishes joe@foo.com to received further presence updates, then their client must send either an undirected presence stanza with a type="visible" attribute (see Example 2), or a directed presence stanza to joe@foo.com with a type="visible" attribute as below.</p>
+      <example caption="User becomes visible to joe@foo.com"><![CDATA[<presence to="joe@foo.com" type="visible"/>]]></example>
+    </section2>
+    <section2 topic="User Becomes Visible to Selected Contact">
+      <p>The opposite behavior of the previous section should, also, be present in the server. For example, if a user is invisible to all of their contacts, they should be able to become visible to a selected contact by send a stanza similar to the one in Example 4.</p>
+      <p>As with the previous section, a user can later choose to hide his presence updates for joe@foo.com by either sending an undirected presence stanza (see Example 1), or by sending a directed presence stanza to joe@foo.com (see Example 3).</p>
+    </section2>
+  </section1>
+  <section1 topic="Server Implementation Details">
+    <p>The above section documents the major points of the invisible mode protocol. It is important to understand how the server should interact with the protocol documented above.</p>
+    <p>Normally, when a server receives a presence stanza, it stamps the appropriate 'from' attribute on the stanza and sends it on its way. If the stanza does not possess a 'to' attribute, the process of sending the stanza on its way involves broadcasting that stanza to all contacts listed in the user's roster. If the stanza does have a 'to' attribute, the stanza is simply routed to the correct contact. With the addition of invisible mode presence, the server MUST now verify that a stanza should be directed to contacts on a user's roster before sending it on. In addition, stanzas that are directly related to invisible presence (stanzas with a 'type' attribute of either "visible" or "invisible") MUST NOT be sent to any contacts, but MAY cause other presence stanzas to be sent instead.</p>
+    <section2 topic="Undirected Presence While Invisible to Selected Contacts">
+      <p>One of the biggest failings of older invisible mode implementations were client features like auto-away. In most cases, these auto-away stanza would inadvertently cause a user to become visible (although away) to all contacts on its roster. This invisible presence protocol has been designed to deal with that problem elegantly.</p>
+      <p>Consider the following situation (the protocol for which is shown in the examples below):</p>
+      <ol>
+        <li>joe@foo.com has contacts stpeter@foo.com, pgmillard@foo.com and rynok@foo.com on his roster.</li>
+        <li>joe@foo.com has logged into the foo.com sever, but has set his presence to invisible.</li>
+        <li>Assume that stpeter@foo.com, pgmillard@foo.com and rynok@foo.com are all online and visible.</li>
+        <li>joe@foo.com wants rynok@foo.com to see his presence updates, but not stpeter@foo.com or pgmillard@foo.com</li>
+        <li>joe@foo.com sets his presence to extended away.</li>
+        <li>joe@foo.com decides to become visible to all contacts on his roster.</li>
+        <li>joe@foo.com decides to become invisible to pgmillard@foo.com.</li>
+        <li>joe@foo.com set his presence to free to chat.</li>
+      </ol>
+      <example caption="joe@foo.com sends initial presence stanza"><![CDATA[<presence type="invisible"/>]]></example>
+      <p>Since joe@foo.com has just come online, the server SHOULD NOT forward any presence stanzas to contacts on his roster.</p>
+      <example caption="joe@foo.com sends visible presence to rynok@foo.com"><![CDATA[<presence to="rynok@foo.com" type="visible"/>]]></example>
+      <example caption="Server forwards presence update to rynok@foo.com"><![CDATA[<presence from="joe@foo.com/resource" to="rynok@foo.com"/>]]></example>
+      <example caption="joe@foo.com sets his presence to extended away"><![CDATA[<presence><show>xa</show><status>Away (due to idle)</status></presence>]]></example>
+      <example caption="Server forwards presence update to rynok@foo.com"><![CDATA[<presence from="joe@foo.com/resource" to="rynok@foo.com">
+    <show>away</show><status>Meeting</status>
+</presence>]]></example>
+      <p>Note that in this example, presence updates from joe@foo.com are routed only to rynok@foo.com, despite the fact that stpeter@foo.com and pgmillard@foo.com are both online and available. This is because joe@foo.com has chosen to be visible only to rynok@foo.com. If joe@foo.com chooses to become visible to his entire roster, he simply sends an undirected presence stanza with the type="visible" attribute. In this case the server SHOULD forward the last undirected presence stanza received to stpeter@foo.com and pgmillard@foo.com.</p>
+      <example caption="joe@foo.com sends undirected visible stanza"><![CDATA[<presence type="visible"/>]]></example>
+      <example caption="Server forwards last presence update to stpeter@foo.com and pgmillard@foo.com"><![CDATA[<presence from="joe@foo.com/resource" to="stpeter@foo.com"/>
+
+<presence from="joe@foo.com/resource" to="pgmillard@foo.com"/>]]></example>
+      <p>Now Joe has decided that he doesn't want pgmillard@foo.com to receive further presence updates. Since he is currently visible to all contacts, he simply needs to send a directed presence stanza to pgmillard@foo.com with the type="invisible" attribute set.</p>
+      <example caption="joe@foo.com sends directed presence stanza to pgmillard@foo.com"><![CDATA[<presence to="pgmillard@foo.com" type="invisible"/>]]></example>
+      <p>In this case, the server will send a directed presence stanza to pgmillard@foo.com with the type="unavailable" attribute set, which indicates to pgmillard@foo.com's client that joe@foo.com has gone "offline."</p>
+      <example caption="Server sends unavailable presence stanza to pgmillard@foo.com"><![CDATA[<presence from="joe@foo.com/resource" to="pgmillard@foo.com" type="unavailable"/>]]></example>
+      <p>Further presence updates sent by joe@foo.com will now be forwarded to stpeter@foo.com and rynok@foo.com, and MUST NOT be forwarded pgmillard@foo.com.</p>
+      <example caption="joe@foo.com set his presence to free to chat"><![CDATA[<presence><show>chat</show></presence>]]></example>
+      <example caption="Server forwards presence update to stpeter@foo.com and rynok@foo.com"><![CDATA[<presence from="joe@foo.com/resource" to="stpeter@foo.com">
+    <show>chat</show>
+</presence>
+    
+<presence from="joe@foo.com/resource" to="rynok@foo.com/resource">
+    <show>chat</show>
+</presence>]]></example>
+      <p>The server MUST NOT forward presence stanzas containing the type="visible" or type="invisible" attribute to a client.</p>
+    </section2>
+  </section1>
+  <section1 topic="Security Considerations">
+    <p>There are no security features or concerns related to this proposal.</p>
+  </section1>
+  <section1 topic="IANA Considerations">
+    <p>No interaction with &IANA; is required as a result of this JEP.</p>
+  </section1>
+  <section1 topic="Jabber Registrar Considerations">
+    <p>No namespaces or parameters need to be registered with the &REGISTRAR; as a result of this JEP.</p>
+  </section1>
+</jep>
diff --git a/xep-0019.xml b/xep-0019.xml
new file mode 100644
index 00000000..707eee1e
--- /dev/null
+++ b/xep-0019.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type="text/xsl" href="../jep.xsl"?>
+<jep>
+<header>
+  <title>Streamlining the JIGs</title>
+  <abstract>This JEP proposes to streamline the existing Jabber Interest Groups (JIGs).</abstract>
+  &LEGALNOTICE;
+  <number>0019</number>
+  <status>Active</status>
+  <type>Procedural</type>
+  <jig>None</jig>
+  <approver>Board</approver>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Saint-Andre</surname>
+    <email>stpeter@jabber.org</email>
+    <jid>stpeter@jabber.org</jid>
+  </author>
+  <revision>
+    <version>1.0</version>
+    <date>2002-03-20</date>
+    <initials>psa</initials>
+    <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-03-06</date>
+    <initials>psa</initials>
+    <remark>Minor revisions.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-02-24</date>
+    <initials>psa</initials>
+    <remark>Initial release.</remark>
+  </revision>
+</header>
+<section1 topic="Introduction">
+  <p>The Jabber Software Foundation is an experiment. When we initially set up our policies, processes, and structures, we knew that our initial thoughts might not be our final thoughts, and that we would need to make adjustments as experience dictated. In this JEP, I argue that just such an adjustment is now necessary with regard to the Jabber Interest Groups (JIGs). <note>The proposal contained in this JEP formalizes some conclusions reached during a weekly discussion forum held by the Jabber Software Foundation on 2002-01-23. A log of that discussion is available at <link url="http://www.jabber.org/chatbot/logs/conference.jabber.org/foundation/2002-01-23.html">http://www.jabber.org/chatbot/logs/conference.jabber.org/foundation/2002-01-23.html</link>. Further discussion within the Standards JIG has been helpful in clarifying the argument presented here.</note></p>
+</section1>
+<section1 topic="The Problem">
+  <p>JEP-0002 <note>URL: <link url='http://www.jabber.org/jeps/jep-0002.html'>http://www.jabber.org/jeps/jep-0002.html</link></note> defined a JIG as "a working group approved by the Jabber Council to address specific areas of growth or concern within the Jabber community", and specified that the function of a JIG is to "produce acceptable enhancements to the Jabber protocol (delivered in the form of Jabber Enhancement Proposals or JEPs) within a reasonably limited period of time". In early January of 2002, JEP-0002 was modified to incorporate language about disbanding a JIG after a defined period of inactivity on the JIG's mailing list (normally six months).</p>
+  <p>Unfortunately, it is widely recognized in the Jabber community that the JIGs are not working. Ten JIGs have been approved by the Jabber Council,<note>See <link url='http://www.jabber.org/jigs.html'>http://www.jabber.org/jigs.html</link> for the official list.</note> eight of them over six months ago in July and August of 2001. Two of the special-purpose JIGs (OOB and Presence) have seen no activity whatsoever and thus are clearly eligible to be disbanded. The other special-purpose JIGs (Conference, Formatting, Forms, Profiles, RPC, and Whiteboard) have seen extremely limited activity and it is a judgment call whether some of them should be allowed to continue according to the current standards defined in JEP-0002. Only the two "standing" JIGs (Security and Standards) have experienced significant and continued mailing list activity, mainly because the Standards JIG has assumed the role of discussion forum for JEPs before they are submitted to the Jabber Council.</p>
+  <p>In perhaps the best measure of success or failure, only one JIG has produced a JEP for submission to the Jabber Council, and that JEP (JEP-0009 <note>URL: <link url='http://www.jabber.org/jeps/jep-0009.html'>http://www.jabber.org/jeps/jep-0009.html</link></note> for transporting XML-RPC over Jabber) was essentially created outside the JIG structure at JabberCon 2001. Perhaps most ominously, no other JIG has shown any signs of progress toward completing a JEP, or even starting work on one. With the possible exception of JEP-0009, all of the JEPs created so far have come from individuals or small, ad-hoc groups -- not through the efforts of the JIGs.</p>
+  <p>In other words, an honest assessment forces us to conclude that the JIGs are not working.</p>
+</section1>
+<section1 topic="Analysis and Possible Solutions">
+  <p>I see several possible solutions to the JIG problem:</p>
+  <ol>
+    <li>"Crack the whip" -- encourage and cajole the existing JIGs into becoming more active, and energetically manage them so that they produce JEPs.</li>
+    <li>"Wait and see" -- immediately disband the JIGs that are clearly inactive but keep the existing JIGs and hope that they will eventually produce something of value (over time disbanding any that are conspicuously inactive).</li>
+    <li>"Bite the bullet" -- recognize that, for whatever reason, the existing structure (many special-purpose interest groups) is not working and seek a better way to produce enhancements to the Jabber protocols.</li>  
+  </ol>
+  <p>Given the lack of activity in the JIGs so far (and the lack of time available to those who would manage them), I am skeptical that "cracking the whip" will produce results, and I believe the onus of proof is on those who would argue that the existing JIGs can be successful. Similarly, taking a "wait and see" attitude will simply let a bad situation continue unchecked, and in my opinion will at some point require us to choose between option 1 and option 3. Rather than postpone the day of reckoning, I argue that we need to address the problem head-on and take action to streamline the JIGs and find a better way of working.</p>
+  <p>But what is that "better way"? In order to figure that out, we need to understand why things are not working now. I don't think it's that the current JIG members are lazy, stupid, or incompetent -- after all, these are the same people who have in many instances created good Jabber-based software. Nor do I think it's that members of the Jabber community are incapable of creating JEPs, because individually and in small, ad-hoc groups they have created quite a few.</p>
+  <p>I see several reasons why the JIGs are not working:</p>
+  <ol>
+    <li>The Jabber community right now is too small to be split up successfully into smaller interest groups.</li>
+    <li>We have tried to overlay too much structure too quickly. Jabber has traditionally been a fairly anarchic project (or set of projects), and creating ten JIGs right away was at odds with that successful lack of structure.</li>
+    <li>Good JEPs, like good software programs, are usually created by at most a few interested people, not a formal group. Formal groups are not needed to move Jabber forward.</li>
+  </ol>
+  <p>If we reflect on what is working, we see that JEPs are being produced by individuals and small, ad-hoc groups. We also see that active discussion of those proposals is taking place in the Standards JIG, which contains everyone who is strongly interested in the Jabber protocols. Finally, we notice that the special-purpose JIGs have not played any appreciable role in our success so far.</p>
+</section1>
+<section1 topic="Proposed Solution">
+  <p>My proposed solution takes into account everything we have learned to date about producing JEPs and advancing the state of the Jabber protocols. Specifically, I propose that we take the following steps:</p>
+  <ol>
+    <li>Immediately disband all but the Standards JIG. <note>In an earlier version of this JEP, I proposed that we retain the Security JIG. However, since there is a security aspect to all protocols, I now think it is best if security-related topics are discussed within the Standards JIG, not in a separate Security JIG.</note></li>
+    <li>Rely on individuals and small, ad-hoc groups to create JEPs.</li>
+    <li>Continue to use the Standards JIG as the preferred forum for discussion of experimental JEPs before they are submitted to the Jabber Council.</li>
+    <li>If the Standards JIG cannot reach a working consensus on a given topic, let the JEP author(s) continue to rework their proposal informally outside the context of the Standards JIG. <note>One option would be to send interested parties off to their own ad-hoc mailing list (e.g., on JabberStudio, <link url="http://www.jabberstudio.org/">http://www.jabberstudio.org/</link>). Unlike the current JIGs, such a list would be established on the initiative of the JEP author(s) and would not require any formal approval by the Jabber Council.</note></li>
+  </ol>
+  <p>There may be value in bringing back specialized JIGs in the future when the Jabber community becomes larger. However, at this time I urge that we face the facts and proactively implement the solution I have outlined in this JEP. <note>Lest there be any concern that disbanding the JIGs is outside the power or purview of the Jabber Council, I note that Section 8.2 of the Bylaws of the Jabber Software Foundation states in part that "The Jabber Council or the Members of the Corporation may, by resolution, ... terminate a Jabber Interest Group at any time for any reason." (An electronic copy of the Bylaws may be found at <link url="http://www.jabber.org/bylaws.html">http://www.jabber.org/bylaws.html</link>.)</note></p>
+</section1>
+</jep>
diff --git a/xep-0020.xml b/xep-0020.xml
new file mode 100644
index 00000000..f016e8d3
--- /dev/null
+++ b/xep-0020.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Feature Negotiation</title>
+  <abstract>This JEP defines a A protocol that enables two Jabber entities to mutually negotiate feature options.</abstract>
+  &LEGALNOTICE;
+  <number>0020</number>
+  <status>Draft</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>JEP-0004</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>feature-neg</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/feature-neg/feature-neg.xsd</url>
+  </schemaloc>
+  &pgmillard;
+  &stpeter;
+  <revision>
+    <version>1.4</version>
+    <date>2004-05-21</date>
+    <initials>psa</initials>
+    <remark>Moved remaining feature negotiation text from JEP-0030 to this document.</remark>
+  </revision>
+  <revision>
+    <version>1.3</version>
+    <date>2004-04-23</date>
+    <initials>psa</initials>
+    <remark>Per Council discussion, changed root element from &lt;query/&gt; to &lt;feature/&gt; for the sake of consistency with using protocols; moved some text from JEP-0030 to this document.</remark>
+  </revision>
+  <revision>
+    <version>1.2</version>
+    <date>2004-03-08</date>
+    <initials>psa</initials>
+    <remark>Added XMPP error handling; clarified the text; corrected the examples; fixed an error in the schema; added numerous references.</remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2003-02-16</date>
+    <initials>psa</initials>
+    <remark>Made corrections to the text; added security and IANA considerations; added schema.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-12-06</date>
+    <initials>psa</initials>
+    <remark>Per a vote of the Jabber Council, revision 0.4 was advanced to Draft on 2002-12-06.</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2002-11-17</date>
+    <initials>pgm</initials>
+    <remark>Changed protocol to use jabber:x:data.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-10-01</date>
+    <initials>pgm</initials>
+    <remark>Added some extra text to help clarify protocol &amp; purpose.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-05-22</date>
+    <initials>pgm</initials>
+    <remark>Changed examples.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-02-26</date>
+    <initials>pgm</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+<section1 topic="Introduction" anchor='intro'>
+  <p>A discovery protocol such as &jep0030; enables Jabber entities to query other entities regarding the features they support, but does not provide a means for the two entities to negotiate specific options related to the advertised features (e.g., specific methods of file transfer such as &jep0047; or &jep0065;).</p>
+  <p>The protocol defined herein enables Jabber entities to negotiate options for specific features. These features could be negotiated between any two endpoints on the Jabber network, such as two clients, a client and a component, two components, a client and a server, or two servers. The protocol is generic enough that it can be used whenever options need to be negotiated between two Jabber entities.</p>
+</section1>
+<section1 topic="Protocol Details" anchor='protocol'>
+  <p>Features are negotiated though the exchange of &IQ; stanzas containing &QUERY; child elements qualified by the 'http://jabber.org/protocol/feature-neg' namespace. However, this &QUERY; element is simply a wrapper for structured data encapsulated in the &jep0004; protocol. <note>Earlier versions of this JEP defined an structured data format to handle the feature negotiation workflow; versions later than 0.4 use <strong>Data Forms</strong>, i.e., the 'jabber:x:data' namespace.</note></p>
+  <p>In order to begin a negotation, the initiator sends an &IQ; stanza of type "get" to the recipient with a single &lt;feature/&gt; element containing a data form of type "form" which defines the available options for one or more features. Each feature is represented as an x-data "field", which MUST be of type "list-single" as specified in JEP-0004.</p>
+  <p>The recipient SHOULD examine each feature and the options provided. In order to indicate preferred options, the recipient then SHOULD specify one option for each feature and return a data form of type "submit" to the initiator in an &IQ; stanza of type "result".</p>
+  <p>The following examples show some likely scenarios for feature negotiation between entities. Further examples can be found in using protocols, such as &jep0096;.</p>
+  <section2 topic="Basic Flow" anchor='protocol-basic'>
+    <p>A typical negotiation flow is shown in the following example of two entities negotiating the time and place for a meeting.</p>
+    <example caption="Initiating entity sends offer"><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='juliet@capulet.com/balcony'
+    id='neg1'>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='form'>
+      <field type='list-single' var='places-to-meet'>
+         <option><value>Lover's Lane</value></option>
+         <option><value>Secret Grotto</value></option>
+         <option><value>Verona Park</value></option>
+      </field>
+      <field type='list-single' var='times-to-meet'>
+         <option><value>22:00</value></option>
+         <option><value>22:30</value></option>
+         <option><value>23:00</value></option>
+         <option><value>23:30</value></option>
+      </field>
+    </x>
+  </feature>
+</iq>
+    ]]></example>
+    <example caption="Responding entity sends preferred option values"><![CDATA[
+<iq type='result'
+    id='neg1'
+    from='juliet@jabber.org/balcony'
+    to='romeo@montague.net/orchard'>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='places-to-meet'>
+        <value>Secret Grotto</value>
+      </field>
+      <field var='times-to-meet'>
+        <value>22:30</value>
+      </field>
+    </x>
+  </feature>
+</iq>
+    ]]></example>
+    <p>If the responding entity does not support one or more of the features, it MUST return a &feature; error, and SHOULD specify the feature(s) not implemented in the XMPP &lt;text/&gt; element.</p>
+    <example caption="Responding entity does not support a feature"><![CDATA[
+<iq type='error'
+    id='neg1'
+    from='juliet@jabber.org/balcony'
+    to='romeo@montague.net/orchard'>
+  <error code='501' type='cancel'>
+    <feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+    <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>times-to-meet</text>
+  </error>
+</iq>
+    ]]></example>
+    <p>If the responding entity supports none of the options offered for a certain feature, it MUST return a &notacceptable; error, and SHOULD specify the relevant feature in the XMPP &lt;text/&gt; element.</p>
+    <example caption="Responding entity supports no options"><![CDATA[
+<iq type='error'
+    from='juliet@jabber.org/balcony'
+    to='romeo@montague.net/orchard'
+    id='neg1'>
+  <error code='406' type='modify'>
+    <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+    <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>places-to-meet</text>
+  </error>
+</iq>
+    ]]></example>
+  </section2>
+  <section2 topic="Querying for Negotiable Features" anchor='protocol-query'>
+    <p>If at least one feature offered by an entity is subject to &jep0020;, the entity's response to a service discovery information request MUST include &lt;feature var='http://jabber.org/protocol/feature-neg'/&gt; as one of the features.</p>
+    <example caption='Client queries a chatroom for supported features'><![CDATA[
+<iq type='get'
+    from='juliet@capulet.com/balcony'
+    to='balconyscene@plays.shakespeare.lit'
+    id='neg1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>]]></example>
+    <example caption='Chatroom returns supported features'><![CDATA[
+<iq type='result'
+    from='balconyscene@plays.shakespeare.lit'
+    to='juliet@capulet.com/balcony'
+    id='neg1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    ...
+    <feature var='http://jabber.org/protocol/feature-neg'/>
+    <feature var='muc-password'/>
+    ...
+  </query>
+</iq>]]></example>
+    <p>The using protocol (in these examples, &jep0045;) SHOULD specify which features might be negotiable, either in the relevant documentation or in the entry for that feature in the service discovery features registry maintained by the Jabber Registrar. However, the requesting entity MAY also query the responding entity in order to determine which features are negotiable, as shown below.</p>
+    <example caption='Client queries a chatroom for supported features'><![CDATA[
+<iq type='get'
+    from='juliet@capulet.com/balcony'
+    to='balconyscene@plays.shakespeare.lit'
+    id='neg1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>]]></example>
+    <example caption='Chatroom returns supported features'><![CDATA[
+<iq type='result'
+    from='balconyscene@plays.shakespeare.lit'
+    to='juliet@capulet.com/balcony'
+    id='neg1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    ...
+    <feature var='http://jabber.org/protocol/feature-neg'/>
+    <feature var='muc-password'/>
+    ...
+  </query>
+</iq>]]></example>
+    <p>The using protocol (in these examples, <cite>JEP-0045</cite>) SHOULD specify which features might be negotiable, either in the relevant documentation or in the entry for that feature in the service discovery features registry maintained by the Jabber Registrar (see &lt;<link url='http://www.jabber.org/registrar/disco-vars.html'>http://www.jabber.org/registrar/disco-vars.html</link>&gt;). However, the requesting entity MAY also query the responding entity in order to determine which features are negotiable, as shown below.</p>
+    <example caption='Client queries chatroom regarding options for a negotiable feature'><![CDATA[
+<iq type='get'
+    from='juliet@capulet.com/balcony'
+    to='balconyscene@plays.shakespeare.lit'
+    id='neg2'>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='muc-password'/>
+    </x>
+  </feature>
+</iq>]]></example>
+    <p>If that feature is not negotiable, the responding entity MUST return a "Feature Not Implemented" error:</p>
+    <example caption='Chatroom returns error'><![CDATA[
+<iq type='result'
+    from='balconyscene@plays.shakespeare.lit'
+    to='juliet@capulet.com/balcony'
+    id='neg2'>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='result'>
+      <field var='muc-password' type='list-single'>
+        <option><value>cleartext</value></option>
+        <option><value>SHA1</value></option>
+        <option><value>SASL</value></option>
+      </field>
+    </x>
+  </feature>
+  <error code='501' type='cancel'>
+    <feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</iq>]]></example>
+    <p>If that feature is negotiable, the responding entity MUST return an appropriate negotiation form:</p>
+    <example caption='Chatroom returns negotiation form'><![CDATA[
+<iq type='result'
+    from='balconyscene@plays.shakespeare.lit'
+    to='juliet@capulet.com/balcony'
+    id='neg2'>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='result'>
+      <field var='muc-password' type='list-single'>
+        <option><value>cleartext</value></option>
+        <option><value>SHA1</value></option>
+        <option><value>SASL</value></option>
+      </field>
+    </x>
+  </feature>
+</iq>]]></example>
+    <p>The requesting entity MAY then submit a data form containing the required information.</p>
+  </section2>
+</section1>
+
+<section1 topic='Security Considerations' anchor='security'>
+  <p>Security considerations are the responsibility of the using protocol.</p>
+</section1>
+
+<section1 topic='IANA Considerations' anchor='iana'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+
+<section1 topic="Jabber Registrar Considerations" anchor='registrar'>
+  <p>In order for Jabber entities to adequately leverage <strong>Data Forms</strong> (e.g., by using machine-readable fields), it is RECOMMENDED to register standard x-data fields with the &REGISTRAR; via the mechanisms defined in &jep0068;. Whether to do so for any given features and options shall be determined by the using protocol.</p>
+</section1>
+
+<section1 topic='XML Schema' anchor='schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://jabber.org/protocol/feature-neg'
+    xmlns='http://jabber.org/protocol/feature-neg'
+    elementFormDefault='qualified'>
+
+  <xs:import 
+      namespace='jabber:x:data'
+      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0020: http://www.jabber.org/jeps/jep-0020.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='feature'>
+    <xs:complexType>
+      <xs:sequence xmlns:data='jabber:x:data'>
+        <xs:element ref='data:x'/>
+      </xs:sequence>
+    </xs:complexType>
+
+</xs:schema>
+  ]]></code>
+</section1>
+<section1 topic='Author Note' anchor='authornote'>
+  <p>Peter Millard, the primary author of this specification from version 0.1 through version 1.4, died on April 26, 2006. The remaining author is thankful for Peter's work on this specification.</p>
+</section1>
+</jep>
diff --git a/xep-0021.xml b/xep-0021.xml
new file mode 100644
index 00000000..86721741
--- /dev/null
+++ b/xep-0021.xml
@@ -0,0 +1,343 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+
+<jep>
+
+<header>
+  <title>Jabber Event Notification Service (ENS)</title>
+  <abstract>A generic publish-and-subscribe service for Jabber.</abstract>
+  &LEGALNOTICE;
+  <number>0021</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <supersedes>None</supersedes>
+  <supersededby>JEP-0060</supersededby>
+  <shortname>None</shortname>
+  <author>
+    <firstname>Robert</firstname>
+    <surname>Norris</surname>
+    <email>rob@cataclysm.cx</email>
+    <jid>rob@cataclysm.cx</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2003-04-22</date>
+    <initials>psa</initials>
+    <remark>At the request of the author, the status of this JEP has been changed to Retracted since it has been superseded by JEP-0060. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-03-04</date>
+    <initials>rn</initials>
+    <remark>Initial version</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p>The Jabber Event Notification Service (ENS) acts as a dispatcher and may be used by applications as a central point of collection for certain types of events that are of interest to them. Examples of events include:</p>
+
+  <ul>
+   <li>User has logged in</li>
+   <li>A new message has arrived</li>
+   <li>User's avatar has changed</li>
+   <li>The coffee machine is empty</li>
+  </ul>
+  
+  <p>In Jabber, the role of the ENS has traditionally been filled by overloading the &lt;presence/&gt; packet type. However, this method was never designed to be used as a general publish-and-subscribe mechanism, and so has the following problems:</p>
+
+  <ul>
+   <li>Dispatching of &lt;presence/&gt; packets is performed by the JSM (Jabber Session Manager), and so is not easily usable by components and other entities that don't connect via a client manager (c2s, CCM).</li>
+   <li>An entity cannot subscribe to the presence of a specific resource of another entity, only to any presence from that entity. This lack of granularity makes its difficult to use &lt;presence/&gt; in situations where large chunks of data must be dispatched to subscribers (eg avatars).</li>
+  </ul>
+  
+  <p>The protocol consists of two parts - the subscriber-to-ENS protocol, and the publisher-to-ENS protocol. Since there is no direct interaction between a publisher and a subscriber, it makes sense to seperate the two parts of the protocol.</p>
+
+  <p>The protocol operates in the 'http://xml.cataclysm.cx/jabber/ens/' namespace.</p>
+
+  <p>A reference implementation is available at <link url='http://cataclysm.cx/jabber/ens.html'>http://cataclysm.cx/jabber/ens.html</link>.</p>
+</section1>
+
+<section1 topic='Definitions'>
+  <p>Before we begin describing the protocol, is it necessary to define some terms, including the function and responsibilties of the entities that communicate with the ENS.</p>
+
+  <section2 topic='Event'>
+    <p>An event can be defined as a change to the value of one or more properties of a resource.</p>
+
+    <p>In the ENS, an event type is referred to by a JID (Jabber IDentifier), including the JID resource. For example, consider a hypothetical publisher that is linked to an IMAP message store. It might notify the ENS of the fact the a message has arrived, deleted, or filed, using the following JIDs:</p>
+
+    <ul>
+      <li>rob@imap.cataclysm.cx/NewMessage</li>
+      <li>joe@imap.cataclysm.cx/DeletedMessage</li>
+      <li>jim@imap.cataclysm.cx/FiledMessage</li>
+    </ul>
+
+    <p>Alternatively, an end-user client that wanted to notify the ENS when its avatar changes might do so using a JID like &quot;rob@cataclysm.cx/avatar&quot;</p>
+  </section2>
+
+  <section2 topic='Subscriber'>
+    <p>A subscriber is a Jabber entity that receives notifications about events. Usually, a subscriber will be an end-user client, but it may be any Jabber entity.</p>
+
+    <p>As the name suggests, a subscriber can subscribe and unsubscribe to various events via the ENS. When it subscribes, the publisher responsible for the event it is subscribing to will be asked by the ENS to authorise the subscription request. To facilitate this, the subscriber may provide an XML fragment containing information that the publisher can use to authorise it. The use of this fragment is application specific.
+    </p>
+
+    <p>Once subscribed to an event, the subscriber will receive any notifications that the publisher sends about that event.</p>
+  </section2>
+
+  <section2 topic='Publisher'>
+    <p>A publisher is the Jabber entity responsible for actually sending event notifications to the ENS. A notification contains the event type JID of the event that occured, and an optional &quot;payload&quot; XML fragment, that is passed untouched by the ENS to the subscriber. The contents of this payload is application-specific and can be used to provide detailed information about the event to the subscriber. For example, in the case of the NewMessage event above, the payload might contain the contents of the To:, From: and Subject: headers of the message.</p>
+
+    <p>Additionally, the publisher is responsible for deciding who may subscribe to events it publishes. When the ENS receives a subscription request, it will ask the publisher to decide whether or not the subscriber may subscribe to a particular event. This authorisation request may also contain an XML fragment from the subscriber containing information that may be used for authorisation.</p>
+  </section2>
+
+</section1>
+
+<section1 topic='Subscriber protocol'>
+
+  <section2 topic='Subscription request'>
+    <p>To subscribe to a particular event, the subscriber sends a packet like of the following form to the ENS:</p>
+
+    <example caption='Subscription request'>
+&lt;iq id='sub1' type='set' from='subscriber-jid' to='ens-jid'&gt;
+  &lt;subscribe xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <section3 topic='Option: &lt;auth-info/&gt;'>
+      <p>The subscriber may include an &lt;auth-info/&gt; XML fragment containing some (application-specific) information that the publisher can use to authorise it:</p>
+
+      <example caption='Subscription request with authorisation information'>
+&lt;iq id='sub2' type='set' from='subscriber-jid' to='ens-jid'&gt;
+  &lt;subscribe xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'&gt;
+    &lt;auth-info xmlns='jabber:iq:auth'&gt;password&lt;/auth-info&gt;
+  &lt;/subscribe&gt;
+&lt;/iq&gt;
+      </example>
+    </section3>
+
+    <section3 topic='Option: &lt;reliable/&gt;'>
+      <p>If it wishes, the subscriber may request a &quot;reliable&quot; subscription. This option guarantees that the subscriber will receive all notifications about this event (as far as the Jabber architecture guarantees delivery). This changes the semantics of the subscriber publish protocol - see section 3.6 for more details.</p>
+
+      <example caption='Reliable subscription request'>
+&lt;iq id='sub2' type='set' from='subscriber-jid' to='ens-jid'&gt;
+  &lt;subscribe xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'&gt;
+    &lt;reliable/&gt;
+  &lt;/subscribe&gt;
+&lt;/iq&gt;
+      </example>
+    </section3>
+
+  </section2>
+
+  <section2 topic='Subscription response'>
+    <p>Once subscribed, the ENS will return a packet of the following form to the subscriber:</p>
+
+    <example caption='Successful subscription response'>
+&lt;iq id='sub1' type='result' from='ens-jid' to='subscriber-jid'&gt;
+  &lt;subscribed xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>If an error occured during subscription (such as the publisher not allowing the subscriber to subscribe), an error packet will be returned to the subscriber:</p>
+
+    <example caption='Failed subscription response'>
+&lt;iq id='sub1' type='error' from='ens-jid' to='subscriber-jid'&gt;
+  &lt;subscribe xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'/&gt;
+  &lt;error code='401'&gt;Unauthorized&lt;/error&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>The actual error fragment in the packet is a direct copy of the one returned by the publisher when it fails the authorisation request from the ENS. If the publisher does not provide one, error code 503 (Service Unavailable) will be returned instead. If the publisher does not respond to the authorisation request (after an implementation-specific timeout), error code (Remote Server Timeout) will be returned.</p>
+  </section2>
+
+  <section2 topic='Unsubscription request'>
+    <p>To unsubscribe from a particular event, the subscriber sends a packet like of the following form to the ENS:</p>
+
+    <example caption='Unsubscription request'>
+&lt;iq id='unsub1' type='set' from='subscriber-jid' to='ens-jid'&gt;
+  &lt;unsubscribe xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+  </section2>
+
+  <section2 topic='Unsubscription response'>
+    <p>Once unsubscribed, the ENS will return a packet of the following form to the subscriber:</p>
+
+    <example caption='Unsubscription response'>
+&lt;iq id='unsub1' type='result' from='ens-jid' to='subscriber-jid'&gt;
+  &lt;unsubscribed xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>No further notifications for the event will be received.</p>
+  </section2>
+
+  <section2 topic='Publish'>
+    <p>When a publisher publishes a notification to the ENS, the ENS will forward the notification to any subscribers for that event. A notification sent to a subscriber takes the following form:</p>
+
+    <example caption='Event notification (publish)'>
+&lt;iq id='enspub1' type='set' from='ens-jid' to='subscriber-jid'&gt;
+  &lt;publish xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>A notification may also contain a (application-specific) &quot;payload&quot; XML fragment:</p>
+    
+    <example caption='Event notification (publish) with payload'>
+&lt;iq id='enspub2' type='set' from='ens-jid' to='subscriber-jid'&gt;
+  &lt;publish xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='event-jid'&gt;
+    &lt;xml-payload/&gt;
+  &lt;/publish&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>Section 4.1 has more information about the payload.</p>
+
+    <p>If the subscriber responds to the notification with an error, the subscriber will be automatically unsubscribed from the event by the ENS.</p>
+  </section2>
+
+  <section2 topic='Publish response (reliable subscriptions)'>
+    <p>If the &lt;reliable/&gt; option was specified when the subscriber subscribed to the event, then the subscriber is expected to acknowledge a notification with a packet of the following form:</p>
+
+    <example caption='Event notification (publish) response'>
+&lt;iq id='enspub1' type='result' from='subscriber-jid' to='ens-jid'&gt;
+  &lt;published xmlns='http://xml.cataclysm.cx/jabber/ens/'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>If the subscriber does not respond, or responds with an error, the notification will be resent by the ENS after a (implementation-specific) timeout.</p>
+  </section2>
+</section1>
+
+<section1 topic='Publisher protocol'>
+  <section2 topic='Publish'>
+    <p>To publish a notification, the publisher sends a packet of the following form to the ENS:</p>
+
+    <example caption='Event notification (publish)'>
+&lt;iq id='pub1' type='set' from='event-jid' to='ens-jid'&gt;
+  &lt;publish xmlns='http://xml.cataclysm.cx/jabber/ens/'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>A notification may also contain a (application-specific) &quot;payload&quot; XML fragment:</p>
+    
+    <example caption='Event notification (publish) with payload'>
+&lt;iq id='pub1' type='set' from='event-jid' to='ens-jid'&gt;
+  &lt;publish xmlns='http://xml.cataclysm.cx/jabber/ens/'&gt;
+    &lt;xml-payload/&gt;
+  &lt;/publish&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>The payload can be any well-formed XML data. Everything inside the &lt;publish/&gt; tag will be forwarded untouched to the subscriber.</p>
+  </section2>
+
+  <section2 topic='Publish response'>
+    <p>Once the ENS has dispatched the notification to subscribers, it will return a packet of the following form to the publisher:</p>
+
+    <example caption='Event notification (publish) response'>
+&lt;iq id='pub1' type='result' from='ens-jid' to='event-jid'&gt;
+  &lt;published xmlns='http://xml.cataclysm.cx/jabber/ens/'/&gt;
+&lt;/iq&gt;
+    </example>
+  </section2>
+
+  <section2 topic='Authorisation request'>
+    <p>A publisher is required to approve subcription requests. When a subscriber attempts to subscribe to an event, the publisher will receive a packet of the following form from the ENS:</p>
+
+    <example caption='Authorisation request'>
+&lt;iq id='ensauth1' type='get' from='ens-jid' to='event-jid'&gt;
+  &lt;authorise xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='subscriber-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>The subscriber may include an &lt;auth-info/&gt; XML fragment containing some (application-specific) information that the publisher can use to authorise it:</p>
+    
+    <example caption='Authorisation request with authorisation information'>
+&lt;iq id='ensauth1' type='get' from='ens-jid' to='event-jid'&gt;
+  &lt;authorise xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='subscriber-jid'&gt;
+    &lt;auth-info xmlns='jabber:iq:auth'&gt;password&lt;/auth-info&gt;
+  &lt;/authorise&gt;
+&lt;/iq&gt;
+    </example>
+
+  </section2>
+
+  <section2 topic='Authorisation response'>
+    <p>To signal to the ENS that a subscriber should be allowed to subscribe, the publisher should return a packet of the following form:</p>
+    
+    <example caption='Successful authorisation response'>
+&lt;iq id='ensauth1' type='result' from='event-jid' to='ens-jid'&gt;
+  &lt;authorised xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='subscriber-jid'/&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>To deny the subscription, the publisher should return an error packet, containing the appropriate &lt;error/&gt; fragment:</p>
+
+    <example caption='Unsuccessful authorisation response'>
+&lt;iq id='ensauth1' type='error' from='event-jid' to='ens-jid'&gt;
+  &lt;authorise xmlns='http://xml.cataclysm.cx/jabber/ens/' jid='subscriber-jid'/&gt;
+  &lt;error code='401'&gt;Unauthorized&lt;/error&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p>The &lt;error/&gt; fragment will be copied untouched into the error response sent back to the subscriber. See section 3.2 for more details.</p>
+  </section2>
+</section1>
+
+<section1 topic='Errors'>
+  <p>The ENS will respond with error code 400 (Bad Request) any time it receives a request that it cannot understand (a malformed packet, for example).</p>
+
+  <p>Other errors may occur, and they are described in the appropriate sections of the above protocol specification.</p>
+</section1>
+
+<section1 topic='Considerations'>
+  <p>The following items should be discussed before this proposal is approved by the Council:</p>
+
+  <section2 topic='ENS discovery'>
+    <p>The ENS, as described, works well. However, no provisions are made for a subscriber to find out which ENS a publisher is publishing to. It does a subscriber no good to subscribe to an event on the wrong ENS - the subscription would succeed (assuming the publisher allows it), but no notifications would ever be received.</p>
+
+    <p>There are several potential solutions, each with their problems:</p>
+
+    <ul>
+      <li>Leave it to the subscriber to find the appropriate ENS outside of the ENS framework itself. This might be via a browse to the publisher, or maybe just entering it into their client's configuration. Obviously, this is very application-specific.</li>
+      <li>Force the publisher to publish to multiple ENSs, as necessary. This would require additions to the protocol (to tell the publisher of new ENSs), and would require the publisher to maintain a list of JIDs it needs to publish to. This solution is pointless - if the publisher is going to publish to multiple JIDs and maintain its own list, it might as well publish direct to subscribers.</li>
+      <li>Have some sort of ENS-to-ENS protocol, and have ENSs proxy publishes for other ENSs. This does not fix the problem, it just moves it away from the subscriber and into the ENS. An ENS will still need to find out which ENS the publisher is publishing to.</li>
+      <li>Integrate ENS into the session manager. This leaves us with a glorified presence system, and makes the ENS basically unusable by non-session-manager-based server components.</li>
+    </ul>
+    
+    <p>This problem may be outside of the scope of this specification.</p>
+  </section2>
+
+  <section2 topic='How reliable should &lt;reliable/&gt; be?'>
+    <p>Currently, if a subscriber obtains a reliable subscription, and then disappears from the network (as an end-user client might), the ENS will continue to send notifications to it (ignoring errors) until it unsubscribes. If the subscriber never comes back, then ENS will send notifications forever (in theory).</p>
+
+    <p>At what point should even &lt;reliable/&gt; have its limits? Should we unsubscribe a reliable subscriber who bounces (ie. the Jabber server failed to deliver) more than, say, 10 publishes? Or maybe they should be unsubscribed if they do not respond (as in section 3.6) to anything for, say, 10 minutes?</p>
+
+    <p>&lt;reliable/&gt; is an interesting idea, but it may be that it is too problematic for its own good.</p>
+  </section2>
+
+  <section2 topic='Longevity of subscriptions'>
+    <p>The topic of reliable subscriptions raises the question as to how long a subscription lasts. Should a subscription last forever (like &lt;presence/&gt; does), even across restarts of the server?</p>
+
+    <p>If end-user clients are to be subscribers, then under this scheme the ENS would have to subscribe to presence, so as to know when the client has disconnected. Since presence is a function of the session manager, this could have the effect of making the ENS less generic that we may like.</p>
+  </section2>
+
+  <section2 topic='Replacing &lt;presence/&gt; with the ENS?'>
+    <p>As I see it, basic presence will always be a function of the session manager, for the following reasons:</p>
+
+    <ul>
+      <li>No ENS discovery problems</li>
+      <li>Subscriptions are maintained across sessions</li>
+      <li>In very widespread use (ie. everywhere)</li>
+    </ul>
+
+    <p>I think the places where the ENS can boom will be in applications like avatars, and genuine event-based systems (like the kind described above - &quot;you have new mail&quot;, &quot;someone has scheduled a meeting with you in your online calendar&quot;, etc).</p>
+  </section2>
+</section1>
+
+</jep>
diff --git a/xep-0022.xml b/xep-0022.xml
new file mode 100644
index 00000000..0f1feceb
--- /dev/null
+++ b/xep-0022.xml
@@ -0,0 +1,321 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Message Events</title>
+  <abstract>This JEP defines protocol extensions used to request and respond to events relating to the delivery, display, and composition of messages.</abstract>
+  &LEGALNOTICE;
+  <number>0022</number>
+  <status>Active</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>x-event</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/x-event/x-event.xsd</url>
+  </schemaloc>
+  &jer;
+  <author>
+    <firstname>DJ</firstname>
+    <surname>Adams</surname>
+    <email>dj.adams@pobox.com</email>
+    <jid>dj@gnu.mine.nu</jid>
+  </author>
+  &stpeter;
+  <revision>
+    <version>1.3</version>
+    <date>2004-01-06</date>
+    <initials>psa</initials>
+    <remark>Added XML schema.</remark>
+  </revision>
+  <revision>
+    <version>1.2</version>
+    <date>2003-02-11</date>
+    <initials>psa</initials>
+    <remark>Attempted to clarify usage and business rules.</remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2003-01-26</date>
+    <initials>psa</initials>
+    <remark>Added more detailed information and clarified a few points.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-03-13</date>
+    <initials>dja</initials>
+    <remark>Minor corrections and additions.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-03-05</date>
+    <initials>dja</initials>
+    <remark>Initial draft.</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p>The 'jabber:x:event' namespace defines extensions used to request and respond to events relating to the delivery, display, and composition of messages.</p>
+  <p>By attaching a jabber:x:event extension to a &MESSAGE; element, the sender can track stages in the delivery of that message to its recipient.</p>
+</section1>
+
+<section1 topic='The Events'>
+  <p>There are four message events currently defined in this namespace:</p>
+
+  <section2 topic='Offline'>
+    <p>Indicates that the message has been stored offline by the intended recipient's server. This event is triggered only if the intended recipient's server supports offline storage, has that support enabled, and the recipient is offline when the server receives the message for delivery.</p>
+  </section2>
+
+  <section2 topic='Delivered'>
+    <p>Indicates that the message has been delivered to the recipient. This signifies that the message has reached the recipient's Jabber client, but does not necessarily mean that the message has been displayed. This event is to be raised by the Jabber client.</p>
+  </section2>
+
+  <section2 topic='Displayed'>
+    <p>Once the message has been received by the recipient's Jabber client, it may be displayed to the user. This event indicates that the message has been displayed, and is to be raised by the Jabber client. Even if a message is displayed multiple times, this event should be raised only once.</p>
+  </section2>
+
+  <section2 topic='Composing'>
+    <p>In threaded chat conversations, this indicates that the recipient is composing a reply to a message. The event is to be raised by the recipient's Jabber client. A Jabber client is allowed to raise this event multiple times in response to the same request, providing the original event is cancelled first.</p>
+  </section2>
+</section1>
+
+<section1 topic='Usage'>
+
+  <p>Extensions qualified by the jabber:x:event namespace may be used only in the context of &MESSAGE; elements. That is, event information should be requested, and given in response, in relation to &MESSAGE; elements only, and not &PRESENCE; or &IQ; elements.</p>
+  <p>Event information should only be sent in response to a request for that information. Unsolicited event information is illegal. In addition, a client should not request message event information from a correspondent if it is known (for example through the results of a previous browse request) that the correspondent does not support message events.</p>
+  <p>Any request for the offline event in a message that has been stored offline must be removed by the server before the message is forwarded to the Jabber client. This means that any &lt;offline/&gt; tag should be removed from the extension.</p>
+
+  <section2 topic='Requesting Event Notifications'>
+  <p>Event notifications are requested by attaching an extension qualified by the jabber:x:event namespace to a &MESSAGE; element. A tag representing each event type requested for that message should be placed within the extension. Only one jabber:x:event extension may be attached to a &MESSAGE; element, but multiple event types may be requested within that one extension. The tags representing each of the event types are &lt;offline/&gt;, &lt;delivered/&gt;, &lt;displayed/&gt;, and &lt;composing/&gt;.</p>
+  <p>An example of a &MESSAGE; element with a jabber:x:event extension is shown here.</p>
+  <example caption='Requesting notification of offline storage and delivery for a message'><![CDATA[
+<message to='romeo@montague.net' id='message22'>
+  <body>Art thou not Romeo, and a Montague?</body>
+  <x xmlns='jabber:x:event'>
+    <offline/>
+    <delivered/>
+    <composing/>
+  </x>
+</message>
+  ]]></example>
+  <p>Here we see the sender wants to be notified if the message is stored offline (by the server), notified when the message is delivered (to the client), and notified if the recipient begins replying to the message. In this case, the sender will potentially receive three events based on this request.  The first if the recipient is offline and the message is stored on the server, the second when the recipient becomes available and the message is delivered, and the third if the recipient begins composing a reply to the message.</p>
+  <p>Note that the &MESSAGE; element requesting event notification contains an 'id' attribute. While these attributes are optional in the Jabber protocol, messages that contain event notification requests MUST contain an 'id' attribute so that raised events may be matched up with their original requests.</p>
+  </section2>
+
+  <section2 topic='Raising Events'>
+  <p>If the message is stored by the server, the server must raise the requested event (offline) by sending a message to the sender as shown in this example:</p>
+  <example caption='Raising the offline event'><![CDATA[
+<message
+    from='romeo@montague.net'
+    to='juliet@capulet.com/balcony'>
+  <x xmlns='jabber:x:event'>
+    <offline/>
+    <id>message22</id>
+  </x>
+</message>
+  ]]></example>
+  <p>When raising an event, the raiser must send a &MESSAGE; element constructed according to the following rules:</p>
+    <ul>
+      <li>The element must contain only a jabber:x:event extension. Standard message elements such as &lt;subject/&gt;, &lt;body/&gt;, MUST NOT be included.</li>
+      <li>The extension must contain one tag representing the event being raised.  For example, if the offline event is being raised, an &lt;offline/> tag must be included. (The events are temporally exclusive, thus only one event tag should ever be included.)</li>
+      <li>The extension must also contain an &lt;id/&gt; tag. The contents of this tag MUST be the value of the 'id' <em>attribute</em> of the original message to which this event notification pertains. (If no 'id' attribute was included in the original message, then the &lt;id/&gt; tag must still be included with no CDATA.)</li>
+      <li>The message's from attribute should be set to the recipient of the original message for which the event is being raised. (This is an issue more relevant for the server, in responding to the offline event, because clients should rely on the server to stamp the elements that they send out with a from attribute.)</li>
+      <li>The link between the original message for which the event is being raised, and the message containing that raised event, is the &lt;id/&gt; tag in the jabber:x:event extension of the message containing that raised event, that points to the id attribute of the original message.</li>
+    </ul>
+  </section2>
+
+  <section2 topic='The Composing Event'>
+  <p>The composing event is slightly different from the other events in that it can be raised and cancelled multiple times. This is to allow the reflection of what actually is happening when a user replies to a message; he may start composing a reply, which would trigger the composing event, get halfway through, and stop (by some definition of "stop", which may be implementation-specific). At this stage the event is no longer valid, or at least doesn't make much sense. So the client may send a cancellation for the composing event just raised.</p>
+  <p>The cancellation is raised by sending another jabber:x:event; however, in contrast to how the events are usually raised, no &lt;composing/&gt; tag is sent, just an &lt;id/&gt; tag, like this:</p>
+  <example caption='Romeo begins to compose a reply'><![CDATA[
+<message
+    from='romeo@montague.net'
+    to='juliet@capulet.com/balcony'>
+  <x xmlns='jabber:x:event'>
+    <composing/>
+    <id>message22</id>
+  </x>
+</message>
+  ]]></example>
+  <example caption='Romeo pauses to reflect before answering, thus cancelling the composing event'><![CDATA[
+<message
+    from='romeo@montague.net'
+    to='juliet@capulet.com/balcony'>
+  <x xmlns='jabber:x:event'>
+    <id>message22</id>
+  </x>
+</message>
+  ]]></example>
+  <p>The lack of an &lt;composing/&gt; tag (and any other event tag) signifies that the composing event, indicated previously by the id value, has been cancelled. In this example, the composing event being cancelled is that event that was previously raised with the id of message22.  After cancelling a composing event, a new one may be raised, following the same rules as before, when the typing of the reply is resumed.</p>
+  </section2>
+</section1>
+
+<section1 topic='Examples'>
+  <p>This section contains a number of examples to illustrate the full flow of messages, event notifications, and event cancellations for a fictional conversation.</p>
+  <example caption='Juliet sends a message to Romeo and requests all event types'><![CDATA[
+SEND: <message to='romeo@montague.net' id='message22'>
+      <body>Art thou not Romeo, and a Montague?</body>
+      <x xmlns='jabber:x:event'>
+        <offline/>
+        <delivered/>
+        <displayed/>
+        <composing/>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo temporarily loses his wireless connection in the Capulet's orchard and therefore his message is stored offline by the montague.net server, which generates the offline event and sends that notification to Juliet.</p>
+  <example caption='Receiving the offline event'><![CDATA[
+RECV: <message
+          from='romeo@montague.net'
+          to='juliet@capulet.com/balcony'>
+      <x xmlns='jabber:x:event'>
+        <offline/>
+        <id>message22</id>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo reconnects and the message is delivered to his Jabber client, which generates a delivered event and sends it to Juliet's client.</p>
+  <example caption='Juliet receives notification of message delivery'><![CDATA[
+RECV: <message
+          from='romeo@montague.net/orchard'
+          to='juliet@capulet.com/balcony'>
+      <x xmlns='jabber:x:event'>
+        <delivered/>
+        <id>message22</id>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo's Jabber client displays the message and sends a displayed event to Juliet's client.</p>
+  <example caption='Juliet receives notification of message display'><![CDATA[
+RECV: <message
+          from='romeo@montague.net/orchard'
+          to='juliet@capulet.com/balcony'>
+      <x xmlns='jabber:x:event'>
+        <displayed/>
+        <id>message22</id>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo begins composing a reply to Juliet's heartfelt question, and his Jabber client notifies Juliet that he is composing a reply.</p>
+  <example caption='Juliet receives notification of message composing'><![CDATA[
+RECV: <message
+          from='romeo@montague.net/orchard'
+          to='juliet@capulet.com/balcony'>
+      <x xmlns='jabber:x:event'>
+        <composing/>
+        <id>message22</id>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo realizes his reply is too rash and pauses to choose the right words; his Jabber client senses the delay and cancels the previous composing event.</p>
+  <example caption='Juliet receives cancellation of message composing'><![CDATA[
+RECV: <message
+          from='romeo@montague.net/orchard'
+          to='juliet@capulet.com/balcony'>
+      <x xmlns='jabber:x:event'>
+        <id>message22</id>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo starts composing again, and his Jabber client sends a notification to Juliet's client.</p>
+  <example caption='Juliet receives a second notification of message composing'><![CDATA[
+RECV: <message
+          from='romeo@montague.net/orchard'
+          to='juliet@capulet.com/balcony'>
+      <x xmlns='jabber:x:event'>
+        <composing/>
+        <id>message22</id>
+      </x>
+    </message>
+  ]]></example>
+  <p>Romeo finally sends his reply, and requests composing events related to it.</p>
+  <example caption='Romeo replies'><![CDATA[
+SEND: <message to='juliet@capulet.com' id='GabberMessage43'>
+      <body>Neither, fair saint, if either thee dislike.</body>
+      <x xmlns='jabber:x:event'>
+        <composing/>
+      </x>
+    </message>
+  ]]></example>
+</section1>
+
+<section1 topic='Implementation Notes'>
+  <p>Compliant implementations SHOULD observe the following business rules:</p>
+  <ol>
+    <li>Every outgoing message sent from a compliant client should contain a request for event notifications (if such notifications are desired). The request for notifications cannot be sent just once in a conversation, since it applies to every message sent.</li>
+    <li>When a client receives a request for events from another entity, it should cache the most recent ID.</li>
+    <li>When a user begins replying to a message received from a contact, the user's client should check to see whether events have been requested by the contact for that message and set the CDATA of the &lt;id/&gt; element to the cached ID value.</li>
+    <li>The CDATA of the &lt;id/&gt; element MUST be the same as the value of the 'id' attribute of the notification request.</li>
+  </ol>
+</section1>
+
+<section1 topic='Security Considerations'>
+  <p>There are no security features or concerns related to this proposal.</p>
+</section1>
+<section1 topic='IANA Considerations'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations'>
+  <p>No action on the part of the &REGISTRAR; is necessary as a result of this JEP, since 'jabber:x:event' is already a registered protocol namespace.</p>
+</section1>
+
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:x:event'
+    xmlns='jabber:x:event'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0022: http://www.jabber.org/jeps/jep-0022.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='x'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='offline' minOccurs='0' type='empty'/>
+        <xs:element name='delivered' minOccurs='0' type='empty'/>
+        <xs:element name='displayed' minOccurs='0' type='empty'/>
+        <xs:element name='composing' minOccurs='0' type='empty'/>
+        <xs:element name='id' minOccurs='0' type='xs:NMTOKEN'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+    ]]></code>
+</section1>
+
+<section1 topic='Open Issues'>
+  <ol>
+    <li>In a Standards Track JEP addressing event functionality, it would be desirable to have more cancellation methods for composing events than those defined in this Informational JEP. For instance, is someone still composing if they become unavailable? This example points to the fact that cancellation of a composing event can either be explicit (the default or desired scenario) or implicit (e.g., through a change in the availability state of a client or the existence of the session associated with the message composition).</li>
+  </ol>
+</section1>
+
+</jep>
diff --git a/xep-0023.xml b/xep-0023.xml
new file mode 100644
index 00000000..a8618d43
--- /dev/null
+++ b/xep-0023.xml
@@ -0,0 +1,175 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Message Expiration</title>
+  <abstract>This JEP documents an historical protocol that was used to specify expiration dates for messages; this protocol has been deprecated in favor of JEP-0079: Advanced Message Processing.</abstract>
+  &LEGALNOTICE;
+  <number>0023</number>
+  <status>Deprecated</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby>
+    <spec>JEP-0079</spec>
+  </supersededby>
+  <shortname>x-expire</shortname>
+  <schemaloc>
+    <url>http://jabber.org/protocol/x-expire/x-expire.xsd</url>
+  </schemaloc>
+  &jer;
+  <author>
+    <firstname>DJ</firstname>
+    <surname>Adams</surname>
+    <email>dj.adams@pobox.com</email>
+    <jid>dj@gnu.mine.nu</jid>
+  </author>
+  <author>
+    <firstname>Harold</firstname>
+    <surname>Gottschalk</surname>
+    <email>heg@imissary.com</email>
+    <jid>heg@imissary.com</jid>
+  </author>
+  <revision>
+    <version>1.2</version>
+    <date>2004-10-18</date>
+    <initials>psa</initials>
+    <remark>Per a vote of the Jabber Council, changed status to Deprecated since message expiration functionality should be implemented via JEP-0079: Advanced Message Processing.</remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2004-01-06</date>
+    <initials>psa</initials>
+    <remark>Added XML schema; added security, IANA, and Jabber Registrar considerations.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-07-15</date>
+    <initials>psa</initials>
+    <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+    <version>0.9</version>
+    <date>2002-03-19</date>
+    <initials>dja</initials>
+    <remark>Added remarks about client-end expiry.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-03-07</date>
+    <initials>dja</initials>
+    <remark>Initial draft.</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p><em>Note Well: The protocol described herein has been deprecated by the &JSF;. The recommended protocol for implementing message expiration functionality is now &jep0079;.</em></p>
+  <p>It is sometimes helpful to indicate that a piece of information has a finite useful life or time-to-live (TTL). In the context of instant messaging, the main use of a TTL is to indicate that a message must or should be used by or read by a certain time, usually because the message has meaning or purpose only within a finite amount of time. In normal usage, such a message should be discarded after the specified time has passed if it has not been used or read by that time.</p>
+  <p>In Jabber, TTL functionality has been implemented informally using the jabber:x:expire namespace. Support for this namespace was added to the &jabberd; server as well as some clients and components in early 2001. Specifically, that support has involved the following two areas of responsibility:</p>
+  <ul>
+    <li>The sender of the message is responsible for attaching a jabber:x:expire extension to the XML stanza (usually a message).</li>
+    <li>Mechanisms involved in the store-and-forward of such a stanza
+<note>The best-known example of a mechanism that handles storing and forwarding of XML stanzas is the Jabber Session Manager (JSM) within current Jabber server implementations, specifically the mod_offline module. However, expiration of an XML stanza could also be handled by a Jabber client.</note>
+en route to its intended recipient are responsible for checking the remaining time to live and expiring (discarding) the XML stanza if necessary.</li>
+  </ul>
+</section1>
+
+<section1 topic='Specifying a TTL'>
+  <p>An Endpoint can specify a TTL for an XML stanza that it wishes to send by attaching an &lt;x/&gt; extension qualified by the jabber:x:expire namespace. The extension contains no children, only a 'seconds' attribute that contains a value representing the stanza's TTL, in seconds.</p>
+
+  <example caption='Specifying a 30-minute TTL for a message'>
+SEND: &lt;message to='sabine@gnu.mine.nu' id='msg811'&gt;
+        &lt;subject&gt;Eccles cakes!&lt;/subject&gt;
+        &lt;body&gt;
+          I've got some freshly made Eccles cakes here, come
+          round for one before they all disappear!
+        &lt;/body&gt;
+        &lt;x xmlns='jabber:x:expire' seconds='1800'/&gt;
+      &lt;/message&gt;
+  </example>
+</section1>
+
+<section1 topic='Handling XML Stanzas with a TTL'>
+  <p>Any mechanism that is involved in the storage, forwarding, and general handling of XML stanzas must check for the presence of such an extension and act accordingly, expiring (discarding) any stanzas that have exceeded their TTL lifetime.  The jabber:x:expire namespace allows for a further attribute inside the &lt;x/&gt; extension: 'stored'. Here, the mechanism can record a value representing when the stanza was committed to storage, so that when the stanza is eventually retrieved for forwarding to the intended recipient, the elapsed time of storage can be calculated. This is to prevent the stanza from being held in 'suspended animation'.</p>
+  <p>Here we see what the original message looks like after the stanza has been committed to storage and the time of storage recorded:</p>
+  <example caption='Recording a storage-time in the extension'>
+SEND: &lt;message to='sabine@gnu.mine.nu' id='msg811'&gt;
+        &lt;subject&gt;Eccles cakes!&lt;/subject&gt;
+        &lt;body&gt;
+          I've got some freshly made Eccles cakes here, come
+          round for one before they all disappear!
+        &lt;/body&gt;
+        &lt;x xmlns='jabber:x:expire'
+           seconds='1800'
+           stored='912830221'/&gt;
+      &lt;/message&gt;
+  </example>
+  <p>When Sabine attempts to retrieve her offline messages, the store-and-forward mechanism (e.g., mod_offline) compares the current time against the stored attribute. If the 1800 seconds have passed, the mechanism should simply drop the message, without notifying either the sender or the intended recipient. No Eccles cakes for Sabine!</p>
+<section2 topic='Usage in client space'>
+  <p>Although current usage of jabber:x:expire is most commonly seen in server implementations to address any TTL requirements of stored messages, Jabber clients can also be seen as handlers of messages that may contain expiration extension information. If a message is received by a Jabber client, and not immediately displayed to the user, the client must check for TTL information and expire the message (rather than display it to the user) if appropriate.</p>
+</section2>
+</section1>
+
+<section1 topic='Security Considerations'>
+  <p>There are no security features or concerns related to this proposal.</p>
+</section1>
+<section1 topic='IANA Considerations'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations'>
+  <p>No action on the part of the &REGISTRAR; is necessary as a result of this JEP, since 'jabber:x:expire' is already a registered protocol namespace.</p>
+</section1>
+
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:x:expire'
+    xmlns='jabber:x:expire'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0023: http://www.jabber.org/jeps/jep-0023.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='x'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='seconds' type='xs:unsignedLong' use='required'/>
+          <xs:attribute name='stored' type='xs:unsignedLong' use='optional'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+    ]]></code>
+</section1>
+
+<section1 topic='Open Issues'>
+  <ol>
+    <li>The jabber:x:expire namespace is processed only for delayed messages and only by servers and subsystems which support this informational draft. Therefore it is possible or even likely that a TTL will not be properly handled from the user perspective.</li>
+    <li>A physical, time-based TTL is not implemented by this JEP, and would not be possible across systems without synchronized time.</li>
+  </ol>
+</section1>
+
+</jep>
diff --git a/xep-0024.xml b/xep-0024.xml
new file mode 100644
index 00000000..75cf8ef1
--- /dev/null
+++ b/xep-0024.xml
@@ -0,0 +1,1132 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Publish/Subscribe</title>
+  <abstract>A publish--subscribe protocol for Jabber.</abstract> 
+  <legal>This document has been placed in the public domain.</legal>
+  <number>0024</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <supersedes>None</supersedes>
+  <supersededby>JEP-0060</supersededby>
+  <shortname>None</shortname>
+  <author>
+    <firstname>DJ</firstname>
+    <surname>Adams</surname>
+    <email>dj.adams@pobox.com</email>
+    <jid>dj@gnu.mine.nu</jid>
+  </author>
+  <author>
+    <firstname>Piers</firstname>
+    <surname>Harding</surname>
+    <email>piers@ompa.net</email>
+    <jid>piers@gnu.mine.nu</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2003-04-22</date>
+    <initials>psa</initials>
+    <remark>At the request of the authors, the status of this JEP has been changed to Retracted since it has been superseded by JEP-0060. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-03-05</date>
+    <initials>dja</initials>
+    <remark>Initial draft.</remark>
+  </revision>
+</header>
+
+<section1 topic='Abstract'>
+<p>
+Pubsub ("publish/subscribe") is a technique for coordinating the efficient
+delivery of information from publisher to consumer. This specification
+<note>An earlier draft of this specification can be found at <link url='http://www.pipetree.com/testwiki/JabberPubsubSpec'>http://www.pipetree.com/testwiki/JabberPubsubSpec</link>.</note>
+describes the use of pubsub within a Jabber context and is a result of
+two separate but related goals:
+</p>
+
+<ul>
+<li>to be able to exchange information _within_ a Jabber environment
+(for example continuously changing personal information between users)</li>
+<li>to be able to exchange information _using_ Jabber as a mechanism for
+<ul>
+<li>organising that exchange</li>
+<li>providing transport for the information</li>
+</ul>
+</li>
+</ul>
+
+<p>
+The specification details the use of the Jabber protocol elements and
+introduces a new namespace, jabber:iq:pubsub. 
+It also includes notes on actual implementation of such a
+mechanism in Jabber.
+</p>
+
+</section1>
+
+
+<section1 topic='Introduction'>
+<p>
+It's clear that as Jabber is deployed over a wider spectrum of platforms
+and circumstances, more and more information will be exchanged. Whether
+that information is specific to Jabber (JSM) users, or components, we need
+an mechanism to be able to manage the exchange of this information in an
+efficient way. 
+</p>
+
+<p>
+For example, it is currently the trend to embed information about a
+particular client's circumstance inside presence packets, either in the
+&lt;status/&gt; tag or in an &lt;x/&gt; extension. One example that comes
+to mind is "song currently playing on my MP3 player" (to which I have to
+admit some responsibility for the meme in the first place). While embedding
+information inside presence packets and having that information diffused to
+the users who are subscribed to that user's presence has the desired effect,
+it has a couple of non-trivial drawbacks:
+</p>
+
+<ul>
+<li>the diffusion is inefficient, sending potentially huge amounts of data
+to recipients who aren't interested</li>
+<li>the distribution is tied to closely to presence subscription; any entity
+that wants to receive information must be subscribed to the source's presence,
+and there is no mechanism for specifying _what_ information they wish to
+receive. It is also arguably too closely tied to the JSM to be useful for
+_component_-based information exchange.</li>
+</ul>
+
+<p>
+This is above and beyond the simple fact that this overloading of presence
+packets and the presence subscription and diffusion mechanism can only end
+in tears.
+</p>
+
+<p>
+It would be far better to have a separate (sub-)protocol that enabled
+entities to take part in publish/subscribe relationships, and have a service
+that facilitated the efficient exchange of information. Not only would it
+relax the undue pressure on the presence mechanism, but it would also allow
+people to use Jabber, which is, after all, about exchanging structured content
+between endpoints, as a publish/subscribe _mechanism_ in its own right.
+</p>
+
+<p>
+This specification describes a publish/subscribe protocol in terms
+of IQ packets with payload data in a new namespace, jabber:iq:pubsub. The
+choice for this namespace is slightly arbitrary - it was the same namespace
+used in temas's original document, seems to fit well, and we need a namespace
+to focus on.<note>It may well be that we will move to a URI-based namespace
+in the form of a URL pointing to this specification.</note>
+</p>
+
+<p>
+The aim of the specification is to provide for a facility where Jabber
+entities can subscribe to (consume) and publish (emit) information in an
+efficient and organised way. These entities could be JSM users or components.
+</p>
+
+<p>
+Push technology is back with a vengeance. Jabber can play a fundamental
+part.
+</p>
+
+</section1>
+
+<section1 topic='The Specification'>
+
+<p>
+The pubsub services will be typically provided by a component. In what
+follows, there are generally three parties involved:
+</p>
+
+<ul>
+<li>the subscriber</li>
+<li>the pubsub service</li>
+<li>the publisher</li>
+</ul>
+
+<p>
+Bear in mind that it is perfectly possible for a subscriber to be a
+publisher, and a publisher to be a subscriber, too.
+</p>
+
+<p>
+The pubsub traffic will be carried in info/query (IQ) packets. All of the
+data in these packets will be qualified by the jabber:iq:pubsub namespace.
+</p>
+
+<p>
+Pubsub scenarios can be seen in a subscribe (or unsubscribe) context or a
+publish context. In light of this, we will examine the IQ packets
+used in these contexts.
+</p>
+
+<section2 topic='Subscribe/Unsubscribe Context'>
+
+<p>
+A potential consumer, or recipient, of published information, needs to
+request that he be sent that published information. Requesting to receive,
+or be pushed, information is known as subscribing.
+</p>
+
+<p>
+A subscription request generally takes this form:
+</p>
+
+<example caption='General form of a subscription'>
+SEND: &lt;iq type='set' from='subscriber' to='pubsub' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe [to='publisher']&gt;
+            [&lt;ns&gt;namespace:1&lt;/ns&gt;
+             &lt;ns&gt;namespace:2&lt;/ns&gt;
+             ...
+             &lt;ns&gt;namespace:N&lt;/ns&gt;]
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' to='subscriber' from='pubsub' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe [to='publisher']&gt;
+            [&lt;ns&gt;namespace:1&lt;/ns&gt;
+             &lt;ns&gt;namespace:2&lt;/ns&gt;
+             ...
+             &lt;ns&gt;namespace:N&lt;/ns&gt;]
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+Note - sections inside [...] are optional.
+</p>
+
+<section3 option='Publisher-Specific Subscriptions and Unsubscriptions'>
+
+<p>
+Subscriptions can be specific to a publisher, in which case a to attribute
+is specified in the &lt;subscribe/&gt; tag:
+</p>
+
+<example caption='Publisher-specific subscription'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+In this case, the namespaces specified will be added to any existing list
+of namespaces already recorded for that subscriber:publisher relationship.
+In other words, it's a relative, not an absolute, subscription request.
+</p>
+
+<p>
+It is also possible in a publisher-specific subscription to omit specific
+namespaces, if you want to be sent everything that particular publisher
+might publish:
+</p>
+
+<example caption='Publisher-specific subscription without namespace specification'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher'/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher'/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+This type of subscription should have the effect of absolutely replacing any
+previous namespace-specific subscription to the publisher specified.
+</p>
+
+<p>
+If a subscriber wishes to cancel a subscription from a particular publisher,
+he can send an unsubscribe like this:
+</p>
+
+<example caption='Publisher-specific unsubscription'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe to='publisher'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe to='publisher'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+This should have the effect of removing the subscription from that publisher
+for the namespaces specified.
+</p>
+
+<p>
+You can also send an unsubscribe without specifying any namespaces:
+</p>
+
+<example caption='Publisher-specific general unsubscription'>
+SEND: &lt;iq type='set' to='pubsub.localhost' 
+             from='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe to='publisher'/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe to='publisher'/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+This should have the effect of removing any subscription relationship with
+the publisher specified. Note, however, that this won't stop the subscriber
+being pushed information from that publisher if he's specified a
+"publisher-generic" subscription (see next section).
+</p>
+
+</section3>
+
+<section3 option='Non-Publisher-Specific Subscriptions and Unsubscriptions'>
+
+<p>
+As well as being able to subscribe to specific publishers, it is also
+possible to subscribe to receive data, according to namespace, regardless
+of publisher:
+</p>
+
+<example caption='General namespace specific subscription'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+This means that the subscriber wishes to be pushed information in the
+namespaces specified, regardless of who publishes it. Like the
+publisher-specific subscribe that specifies namespaces, this request is
+relative, in the namespaces are added to any existing namespaces already
+recorded for this generic subscription.
+</p>
+
+<p>
+Subscribing to everything from everyone is probably not a good idea and
+we should not allow this. (The format of the request is actually used in
+an IQ-get context - see later).
+</p>
+
+<example caption='This is not allowed'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='error' from='pubsub.localhost'
+             to='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe/&gt;
+        &lt;/query&gt;
+        &lt;error code='405'&gt;Not Allowed&lt;/error&gt;
+      &lt;/iq&gt;
+</example>
+
+
+<p>
+Likewise, you can unsubscribe from certain namespaces in this non-publisher-specific context like this:
+</p>
+
+<example caption='General unsubscription to specific namespaces'>
+SEND: &lt;iq type='set' to='pubsub.localhost' 
+             from='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/unsubscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost' 
+             to='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/unsubscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+If there are any subscriptions to specific publishers for the namespaces
+specified here, they should be removed (for those namespaces) in addition
+to the removal from the 'all publishers' list.
+</p>
+
+<p>
+Finally, a subscriber can wipe the slate clean like this:
+</p>
+
+<example caption='Wiping the slate'>
+SEND: &lt;iq type='set' to='pubsub.localhost' 
+             from='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost' 
+             to='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;unsubscribe/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+which should have the effect of removing all namespace subscriptions
+from everywhere.
+</p>
+
+</section3>
+
+<section3 option='Further Notes'>
+
+<p>
+All the examples so far have shown actions on the subscriber's part, and
+have consisted of IQ-sets. In an IQ-set, within the jabber:iq:pubsub
+namespace, multiple children can exist in the query payload, but those
+children must be of the same type. In other words, you can send multiple
+&lt;subscribe/&gt;s, or multiple &lt;unsubscribe/&gt;s, but not a combination
+of the two.
+</p>
+
+<p>
+This is allowed:
+</p>
+
+<example caption='Subscribing to more than one publisher at once'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisherA'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+          &lt;subscribe to='publisherB'&gt;
+            &lt;ns&gt;namespace:3&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisherA'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+          &lt;subscribe to='publisherB'&gt;
+            &lt;ns&gt;namespace:3&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+But this is not allowed:
+</p>
+
+<example caption='Subscribes and unsubscribes in same IQ-set is not allowed'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisherA'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+          &lt;unsubscribe to='publisherB'&gt;
+            &lt;ns&gt;namespace:3&lt;/ns&gt;
+          &lt;/unsubscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='subscriber.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisherA'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+          &lt;unsubscribe to='publisherB'&gt;
+            &lt;ns&gt;namespace:3&lt;/ns&gt;
+          &lt;/unsubscribe&gt;
+        &lt;/query&gt;
+        &lt;error code='400'&gt;
+          Bad Request: only subscribes or unsubscribes
+        &lt;/error&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+In the case where multiple &lt;subscribe/&gt;s or &lt;unsubscribe/&gt;s
+appear in an action, each element will be processed in turn, as they appear
+in the payload.
+</p>
+
+<p>
+As well as actions, the subscriber can query his subscription using an
+IQ-get in the jabber:iq:pubsub namespace. This should return a list of
+the subscribers current subscriptions, like this:
+</p>
+
+<example caption='Querying current subscription'>
+SEND: &lt;iq type='get' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe/&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &gt;iq type='result' from='pubsub.localhost'
+             to='subscriber@localhost/resource' id='s1'&gt;
+        &gt;query xmlns='jabber:iq:pubsub'&gt;
+          &gt;subscribe&gt;
+            &gt;ns&gt;namespace:1&gt;/ns&gt;
+            &gt;ns&gt;namespace:2&gt;/ns&gt;
+          &gt;/subscribe&gt;
+          &gt;subscribe to='publisherA'&gt;
+            &gt;ns&gt;namespace:2&gt;/ns&gt;
+            &gt;ns&gt;namespace:4&gt;/ns&gt;
+          &gt;/subscribe&gt;
+          &gt;subscribe to='publisherB'&gt;
+            &gt;ns&gt;namespace:5&gt;/ns&gt;
+          &gt;/subscribe&gt;
+        &gt;/query&gt;
+      &gt;/iq&gt;
+</example>
+
+<p>
+Note the two references to namespace:2 - one inside the non-publisher-specific
+subscription list and one inside the subscription list specific to publisherA.
+This example implies that the non-publisher-specific and publisher-specific
+subscription information should be kept separately. This is designed to make
+it easier on the subscriber to manage his specific subscriptions over time.
+</p>
+
+</section3>
+
+</section2>
+
+<section2 topic='Publish Context'>
+
+<p>
+In contrast to the subscribe and unsubscribe context, the publishing
+context is a lot simpler to explain.
+</p>
+
+<p>
+A publisher can publish information within a certain namespace, like this:
+</p>
+
+<example caption='Publishing information'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='publisher@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='foo'/&gt;
+            &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='publisher@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='foo'/&gt;
+            &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+It's also possible for a publisher to publish more than one item at once,
+like this:
+</p>
+
+<example caption='Publishing information in different namespaces'>
+SEND: &lt;iq type='set' to='pubsub.localhost'
+             from='publisher.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='foo'/&gt;
+            &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
+          &lt;/publish&gt;
+          &lt;publish ns='jabber:x:oob'/&gt;
+            &lt;x xmlns='jabber:x:oob'&gt;
+              &lt;url&gt;http://www.pipetree.com/jabber/&lt;/url&gt;
+              &lt;desc&gt;Some stuff about Jabber&lt;/desc&gt;
+            &gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='publisher.localhost' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='foo'/&gt;
+            &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
+          &lt;/publish&gt;
+          &lt;publish ns='jabber:x:oob'/&gt;
+            &lt;x xmlns='jabber:x:oob'&gt;
+              &lt;url&gt;http://www.pipetree.com/jabber/&lt;/url&gt;
+              &lt;desc&gt;Some stuff about Jabber&lt;/desc&gt;
+            &gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<!--
+<p>
+Optionally, a pubsub component may respond with an empty IQ-result, to 
+reduce traffic:
+</p>
+
+<example>
+RECV: &lt;iq type='result' from='pubsub.localhost'
+             to='publisher.localhost' id='s1'&gt;
+      &lt;/iq&gt;
+</example>
+-->
+
+<p>
+Each published item is wrapped in a &lt;publish/&gt; tag. This tag
+must contain the namespace of the item being publishes, in an ns 
+attribute, as shown. This is distinct from the xmlns attribute of
+the fragment of XML actually being published. It is theoretically
+none of the pubsub component's business to go poking around in the
+real published data, nor should it have to. It needs to know what
+namespace is qualifying the published information that has been 
+received, so that the list of appropriate recipients can be 
+determined.
+</p>
+
+</section2>
+
+
+<section2 topic='Distributing Published Information'>
+<p>
+While it's the responsibility of the publishing entities to publish
+information, it's the responsibility of the pubsub
+component to push out that published data to the subscribers. The 
+list of recipient subscribers must be determined by the information
+stored by the pubsub component as a result of receiving subscription
+requests (which are described earlier).
+</p>
+<p>
+On receipt of an IQ-set containing published information, the pubsub
+entity must determine the list of subscribers to which that information
+should be pushed. If the IQ-set contains multiple &lt;publish/&gt;
+fragments, this process must be carried out for each one in turn.
+<note>Whether a pubsub component implementation should be allowed to
+batch up individual published information fragments for one recipient
+as a result of a large, multi-part incoming publishing IQ-set, is not
+specified here, the choice is down to the implementer. Receiving entities
+should be able to cope with being pushed an IQ-set with multiple
+fragments of published data.</note>
+</p>
+<p>
+Taking the earlier example of the publishing of data in the 'foo'
+namespace, the following example shows what the pubsub component
+must send to push this foo data out to a subscriber. 
+</p>
+<example caption='Pushing out published information to a subscriber'>
+SEND: &lt;iq type='set' to='subscriber@localhost/foosink'
+             from='pubsub.localhost' id='push1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='foo' from='publisher@localhost'/&gt;
+            &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+<p>
+The recipient is _not_ required to send an 'acknowledgement' in the 
+form of an IQ-result; the idea that this _push_ of information is
+akin to how information is pushed in a live browsing context (see
+jabber:iq:browse documentation for more details).
+</p>
+
+</section2>
+
+<section2 topic='Delivery Sensitivity'>
+
+<p>
+When a pubsub service receives a publish packet like the ones above, it
+needs to deliver (push) the information out according to the subscriptions
+that have been made. 
+</p>
+
+<p>
+However, we can introduce a modicum of sensitivity by using a presence
+subscription between the pubsub service and the subscriber(s). If the
+subscriber wishes only to receive information when he's online (this is
+a JSM-specific issue), then he needs to set up a presence subscription
+relationship with the pubsub service. The pubsub service should respond
+to presence subscriptions and unsubscriptions by 
+</p>
+
+<ul>
+<li>accepting the (un)subscription request</li>
+<li>reciprocating the (un)subscription request</li>
+</ul>
+
+<p>
+If the pubsub service deems that a published piece of information should
+be pushed to a subscriber, and there is a presence subscription relationship
+with that subscriber, the service should only push that information to the 
+subscriber if he is available. If he is not available, the information is not
+to be sent. 
+</p>
+
+<p>
+Thus the subscriber can control the sensitivity by initiating (or not) a
+presence relationship with the service. If the subscriber wishes to receive
+information regardless of availability, he should not initiate a (or cancel
+any previous) presence relationship with the service. 
+</p>
+
+<p>
+This loose coupling of presence relationships for sensitivity allows this
+specification to be used in the wider context of component-to-component
+publish/subscribe where presence is not a given.
+</p>
+
+</section2>
+
+<section2 topic='Use of Resources'>
+<p>
+When in receipt of a pubsub subscription request from an entity 
+where a resource is specified in the JID, the pubsub component must
+honour the resource specified in the from attribute of the request.
+For example, here's a typical subscription request from a JSM user:
+</p>
+<example caption='Incoming subscription request from a JSM user'>
+RECV: &lt;iq type='set' to='pubsub.localhost'
+             from='subscriber@localhost/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+<p>
+When storing the subscriber/publisher/namespace relationship matrix for
+eventual querying when a publisher publishes some information, the 
+pubsub component must use the full JID, not just the username@host part.
+</p>
+<p>
+Similarly, in this example:
+</p>
+<example caption='Incoming subscription request from a component'>
+RECV: &lt;iq type='set' to='pubsub.localhost'
+             from='news.server/politics-listener' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher'&gt;
+            &lt;ns&gt;news:politics:home&lt;/ns&gt;
+            &lt;ns&gt;news:politics:foreign:usa&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+<p>
+the full JID of the component subscriber - news.server/politics-listener,
+should be used to qualify the matrix.
+</p>
+<p>
+This is because it allows the subscribing entities to arrange the 
+receipt of pushed items by resource. In the case of a JSM user, it
+allows him to organise his clients, which may have different capabilities
+(some being able to handle the jabber:iq:pubsub data, others not) to
+receive the 'right' data. In the case of a component, it allows the
+component to associate component-specific data with incoming published
+namespace-qualified information.
+</p>
+
+</section2>
+
+</section1>
+
+
+<section1 topic='Implementation Notes'>
+
+<p>
+While the specification describes the fundamental building blocks of the
+pubsub protocol, there are ideas that are not discussed above but nonetheless
+may be incorporated into an implementation. There are other considerations
+that have to be made in the wider context of publish and subscribe. Some of
+the main ones are discussed briefly here too.
+</p>
+
+<section2 topic='Publisher Discovery'>
+<p>
+There is no part of this pubsub specification that determines how a 
+potential subscriber might discover publishers. After all, there are
+no rules governing which pubsub component a publisher could or should
+publish to. And since pubsub subscriptions are specific to a pubsub
+component, there is an information gap - "how do I find out what 
+publishers there are, and through which pubsub components they're publishing
+information?"
+</p>
+<p>
+This problem domain should be solved using other methods, not with the
+actual jabber:iq:pubsub specific namespace. A combination of jabber:iq:browse
+usage (the magic ointment that heals all things) and perhaps a DNS style
+(or at least root-node-based) knowledge hierarchy might be the right
+direction.
+</p>
+<p>
+In the case where a server administrator wishes to facilitate pubsub
+flow between JSM users on a server, a pubsub component can be plugged
+into the jabberd backbone, and there is potentially no real issue with
+knowing which pubsub component to use, and where it is.
+But what about if the JSM users on one server wish to build pubsub
+relationships with JSM users on another server? (Note that this general
+question is not specific to JSM users, although that example will be used
+here). The next two sections look at how these things might pan out.
+</p>
+</section2>
+
+<section2 topic='Cross-Server Relationships'>
+<p>
+When JSM users on server1 wish to subscribe to information published 
+by JSM users on server2 (let's say it's the mp3 player info, or avatars)
+then there are some issues that come immediately to mind:
+</p>
+<ul>
+<li>Does a JSM user on server1 (userA@server1) send his IQ-set subscription
+to the pubsub component on server2 (pubsub.server2), or server1
+(pubsub.server1)?</li>
+<li>If he sends it to pubsub.server2, can we expect 
+pubsub.server2 to always accept that subscription request, i.e. to 
+be willing to serve userA@server1 (if pubsub.server2 knows that 
+pubsub.server1 exists)?</li>
+<li>Will there be performance (or at least server-to-server traffic)
+implications if many subscription relationships exist between subscribers on
+server1 and publishers on server2?</li>
+</ul>
+
+<section3 topic='Proxy Subscriptions'>
+<p>
+To reduce the amount of server-to-server traffic, we can employ the 
+concept of "proxy subscriptions". This is simply getting a pubsub component
+to act on behalf of a (server-local) subscriber. Benefit comes when a pubsub
+component acts on behalf of multiple (server-local) subscribers.
+</p>
+<p>
+Here's how such proxy subscriptions can work, to reduce the amount of
+server-to-server traffic:
+</p>
+<p>
+Step 1: Subscriber sends original subscription
+</p>
+<p>
+JSM users on server1 wish to subscribe to information published by an 
+entity on server2. Each of them sends a subscription request to the
+_local_ pubsub component:
+</p>
+<example>
+SEND: &lt;iq type='set' to='pubsub.server1'
+             from='subscriber@server1/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher.server2'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+Step2: Pubsub component subscribes on subscriber's behalf
+</p>
+<p>
+The pubsub component knows about the publisher, and where (to which
+pubsub component) that publisher publishes information. It formulates
+a subscription request and sends it to the remote pubsub component:
+</p>
+<example>
+SEND: &lt;iq type='set' to='pubsub.server2'
+             from='pubsub.server1' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher.server2'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+The remote pubsub component receives and acknowledges the subscription
+request, and the local pubsub component relays the response back to 
+the original requester:
+</p>
+<example>
+SEND: &lt;iq type='result' from='pubsub.server1'
+             to='subscriber@server1/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher.server2'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+If the remote pubsub server was unable or unwilling to accept the 
+subscription request, this should be reflected in the response:
+</p>
+<example>
+SEND: &lt;iq type='error' from='pubsub.server1'
+             to='subscriber@server1/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher.server2'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+        &lt;error code='406'&gt;Not Acceptable&lt;/error&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+Step3: Publisher publishes information
+</p>
+<p>
+The publisher, publisher.server2, publishes information in the 
+namespace:1 namespace, to the remote pubsub component pubsub.server2:
+</p>
+<example>
+SEND: &lt;iq type='set' from='publisher.server2'
+             to='pubsub.server2' id='p1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='namespace;1'&gt;
+            &lt;stuff xmlns='namespace:1'&gt;nonsense&lt;/stuff&gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+
+<p>
+Step4: Pubsub component receives published information
+</p>
+<p>
+The pubsub component pushes the published information to pubsub.server1,
+who has been determined to be a valid recipient:
+</p>
+<example>
+RECV: &lt;iq type='set' from='pubsub.server2'
+             to='pubsub.server1' id='p1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='namespace;1' from='publisher.server2'&gt;
+            &lt;stuff xmlns='namespace:1'&gt;nonsense&lt;/stuff&gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+Step5: Pubsub component forwards published information to original subscriber
+</p>
+<p>
+The local pubsub component then diffuses the information received to the
+original subscriber:
+</p>
+<example>
+SEND: &lt;iq type='set' from='pubsub.server1'
+             to='subscriber@server1/resource' id='p1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;publish ns='namespace;1' from='publisher.server2'&gt;
+            &lt;stuff xmlns='namespace:1'&gt;nonsense&lt;/stuff&gt;
+          &lt;/publish&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
+</example>
+
+<p>
+This way, only a single published element must travel between servers
+to satisfy a multiplex of subscribed entities at the delivery end.
+</p>
+
+<p>
+Of course, this mechanism will rely upon knowledge about pubsub components
+and where they're available; furthermore, it will require knowledge about
+where publisher entities publish their information.
+This knowledge, and the mechanisms to discover this sort of information,
+is not to be covered in this spec, which purely deals with the subscription
+and publishing of information. As SOAP is to UDDI (to use a slightly
+controversial pair of technologies), so is jabber:iq:pubsub to this 
+discovery mechanism as yet undefined. To include the definition of such
+a discovery mechanism in this specification is wrong on two counts:
+</p>
+<ul>
+<li>Discovery mechanisms by nature should not be tied to specific areas</li>
+<li>Trying to load too much onto jabber:iq:pubsub will only produce a 
+complex and hard-to-implement specification</li>
+</ul>
+<p>
+After all, the jabber:iq:pubsub spec as defined here is usable out of the
+box for the simple scenarios, and scenarios where discovery is not 
+necessary or the information can be exchanged in other ways.
+</p>
+
+</section3>
+
+<section3 topic='Willingness to Serve'>
+<p>
+There are some situations where it might be appropriate for a pubsub
+component to refuse particular subscription requests. Here are two 
+examples:
+</p>
+<ul>
+<li>Where a pubsub component that's been designed, implemented, or
+configured to handle local-only pubsub traffic, and a subscription request
+is received, specifying a publisher that the local pubsub component knows
+to be one that publishes to a remote pubsub component <note>under other
+circumstances, this would trigger a 'Proxy Subscription', as described earlier, if supported</note>. In this case, the local pubsub component would be
+unwilling to provoke a server-to-server connection and therefore unwilling to 
+honour the request.</li>
+<li>Where a pubsub component receives a subscription request from a 
+remote subscriber, and that pubsub component knows that there's a 
+pubsub component local to the subscriber. In this case, the (administrator 
+of the) remote pubsub component might want to encourage proxy subscriptions.
+</li>
+</ul>
+<p>
+A refusal could take one of a number of guises:
+</p>
+<example caption='A flat refusal'>
+SEND: &lt;iq type='error' from='pubsub.server2'
+             to='subscriber@server1/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher.server2'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+        &lt;error code='406'&gt;Local pubsub only&lt;/error&gt;
+      &lt;/iq&gt;
+</example>
+<example caption='A refusal with redirection'>
+SEND: &lt;iq type='error' from='pubsub.server2'
+             to='subscriber@server1/resource' id='s1'&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe to='publisher.server2'&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+        &lt;error code='302' jid='pubsub.server1'/&gt;
+      &lt;/iq&gt;
+</example>
+<note>This 302 redirect is not covered in the general protocol specification,
+but it's an interesting concept :-)</note>
+</section3>
+
+</section2>
+
+
+<section2 topic='Subscriber Anonymity and Acceptance?'>
+<p>
+The jabber:iq:pubsub specification makes no provision for 
+publishers to query a pubsub component to ask for a list of those entities
+that are subscribed to (namespaces) it (publishes). This is deliberate. 
+Do we wish to add to the specification to allow the publisher to discover
+this information? If so, it must be as an optional 'opt-in' (or 'opt-out')
+tag for the subscriber, to determine whether his JID will show up on the
+list. 
+<note>Even if there is no provision for querying the subscribers, perhaps
+we should make a provision for the publisher to ask the pubsub component
+for a list of namespaces that have been subscribed to (for that publisher).
+</note>
+</p>
+<p>
+Associated with this is the semi-reciprocal issue of acceptance? The 
+specification deliberately makes no provision for a subscription acceptance
+mechanism (where the publisher must first accept a subscriber's request,
+via the pubsub component). If we're to prevent the publishers knowing
+who is subscribing, ought we to give them the power of veto, to 'balance
+things out'?
+</p>
+<p>
+Note that if we do, the acceptance issue is not necessarily one for the
+pubsub specification to resolve; there are other ways of introducing 
+access control, at least in a component environment; use of a mechanism
+that the Jabber::Component::Proxy Perl module represents is one example:
+wedge a proxy component in front of a real (pubsub) component and have
+the ability to use ACLs (access control lists) to control who gets to 
+connect to the real component.
+</p>
+
+</section2>
+
+</section1>
+
+</jep>
diff --git a/xep-0025.xml b/xep-0025.xml
new file mode 100644
index 00000000..0082ebf0
--- /dev/null
+++ b/xep-0025.xml
@@ -0,0 +1,386 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+  <header>
+    <title>Jabber HTTP Polling</title>
+    <abstract>This document defines a protocol that enables access to a Jabber server from behind firewalls which do not allow outgoing sockets on port 5222, via HTTP requests.</abstract>
+    &LEGALNOTICE;
+    <number>0025</number>
+    <status>Deprecated</status>
+    <type>Historical</type>
+    <jig>Standards JIG</jig>
+    <dependencies>
+      <spec>XMPP Core</spec>
+    </dependencies>
+    <supersedes/>
+    <supersededby>
+      <spec>JEP-0124</spec>
+    </supersededby>
+    <shortname>httppoll</shortname>
+    &hildjj;
+    <author>
+      <firstname>Craig</firstname>
+      <surname>Kaes</surname>
+      <email>ckaes@jabber.com</email>
+      <jid>ckaes@corp.jabber.com</jid>
+    </author>
+    <author>
+      <firstname>David</firstname>
+      <surname>Waite</surname>
+      <email>mass@akuma.org</email>
+      <jid>mass@akuma.org</jid>
+    </author>
+    <revision>
+      <version>1.1</version>
+      <date>2006-07-26</date>
+      <initials>psa</initials>
+      <remark><p>Per a vote of the Jabber Council, changed status to Deprecated.</p></remark>
+    </revision>
+    <revision>
+      <version>1.0</version>
+      <date>2002-10-11</date>
+      <initials>psa</initials>
+      <remark><p>Per a vote of the Jabber Council, advanced status to Active.</p></remark>
+    </revision>
+    <revision>
+      <version>0.2</version>
+      <date>2002-09-23</date>
+      <initials>dew</initials>
+      <remark><p>Changed format to allow socket-equivalent security.</p></remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2002-03-14</date>
+      <initials>jjh</initials>
+      <remark><p>Initial version.</p></remark>
+    </revision>
+  </header>
+  <section1 topic="Introduction">
+    <p><em>Note Well: This protocol specified in this document has been superseded by the protocol specified in &jep0124;.</em></p>
+    <p>
+      This JEP documents a method to allow Jabber clients to access Jabber
+      servers from behind existing firewalls. Although several similar methods
+      have been proposed, this approach should work through all known firewall
+      configurations which allow outbound HTTP access.
+    </p>
+  </section1>
+  <section1 topic="Background">
+    <p>
+      In general, a firewall is a box that protects a network from outsiders,
+      by controlling the IP connections that are allowed to pass through the
+      box. Often, a firewall will also allow access outside only by proxy,
+      either explicit proxy support or implicit through Network Address
+      Translation (NAT).
+    </p>
+    <p>
+      In the interest of security, many firewall administrators do not allow
+      outbound connections to unknown and unused ports. Until Jabber becomes
+      more widely deployed, port 5222/tcp (for Jabber client connections) will
+      often be blocked.
+    </p>
+    <p>
+      The best solution for sites that are concerned about security is to run
+      their own Jabber server, either inside the firewall, or in a DMZ
+      <note>
+        DMZ definition at
+        <link
+          url="http://searchwebmanagement.techtarget.com/sDefinition/0,,sid27_gci213891,00.html">
+          searchwebmanagement.com
+        </link>
+      </note>
+      network. However, there are network configuration where an external
+      Jabber server must still be used and port 5222/tcp outbound cannot be
+      allowed. In these situations, different methods for connecting to a
+      Jabber server are required. Several methods exist today for doing this
+      traversal. Most rely on the fact that a most firewalls are configured to
+      allow access through port 80/tcp. Although some less-complicated
+      firewalls will allow any protocol to traverse this port, many will proxy,
+      filter, and verify requests on this port as HTTP. Because of this, a
+      normal Jabber connection on port 80/tcp will not suffice.
+    </p>
+    <p>
+      In addition, many firewalls/proxy servers will also not allow or not
+      honor HTTP Keep-alives (as defined in section 19.7.1.1 of &rfc2068;)
+      and will consider long-lived socket connections as security issues.
+      Because of this the traditional Jabber connection model, where one
+      socket is one stream is one session, will not work reliably.
+    </p>
+    <p>
+      In light of all of the ways that default firewall rules can interfere
+      with Jabber connectivity, a lowest-common denominator approach was
+      selected. HTTP is used to send XML as POST requests and receieve pending
+      XML within the responses. Additional information is prepended in the
+      request body to ensure an equivalent level of security to TCP/IP sockets.
+    </p>
+  </section1>
+  <section1 topic="Normal data transfer">
+    <p>
+      The client makes HTTP requests periodically to the server. Whenever the
+      client has something to send, that XML is included in the body of the
+      request. When the server has something to send to the client, it must be
+      contained in the body of the response.
+    </p>
+    <p>
+      In some browser/platform combinations, sending cookies from the client is
+      not possible due to design choices and limitations in the
+      browser. Therefore, a work-around was needed to support clients based on
+      these application platforms.
+    </p>
+    <p>
+      All requests to the server are HTTP POST requests, with Content-Type:
+      application/x-www-form-urlencoded. Responses from the server have
+      Content-Type: text/xml. Both the request and response bodies are UTF-8
+      encoded text, even if an HTTP header to the contrary exists. All
+      responses contain a Set-Cookie header with an identifier, which is sent
+      along with future requests as described below. This identifier cookie
+      must have a name of 'ID'. The first request to a server always uses 0 as
+      the identifier. The server must always return a 200 response code,
+      sending any session errors as specially-formatted identifiers.
+    </p>
+    <p>
+      The client sends requests with bodies in the following format:
+      <example caption="Request Format">
+          identifier ; key [ ; new_key] , [xml_body]
+      </example>
+      If the identifier is zero, key indicates an initial key. In this case,
+      new_key should not be specified, and must be ignored.
+      <table caption="Request Values">
+        <tr>
+          <th>Identifier</th>
+          <th>Purpose</th>
+        </tr>
+        <tr>
+          <td>identifier</td>
+          <td>
+            To uniquely identify the session server-side. This field is only
+            used to identify the session, and provides no security.
+          </td>
+        </tr>
+        <tr>
+          <td>key</td>
+          <td>
+            To verify this request is from the originator of the session. The
+            client generates a new key in the manner described below for each
+            request, which the server then verifies before processing the
+            request.
+          </td>
+        </tr>
+        <tr>
+          <td>new_key</td>
+          <td>
+            The key algorithm can exhaust valid keys in a sequence, which
+            requires a new key sequence to be used in order to continue the
+            session. The new key is sent along with the last used key in the
+            old sequence.
+          </td>
+        </tr>
+        <tr>
+          <td>xml_body</td>
+          <td>
+            The body of text to send. Since a POST must be sent in order for
+            the server to respond with recent messages, a client may send
+            a request without an xml_body in order to just retrieve new
+            incoming packets. This is not required to be a full XML document or
+            XML fragment, it does not need to start or end on element boundaries.
+          </td>
+        </tr>
+      </table>
+    </p>
+    <p>
+      The identifier is everything before the first semicolon, and must consist
+      of the characters [A-Za-z0-9:-]. The identifier returned from the first
+      request is the identifier for the session. Any new identifier that ends
+      in ':0' indicates an error, with the entire identifier indicating the
+      specific error condition. Any new identifier that does not end in ':0' is
+      a server programming error, the client should discontinue the
+      session. For new sessions, the client identifier is considered to be 0.
+    </p>
+    <section2 topic="Error conditions">
+      <p>
+        Any identifier that ends in ':0' indicates an error. Any previous
+        identifier associated with this session is no longer valid.
+      </p>
+      <section3 topic="Unknown Error">
+        <p>
+          Server returns ID=0:0. The response body can contain a textual error
+          message.
+        </p>
+      </section3>
+      <section3 topic="Server Error">
+        <p>Server returns ID=-1:0</p>
+      </section3>
+      <section3 topic="Bad Request">
+        <p>Server returns ID=-2:0</p>
+      </section3>
+      <section3 topic="Key Sequence Error">
+        <p>Server returns ID=-3:0</p>
+      </section3>
+    </section2>
+    <p>
+      The key is a client security feature to allow TCP/IP socket equivalent
+      security. It does not protect against intermediary attacks, but does
+      prevent a person who is capable of listening to the HTTP traffic from
+      sending messages and receiving incoming traffic from another machine.
+    </p>
+    <p>The key algorithm should be familiar with those with knowledge of Jabber zero-knowledge authentication.</p>
+    <example caption="Key Algorithm">
+        K(n, seed) = Base64Encode(SHA1(K(n - 1, seed))), for n &gt; 0
+        K(0, seed) = seed, which is client-determined
+    </example>
+    <p>Note: Base64 encoding is defined in &rfc3548;. SHA1 is defined in &rfc3174;.</p>
+    <p>
+      No framing is implied by a single request or reply. A single request can
+      have no content sent, in which case the body contains only the identifier
+      followed by a comma. A reply may have no content to send, in which case
+      the body is empty. Zero or more XMPP packets may be sent in a single
+      request or reply, including partial XMPP packets.
+    </p>
+    <p>
+      The absense of a long-lived connection requires the server to consider
+      client traffic as a heartbeat to keep the session alive. If a
+      server-configurable period of time passes without a successful POST
+      request sent by the client, the server must end the client session. Any
+      client requests using the identifier associated with that now dead
+      session must return an error of '0:0'.
+    </p>
+    <p>
+      The maximum period of time to keep a client session active without an
+      incoming POST request is not defined, but five minutes is the recommended
+      minimum. The maximum period of time recommended for clients between
+      requests is two minutes; if the client has not sent any XML out for two
+      minutes, a request without an XML body should be sent. If a client is
+      disconnecting from the server, a closing &lt;stream:stream&gt; must be
+      sent to end the session. Failure to do this may have the client continue
+      to be represented to other users as available.
+    </p>
+    <p>
+      If the server disconnects the user do to a session timeout, the server
+      MUST bounce pending IQ requests and either bounce or store offline
+      incoming messages.
+    </p>
+  </section1>
+  <section1 topic="Usage">
+    <p>
+      The following is the sequence used for client communication
+      <ol>
+        <li>
+          The client generates some initial K(0, seed) and runs the algorithm
+          above 'n' times to determine the initial key sent to the server,
+          K(n, seed)
+        </li>
+        <li>
+          The client sends the request to the server to start the stream,
+          including an identifier with a value of zero and K(n, seed)
+        </li>
+        <li>
+          The server responds with the session identifier in the headers
+          (within the Set-Cookie field).
+        </li>
+        <li>
+          For each further request done by the client, the identifier from the
+          server and K(n - 1, seed) are sent along.
+        </li>
+        <li>
+          The server verifies the incoming value by generating
+          K(1, incoming_value), and verifying that value against the value sent
+          along with the last client request. If the values do not match, the
+          request should be ignored or logged, with an error code being
+          returned of -3:0. The request must not be processed, and must not
+          extend the session keepalive. 
+        </li>
+        <li>
+          The client may send a new key K(m, seed') at any point, but should
+          do this for n &gt; 0 and must do this for n = 0. If K(0, seed) is
+          sent without a new key, the client will not be able to continue the
+          session.
+        </li>
+      </ol>
+    </p>
+    <example caption="Initial request (without keys)">
+
+<![CDATA[POST /wc12/webclient HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Host: webim.jabber.com
+
+0,<stream:stream to="jabber.com"
+  xmlns="jabber:client"
+  xmlns:stream="http://etherx.jabber.org/streams">]]>
+ 
+    </example>
+    <example caption="Initial response">
+
+<![CDATA[Date: Fri, 15 Mar 2002 20:30:30 GMT
+Server: Apache/1.3.20
+Set-Cookie: ID=7776:2054; path=/webclient/; expires=-1
+Content-Type: text/xml
+
+<?xml version='1.0'?>
+<stream:stream xmlns:stream='http://etherx.jabber.org/streams'
+  id='3C9258BB'
+  xmlns='jabber:client' from='jabber.com'>]]>
+
+    </example>
+    <example caption="Next request (without keys)">
+
+<![CDATA[POST /wc12/webclient HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Host: webim.jabber.com
+
+7776:2054,<iq type="get" id="WEBCLIENT3">
+  <query xmlns="jabber:iq:auth">
+    <username>hildjj</username>
+  </query>
+</iq>]]>
+
+    </example>
+    <example caption='key sequence'>
+      K(0, "foo") = "foo"
+      K(1, "foo") = "C+7Hteo/D9vJXQ3UfzxbwnXaijM="
+      K(2, "foo") = "6UU8CDmH3O4aHFmCqSORCn721+M="
+      K(3, "foo") = "vFFYSOhGyaGUgLrldtMBX7x91Wc="
+      K(4, "foo") = "ZaDxCilBVTHS9dJfbBo1NsC2b+8="
+      K(5, "foo") = "moPFsvHytDGiJQOjp186AMXAeP0="
+      K(6, "foo") = "VvxEk07IFy6hUmG/PPBlTLE2fiA="
+    </example>
+      <example caption="Initial request (with keys)">
+
+<![CDATA[POST /wc12/webclient HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Host: webim.jabber.com
+
+0;VvxEk07IFy6hUmG/PPBlTLE2fiA=,<stream:stream to="jabber.com"
+  xmlns="jabber:client"
+  xmlns:stream="http://etherx.jabber.org/streams">]]>
+ 
+      </example>
+      <example caption="Next request (with keys)">
+
+<![CDATA[POST /wc12/webclient HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Host: webim.jabber.com
+
+7776:2054;moPFsvHytDGiJQOjp186AMXAeP0=,<iq type="get" id="WEBCLIENT3">
+  <query xmlns="jabber:iq:auth">
+    <username>hildjj</username>
+  </query>
+</iq>]]>
+
+    </example>
+    <example caption='Changing key'>
+<![CDATA[POST /wc12/webclient HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Host: webim.jabber.com
+
+7776:2054;C+7Hteo/D9vJXQ3UfzxbwnXaijM=;Tr697Eff02+32FZp38Xaq2+3Bv4=,<presence/>]]>
+    </example>
+  </section1>
+  <section1 topic="Known issues">
+    <ul>
+      <li>This method works over HTTPS, which is good from the standpoint of functionality, but bad in the sense that a massive amount of hardware would be needed to support reasonable polling intervals for non-trivial numbers of clients.</li>
+    </ul>
+  </section1>
+</jep>
diff --git a/xep-0026.xml b/xep-0026.xml
new file mode 100644
index 00000000..2c0bebab
--- /dev/null
+++ b/xep-0026.xml
@@ -0,0 +1,209 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+	<title>Internationalization (I18N)</title>
+        <abstract>NOTE WELL: this JEP was retracted on 2003-11-05 since the topic is addressed definitively in XMPP Core. Please refer to XMPP Core for further information.</abstract>
+        &LEGALNOTICE;
+	<number>0026</number>
+	<status>Retracted</status>
+	<type>Standards Track</type>
+	<jig>Standards</jig>
+        <dependencies>None</dependencies>
+        <supersedes>None</supersedes>
+        <supersededby>XMPP Core</supersededby>
+        <shortname>N/A</shortname>
+	<author>
+		<firstname>Max</firstname>
+		<surname>Horn</surname>
+		<email>max@quendi.de</email>
+		<jid>black_fingolfin@jabber.org</jid>
+	</author>
+        <revision>
+          <version>0.2</version>
+          <date>2003-11-05</date>
+          <initials>psa</initials>
+          <remark>The status of this JEP has been changed to Retracted since it has been superseded by &xmppcore;. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+        </revision>
+	<revision>
+		<version>0.1</version>
+		<date>2002-03-14</date>
+		<initials>mh</initials>
+		<remark>Initial version.</remark>
+	</revision>
+</header>
+<section1 topic='Introduction'>
+	 <p>
+	 	Jabber is meant to allow people everywhere in the world to communicate
+		with each other. However, people converse in many different languages, not just
+		English. Many humans in fact don't even understand English. Hence,
+		Jabber should not be tied to  a particular language, but rather allow
+		usage of any language, be it English, Chinese, Inuit, or anything else.
+	</p>
+	<p>
+		One important step towards this goal is that Jabber is based upon
+		Unicode, allowing for many different languages. But that alone is not
+		enough. Jabber promotes a server-based system for many of its
+		components and services, like the JUD, or transports. Many of these have
+		to interact with users in some way. Currently, they do so in only one
+		fixed language (usually English). Even if the server admin is willing
+		to translate the messages, forms, etc. involved, there can only be one
+		localization active for a given server/component.
+	</p>
+	<p>
+		Hence, Jabber must support a way for clients to inform the server about
+		their preferred language. In addition, the server and other components
+		have to understand and honor this information. Only this way can we
+		ensure that Jabber is able to work in a multi-national, multi-lingual
+		environment.
+	</p>
+	<p>
+		Some examples on how this information could and should be used, include
+	</p>
+	<ul>
+		<li>Forms (e.g. for registration or searching, refer also to <link url="http://foundation.jabber.org/jeps/jep-0004.html">JEP-0004</link>) can be localized, so that instructions and field labels are in the native language of the person who has to fill them out</li>
+		<li>Even if the form can't be sent in the proper language (e.g. simply because it hasn't yet been translated), the component still should tag its reply with the language being used</li>
+		<li>Incoming messages in a different language could be automatically translated (server-side or client-side)</li>
+		<li>Redirection of messages based on their language (think of a help desk which services world wide requests)</li>
+		<li>Transports to services which are not unicode based could use the language information as a hint at the best encoding (least lossage) for converted messages</li>
+	</ul>
+</section1>
+
+<section1 topic='Implementation'>
+	<p>
+		The basic idea behind this proposal was to use existing standards where possible, and to make it fully backward compatible. Furthermore it was a goal to allow clients to support it now, even without any server support, while at the same time permitting improved functionality once servers start to implement this spec.
+	</p>
+
+	<section2 topic='Encoding the locale'>
+		<p>To encode the locale on any given XML packet, we use the xml:lang attribute, as defined in the <link url="http://www.w3.org/TR/REC-xml#sec-lang-tag">XML specification</link>. This in turn uses values as specified in <link url="http://www.ietf.org/rfc/rfc1766.txt">RFC 1766</link> to encode languages and regions. This way, you can even distinguish between British and Australian English.
+		</p>
+		<example caption='Example message with locale set to German'>
+&lt;message to='friedrich@jabber.org' xml:lang='de-DE'&gt;
+  &lt;body'&gt;Ich bin ein Berliner!&lt;/body'&gt;
+&lt;/message&gt;  </example>
+		<p>
+			An xml:lang tag can be put onto any XML element; for the purposes of this JEP, however, we will limit its usage to the four central Jabber elements: &lt;stream/&gt;, &lt;message/&gt;, &lt;iq/&gt; and &lt;presence/&gt;.
+		</p>
+	</section2>
+	
+	<section2 topic='Client support'>
+		<p>
+			A client claiming to support this JEP has to initiate server connection slightly differently by putting an xml:lang attribute in the initial &lt;stream:stream&gt; element.
+		</p>
+		<example caption='Jabber session initiated with Canadian French as default'>
+&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
+&lt;stream:stream to='jabber.org' xmlns='jabber:client'
+          xmlns:stream='http://etherx.jabber.org/streams' xml:lang='fr-CA'&gt; </example>
+		<p>
+			Servers not supporting this JEP will just ignore the additional attribute. Compliant server can be distinguished by the fact that their reply &lt;stream:stream&gt; element also contains an xml:lang attribute, indicating the main language of the server. A compliant client has to detect whether the server is compliant or not, and base its future behavior on this information.
+		</p>
+		<example caption='Reply by an English-language Jabber server'>
+&lt;stream:stream from='jabber.org' id='12345' xmlns='jabber:client'
+          xmlns:stream='http://etherx.jabber.org/streams' xml:lang='en'&gt; </example>
+		<p>
+			If the client thus determines that the server is compliant, then it doesn't have to do anything beyond this point. All its outgoing messages will automatically be flagged by the server with an xml:lang attribute if necessary. Thus writing a minimal compliant client is trivial.
+		</p>
+		<p>
+			If it is determined that the server does not support this JEP, and the client still wants to offer locale support, it may start flagging all its outgoing message/iq/presence elements with the xml:lang attribute, to ensure that other components/clients which do conform to this JEP can handle the localization despite the local server not doing so.
+		</p>
+		<p>
+			Finally, if for whatever reasons the client wants to flag particular messages with a different locale (e.g. if the user is bilingual), it can do so at any time by putting an appropriate xml:lang element in the outgoing data. This will override the previously set default locale for this message only.
+		</p>
+	</section2>
+
+	
+	<section2 topic='Server support'>
+		<p>
+			A compliant server must detect the xml:lang attribute in incoming &lt;stream:stream&gt; elements. The server then has to store this information for later use, i.e. it has to remember the default language for each active session. 
+		</p>
+		<p>
+			Additionally, a compliant server must attach an xml:lang attribute to the reply &lt;stream:stream&gt; element sent in response to a newly initiated connection. This attribute should reflect the default language of that server, and is used to indicate to clients that the server implements this JEP.
+		</p>
+		<p>
+			The server should not only allow user clients to specify a default language this way, but also server-side components, like the JUD should be allowed to do this.
+		</p>
+		<p>
+			Whenever a message leave the server, it has to tag the message automatically with the xml:lang attribute of the corresponding seesion, if any was specified, unless the message is already tagged this way. In that case, the already existing xml:lang attribute takes precedence, thus allowing for greater flexibility.
+		</p>
+		<p>
+			If a client send a message to another local client which uses the same xml:lang value, then no change is applied. But if the recipient uses a different xml:lang, and if the message has no xml:lang attribute attached yet, the xml:lang of the server has to be attached before delievey of the message.
+		</p>
+	</section2>
+
+	
+	<section2 topic='Service support'>
+		<p>
+			Jabber based services that wish to comply to this JEP have to make sure that all information they send to clients is tagged with an xml:lang attribute corresponding to the language used in the outgoing data, if appropriate, even if the component supports no other localizations. An example for this is a search form based on <link url="http://foundation.jabber.org/jeps/jep-0004.html">JEP-0004</link>.
+		</p>
+		<example caption='Search form in English'>
+&lt;iq from='users.jabber.org' type='result' id='4' xml:lang='en'&gt;
+  &lt;query xmlns='jabber:iq:search'&gt;
+    &lt;instructions&gt;
+        Fill in a field to search for any matching Jabber users.
+    &lt;/instructions&gt;
+    &lt;nick/&gt;
+    &lt;first/&gt;
+    &lt;last/&gt;
+    &lt;email/&gt;
+
+    &lt;x xmlns='jabber:x:data'&gt;
+      &lt;instructions&gt;
+          To search for a user fill out at least one 
+          of the fields below and submit the form.
+      &lt;/instructions&gt;
+      &lt;field type='text-single' label='First (Given)' var='first'/&gt;
+      &lt;field type='text-single' label='Last (Family)' var='last'/&gt;
+      &lt;field type='text-single' label='Nick (Alias)' var='nick'/&gt;
+      &lt;field type='text-single' label='Email' var='email'/&gt;
+    &lt;/x&gt;
+  &lt;/query&gt;
+&lt;/iq&gt; </example>
+		<p>
+			This way, a client could for example offer to translate the form since it now knows the language the form was written in. Previously it could just guess the language was English, which never was guaranteed.
+		</p>
+     	<p>
+     		To be able to tailor replies to the user's preferred language, the component has to know this information. This is simply inferred from any xml:lang attribute on incoming requests. If none is present, the default locale is assumed. If the client's default locale diverges from that of the component, it is the server's responsibility to tag the query with an appropriate xml:lang attribute (refer to the "Server support" section). If on the other hand the server is not compliant, then any interested client will manually tag its queries with an xml:lang attribute. Thus it is sufficient to check for this attribute.
+     	</p>
+		<example caption='Request for a German-language search form'>
+&lt;iq to='users.jabber.org' type='get' id='5' xml:lang='de'&gt;
+  &lt;query xmlns='jabber:iq:search'/&gt;
+&lt;/iq&gt; </example>
+		<p>
+			A more sophisticated component supporting multiple localizations of its forms/messages could now honor the requested language and send this search form instead of the English one shown previously:
+		</p>
+		<example caption='Search form in German'>
+&lt;iq from='users.jabber.org' type='result' id='5' xml:lang='de'&gt;
+  &lt;query xmlns='jabber:iq:search'&gt;
+    &lt;instructions&gt;
+        F&#252;llen Sie ein Feld aus um nach einem beliebigen 
+        passenden Jabber-Benutzer zu suchen.
+    &lt;/instructions&gt;
+    &lt;nick/&gt;
+    &lt;first/&gt;
+    &lt;last/&gt;
+    &lt;email/&gt;
+
+    &lt;x xmlns='jabber:x:data'&gt;
+      &lt;instructions&gt;
+          Um nach einem Benutzer zu suchen, f&#252;llen Sie mindestens eines 
+          der folgenden Felder aus und schicken dann das Formular ab.
+      &lt;/instructions&gt;
+      &lt;field type='text-single' label='Vorname' var='first'/&gt;
+      &lt;field type='text-single' label='Nachname' var='last'/&gt;
+      &lt;field type='text-single' label='Spitzname' var='nick'/&gt;
+      &lt;field type='text-single' label='Email' var='email'/&gt;
+    &lt;/x&gt;
+  &lt;/query&gt;
+&lt;/iq&gt; </example>
+		<p>
+			If the component doesn't have the requested localization available, it replies with the default localization (but of course with the matching xml:lang attribute tagged to it, and not the one of the request).
+     	</p>
+     
+	</section2>
+</section1>
+
+</jep>
diff --git a/xep-0027.xml b/xep-0027.xml
new file mode 100644
index 00000000..78199105
--- /dev/null
+++ b/xep-0027.xml
@@ -0,0 +1,183 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Current Jabber OpenPGP Usage</title>
+  <abstract>This document outlines the current usage of OpenPGP for messaging and presence.</abstract>
+  &LEGALNOTICE;
+  <number>0027</number>
+  <status>Active</status>
+  <type>Historical</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>openpgp</shortname>
+  <schemaloc>
+    <ns>jabber:x:encrypted</ns>
+    <url>http://jabber.org/protocol/openpgp/x-encrypted.xsd</url>
+  </schemaloc>
+  <schemaloc>
+    <ns>jabber:x:signed</ns>
+    <url>http://jabber.org/protocol/openpgp/x-signed.xsd</url>
+  </schemaloc>
+  &temas;
+  <revision>
+      <version>1.2</version>
+      <date>2004-03-08</date>
+      <initials>psa</initials>
+      <remark>Clarified the text in several places; added several more security considerations and known issues.</remark>
+  </revision>
+  <revision>
+      <version>1.1</version>
+      <date>2004-01-06</date>
+      <initials>psa</initials>
+      <remark>Added XML schemas; added security, IANA, and Jabber Registrar considerations.</remark>
+  </revision>
+  <revision>
+      <version>1.0</version>
+      <date>2002-04-23</date>
+      <initials>psa</initials>
+      <remark>Changed status to Active.</remark>
+  </revision>
+  <revision>
+      <version>0.2</version>
+      <date>2002-04-11</date>
+      <initials>tjm</initials>
+      <remark>Merged DW's comments on key usage as well as more known issues.</remark>
+  </revision>
+  <revision>
+      <version>0.1</version>
+      <date>2002-03-12</date>
+      <initials>tjm</initials>
+      <remark>First draft.</remark>
+  </revision>
+</header>
+<section1 topic='Introduction' anchor='intro'>
+  <p>The Jabber community has long acknowledged the need for privacy and security features in a well-rounded instant messaging system.  Unfortunately, finding a consensus solution to the problem of end-to-end encryption during the community's younger days was not easy.  Eventually, early contributors created a quick solution using OpenPGP.  This JEP documents the OpenPGP solution as it is used today, so that others may interoperate with clients that support it.  This JEP is not intended to present a standard, because more complete solutions are being investigated.</p>
+  <p>All operations described here are done with standard OpenPGP software such as <link url='http://www.gnupg.org/'>GnuPG</link>.  All program output is US-ASCII armored output with the headers removed.  This allows for easy transportation of the program output directly in the XML.  All keys are exchanged using OpenPGP key servers, and usually are retrieved when a signed &PRESENCE; stanza is received (key retrieval does not happen in-band).</p>
+</section1>
+<section1 topic='Signing' anchor='signing'>
+  <p>Signing enables a sender to verify that they sent a certain block of text.  In Jabber, signing uses the 'jabber:x:signed' namespace, and is primarily used with &PRESENCE;, but may also be used with &MESSAGE;.  Because signing requires a block of text, it creates new restrictions on the &PRESENCE; and &MESSAGE; stanzas:</p>
+    <ul>
+      <li>A &PRESENCE; stanza MUST have a &lt;status&gt; element containing XML character data.</li>
+      <li>A &MESSAGE; stanza MUST have a &lt;body&gt; element containing XML character data.</li>
+    </ul>
+    <p>These requirements are necessary so that there is always common text to sign and verify against.  When signing presence, the sender SHOULD sign the XML character data of the &lt;status&gt; element.  The sender SHOULD sign presence using the private key whose KeyID corresponds to the public key to be used in encrypting messages (see below).</p>
+    <example caption='A signed presence stanza'>
+&lt;presence from='pgmillard@jabber.org/wj_dev2' to='jer@jabber.org'&gt;
+  &lt;status&gt;Online&lt;/status&gt;
+  &lt;x xmlns='jabber:x:signed'&gt;
+    iQA/AwUBOjU5dnol3d88qZ77EQI2JACfRngLJ045brNnaCX78ykKNUZaTIoAoPHI
+    2uJxPMGR73EBIvEpcv0LRSy+
+    =45f8
+  &lt;/x&gt;
+&lt;/presence&gt;
+    </example>
+</section1>
+<section1 topic='Encrypting' anchor='encrypting'>
+  <p>Encryption enables the sender to encrypt a message to a specific recipient.  This is accomplished using the 'jabber:x:encrypted' namespace in conjunction with &MESSAGE; stanzas.  Because a block of text is necessary in order to have something to encrypt, &MESSAGE; stanzas intended to be encrypted have the same restrictions as signing (see above).  The data encrypted MUST be the XML character data of the &lt;body&gt; element.  The sender SHOULD encrypt the message body using the public key whose KeyID corresponds to the private key used in signing presence (see above).</p>
+  <example caption='An encrypted message stanza'>
+&lt;message to='reatmon@jabber.org/jarl' from='pgmillard@jabber.org/wj_dev2'&gt;
+  &lt;body&gt;This message is encrypted.&lt;/body&gt;
+  &lt;x xmlns='jabber:x:encrypted'&gt;
+    qANQR1DBwU4DX7jmYZnncmUQB/9KuKBddzQH+tZ1ZywKK0yHKnq57kWq+RFtQdCJ
+    WpdWpR0uQsuJe7+vh3NWn59/gTc5MDlX8dS9p0ovStmNcyLhxVgmqS8ZKhsblVeu
+    IpQ0JgavABqibJolc3BKrVtVV1igKiX/N7Pi8RtY1K18toaMDhdEfhBRzO/XB0+P
+    AQhYlRjNacGcslkhXqNjK5Va4tuOAPy2n1Q8UUrHbUd0g+xJ9Bm0G0LZXyvCWyKH
+    kuNEHFQiLuCY6Iv0myq6iX6tjuHehZlFSh80b5BVV9tNLwNR5Eqz1klxMhoghJOA
+    w7R61cCPt8KSd8Vcl8K+StqOMZ5wkhosVjUqvEu8uJ9RupdpB/4m9E3gOQZCBsmq
+    OsX4/jJhn2wIsfYYWdqkbNKnuYoKCnwrlmn6I+wX72p0R8tTv8peNCwK9bEtL/XS
+    mhn4bCxoUkCITv3k8a+Jdvbov9ucduKSFuCBq4/l0fpHmPhHQjkFofxmaWJveFfF
+    619NXyYyCfoLTmWk2AaTHVCjtKdf1WmwcTa0vFfk8BuFHkdah6kJJiJ7w/yNwa/E
+    O6CMymuZTr/LpcKKWrWCt+SErxqmq8ekPI8h7oNwMxZBYAa7OJ1rXWKNgL9pDtNI
+    824Mf0mXj7q5N1eMHvX1QEoKLAda/Ae3TTEevOyeUK1DEgvxfM2KRZ11RzU+XtIE
+    My/bJk7EycAw8P/QKyeNlO1fxP58VEd6Gb8NCPqKOYn/LKh1O+c20ZNVEPFM4bNV
+    XA4hB4UtFF7Ao8kpdlrUqdKyw4lEtnmdemYQ6+iIIVPEarWl9PxOMY90KAnZrSAq
+    bt9uRY/1rPgelRaWblMKvxgpRO8++Y8VjdEyGgMOXxOiE851Ve72ftGzkSxDH8mW
+    TgY3pf2aATmBp3lagQ1COkGS/xupovT5AQPA3RzbCxDvc6s6eGYKmVVQVj5vmSj1
+    WULad5MB9KT1DzCm6FOSy063nWGBYYMWiejRvGLpo1j4eAnj0qOt7rTWmgv3RkYF
+    Oin0vDOhW7aC
+    =CvnG&lt;/x&gt;
+&lt;/message&gt;
+  </example>
+  <p>It is considered polite to include an unencrypted message &lt;body/&gt; explaining that the actual message body is encrypted.  This helps if the client experiences an error while decrypting the message, or if the user's a client that does not support encryption (although generally this should not happen, since the signed presence can be used to indicate that a client accepts encrypted messages).</p>
+</section1>
+<section1 topic='Security Considerations' anchor='security'>
+  <p>The method defined herein has the following security issues:</p>
+  <ul>
+    <li>Key exchange relies on the web of trust model used on the OpenPGP keys network.</li>
+    <li>There is no mechanism for checking a fingerprint or ownership of a key other than checking the user IDs on a key.</li>
+    <li>When the recipient is not mentioned in the encrypted body, replay attacks are possible on messages.</li>
+    <li>Replay of the signed &PRESENCE; status is possible.</li>
+    <li>It relies on signing or encryption of XML character data; therefore, it does not support signing or encryption of &IQ; stanzas, and it allows signing of the presence &lt;status/&gt; element and encryption of the message &lt;body/&gt; element only. Thus the method is not acceptable when signing or encryption of full stanzas is required.</li>
+    <li>It does not enable both signing and encryption of a stanza, only signing of the presence status and encryption of the message body.</li>
+  </ul>
+</section1>
+<section1 topic='Other Known Issues' anchor='issues'>
+  <p>In addition to the security considerations listed above, there are several other known issues with this method:</p>
+  <ul>
+    <li>It is limited to PGP keys and does not support X.509 certificates, Kerberos, RSA keys, etc.</li>
+    <li>It does not include feature negotiation; instead, signed &PRESENCE; is used as an indicator of support.  Because of the lack of negotiation it is possible for encrypted &MESSAGE; elements to be stored offline and then read by a client that cannot support them.</li>
+    <li>It is verbose (the example encrypted &MESSAGE; is "Hi").</li>
+  </ul>
+</section1>
+<section1 topic='IANA Considerations' anchor='iana'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+<section1 topic='Jabber Registrar Considerations' anchor='registrar'>
+  <p>The &REGISTRAR; shall register the 'jabber:x:encrypted' and 'jabber:x:signed' namespaces as a result of this JEP.</p>
+</section1>
+<section1 topic='XML Schemas' anchor='schemas'>
+  <section2 topic='jabber:x:encrypted' anchor='schemas-encrypted'>
+    <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:x:encrypted'
+    xmlns='jabber:x:encrypted'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0027: http://www.jabber.org/jeps/jep-0027.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='x' type='xs:string'/>
+
+</xs:schema>
+    ]]></code>
+  </section2>
+  <section2 topic='jabber:x:signed' anchor='schemas-signed'>
+    <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='jabber:x:signed'
+    xmlns='jabber:x:signed'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0027: http://www.jabber.org/jeps/jep-0027.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='x' type='xs:string'/>
+
+</xs:schema>
+    ]]></code>
+  </section2>
+</section1>
+</jep>
diff --git a/xep-0028.xml b/xep-0028.xml
new file mode 100644
index 00000000..e301ed59
--- /dev/null
+++ b/xep-0028.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>No Such JEP</title>
+  <abstract>This JEP was removed from the JSF website and source control at the request of the author.</abstract>
+  <number>0028</number>
+</header>
+</jep>
diff --git a/xep-0029.xml b/xep-0029.xml
new file mode 100644
index 00000000..cac9c8ab
--- /dev/null
+++ b/xep-0029.xml
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+    <header>
+        <title>Definition of Jabber Identifiers (JIDs)</title>
+        <abstract>This document defines the exact nature of a Jabber Identifier (JID). <em>Note well: this document is superseded by the XMPP Core memo defined by the IETF's XMPP Working Group.</em></abstract>
+        &LEGALNOTICE;
+        <number>0029</number>
+        <status>Retracted</status>
+        <type>Standards Track</type>
+        <jig>Standards JIG</jig>
+        <dependencies>None</dependencies>
+        <supersedes>None</supersedes>
+        <supersededby>XMPP Core</supersededby>
+        <shortname>N/A</shortname>
+        <author>
+            <firstname>Craig</firstname>
+            <surname>Kaes</surname>
+            <email>craigk@jabber.com</email>
+            <jid>craigk@jabber.com</jid>
+        </author>
+        <revision>
+            <version>1.1</version>
+            <date>2003-10-03</date>
+            <initials>psa</initials>
+            <remark>Changed status to Retracted. This JEP is superseded by the XMPP Core memo defined by the IETF's XMPP Working Group.</remark>
+        </revision>
+        <revision>
+            <version>1.0</version>
+            <date>2002-05-15</date>
+            <initials>psa</initials>
+            <remark>Changed status to Draft.</remark>
+        </revision>
+        <revision>
+            <version>0.2</version>
+            <date>2002-05-01</date>
+            <initials>cak</initials>
+            <remark>
+                Added info on restricting resource identifier length; standardized nomenclature.
+            </remark>
+        </revision>
+        <revision>
+            <version>0.1</version>
+            <date>2002-04-24</date>
+            <initials>cak</initials>
+            <remark>Initial version</remark>
+        </revision>
+    </header>
+    <section1 topic='Introduction'>
+        <p>Jabber Identifiers (JIDs) uniquely identify individual entities in the Jabber network. To date, their syntax has been defined by convention, existing implementations, and available documentation. As it exists, certain characters that are allowed in JIDs cause ambiguity, and the lack of a size limit on resources defies database schemas and causes some trivial JID operations to require dynamic memory allocation. This JEP seeks to both define and improve the existing JID syntax. This JEP will not explain the general usage or nature of JIDs, instead focusing on syntax.</p>
+    </section1>
+    <section1 topic='JIDs'>
+        <p>JIDs consist of three main parts:</p>
+          <ol>
+            <li>The node identifier (optional)</li>
+            <li>The domain identifier (required)</li>
+            <li>The resource identifier (optional)</li>
+          </ol>
+        <p>JIDs are encoded UTF-8. A grammar will be presented first, followed by specific clarifying and further restricting remarks.</p>
+        <section2 topic='Grammar'>
+            <p>
+                <code>
+&lt;JID&gt; ::= [&lt;node&gt;"@"]&lt;domain&gt;["/"&lt;resource&gt;]
+&lt;node&gt; ::= &lt;conforming-char&gt;[&lt;conforming-char&gt;]*
+&lt;domain&gt; ::= &lt;hname&gt;["."&lt;hname&gt;]*
+&lt;resource&gt; ::= &lt;any-char&gt;[&lt;any-char&gt;]*
+&lt;hname&gt; ::= &lt;let&gt;|&lt;dig&gt;[[&lt;let&gt;|&lt;dig&gt;|"-"]*&lt;let&gt;|&lt;dig&gt;]
+&lt;let&gt; ::= [a-z] | [A-Z]
+&lt;dig&gt; ::= [0-9]
+&lt;conforming-char&gt; ::= #x21 | [#x23-#x25] | [#x28-#x2E] | 
+                      [#x30-#x39] | #x3B | #x3D | #x3F | 
+                      [#x41-#x7E] | [#x80-#xD7FF] | 
+                      [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+&lt;any-char&gt; ::= [#x20-#xD7FF] | [#xE000-#xFFFD] | 
+               [#x10000-#x10FFFF]
+                </code>
+            </p>
+        </section2>
+        <section2 topic='Domain Identifier'>
+            <p>A domain identifier is a standard DNS hostname as specified in RFC952 <note><link url='http://www.ietf.org/rfc/rfc952.txt'>http://www.ietf.org/rfc/rfc952.txt</link></note> and RFC1123. <note><link url='http://www.ietf.org/rfc/rfc1123.txt'>http://www.ietf.org/rfc/rfc1123.txt</link></note> It is case-insensitive 7-bit ASCII and limited to 255 bytes.  It is the only required component of a JID.</p>
+        </section2>
+        <section2 topic='Node Identifier'>
+            <p>Node identifiers are restricted to 256 bytes, They may contain any Unicode character higher than #x20 with the exception of the following:</p>
+            <ol>
+                <li>#x22 (")</li>
+                <li>#x26 (&amp;)</li> 
+                <li>#x27 (')</li>
+                <li>#x2F (/)</li>
+                <li>#x3A (:)</li> 
+                <li>#x3C (&lt;)</li> 
+                <li>#x3E (&gt;)</li> 
+                <li>#x40 (@)</li> 
+                <li>#x7F (del)</li>
+                <li>#xFFFE (BOM)</li> 
+                <li>#xFFFF (BOM)</li> 
+            </ol>
+            <p>Case is preserved, but comparisons will be made in case-normalized canonical form.</p>
+        </section2>
+        <section2 topic='Resource Identifier'>
+            <p>Resources identifiers are case-sensitive and are limited to 256 bytes. They may include any Unicode character greater than #x20, except #xFFFE and #xFFFF.</p>
+        </section2>
+        <section2 topic='Limited Resources'>
+            <p>To date, resource identifiers have not had a fixed limit on their length.  This JEP seeks to limit it to 256 bytes for the following reasons:</p>
+            <ol>
+                <li>In order to perform JID manipulations safely, one cannot use stack space if there is no limit.  This forces temporary calculations onto the heap which is unnecessarily costly.</li>
+                <li>As a fixed length character field, a resource identifier is more easily stored in, searched on, and retrieved from a database.  If an end user may store an encyclopedia's worth of information in their resource, then the only way it can be stored without truncating it is to store it as a large object (BLOB or CLOB).  Depending on the database used, that makes it either grossly inefficient or impossible to search on.</li>
+                <li>There exist denial of service attacks stemming from an unlimited resource length.</li>
+            </ol>
+            <p>In a worst-case encoding, such as Han ideographs, 256 bytes will provide enough storage space for 64 character points.  This provides a lower bound on the number of characters a node may have in its resource.</p>
+            <p>Specifying limits in terms of bytes instead of characters is somewhat arbitrary once a lower bound for characters is established.  This JEP proposes limits in terms of bytes mainly because doing so results in parsing efficiency; specifically, an implementation does not have to un-encode the UTF-8 string for the sole purpose of further restricting character sets that require fewer than four bytes per character point.  It is sufficient to have a lower bound on characters and an upper bound on bytes.</p>
+        </section2>
+    </section1>
+</jep>
diff --git a/xep-0030.xml b/xep-0030.xml
new file mode 100644
index 00000000..f2b8a06c
--- /dev/null
+++ b/xep-0030.xml
@@ -0,0 +1,1032 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+  <header>
+    <title>Service Discovery</title>
+    <abstract>This JEP defines a protocol for discovering (1) information about Jabber entities and (2) the items associated with such entities.</abstract>
+    &LEGALNOTICE;
+    <number>0030</number>
+    <status>Final</status>
+    <type>Standards Track</type>
+    <jig>Standards JIG</jig>
+    <dependencies>
+      <spec>XMPP Core</spec>
+    </dependencies>
+    <supersedes>
+      <spec>JEP-0011</spec>
+      <spec>JEP-0094</spec>
+    </supersedes>
+    <supersededby/>
+    <shortname>disco</shortname>
+    <schemaloc>
+      <ns>disco#info</ns>
+      <url>http://jabber.org/protocol/disco/info.xsd</url>
+    </schemaloc>
+    <schemaloc>
+      <ns>disco#items</ns>
+      <url>http://jabber.org/protocol/disco/items.xsd</url>
+    </schemaloc>
+    <registry/>
+    &hildjj;
+    &pgmillard;
+    &reatmon;
+    &stpeter;
+    <revision>
+      <version>2.2</version>
+      <date>2006-01-24</date>
+      <initials>psa</initials>
+      <remark>Further specified and clarified security considerations relating to server handling of requests sent to bare JIDs.</remark>
+    </revision>
+    <revision>
+      <version>2.1</version>
+      <date>2005-03-03</date>
+      <initials>psa</initials>
+      <remark>Added paragraph to implementation notes about server handling of requests sent to bare JIDs.</remark>
+    </revision>
+    <revision>
+      <version>2.0</version>
+      <date>2004-07-20</date>
+      <initials>psa</initials>
+      <remark>Per a vote of the Jabber Council, advanced status to Final.</remark>
+    </revision>
+    <revision>
+      <version>1.10</version>
+      <date>2004-06-29</date>
+      <initials>psa/jjh</initials>
+      <remark>Defined security considerations; changed extended presence example to use a fictitious protocol; further specified publish feature; defined registry submissions.</remark>
+    </revision>
+    <revision>
+      <version>1.9</version>
+      <date>2004-05-27</date>
+      <initials>psa</initials>
+      <remark>Clarified error conditions.</remark>
+    </revision>
+    <revision>
+      <version>1.8</version>
+      <date>2004-05-21</date>
+      <initials>psa</initials>
+      <remark>Moved remaining feature negotiation text to JEP-0020.</remark>
+    </revision>
+    <revision>
+      <version>1.7</version>
+      <date>2004-05-13</date>
+      <initials>psa</initials>
+      <remark>Added implementation note regarding flexibility of feature and item results; final editorial cleanup.</remark>
+    </revision>
+    <revision>
+      <version>1.6</version>
+      <date>2004-05-11</date>
+      <initials>psa</initials>
+      <remark>Corrected examples of publishing available items; further clarified nature of node hierarchies.</remark>
+    </revision>
+    <revision>
+      <version>1.5</version>
+      <date>2004-05-10</date>
+      <initials>psa</initials>
+      <remark>Added clarifying note about node hierarchies.</remark>
+    </revision>
+    <revision>
+      <version>1.4</version>
+      <date>2004-05-07</date>
+      <initials>psa</initials>
+      <remark>Clarified usage of "directory"; added section defining the relationship between an entity and its associated items.</remark>
+    </revision>
+    <revision>
+      <version>1.3</version>
+      <date>2004-04-23</date>
+      <initials>psa</initials>
+      <remark>Further clarified item-publication protocol; moved some feature negotiation text to JEP-0020; added information about registry of well-known service discovery nodes; added implementation notes regarding tree-walking and large result sets; incorporated additional Call for Experience suggestions.</remark>
+    </revision>
+    <revision>
+      <version>1.2</version>
+      <date>2004-04-20</date>
+      <initials>psa</initials>
+      <remark>Editorial cleanup; incorporated some Call for Experience suggestions.</remark>
+    </revision>
+    <revision>
+      <version>1.1</version>
+      <date>2004-03-15</date>
+      <initials>psa</initials>
+      <remark>Described requirements, syntax, and use cases in a more formal manner; corrected several errors in the examples and schemas; defined Jabber Registrar procedures; added a number of references; specified XMPP error handling.</remark>
+    </revision>
+    <revision>
+      <version>1.0</version>
+      <date>2003-04-21</date>
+      <initials>psa</initials>
+      <remark>Per a vote of the Jabber Council, advanced status to Draft; also added XML schemas.</remark>
+    </revision>
+    <revision>
+      <version>0.13</version>
+      <date>2003-02-25</date>
+      <initials>pgm</initials>
+      <remark>Added remarks about empty node attributes; described semantics regarding multiple identity elements.</remark>
+    </revision>
+    <revision>
+      <version>0.12</version>
+      <date>2003-02-06</date>
+      <initials>pgm</initials>
+      <remark>Added support for IQ-set; added example for disco#info to a specific node.</remark>
+    </revision>
+    <revision>
+      <version>0.11</version>
+      <date>2002-12-17</date>
+      <initials>psa</initials>
+      <remark>Added support for the 'node' attribute per discussion on the Standards-JIG list in order to support items that are not JID-addressable.</remark>
+    </revision>
+    <revision>
+      <version>0.10</version>
+      <date>2002-11-21</date>
+      <initials>psa</initials>
+      <remark>Changed &lt;feature type='foo'/&gt; to &lt;feature var='foo'/&gt; to track changes in feature negotiation (JEP-0020); added initial registry parameters.</remark>
+    </revision>
+    <revision>
+      <version>0.9</version>
+      <date>2002-11-07</date>
+      <initials>psa</initials>
+      <remark>Added support for empty result sets in disco#item.</remark>
+    </revision>
+    <revision>
+      <version>0.8</version>
+      <date>2002-11-01</date>
+      <initials>psa</initials>
+      <remark>Removed the max, start, and total attributes for item queries (this will be handled by a generic paging JEP); added "http://jabber.org/protocol/feature-neg" namespace as a feature to signal negotiability regarding one or more features.</remark>
+    </revision>
+    <revision>
+      <version>0.7</version>
+      <date>2002-10-28</date>
+      <initials>psa</initials>
+      <remark>Cleaned up the feature text and examples.</remark>
+    </revision>
+    <revision>
+      <version>0.6</version>
+      <date>2002-10-27</date>
+      <initials>psa</initials>
+      <remark>Added the 'category' attribute to the &lt;feature/&gt; element; added security, IANA, and Jabber Registrar considerations; added a number of examples.</remark>
+    </revision>
+    <revision>
+      <version>0.5</version>
+      <date>2002-10-15</date>
+      <initials>psa</initials>
+      <remark>Total overhaul and simplification.</remark>
+    </revision>
+    <revision>
+      <version>0.4</version>
+      <date>2002-07-16</date>
+      <initials>psa</initials>
+      <remark>Major additions and fixes, many more examples.</remark>
+    </revision>
+    <revision>
+      <version>0.3</version>
+      <date>2002-05-30</date>
+      <initials>psa</initials>
+      <remark>Re-organized around use cases, made some minor fixes.</remark>
+    </revision>
+    <revision>
+      <version>0.2</version>
+      <date>2002-05-05</date>
+      <initials>psa</initials>
+      <remark>Incorporated comments from co-authors and added notes.</remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2002-05-03</date>
+      <initials>psa</initials>
+      <remark>Initial draft.</remark>
+    </revision>
+  </header>
+
+  <section1 topic='Introduction' anchor='intro'>
+    <p>The ability to discover information about entities on the Jabber network is extremely valuable. Such information might include features offered or protocols supported by the entity, the entity's type or identity, and additional entities that are associated with the original entity in some way (often thought of as "children" of the "parent" entity). While mechanisms for doing so are not defined in &xmppcore;, several protocols have been used in the past within the Jabber community for service discovery, specifically &jep0011; and &jep0094;. However, those protocols are perceived to be inadequate for several reasons:</p>
+    <ol>
+      <li><p>Neither Jabber Browsing nor Agent Information is easily extensible. For example, the categories and subcategories listed for JID-Types in JEP-0011 are explicitly defined as the only official categories, and any additions to the list of JID-Types would require a modification to JEP-0011. While the Jabber Browsing specification does allow for the use of unofficial categories and types prefixed with the string 'x-', this introduces migration issues. This lack of flexibility violates one of the Jabber community's core &jep0134;.</p></li>
+      <li><p>In Agent Information, there is no way to advertise supported features. While Jabber Browsing includes such a mechanism, the only way to express the availability of a feature is to advertise a supported protocol namespace. Yet some features may not be uniquely associated with a protocol namespace, which are one implementation of features but not the only one.</p></li>
+      <li><p>A Jabber Browsing result returns a combination of (1) namespaces supported by a Jabber Entity, (2) items associated with a Jabber Entity, and (3) namespaces supported by the associated items. This approach mixes information levels and requires parents to know everything about child nodes, thereby introducing significant confusion.</p></li>
+      <li><p>In both Jabber Browsing and Agent Information, items must be addressable as JIDs; however, this may not be possible in some applications.</p></li>
+    </ol>
+    <p>This JEP addresses the perceived weaknesses of both the Jabber Browsing and Agent Information protocols. The result is a standards-track protocol for service discovery (often abbreviated to "disco", as is familiar in protocols such as &w3soap;).</p>
+  </section1>
+
+  <section1 topic='Requirements' anchor='reqs'>
+    <p>The authors have designed the service discovery protocol with the following requirements in mind:</p>
+    <ul>
+      <li><p>The protocol MUST support all functionality supported by the protocols it supersedes (Jabber Browsing and Agent Information).</p></li>
+      <li>
+        <p>There are three kinds of information that need to be discovered about an entity:</p>
+        <ol>
+          <li>its basic identity (type and/or category)</li>
+          <li>the features it offers and protocols it supports</li>
+          <li>any additional items associated with the entity, whether or not they are addressable as JIDs</li>
+        </ol>
+        <p>All three MUST be supported, but the first two kinds of information relate to the entity itself whereas the third kind of information relates to items associated with the entity itself; therefore two different query types are needed.</p>
+      </li>
+      <li><p>Discovering information about a child item MUST be accomplished by sending a separate discovery request to that item, not to the parent entity. (One result of this is that discovering complete information about an entire tree will require multiple request/response pairs in order to "walk the tree".)</p></li>
+      <li><p>The lists of identities and features MUST be flexible.</p></li>
+      <li><p>The protocol itself MUST be extensible.</p></li>
+    </ul>
+  </section1>
+
+  <section1 topic='Discovering Information About a Jabber Entity' anchor='info'>
+    <section2 topic='Basic Protocol' anchor='info-basic'>
+      <p>A requesting entity may want to discover information about another entity on the network. The information desired generally is of two kinds:</p>
+      <ol>
+        <li><p><strong>The target entity's identity.</strong> In disco, an entity's identity is broken down into its category (server, client, gateway, directory, etc.) and its particular type within that category (IM server, phone vs. handheld client, MSN gateway vs. AIM gateway, user directory vs. chatroom directory, etc.). This information helps requesting entities to determine the group or "bucket" of services into which the entity is most appropriately placed (e.g., perhaps the entity is shown in a GUI with an appropriate icon). An entity MAY have multiple identities. When multiple identity elements are provided, the name attributes for each identity element SHOULD have the same value.</p>
+        </li>
+        <li><p><strong>The features offered and protocols supported by the target entity.</strong> This information helps requesting entities determine what actions are possible with regard to this entity (registration, search, join, etc.), what protocols the entity supports, and specific feature types of interest, if any (e.g., for the purpose of feature negotiation).</p></li>
+      </ol>
+      <p>In order to discover such information, the requesting entity MUST send an IQ stanza of type "get", containing an empty &lt;query/&gt; element qualified by the 'http://jabber.org/protocol/disco#info' namespace, to the JID of the target entity (the 'to' address is REQUIRED and MUST contain a valid JID; a 'node' attribute on the &QUERY; element is OPTIONAL as described in the <link url="#info-nodes">Info Nodes</link> and <link url="#items-nodes">Items Nodes</link> section of this document):</p>
+      <example caption='Querying for information'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='plays.shakespeare.lit'
+    id='info1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+      ]]></example>
+      <p>The target entity then MUST either return an IQ result, or return an error (see the <link url="#errors">Error Conditions</link> section of this document). The result MUST contain a &lt;query/&gt; element qualified by the 'http://jabber.org/protocol/disco#info' namespace, which in turn contains one or more &lt;identity/&gt; elements and one or more &lt;feature/&gt; elements. (Note: Every entity MUST have at least one identity, and every entity MUST support at least the 'http://jabber.org/protocol/disco#info' feature; however, an entity is not required to return a result and MAY return an error, most likely &feature; or &unavailable;, although other error conditions may be appropriate.) Each &lt;identity/&gt; element MUST possess 'category' and 'type' attributes specifying the category and type for the entity, and MAY possess a 'name' attribute specifying a natural-language name for the entity. Each &lt;feature/&gt; element MUST possess a 'var' attribute whose value is a protocol namespace or other feature offered by the entity. Preferably, both the category/type values and the feature values will be registered in a public registry, as described in the <link url="#registrar">Jabber Registrar Considerations</link> section of this document.</p>
+      <example caption='Result-set for information request'><![CDATA[
+<iq type='result'
+    from='plays.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='info1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='conference'
+        type='text'
+        name='Play-Specific Chatrooms'/>
+    <identity
+        category='directory'
+        type='chatroom'
+        name='Play-Specific Chatrooms'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
+    <feature var='http://jabber.org/protocol/disco#items'/>
+    <feature var='http://jabber.org/protocol/muc'/>
+    <feature var='jabber:iq:register'/>
+    <feature var='jabber:iq:search'/>
+    <feature var='jabber:iq:time'/>
+    <feature var='jabber:iq:version'/>
+  </query>
+</iq>
+    ]]></example>
+      <p>If the JID of the specified target entity does not exist, the server or other authoritative entity SHOULD return an &notfound; error, unless doing so would violate the privacy and security considerations specified in <strong>XMPP Core</strong> and &xmppim; or local privacy and security policies (see also the <link url='#security'>Security Considerations</link> of this document):</p>
+      <example caption='Target entity does not exist'><![CDATA[
+<iq type='error'
+    from='plays.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='info1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+  <error code='404' type='cancel'>
+    <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</iq>
+      ]]></example>
+      <p>If privacy and security considerations or policies prevent the server or other authoritative entity from returning an &notfound; error, it SHOULD return a &unavailable; error instead:</p>
+      <example caption='Service unavailable'><![CDATA[
+<iq type='error'
+    from='plays.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='info1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+  <error code='503' type='cancel'>
+    <service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</iq>
+      ]]></example>
+      <p>When an entity sends a disco#info request to a bare JID (&lt;account@domain.tld&gt;) hosted by a server, the server itself MUST reply on behalf of the hosted account, either with an IQ-error or an IQ-result. For important rules regarding access to this functionality, see the <link url='#security'>Security Considerations</link> section of this document. In particular, in response to a disco#info request sent to a bare JID with no node, if access is not denied the server SHOULD return an IQ-result for the bare JID, in which the primary identity SHOULD have a category of "account" with an appropriate type as specified in the Service Discovery Identities registry (most likely, a type of "registered"). Note: This enables authorized or trusted entities to discover whether the account exists and its account type (e.g., in IM systems to determine the existence of an account before adding it to a contact's roster).</p>
+      <example caption='Requesting info from a bare JID'><![CDATA[
+<iq type='get'
+    from='shakespeare.lit'
+    to='juliet@capulet.com'
+    id='info2'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+      ]]></example>
+      <p>Here we assume that shakespeare.lit is trusted by capulet.com and that the account &lt;juliet@capulet.com&gt; is a registered account:</p>
+      <example caption='Server replies on behalf of bare JID'><![CDATA[
+<iq type='result'
+    from='juliet@capulet.com'
+    to='shakespeare.lit'
+    id='info2'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity category='account' type='registered'/>
+  </query>
+</iq>
+      ]]></example>
+      <p>A query sent to an associated entity may result in different or more detailed information. One example is sending a query to a particular conference room rather than the parent conference service:</p>
+      <example caption='Querying a specific conference room'><![CDATA[
+<iq type='get'
+    from='juliet@capulet.com/balcony'
+    to='balconyscene@plays.shakespeare.lit'
+    id='info3'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+
+<iq type='result'
+    from='balconyscene@plays.shakespeare.lit'
+    to='juliet@capulet.com/balcony'
+    id='info3'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='conference'
+        type='text'
+        name='Romeo and Juliet, Act II, Scene II'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
+    <feature var='http://jabber.org/protocol/muc'/>
+    <feature var='http://jabber.org/protocol/feature-neg'/>
+    <feature var='muc-password'/>
+    <feature var='muc-hidden'/>
+    <feature var='muc-temporary'/>
+    <feature var='muc-open'/>
+    <feature var='muc-unmoderated'/>
+    <feature var='muc-nonanonymous'/>
+  </query>
+</iq>]]></example>
+      <p>Another example of this is sending a query to a specific connected resource for an IM user:</p>
+      <example caption='Querying a connected resource for further information'><![CDATA[
+<iq type='get'
+    from='juliet@capulet.com/balcony'
+    to='romeo@montague.net/orchard'
+    id='info4'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+
+<iq type='result'
+    from='romeo@montague.net/orchard'
+    to='juliet@capulet.com/balcony'
+    id='info4'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='client'
+        type='pc'
+        name='Gabber'/>
+    <feature var='jabber:iq:time'/>
+    <feature var='jabber:iq:version'/>
+  </query>
+</iq>
+      ]]></example>
+    </section2>
+    <section2 topic='Info Nodes' anchor='info-nodes'>
+      <p>A disco#info query MAY also be directed to a specific node identifier associated with a JID, although the primary use of nodes is as <link url='#items-nodes'>Items Nodes</link> rather than as info nodes:</p>
+      <example caption='Querying a specific JID and node combination'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='mim.shakespeare.lit'
+    id='info3'>
+  <query xmlns='http://jabber.org/protocol/disco#info' 
+         node='http://jabber.org/protocol/commands'/>
+</iq>
+      ]]></example>
+      <example caption='JID+node result'><![CDATA[
+<iq type='result'
+    from='mim.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='info3'>
+  <query xmlns='http://jabber.org/protocol/disco#info' 
+         node='http://jabber.org/protocol/commands'>
+    <identity
+        category='automation'
+        type='command-list'/>
+  </query>
+</iq>
+      ]]></example>
+    </section2>
+  </section1>
+
+  <section1 topic='Discovering the Items Associated with a Jabber Entity' anchor='items'>
+    <section2 topic='Basic Protocol' anchor='items-basic'>
+      <p>In order for the requesting entity to discover the items associated with a Jabber Entity, it MUST send an IQ stanza of type "get" to the target entity, containing an empty &lt;query/&gt; element qualified by the 'http://jabber.org/protocol/disco#items' namespace:</p>
+      <example caption='Requesting all items'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='shakespeare.lit'
+    id='items1'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+      ]]></example>
+      <p>The target entity then MUST either return its list of publicly-available items, or return an error. The list of items MUST be provided in an IQ stanza of type "result", with each item specified by means of an &lt;item/&gt; child of a &lt;query/&gt; element qualified by the 'http://jabber.org/protocol/disco#items' namespace (the &lt;item/&gt; child MUST possess a 'jid' attribute specifying the JID of the item and MAY possess a 'name' attribute specifying a natural-language name for the item):</p>
+      <example caption='Result-set for all items'><![CDATA[
+<iq type='result'
+    from='shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='items1'>
+  <query xmlns='http://jabber.org/protocol/disco#items'>
+    <item jid='people.shakespeare.lit'
+          name='Directory of Characters'/>
+    <item jid='plays.shakespeare.lit'
+          name='Play-Specific Chatrooms'/>
+    <item jid='mim.shakespeare.lit'
+          name='Gateway to Marlowe IM'/>
+    <item jid='words.shakespeare.lit'
+          name='Shakespearean Lexicon'/>
+    <item jid='globe.shakespeare.lit'
+          name='Calendar of Performances'/>
+    <item jid='headlines.shakespeare.lit'
+          name='Latest Shakespearean News'/>
+    <item jid='catalog.shakespeare.lit'
+          name='Buy Shakespeare Stuff!'/>
+    <item jid='en2fr.shakespeare.lit'
+          name='French Translation Service'/>
+  </query>
+</iq>
+      ]]></example>
+      <p>The &lt;item/&gt; element MUST NOT contain XML character data and SHOULD be empty; while it MAY contain XML data in another namespace, such data MUST be ignored if an implementation does not understand it.</p>
+      <p>If there are no items associated with an entity (or if those items are not publicly available), the target entity MUST return an empty query element to the requesting entity:</p>
+      <example caption='Empty result set'><![CDATA[
+<iq type='result'
+    from='shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='items1'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+      ]]></example>
+      <p>As with disco#info requests, when an entity sends a disco#items request to a bare JID (&lt;account@domain.tld&gt;) hosted by a server, the server itself MUST reply on behalf of the hosted account. For important rules regarding access to this functionality, see the <link url='#security'>Security Considerations</link> section of this document. In particular, in response to a disco#items request sent to a bare JID with no node, if access is not denied the server SHOULD return the associated items including connected or available resources as appropriate:</p>
+      <example caption='Requesting items from a bare JID'><![CDATA[
+<iq type='get'
+    from='shakespeare.lit'
+    to='juliet@capulet.com'
+    id='items2'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+      ]]></example>
+      <p>Here we assume that shakespeare.lit is trusted by capulet.com and that the account &lt;juliet@capulet.com&gt; has two available resources:</p>
+      <example caption='Server replies on behalf of bare JID'><![CDATA[
+<iq type='result'
+    from='juliet@capulet.com'
+    to='shakespeare.lit'
+    id='items2'>
+  <query xmlns='http://jabber.org/protocol/disco#items'>
+    <item jid='juliet@capulet.com/balcony'/>
+    <item jid='juliet@capulet.com/chamber'/>
+  </query>
+</iq>
+      ]]></example>
+    </section2>
+    <section2 topic='Items Nodes' anchor='items-nodes'>
+      <p>It is possible that an item associated with an entity will not be addressable as a JID; examples might include offline messages stored in an inbox (see &jep0013;), entries in a Jabber-enabled weblog, XML-RPC services associated with a client or component, items available in an online trading system (e.g., a catalog or auction), news postings located at an NNTP gateway, and topics hosted by a &jep0060; component. In order to handle such items, the &lt;item/&gt; element MAY possess an OPTIONAL 'node' attribute that supplements the REQUIRED 'jid' attribute.</p>
+      <p>The value of the node attribute may or may not have semantic meaning; from the perspective of Service Discovery, a node is merely something that is associated with an entity. In order to discover more about the node, the requesting entity MUST query the entity's JID while specifying the node. If the value of the 'node' attribute has semantic meaning, that meaning is provided by the using protocol or application, not by the Service Discovery protocol. A node attribute SHOULD NOT be included unless it is necessary to provide or discover information about an entity that cannot be directly addressed as a JID (i.e., if the associated item can be addressed as a JID, do not include a node). The value of the 'node' attribute MUST NOT be null.</p>
+      <p>In the following example, a user requests all available items from an online catalog service:</p>
+      <example caption='Requesting nodes'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='catalog.shakespeare.lit'
+    id='items2'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+        ]]></example>
+        <p>If there are items associated with the target entity but they are not addressable as JIDs, the service SHOULD then return a list of nodes (where each &lt;item/&gt; element MUST possess a 'jid' attribute, SHOULD possess a 'node' attribute, and MAY possess a 'name' attribute):</p>
+        <example caption='Service returns nodes'><![CDATA[
+<iq type='result'
+    from='catalog.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='items2'>
+  <query xmlns='http://jabber.org/protocol/disco#items'>
+    <item jid='catalog.shakespeare.lit'
+          node='books'
+          name='Books by and about Shakespeare'/>
+    <item jid='catalog.shakespeare.lit'
+          node='clothing'
+          name='Wear your literary taste with pride'/>
+    <item jid='catalog.shakespeare.lit'
+          node='music'
+          name='Music from the time of Shakespeare'/>
+  </query>
+</iq>
+      ]]></example>
+      <p>There may be futher nodes associated with the "first-level" nodes returned in the above query (e.g., the nodes may be categories that have associated items). The requesting entity can query a node further by sending a request to the JID and specifying the node of interest in the query.</p>
+      <example caption='Requesting further nodes'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='catalog.shakespeare.lit'
+    id='items3'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='music'/>
+</iq>
+      ]]></example>
+      <p>The service then returns the further nodes associated with the "parent" node. In the following example, the service itself enforces an alphabetically-ordered hierarchical structure on the nodes that are returned, but such a structure is a matter of implementation rather than protocol.</p>
+      <example caption='Service returns further nodes'><![CDATA[
+<iq type='result'
+    from='catalog.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='items3'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='music'>
+    <item jid='catalog.shakespeare.lit'
+          node='music/A'/>
+    <item jid='catalog.shakespeare.lit'
+          node='music/B'/>
+    <item jid='catalog.shakespeare.lit'
+          node='music/C'/>
+    <item jid='catalog.shakespeare.lit'
+          node='music/D'/>
+    .
+    .
+    .
+  </query>
+</iq>
+      ]]></example>
+      <p>The requesting entity can then query further if desired:</p>
+      <example caption='Requesting even more nodes'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='catalog.shakespeare.lit'
+    id='items4'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='music/D'/>
+</iq>
+      ]]></example>
+      <example caption='Service returns even more nodes'><![CDATA[
+<iq type='result'
+    from='catalog.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='items4'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='music/D'>
+    <item jid='catalog.shakespeare.lit'
+          node='music/D/dowland-firstbooke'
+          name='John Dowland - First Booke of Songes or Ayres'/>
+    <item jid='catalog.shakespeare.lit'
+          node='music/D/dowland-solace'
+          name='John Dowland - A Pilgrimes Solace'/>
+  </query>
+</iq>
+      ]]></example>
+    </section2>
+    <section2 topic='Node Hierarchies' anchor='items-hierarchy'>
+      <p>The foregoing examples show a hierarchy of nodes, in which some nodes are branches (i.e., contain further nodes) and some nodes are leaves (i.e., do not contain further nodes). The "hierarchy" category SHOULD be used to identify such nodes, where the "branch" and "leaf" types are exhaustive of the types within this category.</p>
+      <p>If the hierarchy category is used, every node in the hierarchy MUST be identified as either a branch or a leaf; however, since a node MAY have multiple identities, any given node MAY also possess an identity other than "hierarchy/branch" or "hierarchy/leaf".</p>
+      <p>Therefore, a disco#info request to the "music/D" node shown above would yield &lt;identity category='hierarchy' type='branch'/&gt; while a disco#info request to the "music/D/dowland-firstbooke" node would yield &lt;identity category='hierarchy' type='leaf'/&gt; (and each node could yield additional identities as appropriate).</p>
+    </section2>
+    <section2 topic='Relationship Between an Entity and its Items' anchor='items-relationship'>
+      <p>This section explains in greater detail the relationship between an entity and its associated items.</p>
+      <p>In general, the items returned by an entity in a disco#items result MUST be items over which the entity has some relationship of ownership -- either direct control over the item itself (e.g., <strong>Publish-Subscribe</strong> nodes owned by the entity) or at least the ability to provide or vouch for the item in a canonical way on the Jabber network (e.g., groupchat rooms directly hosted by a multi-user chat service or IRC channels to which a gateway provides access).</p>
+      <p>Such a relationship does not constrain the relationship between the owning entity's address and the address of the associated entity. In particular, any of the following scenarios is perfectly acceptable:</p>
+      <ol>
+        <li><p>Upon querying an entity (JID1) for items, one receives a list of items that can be addressed as JIDs; each associated item has its own JID, but no such JID equals JID1.</p></li>
+        <li><p>Upon querying an entity (JID1) for items, one receives a list of items that cannot be addressed as JIDs; each associated item has its own JID+node, where each JID equals JID1 and each NodeID is unique.</p></li>
+        <li><p>Upon querying an entity (JID1+NodeID1) for items, one receives a list of items that can be addressed as JIDs; each associated item has its own JID, but no such JID equals JID1.</p></li>
+        <li><p>Upon querying an entity (JID1+NodeID1) for items, one receives a list of items that cannot be addressed as JIDs; each associated item has its own JID+node, but no such JID+node equals JID1+NodeID1 and each NodeID is unique in the context of the associated JID.</p></li>
+      </ol>
+      <p>In addition, the results MAY also be mixed, so that a query to a JID or a JID+node could yield both (1) items that are addressed as JIDs and (2) items that are addressed as JID+node combinations.</p>
+      <p>Consider the case of an entity that owns multiple publish-subscribe nodes -- for example, a person who owns one such node for each of his music players. The following examples show what the disco#items query and result might look like (using the protocol defined in &jep0118;):</p>
+      <example caption='User queries entity regarding tunes'><![CDATA[
+<iq from='juliet@capulet.com/chamber'
+    id='items4'
+    to='romeo@montague.net'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='http://jabber.org/protocol/tune'/>
+</iq>
+      ]]></example>
+      <p>The queried entity now returns a list of publish-subscribe nodes over which it has control, each of which is hosted on a different pubsub service:</p> 
+      <example caption='Entity returns multiple items'><![CDATA[
+<iq from='romeo@montague.net'
+    id='items4'
+    to='juliet@capulet.com/chamber'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items' 
+         node='http://jabber.org/protocol/tune'>
+    <item jid='pubsub.shakespeare.lit'
+          name='Romeo&apos;s CD player'
+          node='s623nms9s3bfh8js'/>
+    <item jid='pubsub.montague.net'
+          node='music/R/Romeo/iPod'/>
+    <item jid='tunes.characters.lit'
+          node='g8k4kds9sd89djf3'/>
+  </query>
+</iq>
+      ]]></example>
+    </section2>
+  </section1>
+
+  <section1 topic='Publishing Available Items' anchor='publish'>
+    <p>The server handling rules defined in <strong>XMPP IM</strong> require that the server itself reply on behalf of the user if the 'to' attribute of an IQ get or set is of the form &lt;user@host&gt;. This functionality is currently employed so that the user can "publish" information (e.g., vCard information as specified in &jep0054;) in a way that makes it possible for other entities to retrieve that information even if the user is unavailable. The service discovery specification defined herein builds on that notion by enabling a user to publish some of its service discovery information to the server, which shall store that information in persistent storage and return that information when other entities request it from the user's "bare JID" (user@host), either alone or in combination with a particular node.</p>
+    <p>Implementations of service discovery that are built into instant messaging servers SHOULD allow users to publish items in this fashion, although they are not required to do so in order to conform to the service discovery specification. In order to discover whether his or her server supports this publish functionality, the user SHOULD send a disco#info request to his or her server:</p>
+    <example caption="User sends disco#info request to server"><![CDATA[
+<iq from='kinglear@shakespeare.lit'
+    id='pubinfo'
+    to='shakespeare.lit'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+    ]]></example>
+    <p>If the server supports service discovery publishing and the server wishes to disclose that fact to the user, it MUST include a feature of 'http://jabber.org/protocol/disco#publish' in its response.</p>
+    <example caption="Server responds with identity and feature information"><![CDATA[
+<iq from='shakespeare.lit'
+    id='pubinfo'
+    to='kinglear@shakespeare.lit'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity category='server' type='im'/>
+    ...
+    <feature var='http://jabber.org/protocol/disco#publish'/>
+    ...
+  </query>
+</iq>
+    ]]></example>
+
+    <p>In order to publish items, an entity uses an IQ-set transaction to its server, which is responsible for responding to requests on behalf of that entity. Each &lt;item/&gt; child element of the parent query MUST possess the following attributes:</p>
+    <ul>
+      <li><strong>action</strong> -- specifies the action to be taken for the item</li>
+      <li><strong>jid</strong> -- specifies the Jabber ID of the item "owner" or location</li>
+    </ul>
+    <p>The &lt;item/&gt; element MAY also possess the following attributes:</p>
+    <ul>
+      <li><strong>name</strong> -- specifies a natural-language name for the item.</li>
+      <li><strong>node</strong> -- specifies the particular node associated with the JID of the item "owner" or location</li>
+    </ul>
+    <p>The allowable values for the 'action' attribute are "update" and "remove"). If the action is "update", the server MUST either create a new entry (if the node and jid combination does not already exist) or overwrite an existing entry. If the action is "remove", the item MUST be removed from persistent storage.</p>
+    <p>The following example shows a user publishing a list of his biological children to a well-known (but fictitious) service discovery node.</p>
+    <example caption='Publishing items'><![CDATA[
+<iq from='kinglear@shakespeare.lit'
+    id='publish1'
+    type='set'>
+  <query xmlns='http://jabber.org/protocol/disco#items'
+         node='jabber:iq:kids'>
+    <item action='update'
+          jid='cordelia@shakespeare.lit'
+          name='Cordelia'/>
+    <item action='update'
+          jid='goneril@shakespeare.lit'
+          name='Goneril'/>
+    <item action='update'
+          jid='regan@shakespeare.lit'
+          name='Regan'/>
+  </query>
+</iq>
+    ]]></example>
+
+    <example caption="Server responds with success"><![CDATA[
+<iq id='publish1'
+    to='kinglear@shakespeare.lit'
+    type='result'/>
+    ]]></example>
+
+    <p>Subsequent queries to "jid='kinglear@shakespeare.lit'" and "node='jabber:iq:kids'" will yield the list shown above (absent the 'action' attributes).</p>
+
+    <p>If the server or service does not support persistent storage, it MUST respond to IQ-set requests with a &feature; error.</p>
+
+    <example caption='Persistent storage is not available'><![CDATA[
+<iq id='publish1'
+    to='kinglear@shakespeare.lit'
+    type='error'>
+  <query xmlns='http://jabber.org/protocol/disco#items'
+         node='jabber:iq:kids'>
+    <item action='update'
+          jid='cordelia@shakespeare.lit'
+          name='Cordelia'/>
+    <item action='update'
+          jid='goneril@shakespeare.lit'
+          name='Goneril'/>
+    <item action='update'
+          jid='regan@shakespeare.lit'
+          name='Regan'/>
+  </query>
+  <error code='501' type='cancel'>
+    <feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</iq>
+    ]]></example>
+
+  </section1>
+
+  <section1 topic='Implementation Notes' anchor='impl'>
+    <p>In order to retrieve full information about an entity and its associated items, the requesting application needs to "walk the tree" of items. Naturally, this can result in a large number of requests and responses. The requesting application SHOULD NOT send follow-up requests to all items associated with an entity if the list of such items is long (e.g., more than twenty items). Entities that will routinely host a large number of items (e.g., IRC gateways or NNTP services) SHOULD structure nodes into hierarchies and/or provide more robust searching capabilities, for example via &jep0055;; they SHOULD NOT return extremely large result sets via Service Discovery.</p>
+    <p>This JEP does not require that a responding entity must return the same results in response to the same request from different requesting entities (e.g., an entity could return a different list of items or features based on the degree to which it trusts the requesting entity, or based on the known capabilities of the requesting entity). However, the responding entity SHOULD return the same &lt;identity/&gt; element (category+type) to all disco#info requests sent to the same JID+node combination.</p>
+  </section1>
+
+  <section1 topic='Error Conditions' anchor='errors'>
+    <p>If a specific entity (JID or JID+node) does not support the disco namespace, refuses to return disco results to the specific requesting entity, or refuses to return disco results to any requesting entity, it SHOULD return an appropriate error message (such as &unavailable;, &forbidden;, or &notallowed;, respectively). One example is shown below.</p>
+    <example caption='JID+node error'><![CDATA[
+<iq type='error'
+    from='mim.shakespeare.lit'
+    to='romeo@montague.net/orchard'
+    id='info3'>
+  <query xmlns='http://jabber.org/protocol/disco#info' 
+         node='http://jabber.org/protocol/commands'/>
+  <error code='405' type='cancel'>
+    <not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</iq>
+    ]]></example>
+    <p>Other error conditions may be appropriate depending on the application.</p>
+    <p>The following table summarizes the common error conditions that can have special meaning in the context of Service Discovery (for information regarding error condition syntax and semantics, see &jep0086;).</p>
+    <table caption='Error Conditions'>
+      <tr>
+        <th>Condition</th>
+        <th>Cause</th>
+      </tr>
+      <tr>
+        <td>&feature;</td>
+        <td>The sender has attempted to publish items but the server does not support the <link url="#publish">Publishing Available Items</link> feature.</td>
+      </tr>
+      <tr>
+        <td>&notfound;</td>
+        <td>The JID or JID+NodeID of the specified target entity does not exist and that fact can be divulged in accordance with privacy and security considerations and policies.</td>
+      </tr>
+      <tr>
+        <td>&unavailable;</td>
+        <td>The target entity does not support this protocol, or the specified target entity does not exist but that fact cannot be divulged because of pricacy and security considerations.</td>
+      </tr>
+    </table>
+    <p>The other error conditions specified in <strong>XMPP Core</strong> MAY be returned as well (&forbidden;, &notallowed;, &notauthorized;, etc.), including application-specific conditions.</p>
+    <p>As noted above, if an entity has no associated items, it MUST return an empty &QUERY; element (rather than an error) in response to a disco#items request.</p>
+  </section1>
+
+  <section1 topic='Security Considerations' anchor='security'>
+    <p>Certain attacks may be made easier when an entity discloses (via disco#info responses) that it supports particular protocols or features; however, in general, service discovery introduces no new vulnerabilities, since a malicious entity could discover that the responding entity supports such protocols and features by sending requests specific to those protocols rather than by sending service discovery requests.</p>
+    <p>A responding entity is under no obligation to return the identical service discovery response when replying to service discovery requests received from different requesting entities, and MAY perform authorization checks before responding in order to determine how (or whether) to respond.</p>
+    <p>A server MUST carefully control access to any functionality that would enable directory harvesting attacks or that would leak information about connected or available resources; this functionality consists of the server's replies to disco#info and disco#items requests sent to bare JIDs (addresses of the form account@domain.tld) hosted on the server, since the server responds to such requests on behalf of the account. The following rules apply to the handling of service discovery requests sent to bare JIDs:</p>
+    <ol>
+      <li>
+        <p>In response to a disco#info request, the server MUST return a &unavailable; error if one of the following is true:</p>
+        <ol>
+          <li>The target entity does not exist (no matter if the request specifies a node or not).</li>
+          <li>The requesting entity is not authorized to receive presence from the target entity (i.e., via a presence subscription of type "both" or "from") or is not otherwise trusted (e.g., another server in a trusted network).</li>
+        </ol>
+      </li>
+      <li>
+        <p>In response to a disco#items request, the server MUST return an empty result set if:</p>
+        <ol>
+          <li>The target entity does not exist (no matter if the request specifies a node or not).</li>
+          <li>The request did not specify a node, the only items are available resources (as defined in <cite>RFC 3921</cite>), and the requesting entity is not authorized to receive presence from the target entity (i.e., via a presence subscription of type "both" or "from") or is not otherwise trusted (e.g., another server in a trusted network). <note>However, the server MAY return items other than available resources (if any).</note></li>
+        </ol>
+      </li>
+    </ol>
+  </section1>
+  <section1 topic='IANA Considerations' anchor='iana'>
+    <p>This JEP requires no interaction with &IANA;.</p>
+  </section1>
+  <section1 topic='Jabber Registrar Considerations' anchor='registrar'>
+    <section2 topic='Protocol Namespaces' anchor='registrar-protocol'>
+      <p>The &REGISTRAR; includes the 'http://jabber.org/protocol/disco#info' and 'http://jabber.org/protocol/disco#items' namespaces in its registry of protocol namespaces.</p>
+    </section2>
+    <section2 topic='Registries' anchor='registrar-reg'>
+      <section3 topic='Identity Categories and Types Registry' anchor='registrar-reg-identity'>
+        <p>The Jabber Registrar shall maintain a registry of values for the 'category' and 'type' attributes of the &lt;identity/&gt; element in the 'http://jabber.org/protocol/disco#info' namespace; see &lt;<link url="http://www.jabber.org/registrar/disco-categories.html">http://www.jabber.org/registrar/disco-categories.html</link>&gt;.</p>
+        <section4 topic='Process' anchor='registrar-identity'>
+          &REGPROCESS;
+          <code><![CDATA[
+<category>
+  <name>the name of the category (all lower-case)</name>
+  <desc>a natural-language description of the category</desc>
+  <type>
+    <name>the name of the specific type (all lower-case)</name>
+    <desc>a natural-language description of the type</desc>
+    <doc>the document (e.g., JEP) in which this type is specified</doc>
+  </type>
+</category>
+          ]]></code>
+          <p>The registrant may register more than one category at a time, each contained in a separate &lt;category/&gt; element. The registrant may also register more than one type at a time, each contained in a separate &lt;type/&gt; child element. Registrations of new types within an existing category must include the full XML snippet but should not include the category description (only the name).</p>
+        </section4>
+        <section4 topic='Initial Submission' anchor='registrar-reg-identity-init'>
+          <p>This JEP defines a "hierarchy" category that contains two and only two types: "branch" and "leaf"; the associated registry submission is as follows:</p>
+          <code><![CDATA[
+<category>
+  <name>hierarchy</name>
+  <desc>
+    An entity that exists in the context of a 
+    service discovery node hierarchy.
+  </desc>
+  <type>
+    <name>branch</name>
+    <desc>
+      A "container node" for other entities in a 
+      service discovery node hierarchy.
+    </desc>
+    <doc>JEP-0030</doc>
+  </type>
+  <type>
+    <name>leaf</name>
+    <desc>
+      A "terminal node" in a service discovery 
+      node hierarchy.
+    </desc>
+    <doc>JEP-0030</doc>
+  </type>
+</category>
+          ]]></code>
+        </section4>
+      </section3>
+      <section3 topic='Features Registry' anchor='registrar-reg-features'>
+        <p>The Jabber Registrar shall maintain a registry of features for use as values of the 'var' attribute of the &lt;feature/&gt; element in the 'http://jabber.org/protocol/disco#info' namespace; see &lt;<link url="http://www.jabber.org/registrar/disco-vars.html">http://www.jabber.org/registrar/disco-vars.html</link>&gt;.</p>
+        <section4 topic='Process' anchor='registrar-reg-features-process'>
+          &REGPROCESS;
+          <code><![CDATA[
+<feature var='name of feature or namespace'>
+  <desc>a natural-language description of the feature</desc>
+  <doc>the document (e.g., JEP) in which this feature is specified</doc>
+</feature>]]></code>
+          <p>The registrant may register more than one feature at a time, each contained in a separate &lt;feature/&gt; element.</p>
+        </section4>
+        <section4 topic='Initial Submission' anchor='registrar-reg-features-init'>
+          <p>This JEP defines a "publish" feature that is not associated with either of the protocol namespaces listed above; the registry submission for this feature is as follows:</p>
+          <code><![CDATA[
+<feature var='http://jabber.org/protocol/disco#publish'>
+  <desc>the service discovery "publish" feature</desc>
+  <doc>JEP-0030</doc>
+</feature>
+          ]]></code>
+        </section4>
+      </section3>
+      <section3 topic='Well-Known Nodes' anchor='registrar-reg-nodes'>
+        <p>A using protocol may specify one or more service discovery nodes that have a special and well-defined meaning in the context of that protocol. For the purpose of reserving these node names globally across all Jabber protocols, the Jabber Registrar shall maintain a registry of well-known service discovery nodes; see &lt;<link url="http://www.jabber.org/registrar/disco-nodes.html">http://www.jabber.org/registrar/disco-nodes.html</link>&gt;.</p>
+        <section4 topic='Process' anchor='registrar-reg-nodes-process'>
+          &REGPROCESS;
+          <code><![CDATA[
+<node>
+  <name>the name of the node</name>
+  <desc>a natural-language description of the node</desc>
+  <doc>the document (e.g., JEP) in which this node is specified</doc>
+</node>
+          ]]></code>
+          <p>The registrant may register more than one node at a time, each contained in a separate &lt;node/&gt; element.</p>
+        </section4>
+      </section3>
+    </section2>
+    <section2 topic='URI Query Types' anchor='registrar-querytypes'>
+      <p>As authorized by &jep0147;, the Jabber Registrar maintains a registry of queries and key-value pairs for use in XMPP URIs (see &QUERYTYPES;).</p>
+      <p>The "disco" querytype is defined herein for service discovery interactions, with three keys: (1) "node" (the optional node to query), (2) "request" (with values of "info" to retrieve service discovery information and "items" to retrieve service discovery items), and (3) "type" (with values of "get" for IQ-gets and "set" for IQ-sets).</p>
+      <example caption='Service Discovery Information Request: IRI/URI'><![CDATA[
+xmpp:romeo@montague.net?disco;type=get;request=info
+      ]]></example>
+      <example caption='Service Discovery Information Request: Resulting Stanza'><![CDATA[
+<iq to='romeo@montague.net' type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+      ]]></example>
+      <example caption='Service Discovery Items Request: IRI/URI'><![CDATA[
+xmpp:romeo@montague.net?disco;type=get;request=items
+      ]]></example>
+      <example caption='Service Discovery Items Request: Resulting Stanza'><![CDATA[
+<iq to='romeo@montague.net' type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+      ]]></example>
+      <p>The following submission registers the "disco" querytype.</p>
+      <code><![CDATA[
+<querytype>
+  <name>disco</name>
+  <proto>http://jabber.org/protocol/disco</proto>
+  <desc>enables interaction for the purpose of service discovery</desc>
+  <doc>JEP-0030</doc>
+  <keys>
+    <key>
+      <name>node</name>
+      <desc>the (optional) service discovery node</desc>
+    </key>
+    <key>
+      <name>request</name>
+      <desc>the service discovery request type</desc>
+      <values>
+        <value>
+	  <name>info</name>
+          <desc>a service discovery information (disco#info) request</desc>
+        </value>
+        <value>
+	  <name>items</name>
+          <desc>a service discovery items (disco#items) request</desc>
+        </value>
+      </values>
+    </key>
+    <key>
+      <name>type</name>
+      <desc>the IQ type</desc>
+      <values>
+        <value>
+	  <name>get</name>
+          <desc>an IQ get</desc>
+        </value>
+        <value>
+	  <name>set</name>
+          <desc>an IQ set (disco publish)</desc>
+        </value>
+      </values>
+    </key>
+  </keys>
+</querytype>
+
+      ]]></code>
+    </section2>
+  </section1>
+  <section1 topic='XML Schemas' anchor='schemas'>
+    <section2 topic='disco#info' anchor='schemas-info'>
+      <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://jabber.org/protocol/disco#info'
+    xmlns='http://jabber.org/protocol/disco#info'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0030: http://www.jabber.org/jeps/jep-0030.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='query'>
+    <xs:complexType>
+      <xs:sequence minOccurs='0'>
+        <xs:element ref='identity' maxOccurs='unbounded'/>
+        <xs:element ref='feature' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='node' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='identity'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='category' type='xs:string' use='required'/>
+          <xs:attribute name='name' type='xs:string' use='optional'/>
+          <xs:attribute name='type' type='xs:string' use='required'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='feature'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='var' type='xs:string' use='required'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+      ]]></code>
+    </section2>
+    <section2 topic='disco#items' anchor='schemas-items'>
+      <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://jabber.org/protocol/disco#items'
+    xmlns='http://jabber.org/protocol/disco#items'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0030: http://www.jabber.org/jeps/jep-0030.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='query'>
+    <xs:complexType>
+      <xs:sequence minOccurs='0'>
+        <xs:element ref='item' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='node' type='xs:string' use='optional'/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='item'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='action' use='optional'>
+            <xs:simpleType>
+              <xs:restriction base='xs:NCName'>
+                <xs:enumeration value='remove'/>
+                <xs:enumeration value='update'/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name='jid' type='xs:string' use='required'/>
+          <xs:attribute name='name' type='xs:string' use='optional'/>
+          <xs:attribute name='node' type='xs:string' use='optional'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+      ]]></code>
+    </section2>
+  </section1>
+<section1 topic='Author Note' anchor='authornote'>
+  <p>Peter Millard, a co-author of this specification from version 0.1 through version 2.2, died on April 26, 2006.</p>
+</section1>
+</jep>
diff --git a/xep-0031.xml b/xep-0031.xml
new file mode 100644
index 00000000..51c3be61
--- /dev/null
+++ b/xep-0031.xml
@@ -0,0 +1,2328 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+
+<jep>
+
+<header>
+
+<title>
+A Framework For Securing Jabber Conversations
+</title>
+
+<abstract>
+Although the value and utility of contemporary instant messaging 
+systems, like Jabber, are now indisputable, current security 
+features to protect message data are generally inadequate for 
+many deployments; this is particularly true in security conscious 
+environments like large, commercial enterprises and government 
+agencies. These current features suffer from issues of 
+scalability, usability, and supported features. Furthermore, there is a 
+lack of standardization.
+
+We present a protocol to allow communities of Jabber users to 
+apply cryptographic protection to selected conversation data.
+</abstract>
+
+<number>
+0031
+</number>
+
+<status>
+Deferred
+</status>
+
+<type>
+Standards Track
+</type>
+
+<jig>
+Standards
+</jig>
+
+<author>
+<firstname>
+Paul
+</firstname>
+<surname>
+Lloyd
+</surname>
+<email>
+paul_lloyd@hp.com
+</email>
+<jid>
+paul_lloyd@jabber.hp.com (private)
+</jid>
+</author>
+
+<revision>
+<version>
+0.2
+</version>
+<date>
+2002-07-09
+</date>
+<initials>
+PCL
+</initials>
+<remark>
+updated to reflect group consensus to incorporate XML Encryption, as well
+as other group comments from Draft 0.9.
+</remark>
+</revision>
+
+<revision>
+<version>
+0.1
+</version>
+<date>
+2002-05-07
+</date>
+<initials>
+PCL
+</initials>
+<remark>
+initial version
+</remark>
+</revision>
+
+</header>
+
+
+<section1 topic="Introduction">
+
+<p>
+Instant messaging has clearly crossed the chasm from experimental 
+to mainstream in a short amount of time. It is particularly 
+interesting to note the extent to which the employees and 
+affiliates of large enterprises have adopted instant messaging as 
+part of their daily professional lives. IM is no longer simply 
+used on Friday evening to select which movie to watch; it's now 
+used on Monday morning to select which company to acquire.
+</p>
+
+<p>
+While the benefits of IM are clear and compelling, the risks 
+associated with sharing sensitive information in an IM 
+environment are often overlooked. We need a mechanism that 
+permits communities of users to protect their IM conversations. 
+This document presents an extension protocol that can be 
+incorporated into the existing Jabber protocol to provide such a 
+mechanism. We hope that this protocol spurs both interest
+and further investigation into mechanisms to protect Jabber 
+conversations. We also hope that the Jabber community can 
+accelerate the adoption of standardized security mechanisms.
+</p>
+
+<p>
+In addition to its ability to protect traditional messaging data,
+the proposed protocol may also serve as a foundation for securing
+other data transported via other Jabber extensions.
+</p>
+
+<p>
+We use the following terms throughout this document to describe 
+the most relevant aspects of the IM environment that we wish to 
+address:
+</p>
+
+<ul>
+<li>
+<p>
+user. A user is simply any Jabber user. Users are uniquely 
+identified by a JID; they connect to Jabber hosts using a 
+Jabber node.
+</p>
+<p>
+Users produce and consume information, and we wish to 
+provide them with mechanisms that can be used to protect 
+this information.
+</p>
+</li>
+<li>
+<p>
+community. A community is a collection of users who wish to 
+communicate via Jabber. No restrictions or assumptions are 
+made about the size of communities or the geographical, 
+organizational, or national attributes of the members. 
+Communities are assumed to be dynamic and ad-hoc. Users 
+typically join communities by the simple act of invitation. 
+All members of a community are assumed to be peers.
+</p>
+<p>
+The members of communities share information among 
+themselves, and we wish to provide them with mechanisms 
+that can permit information to only be shared by community 
+members.
+</p>
+</li>
+<li>
+<p>
+conversation. A conversation is the set of messages 
+that flows among the members of a community via some 
+network. Conversations consist of both the actual 
+conversation data produced and consumed by the various 
+users as well as the Jabber protocol elements that 
+transport it. Members participate in a conversation when 
+they are the source or destination of this traffic.
+</p>
+<p>
+In hostile network environments, like the Internet, 
+conversation data is vulnerable to a variety of well-known 
+attacks.
+</p>
+</li>
+</ul>
+
+<p>
+Other Jabber and IM terms are used in a traditional, intuitive 
+fashion.
+</p>
+
+</section1>
+
+<section1 topic="Requirements And Considerations">
+
+<p>
+The proposed protocol is designed to address the specific 
+requirements and considerations presented in this section.
+</p>
+
+<section2 topic="Security Requirements">
+
+<section3 topic="Data Protection Requirements">
+
+<p>
+A secure IM system must permit conversation participants to 
+preserve the following properties of their conversation data:
+</p>
+
+<ul>
+<li>
+<p>
+confidentiality. Conversation data must only be disclosed 
+to authorized recipients
+</p>
+</li>
+<li>
+<p>
+integrity. Conversation data must not be altered
+</p>
+</li>
+<li>
+<p>
+data origin authentication. Recipients must be able to 
+determine the identity of the sender and trust that the 
+message did, in fact, come from the sender. It is important 
+to note that this requirement does not include the 
+requirement of a durable digital signature on conversation 
+data.
+</p>
+</li>
+<li>
+<p>
+replay protection. Recipients must be able to detect and 
+ignore duplicate conversation data.
+</p>
+</li>
+</ul>
+
+<p>      
+These are established, traditional goals of information security 
+applied to the conversation data. In the IM environment, these 
+goals protect against these attacks:
+</p>
+
+<ul>
+<li>
+<p>
+eavesdropping, snooping, etc.
+</p>
+</li>
+<li>
+<p>
+masquerading as a conversation participant
+</p>
+</li>
+<li>
+<p>
+forging messages
+</p>
+</li>
+</ul>
+
+<p>
+Preserving the availability of conversation data is not addressed 
+by this protocol.
+</p>
+
+<p>
+Preserving the anonymity of conversation participants is an 
+interesting topic which we defer for future exploration.
+</p>
+
+<p>
+Finally, note that this protocol does not concern any authentication
+between a Jabber node and a Jabber host.
+</p>
+
+</section3>
+
+<section3 topic="Data Classification Requirements">
+
+<p>
+A secure IM system must support a data classification feature through the use
+of security labeling. Conversation participants must be
+able to associate a security label with each piece of 
+conversation data. This label may be used to specify a data 
+classification level for the conversation data.
+</p>
+
+</section3>
+
+<section3 topic="The End To End Requirement">
+
+<p>
+It is easy to imagine Jabber systems in which the servers play 
+active, fundamental roles in the protection of conversation 
+data. Such systems could offer many advantages, like:
+</p>
+
+<ul>
+<li>
+<p>
+allowing the servers to function as credential issuing 
+authorities,
+</p>
+</li>
+<li>
+<p>
+allowing the servers to function as policy enforcement 
+points.
+</p>
+</li>
+</ul>
+
+<p>
+Unfortunately, such systems have significant disadvantages when 
+one considers the nature of instant messaging:
+</p>
+
+<ul>
+<li>
+<p>
+Many servers may be untrusted, public servers.
+</p>
+</li>
+<li>
+<p>
+In many conversation communities, decisions of trust and 
+membership can only be adequately defined by the members 
+themselves.
+</p>
+</li>
+<li>
+<p>
+In many conversation communities, membership in the 
+community changes in real time based upon the dynamics of 
+the conversation.
+</p>
+</li>
+<li>
+<p>
+In many conversation communities, the data classifaction of 
+the conversation changes in real time based upon the 
+dynamics of the conversation.
+</p>
+</li>
+</ul>
+
+<p>
+Furthermore, the widespread use of gateways to external IM 
+systems is a further complication.
+</p>
+
+<p>
+Based on this analysis, we propose that security be entirely 
+controlled in an end to end fashion by the conversation 
+participants themselves via their user agent software.
+</p>
+
+</section3>
+
+<section3 topic="Trust Issues">
+
+<p>
+We believe that, ultimately, trust decisions are in the hands of 
+the conversation participants. A security protocol and 
+appropriate conforming user agents must provide a mechanism for them to make 
+informed decisions.
+</p>
+
+</section3>
+
+<section3 topic="Cryptosystem Design Considerations">
+
+<p>
+One of the accepted axioms of security is that people must avoid 
+the temptation to start from scratch and produce new, untested 
+algorithms and protocols. History has demonstrated that such 
+approaches are likely to contain flaws and that considerable time 
+and effort are required to identify and address all of these 
+flaws. Any new security protocol should be based on existing, 
+established algorithms and protocols.
+</p>
+
+</section3>
+
+</section2>
+
+<section2 topic="Environmental Considerations">
+
+<p>
+Any new IM security protocol must integrate smoothly into the 
+existing IM environment, and it must also recognize the nature of 
+the transactions performed by conversation participants. These 
+considerations are especially important:
+</p>
+
+<ul>
+<li>
+<p>
+dynamic communities. The members of a community are defined 
+in near real time by the existing members.
+</p>
+</li>
+<li>
+<p>
+dynamic conversations. Conversations may involve any 
+possible subset of the entire set of community members.
+</p>
+</li>
+</ul>
+
+<p>
+Addressing these considerations becomes especially crucial when 
+selecting a conference keying mechanism.
+</p>
+
+</section2>
+
+<section2 topic="Usability Requirements">
+
+<p>
+Given the requirement to place the responsibility for the 
+protection of conversation data in the hands of the participants, 
+it is imperative to address some fundamental usability issues:
+</p>
+
+<ul>
+<li>
+<p>
+First, overall ease of use is a requirement. For protocol 
+purposes, one implication is that some form of 
+authentication via passphrases is necessary. While we 
+recognize that this can have appalling consequences, 
+especially when we realize that a passphrase may be shared 
+by all of the community members, we also recognize the 
+utility.
+</p>
+</li>
+<li>
+<p>
+PKIs are well established in many large organizations, and 
+some communities will prefer to rely on credentials issued
+from these authorities. To ensure ease of use, we must 
+strive to allow the use of existing PKI credentials and 
+trust models rather than impose closed, Jabber-specific 
+credentials.
+</p>
+</li>
+<li>
+<p>
+Finally, performance must not be negatively impacted; this 
+is particularly true if we accept that most communities are 
+composed of human users conversing in real time. For 
+protocol purposes, one obvious implication is the desire to 
+minimize computationally expensive public key operations.
+</p>
+</li>
+</ul>
+
+<p>
+We note that, in practice, the design and construction of user 
+agents will also have a major impact on ease of use.
+</p>
+
+</section2>
+
+<section2 topic="Development And Deployment Requirements">
+
+<p>
+To successfully integrate into the existing Jabber environment, 
+an extension protocol for security must satisfy the following:
+</p>
+
+<ul>
+<li>
+<p>
+It must be an optional extension of the existing Jabber protocol.
+</p>
+</li>
+<li>
+<p>
+It must be transparent to existing Jabber servers.
+</p>
+</li>
+<li>
+<p>
+It must function gracefully in cases where some community 
+members are not running a user agent that supports the 
+protocol.
+</p>
+</li>
+<li>
+<p>
+It must make good use of XML.
+</p>
+</li>
+<li>
+<p>
+It must avoid encumbered algorithms.
+</p>
+</li>
+<li>
+<p>
+It must be straightforward to implement using widely 
+available cryptographic toolkits.
+</p>
+</li>
+<li>
+<p>
+It must not require a PKI.
+</p>
+</li>
+</ul>
+
+<p>
+Failure to accommodate these will impede or prohibit adoption of 
+any security protocol.
+</p>
+
+</section2>
+
+</section1>
+
+<section1 topic="Protocol Specification">
+
+<section2 topic="Protocol Overview">
+
+<p>
+Ultimately, conversation data is protected by the application of 
+keyed cryptographic operations. One operation is used to provide 
+confidentiality, and a separate operation is used to provide 
+integrity and data origin authentication. The keys used to 
+parameterize these operations are called conversation keys. Each 
+conversation should have its own unique set of conversation keys 
+shared among the conversation participants.
+</p>
+
+<p>
+Conversation keys are transported among the conversation 
+participants within a negotiated security session. A security session allows 
+pairs of conversation participants to securely share conversation keys
+throught all participants in the conversation as required.
+</p>
+
+</section2>
+
+<section2 topic="Definitions And Notation">
+
+<p>
+The following terms are used throughout this specification:
+</p>
+
+<ul>
+<li>
+<p>
+initiator. The initiator is the user who requested a security session
+negotiation. Initiator's are identified by their JID.
+</p>
+</li>
+<li>
+<p>
+responder. The responder is the user who responded to a security session
+negotiation request. Responder's are identified by their JID.
+</p>
+</li>
+<li>
+<p>
+hmac. This indicates the HMAC algorithm. The notation hmac (key, value)
+indicates the HMAC computation of value using key.
+</p>
+</li>
+<li>
+<p>
+concatentation operator. The '|' character is used in character or octet
+string expressions to indicate concatenation.
+</p>
+</li>
+<li>
+<p>
+security session ID. A character string that uniquely identifies a
+security session between two users. Security session IDs MUST only
+consist of Letters, Digits, and these characters: '.', '+', '-',
+'_', '@'. Security session IDs are case sensitive.
+</p>
+</li>
+<li>
+<p>
+SS. This term indicates the security session secret that is agreed to
+during a security session negotiation.
+</p>
+</li>
+<li>
+<p>
+SKc. This term indicates the keying material used within a security session
+to protect confidentiality. The SKc is derived from the security session secret, SS.
+</p>
+</li>
+<li>
+<p>
+SKi. This term indicates the keying material used within a security session
+to protect integrity and to provide authnetication. The SKi is derived from the
+security session secret, SS.
+</p>
+</li>
+<li>
+<p>
+conversation key ID. A character string that uniquely identifies a
+conversation key shared by a community of users. Conversation key IDs MUST only
+consist of Letters, Digits, and these characters: '.', '+', '-',
+'_', '@'. Conversation key IDs are case sensitive. Conversation key IDs SHOULD
+be generated from at least 128 random bits.
+</p>
+</li>
+<li>
+<p>
+passphrase ID. A character string that uniquely identifies a
+passphrase shared by a community of users. Passphrase IDs MUST only
+consist of Letters, Digits, and these characters: '.', '+', '-',
+'_', '@'. Passphrase IDs are case sensitive.
+</p>
+</li>
+</ul>
+
+</section2>
+
+<section2 topic="XML Processing">
+
+<p>
+Since cryptographic operations are applied to data that is 
+transported within an XML stream, the protocol defines a set of 
+rules to ensure a consistent interpretation by all conversation 
+participants.
+</p>
+
+<section3 topic="Transporting Binary Content">
+
+<p>
+Binary data, such as the result of an HMAC, is always transported 
+in an encoded form; the two supported encoding schemes are base64 
+and hex.
+</p>
+
+<p>
+Senders MAY include arbitrary white space within the character 
+stream. Senders SHOULD NOT include any other characters outside 
+of the encoding set.
+</p>
+
+<p>
+Receivers MUST ignore all characters not in the encoding set.
+</p>
+
+</section3>
+
+<section3 topic="Transporting Encrypted Content">
+
+<p>
+Encrypted data, including wrapped cryptographic keys, are always
+wrapped per XML Encryption.
+</p>
+
+
+</section3>
+
+<section3 topic="HMAC Computation">
+
+<p>
+HMACs are computed over a specific collection of attribute values 
+and character data; when computing an HMAC the following rules 
+apply:
+</p>
+
+<ul>
+<li>
+<p>
+All characters MUST be encoded in UTF-8.
+</p>
+</li>
+<li>
+<p>
+The octets in each character MUST be processed in network 
+byte order.
+</p>
+</li>
+<li>
+<p>
+For a given element, the attribute values that are HMACed 
+MUST be processed in the specified order regardless of the 
+order in which they appear in the element tag.
+</p>
+</li>
+<li>
+<p>
+For each attribute value, the computation MUST only include 
+characters from the anticipated set defined in this 
+specification; in particular, white space MUST always be 
+ignored.
+</p>
+</li>
+<li>
+<p>
+For character data that is represented in an encoded form, 
+such as base64 or hex, the computation MUST only include 
+valid characters from the encoding set.
+</p>
+</li>
+</ul>
+
+</section3>
+
+<section3 topic="Performing Cryptographic Operations">
+
+<p>
+The following algorithm is used to encrypt a character string, such as
+an XML element:
+</p>
+
+<ul>
+<li>
+<p>
+The character string MUST be encoded in UTF-8.
+</p>
+</li>
+<li>
+<p>
+The octets in each character MUST be processed in network byte order.
+</p>
+</li>
+<li>
+<p>
+Appropriate cryptographic algorithm parameters, such as an 
+IV for a block cipher, are generated.
+</p>
+</li>
+</ul>
+
+</section3>
+
+</section2>
+
+<section2 topic="XML Namespaces">
+
+<p>
+In order to integrate smoothly with the existing Jabber protocol, 
+this protocol utilizes a new XML namespace, jabber:security.
+</p>
+
+</section2>
+
+<section2 topic="Security Sessions">
+
+<section3 topic="Overview">
+
+<p>
+A security session is a pair-wise relationship between two users 
+in which the users have achieved the following:
+</p>
+
+<ul>
+<li>
+<p>
+They have mutually authenticated each other using credentials acceptable to both.
+</p>
+</li>
+<li>
+<p>
+They have agreed on a set of key material known only to both.
+</p>
+</li>
+</ul>
+
+<p>
+Security sessions are identified by a 3-tuple consisting of the following items:
+</p>
+
+<ul>
+<li>
+<p>
+initiator. This is the JID of the user who initiated the session.
+</p>
+</li>
+<li>
+<p>
+responder.  This is the JID of the user who responded to the initiator's request.
+</p>
+</li>
+<li>
+<p>
+sessionId.  A label generated by the initiator.
+</p>
+</li>
+</ul>
+
+<p>
+Security sessions are used to transport conversation keys between the conversation participants.
+</p>
+
+<p>
+Scalabilty is an immediate, obvious concern with such an approach. We expect this
+approach to be viable in practice because:
+</p>
+
+<ul>
+<li>
+<p>
+The number of participants in typical, interactive conversations is generally on the order of 10^1.
+</p>
+</li>
+<li>
+<p>
+New participants are usually invited to dynamically join a 
+conversation by being invited by an existing participant; 
+this existing participant is the only one who needs to 
+establish a security session with the new participant, 
+because this single security session can be used to 
+transport all of the required conversation keys.
+</p>
+</li>
+<li>
+<p>
+User agents can permit the lifetime of security sessions to 
+last long enough to allow transport of conversation keys 
+for a variety of converstions.
+</p>
+</li>
+<li>
+<p>
+Conversation keys can be established with a suitable lifetime.
+</p>
+</li>
+</ul>
+
+<p>
+Other approaches, including the incorporation of more 
+sophisticated conference keying algorithms, are a topic for 
+future exploration.
+</p>
+
+</section3>
+
+<section3 topic="Security Session Negotiation">
+
+<p>
+Security sessions are negotiated using an authenticated Diffie-Hellman key agreement 
+exchange. The two goals of the exchange are to perform the mutual authentication
+and to agree to a secret that is know only to each.
+</p>
+
+<p>
+The exchange also allows the parties to negotiate the various algorithms
+and authentication mechanisms that will be used.
+</p>
+
+<p>
+Once the pair agree on a shared secret, they each derive key material from the
+secret; this key material is used to securely transport the conversation keys,
+which are used to actually protect conversation data.
+</p>
+
+<p>
+The protocol data units (PDUs) that comprise the exchange are transported
+within existing Jabber protocol elements.
+</p>
+
+</section3>
+
+<section3 topic="DTDs">
+
+<example>
+
+&lt;!ELEMENT session1
+          (nonce, keyAgreement, algorithms, authnMethods) &gt;
+&lt;!ATTLIST session1
+          version CDATA #REQUIRED
+          initiator CDATA #REQUIRED
+          responder CDATA #REQUIRED
+          sessionId CDATA #REQUIRED
+          hmac (hmac-sha1) #REQUIRED &gt;
+
+&lt;!ELEMENT nonce
+          (#PCDATA)* &gt;
+&lt;!ATTLIST nonce
+          encoding (base64 | hex) #REQUIRED &gt;
+
+&lt;!ELEMENT keyAgreement
+          (dh) &gt;
+
+&lt;!ELEMENT dh
+          (publicKey) &gt;
+&lt;!ATTLIST dh
+          group (modp1024 | modp2048 | modp4096 | modp8192) #REQUIRED &gt;
+
+&lt;!ELEMENT publicKey
+          (#PCDATA)* &gt;
+&lt;!ATTLIST publicKey
+          encoding (base64 | hex) #REQUIRED &gt;
+
+&lt;!ELEMENT algorithms
+          (algorithm)+ &gt;
+
+&lt;!ELEMENT algorithm
+          (confAlg, hmacAlg) &gt;
+
+&lt;!ELEMENT confAlg EMPTY &gt;
+&lt;!ATTLIST confAlg
+          cipher (3des-cbc | aes-128-cbc | aes-256-cbc) #REQUIRED &gt;
+
+&lt;!ELEMENT hmacAlg EMPTY &gt;
+&lt;!ATTLIST hmacAlg
+          alg (hmac-sha1 | hmac-md5) #REQUIRED&gt;
+
+&lt;!ELEMENT authnMethods
+          (authnMethod)+ &gt;
+
+&lt;!ELEMENT authnMethod
+          (digSig | passphrase) &gt;
+
+&lt;!ELEMENT digSig
+          (certificate+, caCertificate*) &gt;
+&lt;!ATTLIST digSig
+          alg (rsa) #REQUIRED&gt;
+
+&lt;!ELEMENT certificate
+          (#PCDATA)* &gt;
+&lt;!ATTLIST certificate
+          type (x509 | pkcs7) #REQUIRED
+          encoding (base64 | hex) #REQUIRED &gt;
+
+&lt;!ELEMENT caCertificate
+          (#PCDATA)* &gt;
+&lt;!ATTLIST caCertificate
+          type (x509 | pkcs7) #REQUIRED
+          encoding (base64 | hex) #REQUIRED &gt;
+
+&lt;!ELEMENT passphrase EMPTY &gt;
+&lt;!ATTLIST passphrase
+          passphraseId CDATA #REQUIRED &gt;
+
+
+&lt;!ELEMENT session2
+          (nonce, keyAgreement, algorithm, authnMethod, authenticator) &gt;
+&lt;!ATTLIST session2
+          version CDATA #REQUIRED
+          initiator CDATA #REQUIRED
+          responder CDATA #REQUIRED
+          sessionId CDATA #REQUIRED
+          hmac (hmac-sha1) #REQUIRED &gt;
+
+&lt;!ELEMENT authenticator
+          (#PCDATA)* &gt;
+&lt;!ATTLIST authenticator
+          encoding (base64 | hex) #REQUIRED&gt;
+
+
+&lt;!ELEMENT session3
+          (authenticator, keyTransport*) &gt;
+&lt;!ATTLIST session3
+          version CDATA #REQUIRED
+          initiator CDATA #REQUIRED
+          responder CDATA #REQUIRED
+          sessionId CDATA #REQUIRED
+          hmac (hmac-sha1) #REQUIRED &gt;
+</example>
+
+</section3>
+
+<section3 topic="Generating And Sending the session1 PDU">
+
+<p>
+The initiator's user agent employs the following algorithm to generate the session1 PDU:
+</p>
+
+<ul>
+<li>
+<p>
+Appropriate values for the version, initiator, responder, 
+sessionId, and hmac attributes are assembled. The version of 
+this specification is '1.0'. The values of initiator and 
+responder MUST be the JIDs of the two participants, 
+respectively.
+</p>
+</li>
+<li>
+<p>
+The nonce is prepared by first generating a string of 20 
+random octets (160 random bits). The octets are then 
+encoded into a string of 40 hex characters representing the 
+random string.
+</p>
+</li>
+<li>
+<p>
+A Diffie-Hellman group is selected. The appropriate values 
+for g and p will be used to generate the initiator's public 
+key.
+</p>
+</li>
+<li>
+<p>
+An ephemeral private key, x, is generated using g and p 
+for the selected group. This key MUST be generated using an 
+appropriate random number source. The corresponding public 
+key, g^x, is generated and encoded.
+</p>
+</li>
+<li>
+<p>
+The desired set of confidentiality and HMAC cryptographic 
+algorithms is selected. The manner in which these 
+algorithms are selected and all related policy issues are 
+outside the scope of this specification.
+</p>
+</li>
+<li>
+<p>
+The desired set of authentication algorithms is selected. 
+The manner in which these algorithms are selected and all 
+related policy issues are outside the scope of this 
+specification. When the digital signature form of 
+authentication is selected, the relevant end-entity 
+certificate and, optionally, a chain of CA certificates 
+representing a validation path, is assembled and encoded. A 
+set of trusted CA certificates MAY optionally be included 
+via caCertificate elements; if so, the set MUST include the 
+issuer of the initiator's end-entity certificate.
+</p>
+</li>
+</ul>
+
+<p>
+These values are then used to prepare the XML session1 element; 
+this element is transmitted via the existing Jabber iq mechanism:
+</p>
+
+<example>
+&lt;iq from="initiator's JID" to="responder's JID" type="get" id="whatever"&gt;
+   &lt;query xmlns="jabber:security:session"&gt;
+      &lt;session1&gt;...&lt;/session1&gt;
+   &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+<section3 topic="Receiving And Processing the session1 PDU">
+
+<p>
+The responder's user agent employs the following algorithm to process each session1 PDU:
+</p>
+
+<ul>
+<li>
+<p>
+The version and hmac attributes are checked against the 
+values supported by the user agent. An unsupported version 
+results in an error code of 10000, and an unsupported hmac 
+results in an error code of 10001. The responder attribute MUST
+match the JID of the receiver; a mismatch results in an error code of 10009
+</p>
+</li>
+<li>
+<p>
+The nonce is decoded, and its length is checked. The nonce 
+may also be checked to detect replays. An invalid nonce 
+results in an error code of 10002.
+</p>
+</li>
+<li>
+<p>
+The Diffie-Hellman group is checked against the values 
+supported by the user agent. An unsupported group results 
+in an error code of 10003
+</p>
+</li>
+<li>
+<p>
+The desired confidentiality and HMAC cryptographic 
+algorithms are selected from the proposed set. The manner 
+in which these algorithms are selected and all related 
+policy issues are outside the scope of this specification. 
+If none of the proposed algorithms are supported, an error 
+code of 10004 occurs.
+</p>
+</li>
+<li>
+<p>
+The desired authentication algorithm is selected from the 
+proposed set. The manner in which this algorithm is 
+selected and all related policy issues are outside the 
+scope of this specification. In the digital signature case,
+the responder's end-entity 
+certificate MUST be issued by one of the trusted CAs listed 
+in the session1 PDU or by the same issuer as the 
+initiator's end-entity certificate. If none of the proposed 
+algorithms are supported, an error code of 10005 results. 
+If the responder does not have acceptable credentials, an 
+error code of 10006 occurs.
+</p>
+</li>
+</ul>
+
+<p>
+If any errors occur during processing, the session negotiation 
+fails, and the error is communicated via the existing Jabber iq 
+mechanism:
+</p>
+
+<example>
+&lt;iq from="responder's JID" to="initiator's JID" type="error" id="whatever"&gt;
+   &lt;error code="???"&gt;...&lt;/error&gt;
+&lt;/iq&gt;
+</example>
+
+<p>
+If no errors occur, then the responder's user agent proceeds with 
+the session2 PDU.
+</p>
+
+</section3>
+
+<section3 topic="Generating And Sending the session2 PDU">
+
+<p>
+The responder's user agent employs the following algorithm to generate the session2 PDU:
+</p>
+
+<ul>
+<li>
+<p>
+Appropriate values for the version, initiator, responder, 
+sessionId, and hmac attributes are assembled. The version of 
+this specification is '1.0'. The values of initiator and 
+responder MUST be the JIDs of the two participants, 
+respectively. The sessionId and hmac values MUST match the 
+sessionId and hmac values contained in the session1 PDU.
+</p>
+</li>
+<li>
+<p>
+The nonce is prepared by first generating a string of 20 
+random octets (160 random bits). The octets are then 
+encoded into a string of 40 hex characters representing the 
+random string.
+</p>
+</li>
+<li>
+<p>
+An ephemeral private key, y, is generated using g and p 
+for the group indicated by the session1 PDU. This key MUST 
+be generated using an appropriate random number source. The 
+corresponding public key, g^y, is generated and encoded.
+</p>
+</li>
+<li>
+<p>
+The desired pair of confidentiality and HMAC cryptographic 
+algorithms is selected. The manner in which this pair is 
+selected and all related policy issues are outside the 
+scope of this specification.
+</p>
+</li>
+<li>
+<p>
+The desired authentication algorithm is selected. The 
+manner in which this algorithm is selected and all related 
+policy issues are outside the scope of this specification. 
+When the digital signature form of authentication is 
+selected, the relevant end-entity certificate and, 
+optionally, a chain of CA certificates representing a 
+validation path, is assembled and encoded.
+</p>
+</li>
+<li>
+<p>
+Based on the selected authentication algorithm, the 
+responder's authenticator is constructed. A digital signature algorithm
+requires calculating:
+</p>
+<ul>
+<li>
+<p>
+HK  =  hmac (initiator's nonce | responder's nonce, g^xy)
+</p>
+</li>
+<li>
+<p>
+HASH_R  =  hmac (HK, version | sessionId | g^y | g^x | responder's JID)
+</p>
+</li>
+</ul>
+<p>
+HASH_R is signed using the responder's private key and encoded in PKCS#1 format. 
+The PKCS#1 octets are then further encoded in base64 or hex.
+</p>
+<p>
+The passphrase algorithm requires calculating:
+</p>
+<ul>
+<li>
+<p>
+HK  =  hmac (hash (passphrase), initiator's nonce | responder's nonce)
+</p>
+</li>
+<li>
+<p>
+HASH_R  =  hmac (HK, version | sessionId | g^y | g^x | responder's JID)
+</p>
+</li>
+</ul>
+<p>
+The octets of HASH_R are simply encoded in base64 or hex.
+</p>
+<p>
+The manner in which the responder's user agent gains access 
+to the responder's credentials is outside the scope of this 
+specification.
+</p>
+</li>
+</ul>
+
+<p>
+These values are then used to prepare the XML session2 element; 
+this element is transmitted via the existing Jabber iq mechanism:
+</p>
+
+<example>
+&lt;iq from="responder's JID" to="initiator's JID" type="result" id="whatever"&gt;
+   &lt;query xmlns="jabber:security:session"&gt;
+      &lt;session2&gt;...&lt;/session2&gt;
+   &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+<section3 topic="Receiving And Processing the session2 PDU">
+
+<p>
+The initiator's user agent employs the following algorithm to process each session2 PDU:
+</p>
+
+<ul>
+<li>
+<p>
+The attribute values are checked against the values sent in 
+the session1 PDU. A mismatch results in an error code of 
+10008.
+</p>
+</li>
+<li>
+<p>
+The nonce is decoded, and its length is checked. The nonce 
+may also be checked to detect replays. An invalid nonce 
+results in an error code of 10002.
+</p>
+</li>
+<li>
+<p>
+The Diffie-Hellman group is checked against the value sent 
+in the session1 PDU. A mismatch results in an error code of 10003
+</p>
+</li>
+<li>
+<p>
+The confidentiality and HMAC cryptographic algorithms are 
+validated against the set proposed in the session1 PDU. A 
+mismatch results in an error code of 10004.
+</p>
+</li>
+<li>
+<p>
+The authentication algorithm is validated against the set 
+proposed in the session1 PDU. A mismatch results in an 
+error code of 10005.
+</p>
+</li>
+<li>
+<p>
+The authenticator is verified. A failure results in an error code of 10007.
+</p>
+</li>
+</ul>
+
+<p>
+If any errors occur during processing, the session negotiation 
+fails, and the error is communicated via the existing Jabber iq 
+mechanism:
+</p>
+
+<example>
+&lt;iq from="initiator's JID" to="responder's JID" type="error" id="whatever"&gt;
+   &lt;error code="???"&gt;...&lt;/error&gt;
+&lt;/iq&gt;
+</example>
+
+<p>
+If no errors occur, then the initiator's user agent proceeds with the session3 PDU.
+</p>
+
+</section3>
+
+<section3 topic="Generating And Sending the session3 PDU">
+
+<p>
+The initiator's user agent employs the following algorithm to generate the session3 PDU:
+</p>
+
+<ul>
+<li>
+<p>
+Appropriate values for the version, initiator, responder, 
+sessionId, and hmac attributes are assembled. The version of 
+this specification is '1.0'. The values of initiator and 
+responder MUST be the JIDs of the two participants, 
+respectively. The sessionId and hmac values MUST match the 
+sessionId and hmac values contained in both the session1 and 
+session2 PDUs.
+</p>
+</li>
+<li>
+<p>
+Based on the selected authentication algorithm, the 
+initiator's authenticator is constructed. A digital signature algorithm
+requires calculating:
+</p>
+<ul>
+<li>
+<p>
+HK  =  hmac (initiator's nonce | responder's nonce, g^xy)
+</p>
+</li>
+<li>
+<p>
+HASH_I  =  hmac (HK, version | sessionId | g^x | g^y | initiator's JID)
+</p>
+</li>
+</ul>
+<p>
+HASH_I is signed using the responder's private key and encoded in PKCS#1 format. 
+The PKCS#1 octets are then further encoded in base64 or hex.
+</p>
+<p>
+The passphrase algorithm requires calculating:
+</p>
+<ul>
+<li>
+<p>
+HK  =  hmac (hash (passphrase), initiator's nonce | responder's nonce)
+</p>
+</li>
+<li>
+<p>
+HASH_I  =  hmac (HK, version | sessionId | g^x | g^y | initiator's JID)
+</p>
+</li>
+</ul>
+<p>
+The octets of HASH_I are simply encoded in base64 or hex.
+</p>
+<p>
+The manner in which the initiator's user agent gains access 
+to the initiator's credentials is outside the scope of this 
+specification.
+</p>
+</li>
+<li>
+<p>
+A set of conversation keys may optionally be included in 
+the response. This should typically be the case since 
+security sessions are negotiated for the sole purpose of 
+key transport. 
+</p>
+</li>
+</ul>
+
+<p>
+These values are then used to prepare the XML session3 element; 
+this element is transmitted via the existing Jabber iq mechanism:
+</p>
+
+<example>
+&lt;iq from="initiator's JID" to="responder's JID" type="result" id="whatever"&gt;
+   &lt;query xmlns="jabber:security:session"&gt;
+      &lt;session3&gt;...&lt;/session3&gt;
+   &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+<section3 topic="Receiving And Processing the session3 PDU">
+
+<p>
+The responder's user agent employs the following algorithm to process each session3 PDU:
+</p>
+
+<ul>
+<li>
+<p>
+The attribute values are checked against the values sent in 
+the session2 PDU. A mismatch results in an error code of 
+10008.
+</p>
+</li>
+<li>
+<p>
+The authenticator is verified. A failure results in an error code of 10007.
+</p>
+</li>
+<li>
+<p>
+Any keys included in the PDU are processed and added to the user agent's key store.
+</p>
+</li>
+</ul>
+
+<p>
+If any errors occur during processing, the session negotiation 
+fails, and the error is communicated via the existing Jabber iq 
+mechanism:
+</p>
+
+<example>
+&lt;iq from="responder's JID" to="initiator's JID" type="error" id="whatever"&gt;
+   &lt;error code="???"&gt;...&lt;/error&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+<section3 topic="Session Key Material Derivation">
+
+<p>
+TBA
+</p>
+
+</section3>
+
+</section2>
+
+<section2 topic="Key Transport">
+
+<section3 topic="Overview">
+
+<p>
+Conversation keys are used to protect conversation data.
+</p>
+
+</section3>
+
+<section3 topic="The Key Transport Mechanism">
+
+<p>
+Conversation keys are transported using the symmetric key wrap feature of
+XML Encryption embedded in the keyTransport PDU.
+</p>
+
+</section3>
+
+<section3 topic="DTDs">
+
+<example>
+&lt;!ELEMENT keyTransport
+          (convId, payload, hmac) &gt;
+&lt;!ATTLIST keyTransport
+          version CDATA #REQUIRED
+          initiator CDATA #REQUIRED
+          responder CDATA #REQUIRED
+          sessionId CDATA #REQUIRED &gt;
+
+&lt;!ELEMENT convId
+          (#PCDATA)* &gt;
+
+&lt;!-- These are actually instances of xenc:EncryptedKey --&gt;
+&lt;!ELEMENT payload
+          (confKey, hmacKey) &gt;
+
+&lt;!ELEMENT hmac
+          (#PCDATA)* &gt;
+&lt;!ATTLIST hmac
+          encoding (base64 | hex) #REQUIRED &gt;
+</example>
+
+</section3>
+
+<section3 topic="Generating And Sending the keyTransport PDU">
+
+<p>
+The sender's user agent employs the following algorithm to generate the keyTransport PDU:
+</p>
+
+<ul>
+<li>
+<p>
+Appropriate values for the version, initiator, responder, and 
+sessionId attributes are assembled. The version of 
+this specification is '1.0'. The values of initiator and 
+responder MUST be the JIDs of the two participants who negotiated the
+security session, respectively, and they
+MUST correspond to an existing security session.
+</p>
+</li>
+<li>
+<p>
+The key's identifier, convId, is assembled.
+</p>
+</li>
+<li>
+<p>
+The payload, which consists of the confidentiality key and the integrity key, is wrapped
+in instances of xenc:EncryptedKey as follows:
+</p>
+</li>
+<ul>
+<li>
+<p>
+The Type attribute of the xenc:EncryptedKey element MUST indicate 'content'.
+</p>
+</li>
+<li>
+<p>
+The Id, MimeType and Encoding attributes of the xenc:EncryptedKey element MUST NOT
+be present.
+</p>
+</li>
+<li>
+<p>
+The xenc:EncryptionMethod element MUST be present, and the Algorithm attribute
+MUST indicate a valid symmetric key wrap algorithm. Furthermore, the
+algorithm MUST be the same as was negotiated for the security session.
+</p>
+</li>
+<li>
+<p>
+The ds:KeyInfo element MUST NOT be present. The key to use is SKc of the 
+security session.
+</p>
+</li>
+<li>
+<p>
+The xenc:CipherData element MUST be present, and it MUST use the CipherValue choice.
+</p>
+</li>
+</ul>
+<li>
+<p>
+The HMAC is computed using SKi of the security session over the following values:
+</p>
+<ul>
+<li>
+<p>
+the version attribute of the keyTransport element
+</p>
+</li>
+<li>
+<p>
+the initiator attribute of the keyTransport element
+</p>
+</li>
+<li>
+<p>
+the responder attribute of the keyTransport element
+</p>
+</li>
+<li>
+<p>
+the sessionId attribute of the keyTransport element
+</p>
+</li>
+<li>
+<p>
+the character string used to construct the body of the convId element
+</p>
+</li>
+</ul>
+</li>
+</ul>
+
+<p>
+These values are then used to prepare the XML keyTransport element; 
+this element is transmitted via the existing Jabber iq mechanism:
+</p>
+
+<example>
+&lt;iq from="sender's JID" to="receiver's JID" type="set" id="whatever"&gt;
+   &lt;query xmlns="jabber:security:keyTransport"&gt;
+      &lt;keyTransport&gt;...&lt;/keyTransport&gt;
+   &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+<section3 topic="Receiving and Processing the keyTransport PDU">
+
+<p>
+The receiver's user agent employs the following algorithm to process each keyTransport PDU:
+</p>
+
+<ul>
+<li>
+<p>
+The values of the version, initiator, responder, and sessionId are validated; initiator,
+responder, and sessionId MUST indicate an existing security session.
+A version mismatch results in an error code of 10000; an invalid security session
+results in an error of 10010.
+</p>
+</li>
+<li>
+<p>
+The payload, which consists of the confidentiality key and the intergrity key, is unwrapped.
+Any failures result in an error code of 10012.
+</p>
+</li>
+<li>
+<p>
+The body of the HMAC element is decoded into the actual HMAC octet string.
+</p>
+</li>
+<li>
+<p>
+The HMAC is validated. An invalid HMAC results in an error code of 10011.
+</p>
+</li>
+<li>
+<p>
+The keys are added to the user agent's key store.
+</p>
+</li>
+</ul>
+
+<p>
+If any errors occur during processing, the error is communicated via the existing Jabber iq 
+mechanism:
+</p>
+
+<example>
+&lt;iq from="receiver's JID" to="sender's JID" type="error" id="whatever"&gt;
+   &lt;error code="???"&gt;...&lt;/error&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+</section2>
+
+<section2 topic="Message Protection">
+
+<section3 topic="Overview">
+
+<p>
+The ultimate goal is, of course, the protection of conversation data. The protocol exchanges
+described above allow the conversation participants to cryptographically protect their conversation data using the conversation keys that they share.
+</p>
+
+</section3>
+
+<section3 topic="The Message Protection Mechanism">
+
+<p>
+A protected message is defined as a traditional Jabber message whose body content
+is extended to include the transport of a cryptographically protected message body.
+The two key features are
+</p>
+
+<ul>
+<li>
+<p>
+First, the usual body element contains some arbitrary text. Those familiar with the
+evolution of email protocols will recognize this trick as the same one used
+when MIME was introduced.
+</p>
+</li>
+<li>
+<p>
+Second, the message contains a Jabber x element defining the Jabber:security:message
+namespace; this element transports the protected message.
+</p>
+</li>
+</ul>
+
+<p>
+This mechanism has the advantages of allowing transparent integration with existing
+Jabber servers and existing Jabber clients.
+</p>
+
+</section3>
+
+<section3 topic="DTD">
+
+<example>
+&lt;!ELEMENT protectedMessage
+          (securityLabel?, payload, hmac) &gt;
+&lt;!ATTLIST protectedMessage
+          version CDATA #REQUIRED
+          from CDATA #REQUIRED
+          to CDATA #REQUIRED
+          convId #REQUIRED
+          seqNum #REQUIRED &gt;
+
+&lt;!ELEMENT securityLabel
+          (#PCDATA)* &gt;
+
+&lt;!-- this is actually an instance of xenc:EncryptedData --&gt;
+&lt;!ELEMENT payload
+          (#PCDATA)* &gt;
+
+&lt;!ELEMENT hmac
+          (#PCDATA)* &gt;
+&lt;!ATTLIST hmac
+          encoding (base64 | hex) #REQUIRED &gt;
+</example>
+
+</section3>
+
+<section3 topic="Generating And Sending the protectedMessage PDU">
+
+<p>
+The sender's user agent employs the following algorithm to generate the protectedMessage PDU:
+</p>
+
+<ul>
+<li>
+<p>
+Appropriate values for the version, from, to, convId, and 
+seqNum attributes are assembled. The version of 
+this specification is '1.0'. The value of convId MUST correspond to an existing, valid key.
+</p>
+</li>
+<li>
+<p>
+The actual message body is encoded into a character string corresponding to a Jabber message body element. This character string is then wrapped in an instance of xenc:EncryptedData as follows:
+</p>
+</li>
+<ul>
+<li>
+<p>
+The Type attribute of the xenc:EncryptedData element MUST indicate 'element'.
+</p>
+</li>
+<li>
+<p>
+The Id, MimeType and Encoding attributes of the xenc:EncryptedData element MUST NOT
+be present.
+</p>
+</li>
+<li>
+<p>
+The xenc:EncryptionMethod element MUST be present, and the Algorithm attribute
+MUST indicate a valid block encryption algorithm.
+</p>
+</li>
+<li>
+<p>
+The ds:KeyInfo element MUST NOT be present. The key to be used is the confidentiality
+key indicated by the convId attribute.
+</p>
+</li>
+<li>
+<p>
+The xenc:CipherData element MUST be present, and it MUST use the CipherValue choice.
+</p>
+</li>
+</ul>
+<li>
+<p>
+Using the HMAC key indicated by the convId attribute, the HMAC is computed
+over the following values:
+</p>
+<ul>
+<li>
+<p>
+the version attribute of the protectedMessage element
+</p>
+</li>
+<li>
+<p>
+the from attribute of the protectedMessage element
+</p>
+</li>
+<li>
+<p>
+the to attribute of the protectedMessage element
+</p>
+</li>
+<li>
+<p>
+the convId attribute of the protectedMessage element
+</p>
+</li>
+<li>
+<p>
+the seqNum attribute of the protectedMessage element
+</p>
+</li>
+<li>
+<p>
+any securityLabel element
+</p>
+</li>
+<li>
+<p>
+the character string used to construct the body of the payload element 
+</p>
+</li>
+</ul>
+</li>
+</ul>
+
+<p>
+These values are then used to prepare the XML protectedMessage element; 
+this element is transmitted via the existing Jabber message mechanism:
+</p>
+
+<example>
+&lt;message from="sender's JID" to="reveiver's JID" id="whatever"&gt;
+   &lt;body&gt;The real body is protected.&lt;/body&gt;
+   &lt;x xmlns="jabber:security:message"&gt;
+      &lt;protectedMessage&gt;...&lt;/protectedMessage&gt;
+   &lt;/x&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+<section3 topic="Receiving and Processing the protectedMessage PDU">
+
+<p>
+The receiver's user agent employs the following algorithm to process each protectedMessage PDU:
+</p>
+
+<ul>
+<li>
+<p>
+The values of the version, from, to, convId, and seqNum are validated.
+A version mismatch results in an error code of 10000. An unknown convId
+results in an error code of 10015. If replay protection is utilized, a
+duplicate seqNum results in an error code of 10016.
+</p>
+</li>
+<li>
+<p>
+The body of the HMAC element is decoded into the actual HMAC octet string.
+</p>
+</li>
+<li>
+<p>
+The payload, which consists of the actual message body, is unwrapped.
+Any failures result in an error code of 10012.
+</p>
+</li>
+<li>
+<p>
+The HMAC is validated. An invalid HMAC results in an error code of 10011.
+</p>
+</li>
+</ul>
+
+<p>
+If any errors occur during processing, the error is communicated via the existing Jabber iq 
+mechanism:
+</p>
+
+<example>
+&lt;iq from="receiver's JID" to="sender's JID" type="error" id="whatever"&gt;
+   &lt;error code="???"&gt;...&lt;/error&gt;
+&lt;/iq&gt;
+</example>
+
+</section3>
+
+</section2>
+
+<section2 topic="Requesting Keys">
+
+TBA
+
+</section2>
+
+<section2 topic="Conformance Profile">
+
+<p>
+The following block encryption algorithms are required, as
+specified by XML Encryption:
+</p>
+
+<ul>
+<li>
+<p>
+http://www.w3.org/2001/04/xmlenc#tripledes-cbc
+</p>
+</li>
+<li>
+<p>
+http://www.w3.org/2001/04/xmlenc#aes128-cbc
+</p>
+</li>
+<li>
+<p>
+http://www.w3.org/2001/04/xmlenc#aes256-cbc
+</p>
+</li>
+</ul>
+
+<p>
+The following symmetric key wrap algorithms are required, as
+specified by XML Encryption:
+</p>
+
+<ul>
+<li>
+<p>
+http://www.w3.org/2001/04/xmlenc#kw-tripledes
+</p>
+</li>
+<li>
+<p>
+http://www.w3.org/2001/04/xmlenc#kw-aes128
+</p>
+</li>
+<li>
+<p>
+http://www.w3.org/2001/04/xmlenc#kw-aes256
+</p>
+</li>
+</ul>
+
+</section2>
+
+</section1>
+
+<section1 topic="Diffie-Hellman Groups">
+
+<p>
+This protocol makes use of the following Diffie-Hellman groups adopted from IKE.
+</p>
+
+<section2 topic="1024 bit Group, modp1024">
+
+<p>
+The hexidecimal value of the prime, p, is
+</p>
+
+<example>
+FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1
+29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD
+EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245
+E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED
+EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381
+FFFFFFFF FFFFFFFF
+</example>
+
+<p>
+The decimal value of the generator, g, is 2.
+</p>
+
+</section2>
+
+<section2 topic="2048 bit Group, modp2048">
+
+<p>
+The hexidecimal value of the prime, p, is
+</p>
+
+<example>
+FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1
+29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD
+EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245
+E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED
+EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D
+C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F
+83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D
+670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B
+E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9
+DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510
+15728E5A 8AACAA68 FFFFFFFF FFFFFFFF
+</example>
+
+<p>
+The decimal value of the generator, g, is 2.
+</p>
+
+</section2>
+
+<section2 topic="4096 bit Group, modp4096">
+
+<p>
+The hexidecimal value of the prime, p, is
+</p>
+
+<example>
+FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1
+29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD
+EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245
+E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED
+EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D
+C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F
+83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D
+670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B
+E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9
+DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510
+15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64
+ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7
+ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B
+F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C
+BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31
+43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7
+88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA
+2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6
+287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED
+1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9
+93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199
+FFFFFFFF FFFFFFFF
+</example>
+
+<p>
+The decimal value of the generator, g, is 2.
+</p>
+
+</section2>
+
+<section2 topic="8192 bit Group, modp8192">
+
+<p>
+The hexidecimal value of the prime, p, is
+</p>
+
+<example>
+FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1
+29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD
+EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245
+E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED
+EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D
+C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F
+83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D
+670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B
+E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9
+DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510
+15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64
+ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7
+ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B
+F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C
+BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31
+43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7
+88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA
+2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6
+287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED
+1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9
+93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492
+36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD
+F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831
+179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B
+DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF
+5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6
+D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3
+23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA
+CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328
+06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C
+DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE
+12BF2D5B 0B7474D6 E694F91E 6DBE1159 74A3926F 12FEE5E4
+38777CB6 A932DF8C D8BEC4D0 73B931BA 3BC832B6 8D9DD300
+741FA7BF 8AFC47ED 2576F693 6BA42466 3AAB639C 5AE4F568
+3423B474 2BF1C978 238F16CB E39D652D E3FDB8BE FC848AD9
+22222E04 A4037C07 13EB57A8 1A23F0C7 3473FC64 6CEA306B
+4BCBC886 2F8385DD FA9D4B7F A2C087E8 79683303 ED5BDD3A
+062B3CF5 B3A278A6 6D2A13F8 3F44F82D DF310EE0 74AB6A36
+4597E899 A0255DC1 64F31CC5 0846851D F9AB4819 5DED7EA1
+B1D510BD 7EE74D73 FAF36BC3 1ECFA268 359046F4 EB879F92
+4009438B 481C6CD7 889A002E D5EE382B C9190DA6 FC026E47
+9558E447 5677E9AA 9E3050E2 765694DF C81F56E8 80B96E71
+60C980DD 98EDD3DF FFFFFFFF FFFFFFFF
+</example>
+
+<p>
+The decimal value of the generator, g, is 2.
+</p>
+
+</section2>
+
+</section1>
+
+<section1 topic="Security Considerations">
+
+<p>
+This entire document is about security.
+</p>
+
+<p>
+This version of the protocol deliberately incorporates only a minimal amount
+of cryptographic choice. Examples of possible choices that can readily
+added in future drafts include:
+</p>
+
+<ul>
+<li>
+<p>
+Support for the Digital Signature Standard
+</p>
+</li>
+<li>
+<p>
+Support for Elliptic Curve Cryptography
+</p>
+</li>
+<li>
+<p>
+Additional symmetric algorithms
+</p>
+<li>
+<p>
+Additional hash algorithms
+</p>
+</li>
+</li>
+</ul>
+
+<p>
+Furthermore, additional credential formats, such as OpenPGP, may be addressed
+in future drafts.
+</p>
+
+<p>
+This version of the protocol includes a mechanism that derives a cryptographic key from a
+passphrase shared by a community of users. It is impossible to overstate the security
+issues that such a mechanism raises.
+</p>
+
+<p>
+This version of the protocol does not include a specific rekeying capability. Data volumes
+in IM environments are expected to be small, and the protocol prefers to simply instantiate
+new conversation keys. It is straightforward to extend the security session protocol to
+enable negotiation of a new key.
+</p>
+
+</section1>
+
+<section1 topic="Examples">
+
+<section2 topic="Security Session">
+
+<example>
+&lt;iq from='initiator@some.tld'
+    to='responder@other.tld'
+    type='get'
+    id='whatever' &gt;
+    &lt;x xmlns='jabber:security:session&gt;
+       &lt;session1 version='1.0'
+                 initiator='initiator@some.tld'
+                 responder='responder@other.tld'
+                 sessionId='session11223344556677@some.tld'
+                 hmac='hmac-sha1'&gt;
+         &lt;nonce encoding='hex'&gt;
+            ...
+         &lt;/nonce&gt;
+         &lt;keyAgreement&gt;
+            &lt;dh group='modp4096'&gt;
+               &lt;publicKey encoding='base64'&gt;
+                  ...
+               &lt;/publicKey&gt;
+            &lt;/dh&gt;
+         &lt;/keyAgreement&gt;
+         &lt;algorithms&gt;
+            &lt;algorithm&gt;
+               &lt;confAlg cipher='3des-cbc'/&gt;
+               &lt;hmacAlg alg='hmac-sha1'/&gt;
+            &lt;/algorithm&gt;
+         &lt;/algorithms&gt;
+         &lt;authnMethods&gt;
+            &lt;authnMethod&gt;
+               &lt;digSig alg='rsa'&gt;
+                  &lt;certificate type='x509' encoding='base64'&gt;
+                     ...
+                  &lt;/certificate&gt;
+               &lt;/digSig&gt;
+            &lt;/authnMethod&gt;
+         &lt;/authnMethods&gt;
+      &lt;/session1&gt;
+   &lt;/x&gt;
+&lt;/iq&gt;
+
+&lt;iq from='responder@other.tld'
+    to='initiator@some.tld'
+    type='result'
+    id='whatever' &gt;
+    &lt;x xmlns='jabber:security:session&gt;
+       &lt;session2 version='1.0'
+                 initiator='initiator@some.tld'
+                 responder='responder@other.tld'
+                 sessionId='session11223344556677@some.tld'
+                 hmac='hmac-sha1'&gt;
+         &lt;nonce encoding='hex'&gt;
+            ...
+         &lt;/nonce&gt;
+         &lt;keyAgreement&gt;
+            &lt;dh group='modp4096'&gt;
+               &lt;publicKey encoding='base64'&gt;
+                  ...
+               &lt;/publicKey&gt;
+            &lt;/dh&gt;
+         &lt;/keyAgreement&gt;
+         &lt;algorithm&gt;
+            &lt;confAlg cipher='3des-cbc'/&gt;
+            &lt;hmacAlg alg='hmac-sha1'/&gt;
+         &lt;/algorithm&gt;
+         &lt;authnMethod&gt;
+            &lt;digSig alg='rsa'&gt;
+               &lt;certificate type='x509' encoding='base64'&gt;
+                  ...
+               &lt;/certificate&gt;
+            &lt;/digSig&gt;
+         &lt;/authnMethod&gt;
+         &lt;authenticator encoding='base64'&gt;
+            ...
+         &lt;/authenticator&gt;
+      &lt;/session2&gt;
+   &lt;/x&gt;
+&lt;/iq&gt;
+
+&lt;iq from='initiator@some.tld'
+    to='responder@other.tld'
+    type='result'
+    id='whatever' &gt;
+    &lt;x xmlns='jabber:security:session&gt;
+       &lt;session3 version='1.0'
+                 initiator='initiator@some.tld'
+                 responder='responder@other.tld'
+                 sessionId='session11223344556677@some.tld'
+                 hmac='hmac-sha1'&gt;
+         &lt;authenticator encoding='base64'&gt;
+            ...
+         &lt;/authenticator&gt;
+      &lt;/session3&gt;
+   &lt;/x&gt;
+&lt;/iq&gt;
+</example>
+
+
+</section2>
+
+<section2 topic="Key Transport">
+
+<example>
+&lt;iq type='set' &gt;
+   &lt;x xmlns='jabber:security:key&gt;
+      &lt;keyTransport version='1.0'
+                    initiator='initiator@some.tld'
+                    responder='responder@other.tld'
+                    sessionId='session11223344556677@some.tld'&gt;
+         &lt;convId&gt;
+            44d2d2d2d2@some.tld
+         &lt;/convId&gt;
+         &lt;EncryptedKey xmlns='http://www.w3.org/2001/04/xmlenc#'
+                        Type='http://www.w3.org/2001/04/xmlenc#Content'&gt;
+            &lt;EncryptionMethod Algorithm='http://www.w3.org/2001/04/xmlenc#kw-tripledes&gt;
+            &lt;/EncryptionMethod&gt;
+            &lt;CipherData&gt;
+               &lt;CipherValue&gt;
+                  ...
+               &lt;/CipherValue&gt;
+            &lt;/CipherData&gt;
+         &lt;/EncryptedKey&gt;
+         &lt;EncryptedKey xmlns='http://www.w3.org/2001/04/xmlenc#'
+                        Type='http://www.w3.org/2001/04/xmlenc#Content'&gt;
+            &lt;EncryptionMethod Algorithm='http://www.w3.org/2001/04/xmlenc#kw-tripledes&gt;
+            &lt;/EncryptionMethod&gt;
+            &lt;CipherData&gt;
+               &lt;CipherValue&gt;
+                  ...
+               &lt;/CipherValue&gt;
+            &lt;/CipherData&gt;
+         &lt;/EncryptedKey&gt;
+         &lt;hmac encoding='hex'&gt;
+            ...
+         &lt;/hmac&gt;
+      &lt;/keyTransport&gt;
+   &lt;/x&gt;
+&lt;/iq&gt;
+</example>
+
+</section2>
+
+<section2 topic="Message Protection">
+
+<example>
+&lt;message from='initiator@some.tld'
+         to='responder@other.tld'&gt;
+   &lt;body&gt;
+      The real body is protected.
+   &lt;/body&gt;
+   &lt;x xmlns='jabber:security:message'&gt;
+      &lt;protectedMessage version='1.0'
+                        from='initiator@some.tld'
+                        to='responder@other.tld'
+                        convId='44d2d2d2d2@some.tld'
+                        seqNum='1'&gt;
+         &lt;securityLabel&gt;
+            Confidential
+         &lt;/securityLabel&gt;
+         &lt;EncryptedData xmlns='http://www.w3.org/2001/04/xmlenc#'
+                        Type='http://www.w3.org/2001/04/xmlenc#Element'&gt;
+            &lt;EncryptionMethod Algorithm='http://www.w3.org/2001/04/xmlenc#tripledes-cbc&gt;
+            &lt;/EncryptionMethod&gt;
+            &lt;CipherData&gt;
+               &lt;CipherValue&gt;
+                  ...
+               &lt;/CipherValue&gt;
+            &lt;/CipherData&gt;
+         &lt;/EncryptedData&gt;
+         &lt;hmac encoding='hex'&gt;
+            ...
+         &lt;/hmac&gt;
+      &lt;/protectedMessage&gt;
+   &lt;/x&gt;
+&lt;/message&gt;
+</example>
+
+</section2>
+
+</section1>
+
+<section1 topic="References">
+
+<p>
+"XML Encryption Syntax and Processing"; http://www.w3.org/TR/xmlenc-core
+</p>
+
+<p>
+more to be added
+</p>
+
+</section1>
+
+</jep>
diff --git a/xep-0032.xml b/xep-0032.xml
new file mode 100644
index 00000000..c8ce6585
--- /dev/null
+++ b/xep-0032.xml
@@ -0,0 +1,158 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Jabber URI Scheme</title>
+  <abstract>A URI scheme for Jabber communications.</abstract>
+  &LEGALNOTICE;
+  <number>0032</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>None</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>draft-saintandre-xmpp-uri</supersededby>
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Saint-Andre</surname>
+    <email>stpeter@jabber.org</email>
+    <jid>stpeter@jabber.org</jid>
+  </author>
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Millard</surname>
+    <email>me@pgmillard.com</email>
+    <jid>pgmillard@jabber.org</jid>
+  </author>
+  <revision>
+    <version>0.4</version>
+    <date>2003-09-02</date>
+    <initials>psa</initials>
+    <remark>Retracted the JEP, since it is superseded by draft-ietf-xmpp-uri, an Internet-Draft produced by the IETF's XMPP WG.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-10-16</date>
+    <initials>psa</initials>
+    <remark>Changed 'jabber:' scheme to 'xmpp:' scheme; further specified use cases; removed references to official Jabber namespaces.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-05-10</date>
+    <initials>psa</initials>
+    <remark>Added information about syntax, allowable characters, and potential conflict with official Jabber namespaces.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-05-08</date>
+    <initials>psa</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>It is widely acknowledged that it would be good to be able to express a Jabber Identifier (JID) <note>Jabber Identifiers are formally defined in JEP-0029: <link url='http://www.jabber.org/jeps/jep-0029.html'>http://www.jabber.org/jeps/jep-0029.html</link>.</note> as a Uniform Resource Identifier (see &rfc3986;). In addition, there would be value in being able to interact with a JID through a URI scheme (e.g., by sending a message or a presence update).</p>
+  <p>Although XMPP enables a wide range of functionality, the authors propose that a Jabber URI scheme needs to support only a limited subset of the possible Jabber functionality. In particular, we see the following as core functions that need to be supported:</p>
+  <ul>
+    <li>Sending of basic messages</li>
+    <li>Sending of basic presence</li>
+    <li>Sending of subscription requests</li>
+  </ul>
+</section1>
+<section1 topic='Syntax'>
+  <p>The syntactic components of a Jabber URI are as follows:</p>
+  <code>&lt;xmpp&gt;:[&lt;node-identifier&gt;@]&lt;domain-identifier&gt;[?&lt;query&gt;]</code>
+  <p>This scheme is similar to the mailto URI scheme <note>The mailto URI scheme is described in RFC 2368: <link url='http://www.ietf.org/rfc/rfc2368.txt'>http://www.ietf.org/rfc/rfc2368.txt</link>.</note>. One similarity is that a Jabber URI is, in the terminology of RFC 3986, not hierarchical but opaque. A URI that is hierarchical in nature uses the slash ("/") character in order to separate hierarchical components, as is familiar from HTTP and FTP URIs. By contrast, an opaque URI such as a mailto URI contains only the scheme (e.g., 'mailto'), a colon, an address (e.g., 'user@host'), and an optional query component.</p>
+  <p>Per the JID definition in JEP-0029, the node identifier is optional (i.e., a mere domain identifier is a valid JID). However, the proposed Jabber URI scheme forbids the inclusion of a resource identifier in the JID, even though JEP-0029 defines this as valid. This is partly because the authors see no compelling reason to include a resource identifier in the Jabber URI scheme, and also because including a resource would necessitate the inclusion of a slash character in an opaque URI, which is contrary to RFC 3986. Finally, the query component is optional.</p>
+</section1>
+<section1 topic='URI Characters and Escape Sequences'>
+  <p>RFC 3986 limits the characters included in a URI to US-ASCII characters, and further defines a number of US-ASCII characters as reserved or otherwise excluded. Reserved characters are special characters used as delimiters withing URIs and whose usage is limited to their reserved purpose as defined in RFC 3986 or a specific URI scheme. Excluded characters are control characters, spaces, and other common (non-URI-specific) delimiters such as angle brackets, double quotes, the number sign, and the percent sign. Reserved characters must be escaped if their usage in a specific context would conflict with their reserved purpose, and excluded characters must always be escaped. The set of disallowed charaacters for any specific URI component consists of the reserved and excluded characters for that component. These are defined below for each component of a Jabber URI.</p>
+  <section2 topic='Scheme Component'>
+    <p>The scheme component for a Jabber URI is 'xmpp'. This component is delimited from the remainder of the URI by a colon character (':').</p>
+  </section2>
+  <section2 topic='Node Identifier Component'>
+    <p>The node identifier component of a Jabber URI is equivalent to the "userinfo" component of a generic URI. Section 2.3 of JEP-0029 stipulates that a node identifier may contain any Unicode character higher than #x20 with the exception of the following:</p>
+    <code>#x22 (") | #x26 (&amp;) | #x27 (') | #x2F (/) | 
+#x3A (:) | #x3C (&lt;) | #x3E (&gt;) | #x40 (@) | 
+#x7F (del) | #xFFFE (BOM) | #xFFFF (BOM)</code>
+    <p>In addition, Section 2.2 of RFC 3986 stipulates that the following additional characters are reserved:</p> 
+    <code>#x24 ($) | #x2B (+) | #x2C (,) | #x3B (;) | #x3D (=) | #x3F (?)</code>
+    <p>Section 2.4.3 of RFC 3986 further stipulates that the following characters are excluded from URIs in their unescaped form:</p>
+    <code>#x23 (#) | #x25 (%)</code>
+    <p>Finally, because the generic URI syntax does not provide a way to specify a character encoding other than US-ASCII (see Section 2.1 of RFC 3986), the characters in the node identifier component of a Jabber URI must contain only US-ASCII characters.</p>
+    <p>Therefore, in order to ensure that a Jabber URI containing a node identifier is a valid URI, the characters disallowed by RFC 3986 (reserved, excluded, and non-ASCII characters) must be escaped in the node identifier component of a Jabber URI.</p>
+  </section2>
+  <section2 topic='Domain Identifier Component'>
+    <p>A domain identifier is a standard DNS hostname as specified in RFC 952 <note><link url='http://www.ietf.org/rfc/rfc952.txt'>http://www.ietf.org/rfc/rfc952.txt</link></note>.</p>
+  </section2>
+  <section2 topic='Query Component'>
+    <p>The query component of a Jabber URI may contain any US-ASCII character higher than #x20 with the exception of the following:</p>
+    <code>#x22 (") | #x23 (#) | #x24 ($) | #x25 (%) | 
+#x26 (&amp;) | #x27 (') | #x2B (+) | #x2C (,) | 
+#x2F (/) | #x3A (:) | #x3B (;) | #x3C (&lt;) | 
+#x3D (=) | #x3E (&gt;) | #x3F (?) | #x40 (@) | 
+#x7F (del) | #xFFFE (BOM) | #xFFFF (BOM)</code>
+  </section2>
+</section1>
+<section1 topic='Use Cases'>
+    <p>Thus the most basic Jabber URI is user@host (sometimes referred to as a "bare JID") prepended by 'xmpp:', as shown in the following example.</p>
+    <code>
+xmpp:user@host
+    </code>
+    <p>A URI containing bare JID and no query component should trigger an application to present a user with an appropriate interface to complete an action such as sending a message, sending presence, or managing a subscription. In order to make this possible, some basic queries must be included in the protocol.</p>
+    <p>The authors propose three allowable query types in a Jabber URI: message, presence, and subscribe <note>These query types are URI queries as defined in RFC 3986 and are not to be confused with the &lt;query/&gt; element often included as the child of an &lt;iq/&gt; element in XMPP.</note>. These three basic URIs are described below by way of use cases.</p>
+  <section2 topic='Sending a Message'>
+    <p>If no parameters are passed along with the message query type, an application should present a user with an appropriate interface to complete the sending of a message.</p>
+    <example caption='Invoking an Interface to Send a Message to a JID'>
+xmpp:user@host?message
+    </example>
+    <p>The query component may include parameters that further specify the message to be sent to the intended recipient. The following parameters are allowed:</p>
+    <ul>
+      <li>body</li>
+      <li>subject</li>
+      <li>thread (for conversation tracking)</li>
+    </ul>
+    <example caption='Sending a Message with a Subject, Body, and Thread'>
+xmpp:user@host?message&amp;subject=hi&amp;body=Hello%20World&amp;thread=abc123
+    </example>
+  </section2>
+  <section2 topic='Sending Presence'>
+    <p>If no parameters are passed along with the presence query type, an application should present a user with an appropriate interface to complete the act of sending presence.</p>
+    <example caption='Invoking an Interface to Send Presence to a JID'>
+xmpp:user@host?presence
+    </example>
+    <p>The query component may include parameters that further specify the presence to be sent to the intended recipient (e.g., a user-defined status message). The following parameters are allowed:</p>
+    <ul>
+      <li>type ('unavailable'; if not specified, the sender is defined to be online and available)</li>
+      <li>show (one of 'away', 'xa', 'dnd', or 'chat')</li>
+      <li>status (user-defined status message)</li>
+      <li>priority (a non-negative integer, with zero as the lowest priority)</li>
+    </ul>
+    <example caption='Sending a Specific Presence'>
+xmpp:user@host?presence&amp;show=dnd&amp;status=taking%20a%20nap
+    </example>
+  </section2>
+  <section2 topic="Managing Subscriptions">
+    <p>If no parameters are passed along with the subscribe query type, an application should present a user with an appropriate interface to complete the subscription request.</p>
+    <example caption='Invoking an Interface to Send a Subscription Request to a JID'>
+xmpp:user@host?subscribe
+    </example>
+    <p>The query component may include parameters that further specify the subscription request to be sent to the intended recipient. Only the 'type' parameter is deemed useful in the limited Jabber URI spec, with valid values of 'subscribe', 'subscribed', 'unsubscribe', or 'unsubscribed'.</p>
+    <example caption='Sending a Subscription Request'>
+xmpp:user@host?subscribe&amp;type=subscribe
+    </example>
+    <example caption='Accepting a Subscription Request'>
+xmpp:user@host?subscribe&amp;type=subscribed
+    </example>
+    <example caption="Unsubscribing from Another User's Presence">
+xmpp:user@host?subscribe&amp;type=unsubscribe
+    </example>
+    <example caption="Cancelling Another User's Subscription to Your Presence">
+xmpp:user@host?subscribe&amp;type=unsubscribed
+    </example>
+  </section2>
+</section1>
+</jep>
diff --git a/xep-0033.xml b/xep-0033.xml
new file mode 100644
index 00000000..db839c06
--- /dev/null
+++ b/xep-0033.xml
@@ -0,0 +1,667 @@
+<?xml version='1.0'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+    <header>
+        <title>Extended Stanza Addressing</title> 
+        <abstract>This document specifies an XMPP protocol extension that enables entities to include RFC822-style address headers within XMPP stanzas in order to specify multiple recipients or sub-addresses.</abstract>
+        &LEGALNOTICE;
+        <number>0033</number>
+        <status>Draft</status>
+        <type>Standards Track</type>
+        <jig>Standards JIG</jig>
+        <dependencies>
+            <spec>XMPP Core</spec>
+            <spec>JEP-0030</spec>
+        </dependencies>
+        <supersedes/>
+        <supersededby/>
+        <shortname>address</shortname>
+        <schemaloc>
+            <url>http://jabber.org/protocol/address/address.xsd</url>
+        </schemaloc>
+        &hildjj;
+        &stpeter;
+
+        <revision>
+            <version>1.1</version>
+            <date>2004-09-15</date>
+            <initials>psa</initials>
+            <remark>Per list discussion, removed prohibition on multiple replyto and replyroom addresses, since this is allowed by RFC 822.</remark>
+        </revision>
+
+        <revision>
+            <version>1.0</version>
+            <date>2004-05-10</date>
+            <initials>psa</initials>
+            <remark>Per a vote of the Jabber Council, advanced status to Draft; also added Security Considerations in consultation with JEP author.</remark>
+        </revision>
+
+        <revision>
+            <version>0.10</version>
+            <date>2004-03-18</date>
+            <initials>psa</initials>
+            <remark>Disallowed &lt;addresses/&gt; as direct child 
+            of &IQ;.</remark>
+        </revision>
+
+        <revision>
+            <version>0.9</version>
+            <date>2004-02-27</date>
+            <initials>jjh</initials>
+            <remark>Added language note on desc attribute.  Ensured
+            that if uri attribute is used, node MUST NOT be.</remark>
+        </revision>
+
+        <revision>
+            <version>0.8</version>
+            <date>2004-02-11</date>
+            <initials>jjh</initials>
+
+            <remark>Editorial cleanups, rearrangement.  Allowed IQ's
+            in certain cases.  Clarified node rules.  Changed
+            delivered='yes' to delivered='true'.  Noreply shouldn't
+            imply no other addresses.  Clarified when authorization
+            checks take place.  Remove own address on reply.  Bad URI
+            error added.</remark>
+        </revision>
+
+        <revision>
+            <version>0.7</version>
+            <date>2004-02-04</date>
+            <initials>jjh</initials>
+
+            <remark>Clarified that a node attribute refers to a disco
+            node.</remark>
+        </revision>
+
+        <revision>
+            <version>0.6</version>
+            <date>2004-02-04</date>
+            <initials>jjh</initials>
+
+            <remark>Changed namespace to
+            'http://www.jabber.org/protocol/address', and removed one
+            level of nesting, since addresses are the only block left.
+            Made it clearer that the session manager can implement
+            multicast directly.  Removed infobits (needs to be a
+            separate JEP).  Reworked the examples to be more correct.
+            Added reply handling rules. Added schema.</remark>
+
+        </revision>
+        <revision>
+            <version>0.5</version>
+            <date>2003-12-17</date>
+            <initials>jjh</initials>
+
+            <remark>Replaced info with infobits, added noreply address
+            type.</remark>
+
+        </revision>
+        <revision>
+            <version>0.4</version>
+            <date>2003-12-15</date>
+            <initials>jjh</initials>
+
+            <remark>Removed trace; if you want that, use a different
+            namespace.  Required disco use, and removed agents/browse.
+            Added URI addressing.</remark>
+
+        </revision>
+        <revision>
+            <version>0.3</version>
+            <date>2002-07-29</date>
+            <initials>jjh</initials>
+            <remark>Made addresses extensible, added replyroom</remark>
+        </revision>
+        <revision>
+            <version>0.2</version>
+            <date>2002-05-06</date>
+            <initials>jjh</initials>
+            <remark>Re-worked to simpler/more structured XML.</remark>
+        </revision>
+        <revision>
+            <version>0.1</version>
+            <date>2002-04-19</date>
+            <initials>jjh</initials>
+            <remark>Initial version.</remark>
+        </revision>
+    </header>
+    <section1 topic='Introduction' anchor='intro'>
+            <p>On the existing Jabber network, there are many opportunities to optimize stanza traffic. For example, clients that want to send the same stanza to multiple recipients currently must send multiple stanzas. Similarly, when a user comes online the server sends many nearly-identical presence stanzas to remote servers.</p>
+      
+            <p>The 'http://jabber.org/protocol/address' specification provides a method for both clients and servers to send a single stanza and have it be delivered to multiple recipients, similar to that found in &rfc0822;.  As a side-effect, it also provides all of the functionality specified by the old 'jabber:x:envelope' <note><link url='http://www.jabber.org/old-docs/proto-draft/envelope.html'>jabber:x:envelope</link> - Message Envelope Information Extension</note> proposal, which this JEP can supersede.</p>
+    </section1>
+    <section1 topic='Discovering Server Support' anchor='disco'>
+        <p>Support for Extended Stanza Addressing in a given server instance SHOULD be determined using &jep0030;. A conforming server MUST respond to disco#info requests.</p>
+        
+        <section2 topic='Disco to determine support' anchor='disco-support'>
+            <p>To determine if a server or service supports Extended Stanza Addressing, the requesting entity SHOULD send a disco#info request to it.</p>
+
+           <example caption='Disco request for address header support'><![CDATA[
+<iq type='get'
+    from='romeo@montague.net/orchard'
+    to='multicast.montague.net'
+    id='info1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>]]>
+           </example>
+            <p>If the server supports Extended Stanza Addressing, it MUST include a "http://jabber.org/protocol/address" feature in the response.</p>
+           <example caption='Disco response for server supporting address headers'><![CDATA[
+<iq type='result'
+    from='multicast.montague.net'
+    to='romeo@montague.net/orchard'
+    id='info1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    ...
+    <feature var='http://jabber.org/protocol/address'/>
+    ...
+  </query>
+</iq>]]>
+           </example>
+        </section2>
+
+        <section2 topic='Multicast service' anchor='disco-multicast'>
+            <p>The IM service MAY implement multicast directly, or it MAY delegate that chore to a separate service. A client can use the following approach to find a multicast-capable service hosted by its domain:</p>
+            <ol>
+              <li>Send a disco#info request to the IM server; if its reply includes the 'http://jabber.org/protocol/address' feature, then it is a multicast-capable service.</li>
+              <li>If the IM server is not a multicast-capable service, send a disco#items request to the IM server; the IM server will then return a list of associated services.</li>
+              <li>Send a disco#info request to each of the services associated with the IM server; if one of the replies includes the 'http://jabber.org/protocol/address' feature, then that service is a multicast-capable service.</li>
+            </ol>
+
+            <p>The multicast service MAY choose to limit which local users can use the service.  The server MAY choose to limit whether non-local servers can send address headers that require the local server to send to third parties (relaying).  In either case, if the server chooses to disallow the request, the server MUST return a Forbidden error (see the <link url='#errors'>Error Conditions</link> section below).  In the relaying case, the server SHOULD NOT deliver to <em>any</em> of the addresses (even the local ones) if the sender is disallowed.</p>
+        </section2>
+
+        <section2 topic='Caching' anchor='disco-caching'>
+            <p>Implementations MAY choose to cache the disco response.
+            Positive responses MAY be cached differently than negative
+            responses.  The result SHOULD NOT be cached for more than 24
+            hours, unless some sort of time-to-live information is
+            added to the Service Discovery protocol in the future.</p>
+        </section2>
+    </section1>
+
+    <section1 topic='Outer Stanza' anchor='outer'>
+        <p>For multicast processing, the stanza containing an address header
+        (the 'outer stanza') MUST be addressed to the multicast service,
+        with no username or resource in the 'to' attribute.</p>
+
+        <p>When used for additional information in a one-to-one stanza
+        (e.g. using the 'node' attribute), the outer stanza SHOULD be
+        addressed directly to the recipient, not to the multicast
+        service.</p>
+
+        <p>A multicast service MUST NOT change the 'from' address on
+        the outer stanza.  Note that this will limit third-party
+        relaying across server-to-server connections as a side-effect.</p>
+
+        <p>Address headers MAY be included in message or presence
+        stanzas.  They MUST NOT be included as the direct child of an 
+        IQ stanza.</p>
+    </section1>
+
+    <section1 topic='Addresses' anchor='addresses'>
+        <p>Address values are packaged together into an
+        &lt;addresses/&gt; element.</p>
+
+        <example caption='Message with an extended address'><![CDATA[<message to='multicast.jabber.org'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+       <address type='to' jid='hildjj@jabber.org/Work' desc='Joe Hildebrand'/>
+       <address type='cc' jid='jer@jabber.org/Home' desc='Jeremie Miller'/>
+   </addresses>
+   <body>Hello, world!</body>
+</message>]]></example>
+
+        <example caption='Presence with an extended address'><![CDATA[<presence from='hildjj@jabber.com' to='multicast.jabber.org' type='unavailable'>
+    <addresses xmlns='http://jabber.org/protocol/address'>
+        <address type='bcc' jid='temas@jabber.org'/>
+        <address type='bcc' jid='jer@jabber.org'/>
+    </addresses>
+</presence>]]></example>
+
+        
+        <p>Each address to which the sender wants the stanza to be re-sent will show up as an &lt;address/&gt; in the &lt;addresses/&gt; element.  There are several different types of address, shown below.</p>
+
+        <p>An &lt;address/&gt; element MUST possess a 'type' attribute, and MUST possess at least one of the 'jid', 'uri', 'node', and 'desc' attributes. An &lt;address/&gt; element MUST NOT possess both a 'jid' attribute and a 'uri' attribute. If sending through a multicast service, an address MUST include a 'jid' or a 'uri' attribute, unless it is of type 'noreply'.</p>
+
+        <section2 topic="'jid' attribute" anchor='addr-jid'>
+            <p>The 'jid' attribute is used to specify a simple Jabber ID associated with this address.  If the 'jid' attribute is specified, the 'uri' attribute MUST NOT be specified. Support for the 'jid' attribute is REQUIRED.</p>
+        </section2>
+
+        <section2 topic="'uri' attribute" anchor='addr-uri'>
+            <p>The 'uri' attribute is used to specify an external system address, such as a sip:, sips:, or im: URI.  If the 'uri' attribute is specified, the 'jid' and 'node' attributes MUST NOT be specified.  These URIs MUST be formatted as specified in their respective RFCs, however with the characters &amp; &lt; &gt; &apos; &quot; replaced by their equivalent XML escapes, &amp;amp; &amp;lt; &amp;gt; &amp;apos; &amp;quot;. If a receiving entity does not understand the given URI scheme, or if the URI is not formatted correctly, a "JID Malformed" error SHOULD be returned. Support for the 'uri' attribute is OPTIONAL.</p>
+        </section2>
+
+        <section2 topic="'node' attribute" anchor='addr-node'>
+            <p>The 'node' attribute is used to specify a sub-addressable unit at a particular JID, corresponding to a Service Discovery node.  A node attribute MAY be included if a 'jid' attribute is specified.  If a 'uri' attribute is specified, a 'node' attribute MUST NOT be specified. Support for the 'node' attribute is RECOMMENDED.</p>
+        </section2>
+
+        <section2 topic="'desc' attribute" anchor='addr-desc'>
+            <p>The 'desc' attribute is used to specify human-readable information for this address.  This data may be used by clients to provide richer address-book integration.  This information is in the language of the sender, which MAY be identified using the standard xml:lang rules from &xmppcore;. Support for the 'desc' attribute is RECOMMENDED.</p>
+        </section2>
+
+        <section2 topic="'delivered' attribute" anchor='addr-delivered'>
+            <p>When a multicast service delivers the stanza to a non-bcc address, it MUST add a delivered='true' attribute to the address element.  A multicast service MUST NOT deliver to an address that was marked with a delivered='true' attribute when the service received the stanza.  A multicast service SHOULD attempt to deliver to all addresses that are not marked with a delivered='true' attribute.  The delivered attribute is used to prevent loops.  See the <link url='#multicast'>Multicast Usage</link> section below for more details. Support for the 'delivered' attribute is REQUIRED.</p>
+        </section2>
+
+        <section2 topic="'type' attribute" anchor='addr-type'>
+            <p>The 'type' attribute is used to specify the semantics of a particular address. Support for the 'type' attribute is REQUIRED.</p>
+
+            <section3 topic="Address type='to'" anchor='addr-type-to'>
+                <p>These addressees are the primary recipients of the stanza.</p>
+            </section3>
+            <section3 topic="Address type='cc'" anchor='addr-type-cc'>
+                <p>These addressees are the secondary recipients of the stanza.</p>
+            </section3>
+            <section3 topic="Address type='bcc'" anchor='addr-type-bcc'>
+                <p>These addressees should receive 'blind carbon copies' of the stanza.  This means that the server MUST remove these addresses before the stanza is delivered to anyone other than the given bcc addressee or the multicast service of the bcc addressee.</p>
+            </section3>
+            <section3 topic="Address type='replyto'" anchor='addr-type-replyto'>
+                <p>This is the address to which all replies are requested to be sent.  Clients SHOULD respect this request unless an explicit override occurs.  There MAY be more than one replyto or replyroom on a stanza, in which case the reply stanza MUST be routed to all of the addresses.</p>
+            </section3>
+            <section3 topic="Address type='replyroom'" anchor='addr-type-replyroom'>
+                <p>This is the JID of a &jep0045; room to which responses should be sent.  When a user wants to reply to this stanza, the client SHOULD join this room first.  Clients SHOULD respect this request unless an explicit override occurs. There MAY be more than one replyto or replyroom on a stanza, in which case the reply stanza MUST be routed to all of the addresses.</p>
+            </section3>
+            <section3 topic="Address type='noreply'" anchor='addr-type-noreply'>
+                <p>This address type contains no actual address information.  Instead, it means that the receiver SHOULD NOT reply to the message.  This is useful when broadcasting messages to many receivers.</p>
+            </section3>
+        </section2>
+
+        <section2 topic="Extensibility" anchor='extensibility'>
+            <p>As specified herein, the &lt;address/&gt; element is empty.  Implementations or future protocols MAY extend the &lt;address/&gt; element for additional functionality, but any extensions are out of scope for this JEP. Such extensions SHOULD be appropriately qualified with a new namespace, and any extensions that are not understood by an implementation MUST be ignored.</p>
+
+            <example caption='Possible future extension'><![CDATA[<message to='groups.jabber.org'>
+  <addresses xmlns='http://jabber.org/protocol/address'>
+    <address type='to' desc='Foo Group'>
+      <group xmlns='some:funny:group:ns'>foo</group>
+    </address>
+    <address type='replyroom' jid='jdev@conference.jabber.org'/>
+  </addresses>
+</message>]]></example>      
+        </section2>
+    </section1>
+
+    <section1 topic='Multicast Usage' anchor='multicast'>
+        <p>The following usage scenario shows how messages flow through both address-enabled and non-address-enabled portions of the Jabber network.</p>
+    
+        <p>Note: the logic associated with <em>how</em> to perform the following tasks is purely informational.  A conforming service MUST generate output as if these rules had been followed, but need not (and probably <em>will not</em>) use this algorithm.</p>
+
+        <ol>
+            <li>User desires to send a stanza to more than one
+            recipient.</li>
+      
+            <li>Client determines the JID of a multicast service,
+            using Service Discovery.</li>
+      
+            <li>If no multicast service is found, the client MAY
+            choose to deliver each stanza individually, or it MAY
+            query each of the servers associated with desired
+            recipients, and batch stanzas to those servers
+            itself.</li>
+
+            <li>If a multicast service is found, the client constructs
+            a stanza with an address block, and sends it to the
+            multicast service. (Note: For the following rules, any 
+            address that was marked on the incoming address header 
+            with delivered='true' is never re-delivered.)</li>
+
+            <li>The server checks to see if it can deliver to all of
+            the specified addresses.  If not, the stanza is returned
+            with a "Forbidden" error, and processing stops.</li>
+
+            <li>The server adds a delivered='true' attribute to all
+            addresses.</li>
+
+            <li>The server removes all type='bcc' attributes.</li>
+
+            <li>The server delivers the stanza to all of the 'to',
+            'cc', and 'bcc' addresses from the original address header that
+            are being handled locally.  The server replaces the
+            'to' attribute on the outer stanza with the JID of each
+            addressee.  Each 'bcc' recipient MUST receive only the
+            &lt;address type='bcc'/&gt; associated with that
+            addressee.</li>
+
+            <li>For each non-local server (the 'target server') that
+            has addresses specified in 'to', 'cc', or 'bcc' addresses
+            in the original address header, the local server determines
+            whether the target server supports multicast, using Service
+            Discovery.</li>
+      
+            <li>If the target server does not support address headers, the
+            local server sends a copy of the stanza to each address,
+            with the 'to' attribute on the outer stanza set to the JID
+            of the given addressee.</li>
+      
+            <li>If the target server does support address headers, the server
+            removes the delivered='true' attributes on each of the
+            addresses bound for that server, and replaces the 'to'
+            attribute on the outer stanza with the adress of the
+            multicast service for the target server.  The 'bcc'
+            addresses for the target server from the original address header
+            are added back to the address header.  A single stanza is sent to
+            the target server.</li>
+        </ol>
+    </section1>
+
+    <section1 topic='Example Flow' anchor='examples'>
+        <p>Assume for these examples that header1.org and header2.org
+        support address headers, and noheader.org does not.</p>
+
+        <example caption='Client checks local server for address header support'><![CDATA[<iq type='get' to='header1.org' from='a@header1.org/work' id='id_1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>]]></example>
+
+        <example caption='Client receives positive results from server'><![CDATA[<iq type='result' from='header1.org' to='a@header1.org/work' id='id_1'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <feature var='http://jabber.org/protocol/address'/>
+  </query>
+</iq>]]></example>
+
+        <example caption='Client sends message to local server with address header'><![CDATA[<message to='header1.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+     <address type='to'  jid='to@header1.org'/>
+     <address type='cc'  jid='cc@header1.org'/>
+     <address type='bcc' jid='bcc@header1.org'/>
+     <address type='to'  jid='to@header2.org'/>
+     <address type='cc'  jid='cc@header2.org'/>
+     <address type='bcc' jid='bcc@header2.org'/>
+     <address type='to'  jid='to@noheader.org'/>
+     <address type='cc'  jid='cc@noheader.org'/>
+     <address type='bcc' jid='bcc@noheader.org'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>]]></example>
+
+        <example caption='Server delivers to local addresses'><![CDATA[<message to='to@header1.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org' delivered='true'/>
+      <address type='cc' jid='cc@header1.org' delivered='true'/>
+      <address type='to' jid='to@header2.org' delivered='true'/>
+      <address type='cc' jid='cc@header2.org' delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>
+<message to='cc@header1.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+     <address type='to' jid='to@header1.org' delivered='true'/>
+     <address type='cc' jid='cc@header1.org' delivered='true'/>
+     <address type='to' jid='to@header2.org' delivered='true'/>
+     <address type='cc' jid='cc@header2.org' delivered='true'/>
+     <address type='to' jid='to@noheader.org' delivered='true'/>
+     <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>
+<message to='bcc@header1.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+     <address type='to' jid='to@header1.org' delivered='true'/>
+     <address type='cc' jid='cc@header1.org' delivered='true'/>
+     <address type='to' jid='to@header2.org' delivered='true'/>
+     <address type='cc' jid='cc@header2.org' delivered='true'/>
+     <address type='to' jid='to@noheader.org' delivered='true'/>
+     <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>]]></example>
+
+        <example caption='Local server checks target server for address support'><![CDATA[<iq type='get' to='header2.org' from='header1.org' id='id_2'>
+   <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+]]></example>
+
+        <example caption='Local server receives initial negative results from target server'><![CDATA[<iq type='result' from='header2.org' to='header1.org' id='id_2'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+... no address feature ...
+  </query>
+</iq>]]></example>
+
+        <example caption='Local server checks target server for another component having address support'><![CDATA[<iq type='get' to='header2.org' from='header1.org' id='id_3'>
+   <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+]]></example>
+
+        <example caption='Local server receives associated services from target server'><![CDATA[<iq type='result' from='header2.org' to='header1.org' id='id_3'>
+  <query xmlns='http://jabber.org/protocol/disco#items>
+    <item jid='multicast.header2.org'
+          name='Multicast Service'/>
+  </query>
+</iq>]]></example>
+
+        <example caption='Local server checks associated services for address support'><![CDATA[<iq type='get' to='multicast.header2.org' from='header1.org' id='id_4'>
+   <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+]]></example>
+
+        <example caption='Local server receives positive results from target server'><![CDATA[<iq type='result' from='multicast.header2.org' to='header1.org/work' id='id_4'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <feature var='http://jabber.org/protocol/address'/>
+  </query>
+</iq>]]></example>
+
+        <example caption='Local server delivers to target server supporting address headers'><![CDATA[<message to='multicast.header2.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+      <address type='to'  jid='to@header1.org' delivered='true'/>
+      <address type='cc'  jid='cc@header1.org' delivered='true'/>
+      <address type='to'  jid='to@header2.org'/>
+      <address type='cc'  jid='cc@header2.org'/>
+      <address type='bcc' jid='bcc@header2.org'/>
+      <address type='to'  jid='to@noheader.org' delivered='true'/>
+      <address type='cc'  jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>]]></example>
+         <example caption='Target server delivers to its recipients'><![CDATA[<message to='to@header2.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org'  delivered='true'/>
+      <address type='cc' jid='cc@header1.org'  delivered='true'/>
+      <address type='to' jid='to@header2.org'  delivered='true'/>
+      <address type='cc' jid='cc@header2.org'  delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>
+<message to='cc@header2.org' from='a@header1.org/work'>
+   <address xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org'  delivered='true'/>
+      <address type='cc' jid='cc@header1.org'  delivered='true'/>
+      <address type='to' jid='to@header2.org'  delivered='true'/>
+      <address type='cc' jid='cc@header2.org'  delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>
+<message to='bcc@header2.org' from='a@header1.org/work'>
+   <address xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org'  delivered='true'/>
+      <address type='cc' jid='cc@header1.org'  delivered='true'/>
+      <address type='to' jid='to@header2.org'  delivered='true'/>
+      <address type='cc' jid='cc@header2.org'  delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>]]></example>
+
+        <example caption='Local server checks target server for address header support'><![CDATA[<iq type='get' to='noheader.org' from='header1.org' id='id_5'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>]]></example>
+
+        <example caption='Local server receives negative results from target server (assume no associated services found)'><![CDATA[<iq type='result' from='noheader.org' to='header1.org' id='id_5'>
+   <query xmlns='http://jabber.org/protocol/disco#info'>
+... no address feature ...
+   </query>
+</iq>]]></example>
+
+        <example caption='Server delivers to each address on the target server not supporting address headers'><![CDATA[<message to='to@noheader.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org'  delivered='true'/>
+      <address type='cc' jid='cc@header1.org'  delivered='true'/>
+      <address type='to' jid='to@header2.org'  delivered='true'/>
+      <address type='cc' jid='cc@header2.org'  delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>
+<message to='cc@noheader.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org'  delivered='true'/>
+      <address type='cc' jid='cc@header1.org'  delivered='true'/>
+      <address type='to' jid='to@header2.org'  delivered='true'/>
+      <address type='cc' jid='cc@header2.org'  delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>
+<message to='bcc@noheader.org' from='a@header1.org/work'>
+   <addresses xmlns='http://jabber.org/protocol/address'>
+      <address type='to' jid='to@header1.org'  delivered='true'/>
+      <address type='cc' jid='cc@header1.org'  delivered='true'/>
+      <address type='to' jid='to@header2.org'  delivered='true'/>
+      <address type='cc' jid='cc@header2.org'  delivered='true'/>
+      <address type='to' jid='to@noheader.org' delivered='true'/>
+      <address type='cc' jid='cc@noheader.org' delivered='true'/>
+   </addresses>
+   <body>Hello, World!</body>
+</message>]]></example>
+    </section1>
+
+    <section1 topic='Reply Handling' anchor='replies'>
+        <p>When replying to a message stanza that contains an extended
+        address, the following rules apply:</p>
+
+        <ol>
+            <li>If more than one replyto or replyroom address is
+            specified (bad protocol), or if a noreply address is
+            specified, a reply SHOULD NOT be generated.</li> 
+
+            <li>If a replyroom address is specified, the client SHOULD
+            join the specified chat room instead of replying directly
+            to the specified user.  No further extended address
+            processing is required.</li>
+
+            <li>If a replyto address is specified, the reply SHOULD go
+            to the specified address.  No further extended address
+            processing is required.  Any &lt;thread/&gt; element from
+            the initial message MUST be copied into the reply.</li>
+
+            <li>Otherwise, an extended-address aware client MUST copy
+            the address header from the original message into the reply,
+            removing any delivered attributes.  If the original sender
+            is not in the copied list, the original sender MUST be
+            added as a 'to' address.  The recipient's address SHOULD
+            be removed from the list.  The client then proceeds with
+            the rules from the <link url='#multicast'>Multicast Usage</link>
+            section above for delivery of the message.</li>
+        </ol>
+    </section1>
+
+    <section1 topic='Error Conditions' anchor='errors'>
+        <p>The following error conditions are to be used by implementations (for further information regarding error syntax, see &jep0086;):</p>
+        <table caption='Error Conditions'>
+          <tr>
+            <th>XMPP Condition</th>
+            <th>Purpose</th>
+          </tr>
+          <tr>
+            <td>&lt;forbidden/&gt;</td>
+            <td>The sending user does not have permission to use this multicast service.</td>
+          </tr>
+          <tr>
+            <td>&lt;jid-malformed/&gt;</td>
+            <td>A URI attribute was invalid or not understood (note that support for the 'uri' attribute is optional).</td>
+          </tr>
+          <tr>
+            <td>&lt;not-acceptable/&gt;</td>
+            <td>Too many receiver fields were specified.  Servers MAY have configurable limits for this, but the limit MUST be at least 50.</td>
+          </tr>
+        </table>
+    </section1>
+
+  <section1 topic='Security Considerations' anchor='security'>
+    <p>A recipient SHOULD trust a stanza's extended addressing headers only as much as it trusts the sender of the stanza.</p>
+    <p>Furthermore, there exists the potential for abuse related to the 'replyto' and 'replyroom' features (e.g., an entity could send messages with 'replyroom' set to the address of a room that hosts salacious content or with 'replyto' set to the address of a spambot that harvests Jabber addresses). Therefore if a human user's receiving application receives a message with extended stanza addressing that specifies a 'replyto' or 'replyroom' address other than that of the sender, it SHOULD inform the user of that fact. (Naturally, the receiving application MAY also limit the entities to which the recipient can reply using privacy lists as specified in &xmppim;.)</p>
+  </section1>
+  <section1 topic='IANA Considerations' anchor='iana'>
+    <p>This JEP requires no interaction with &IANA;.</p>
+  </section1>
+  <section1 topic='Jabber Registrar Considerations' anchor='registrar'>
+    <p>The &REGISTRAR; shall include 'http://jabber.org/protocol/address' in its registry of protocol namespaces.</p>
+  </section1>
+
+    <section1 topic='XML Schema' anchor='schema'>
+        <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://jabber.org/protocol/address'
+    xmlns='http://jabber.org/protocol/address'
+    elementFormDefault='qualified'>
+
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      JEP-0033: http://www.jabber.org/jeps/jep-0033.html
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name='addresses'>
+     <xs:complexType>
+        <xs:sequence>
+           <xs:element ref='address'
+                       minOccurs='1'
+                       maxOccurs='unbounded'/>
+        </xs:sequence>
+     </xs:complexType>
+  </xs:element>
+
+  <xs:element name='address'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='empty'>
+          <xs:attribute name='delivered' use='optional' fixed='true'/>
+          <xs:attribute name='desc' use='optional' type='xs:string'/>
+          <xs:attribute name='jid' use='optional' type='xs:string'/>
+          <xs:attribute name='node' use='optional' type='xs:string'/>
+          <xs:attribute name='type' use='required'>
+            <xs:simpleType>
+              <xs:restriction base='xs:NCName'>
+                <xs:enumeration value='bcc'/>
+                <xs:enumeration value='cc'/>
+                <xs:enumeration value='noreply'/>
+                <xs:enumeration value='replyroom'/>
+                <xs:enumeration value='replyto'/>
+                <xs:enumeration value='to'/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name='uri' use='optional' type='xs:string'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name='empty'>
+    <xs:restriction base='xs:string'>
+      <xs:enumeration value=''/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
+        ]]></code>
+    </section1>
+
+    <section1 topic='Acknowledgements' anchor='ack'>
+        <p>Sections of this document were inspired by RFC 822.</p>
+    </section1>
+</jep>
diff --git a/xep-0034.xml b/xep-0034.xml
new file mode 100644
index 00000000..a40ba03b
--- /dev/null
+++ b/xep-0034.xml
@@ -0,0 +1,249 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+
+<jep>
+
+<header>
+  <title>SASL Integration</title>
+  <abstract>NOTE WELL: this JEP was retracted on 2003-11-05 since the topic is addressed definitively in XMPP Core. Please refer to XMPP Core for further information.</abstract>
+  &LEGALNOTICE;
+  <number>0034</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <dependencies>None</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>XMPP Core</supersededby>
+  <shortname>N/A</shortname>
+  <author>
+    <firstname>Robert</firstname>
+    <surname>Norris</surname>
+    <email>rob@cataclysm.cx</email>
+    <jid>rob@cataclysm.cx</jid>
+  </author>
+  <author>
+    <firstname>Jeremie</firstname>
+    <surname>Miller</surname>
+    <email>jeremie@jabber.org</email>
+    <jid>jer@jabber.org</jid>
+  </author>
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Saint-Andre</surname>
+    <email>stpeter@jabber.org</email>
+    <jid>stpeter@jabber.org</jid>
+  </author>
+  <revision>
+    <version>1.1</version>
+    <date>2003-11-05</date>
+    <initials>psa</initials>
+    <remark>The status of this JEP has been changed to Retracted since it has been superseded by &xmppcore;. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-08-13</date>
+    <initials>psa</initials>
+    <remark>Changed status to Draft.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-07-26</date>
+    <initials>rn</initials>
+    <remark>Reworked for server-to-server SASL; added jabber:iq:auth get (as in xmpp-im).</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-06-05</date>
+    <initials>rn</initials>
+    <remark>Fleshed out.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-06-03</date>
+    <initials>psa</initials>
+    <remark>Initial version based on Jer's notes.</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p>The Simple Authentication and Security Layer (SASL) (see &rfc4422;) provides a generalized method for adding authentication support to connection-based protocols. This document describes a generic XML namespace profile for SASL, that conforms to section 4 of RFC 4422, "Profiling requirements".</p>
+  
+  <p>This profile may be used for both client-to-server and server-to-server connections. For client connections, the service name used is &quot;jabber-client&quot;. For server connections, the service name used is &quot;jabber-server&quot;. Both these names are registered in the IANA service registry.</p>
+
+  <p>The reader is expected to have read and understood the SASL specification before reading this document.</p>
+</section1>
+
+<section1 topic='Protocol'>
+
+  <section2 topic="Overview">
+    <p>In these examples, &quot;client&quot; refers to the remote entity that initiated the connection, either a Jabber client or a Jabber server. &quot;Server&quot; refers to the server that the remote entity is attempting to connect and authenticate to.</p>
+
+    <p>The steps involved for a SASL negotiation are as follows:</p>
+
+    <ol>
+      <li>Client requests SASL authentication</li>
+      <li>Server responds with list of available SASL authentication mechanisms</li>
+      <li>Client selects mechanism</li>
+      <li>Server sends a challenge</li>
+      <li>Client responds to challenge</li>
+      <li>Server sends more challenges, client sends more responses</li>
+    </ol>
+
+    <p>This series of challenge/response pairs continues until one of three things happens:</p>
+
+    <ol>
+      <li>Client aborts the handshake.</li>
+      <li>Server reports failure.</li>
+      <li>Server reports success.</li>
+    </ol>
+
+    <p>After authentication has completed, the client sends a packet to begin the session.</p>
+    
+    <p>The namespace identifier for this protocol is http://www.iana.org/assignments/sasl-mechanisms.</p>
+
+    <p>The following examples show the dialogue between a client [C] and a server [S].</p>
+
+    <p>
+    </p>
+  </section2>
+
+  <section2 topic="Stream initialization">
+    <p>The client begins by requesting SASL authentication as part of the normal Jabber stream negotiation. <note>In the case of the remote entity being a server, the default namespace in the stream header will be &quot;jabber:server&quot;.</note> The server responds by sending the available authentication mechanisms to the client along with the stream information:</p>
+
+    <example caption="Stream initialization">
+C: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  xmlns:sasl=&apos;http://www.iana.org/assignments/sasl-mechanisms&apos;
+                  to=&apos;jabber.org&apos;&gt;
+S: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  xmlns:sasl=&apos;http://www.iana.org/assignments/sasl-mechanisms&apos;
+                  id=&apos;12345678&apos;&gt;
+   &lt;sasl:mechanisms&gt;
+     &lt;sasl:mechanism&gt;PLAIN&lt;/sasl:mechanism&gt;
+     &lt;sasl:mechanism&gt;DIGEST-MD5&lt;/sasl:mechanism&gt;
+     &lt;sasl:mechanism&gt;EXTERNAL&lt;/sasl:mechanism&gt;
+   &lt;sasl:mechanisms&gt;
+    </example>
+  </section2>
+
+  <section2 topic="Mechanism selection and handshake">
+    <p>Next, the client selects an authentication mechanism:</p>
+
+    <example caption="Plaintext mechanism selection">
+C: &lt;sasl:auth mechanism=&apos;PLAIN&apos;/&gt;
+    </example>
+
+    <p>The server responds with a mechanism-specific challenge, which the client must respond to. More than one challenge/response pair can take place; this is mechanism-specific.</p>
+
+    <p>Challenges and responses are Base64<note><link url="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</link>, section 6.8.</note> encoded.</p>
+
+    <example caption="Plaintext handshake">
+S: &lt;sasl:challenge/&gt;
+C: &lt;sasl:response&gt;cm9iAHNlY3JldA==&lt;/sasl:response&gt;
+    </example>
+
+    <example caption="Digest handshake">
+S: &lt;sasl:challenge&gt;
+     cmVhbG09ImNhdGFjbHlzbS5jeCIsbm9uY2U9Ik9BNk1HOXRFUUdtMmhoIi
+     xxb3A9ImF1dGgiLGNoYXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNz
+   &lt;/sasl:challenge&gt;
+C: &lt;sasl:response&gt;
+     dXNlcm5hbWU9InJvYiIscmVhbG09ImNhdGFjbHlzbS5jeCIsbm9uY2U9Ik
+     9BNk1HOXRFUUdtMmhoIixjbm9uY2U9Ik9BNk1IWGg2VnFUclJrIixuYz0w
+     MDAwMDAwMSxxb3A9YXV0aCxkaWdlc3QtdXJpPSJqYWJiZXIvY2F0YWNseX
+     NtLmN4IixyZXNwb25zZT1kMzg4ZGFkOTBkNGJiZDc2MGExNTIzMjFmMjE0
+     M2FmNyxjaGFyc2V0PXV0Zi04
+   &lt;/sasl:response&gt;
+S: &lt;sasl:challenge&gt;
+     cnNwYXV0aD1lYTQwZjYwMzM1YzQyN2I1NTI3Yjg0ZGJhYmNkZmZmZA==
+   &lt;/sasl:challenge&gt;
+C: &lt;sasl:response/&gt;
+    </example>
+
+    <p>For mechanisms that require the client to send data first (ie the first challenge from the server is empty), the client may optionally send its first response as part of the mechanism selection:</p>
+
+    <example caption="Plaintext mechanism selection; client sends data first">
+C: &lt;sasl:auth mechanism=&apos;PLAIN&apos;&gt;cm9iAHNlY3JldA==&lt;/sasl:auth&gt;
+    </example>
+  </section2>
+
+  <section2 topic="Success, failure and client abort">
+    <p>The handshake continues until authentication completes successfully, authentication fails, or the client aborts the handshake:</p>
+
+    <example caption="Authentication success">
+S: &lt;sasl:success/&gt;
+    </example>
+
+    <example caption="Authentication failure">
+S: &lt;sasl:failure/&gt;
+    </example>
+
+    <example caption="Client abort">
+C: &lt;sasl:abort/&gt;
+    </example>
+
+    <p>Optionally, the server or client may send an informative message along with the success, failure or abort command:</p>
+
+    <example caption="Authentication failure; optional informative message">
+S: &lt;sasl:failure&gt;Plaintext authentication failed (Incorrect username or password)&lt;/sasl:failure&gt;
+    </example>
+
+    <p>Following a failure or client abort, the client may start a new handshake. Following a successful authentication, any further attempts by the client to begin a new authentication handshake will automatically result in the server sending a failure.</p>
+  </section2>
+
+  <section2 topic='Session start'>
+    <p>Note: that this section only applies to client-to-server connections.</p>
+
+    <p>Following successful authentication, the client must send a standard IQ set packet in the jabber:iq:auth namespace to start a session. The client must supply a username and resource for the session along with this packet.</p>
+
+    <example caption="Session start after successful authentication">
+C: &lt;iq id=&quot;a1&quot; type=&quot;get&quot;&gt;
+     &lt;query xmlns=&quot;jabber:iq:auth&quot;&gt;
+       &lt;username&gt;rob&lt;/username&gt;
+     &lt;/query&gt;
+   &lt;/iq&gt;
+S: &lt;iq id=&quot;a1&quot; type=&quot;result&quot;&gt;
+     &lt;query xmlns=&quot;jabber:iq:auth&quot;&gt;
+       &lt;username&gt;rob&lt;/username&gt;
+       &lt;resource/&gt;
+     &lt;/query&gt;
+   &lt;/iq&gt;
+C: &lt;iq id=&quot;a2&quot; type=&quot;set&quot;&gt;
+     &lt;query xmlns=&quot;jabber:iq:auth&quot;&gt;
+       &lt;username&gt;rob&lt;/username&gt;
+       &lt;resource&gt;laptop&lt;/resource&gt;
+     &lt;/query&gt;
+   &lt;/iq&gt;
+S: &lt;iq id=&quot;a2&quot; type=&quot;result&quot;&gt;
+     &lt;query xmlns=&quot;jabber:iq:auth&quot;/&gt;
+   &lt;/iq&gt;
+    </example>
+
+    <p>If the client attempts to start a session before authenticating, or the username given in the jabber:iq:auth packet does not match the username given in the authentication credentials (when the SASL mechanism supports it), the server will return a 401 (Unauthorized) error packet.</p>
+  </section2>
+</section1>
+
+<section1 topic='Support for existing authentication methods'>
+  <p>Traditionally, Jabber servers have supported two authentication models - jabber:iq:auth for client-to-server authentication, and dialback for server-to-server authentication.</p>
+
+  <section2 topic='Legacy client-to-server authentication support'>
+    <p>Until SASL authentication is in widespread use, clients and servers may support both SASL and the legacy jabber:iq:auth authentication system for client-to-server connections. Note that neither the client nor the server are required to support legacy authentication; it is simply a courtesy to users until the majority of clients and servers support SASL authentication.</p>
+
+    <p>If a client connects and does not request the use of SASL (that is, the SASL profile namespace identifier does not appear in the stream initializer response), then the server should disable SASL for this connection; that is, it should not add the SASL profile namespace identifier to the stream initialization response, nor should it offer any SASL mechanisms.</p>
+
+    <p>If a client connects to a server that does not support SASL (identified by the lack of the SASL profile namespace identifier in the stream initializer response, even though the client requested it), the client may choose to fall back to use legacy authentication.</p>
+  </section2>
+
+  <section2 topic='Dialback support for server-to-server authentication'>
+    <p>SASL authentication for server-to-server connections is not intended to replace dialback, as there are uses for both. Dialback is useful in an uncontrolled environment, such as the global Internet, where it is necessary to verify the identity of the remote server. SASL authentication has uses in a more controlled environment, where the administrator wishes to restrict access to a certain number of known remote servers.</p>
+
+    <p>To this end, the use of dialback is not deprecated. If a remote server connects and requests the use of dialback (by specifying the &quot;jabber:server:dialback&quot; namespace, the the local server shall not offer SASL authentication. Similarly, if the remote server connects and requests the use of SASL authentication, then the local server shall not offer dialback. In the event that the remote server requests both, the local server should terminate the stream immediately and close the connection. If the remote server requests neither, then the local server may choose to support the pre-dialback server-to-server stream, but it is recommended that the local server terminate the stream and close the connection.</p>
+  </section2>
+</section1>
+
+</jep>
diff --git a/xep-0035.xml b/xep-0035.xml
new file mode 100644
index 00000000..233839cc
--- /dev/null
+++ b/xep-0035.xml
@@ -0,0 +1,129 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+
+<jep>
+
+<header>
+  <title>SSL/TLS Integration</title>
+  <abstract>NOTE WELL: this JEP was retracted on 2003-11-05 since the topic is addressed definitively in XMPP Core. Please refer to XMPP Core for further information.</abstract>
+  &LEGALNOTICE;
+  <number>0035</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <dependencies>None</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>XMPP Core</supersededby>
+  <shortname>N/A</shortname>
+  <author>
+    <firstname>Robert</firstname>
+    <surname>Norris</surname>
+    <email>rob@cataclysm.cx</email>
+    <jid>rob@cataclysm.cx</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2003-11-05</date>
+    <initials>psa</initials>
+    <remark>The status of this JEP has been changed to Retracted since it has been superseded by &xmppcore;. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-06-14</date>
+    <initials>rn</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p>The TLS protocol <note><link url="http://www.ietf.org/rfc/rfc2246.txt">RFC 2246</link></note> (formerly known as SSL) provides a way to secure an application protocol from tampering and eavesdropping. The option of using such security is desirable for Jabber due to common connection eavesdropping and hijacking attacks. <note>See <link url="http://www.ietf.org/rfc/rfc1704.txt">RFC 1704</link>, "On Internet Authentication."</note><note>This paragraph adapted from <link url="http://www.ietf.org/rfc/rfc2595.txt">RFC 2595</link>, section 1.</note></p>
+
+  <p>Traditionally, Jabber servers has supported TLS by utilising a "wrapper" around the standard protocol stream. This wrapper usually listens on a port other than those listed in the IANA registry <note>The Internet Assigned Numbers Authority defines jabber-client (port 5222) and jabber-server (port 5269) as the standard Jabber ports; see <link url='http://www.iana.org/assignments/port-numbers'>http://www.iana.org/assignments/port-numbers</link>.</note> (commonly 5223 for client-to-server communications and 5270 for server-to-server communications). In the case of client-to-server communications, clients must initiate a TLS session immediately after connecting, before beginning the normal XML stream. This method of utilising TLS is typical of many servers that implement stream-based protocols, but has a number of flaws, which are outlined in section 7 of <link url="http://www.ietf.org/rfc/rfc2595.txt">RFC 2595</link>. Accordingly, the use of port 5223 and port 5270 for secure sessions is deprecated.</p>
+
+  <p>This document describes an extension to the Jabber XML stream that provides a "STARTTLS" command which clients may invoke on an insecure stream to secure it. This extension is modelled on <link url="http://www.ietf.org/rfc/rfc2595.txt">RFC 2595</link>, which describes the STARTTLS extension for the IMAP <note><link url="http://www.ietf.org/rfc/rfc2060">RFC 2060</link></note>, POP3 <note><link url="http://www.ietf.org/rfc/rfc1939">RFC 1939</link></note> and ACAP <note><link url="http://www.ietf.org/rfc/rfc2244">RFC 2244</link></note> protocols. A future document (or an addition to this document) will define TLS support within server-to-server streams.</p>
+</section1>
+
+<section1 topic='Protocol'>
+
+  <section2 topic="Overview">
+    <p>This protocol operates over the standard Jabber client connection on port 5222.</p>
+
+    <p>The namespace identifier for this protocol is http://www.ietf.org/rfc/rfc2595.txt.</p>
+
+    <p>The following examples show the dialogue between a client [C] and a server [S].</p>
+
+    <p>
+    </p>
+  </section2>
+
+  <section2 topic="Stream initialization">
+    <p>The client begins by requesting the use of STARTTLS as part of the normal Jabber stream negotiation. The server responds by informing the client whether or not it supports STARTTLS. It does this in the normal stream negotiation response:</p>
+
+    <example caption="Stream initialization">
+C: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  xmlns:tls=&apos;http://www.ietf.org/rfc/rfc2595.txt&apos;
+                  to=&apos;jabber.org&apos;&gt;
+S: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  xmlns:tls=&apos;http://www.ietf.org/rfc/rfc2595.txt&apos;
+                  id=&apos;12345678&apos;&gt;
+    </example>
+
+    <p>In the event that a server does not support the STARTTLS extension, it will respond with the normal stream negotiation response:</p>
+
+    <example caption="Stream initialization; server not supporting STARTTLS">
+C: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  xmlns:tls=&apos;http://www.ietf.org/rfc/rfc2595.txt&apos;
+                  to=&apos;jabber.org&apos;&gt;
+S: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  id=&apos;12345678&apos;&gt;
+    </example>
+  </section2>
+
+  <section2 topic="TLS negotiation">
+    <p>To begin the TLS negotiation, the client issues the STARTTLS command:</p>
+
+    <example caption="STARTTLS request">
+C: &lt;tls:starttls/&gt;
+    </example>
+
+    <p>When the server is ready to begin the TLS negotiation, it will close the XML stream, but will keep the underlying connection to the client open:</p>
+
+    <example caption="STARTTLS response">
+S: &lt;/stream:stream&gt;
+    </example>
+
+    <p>The client now begins a normal TLS negotiation by sending the TLS ClientHello command. Upon completion of the TLS negotiation, the client reissues the XML stream initialization:</p>
+
+    <example caption="Stream initialization">
+C: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  to=&apos;jabber.org&apos;&gt;
+S: &lt;stream:stream xmlns=&apos;jabber:client&apos;
+                  xmlns:stream=&apos;http://etherx.jabber.org/streams&apos;
+                  id=&apos;12345678&apos;&gt;
+    </example>
+
+    <p>This is necessary, since any information about the stream presented by the server or the client may have been modified by an attacker.</p>
+
+    <p>Note that once the secure channel has been established, the server must not advertise or allow the use of the STARTTLS command.</p>
+  </section2>
+
+</section1>
+
+<section1 topic="Certificate-based authentication">
+  <p>TLS allows clients to be authenticated by verifying the certificate that they present during the TLS negotiation. This can be done in conjunction with the Jabber SASL profile <note><link url="http://www.jabber.org/jeps/jep-0034.html">JEP-0034</link></note> and the EXTERNAL mechanism.</p>
+
+  <p>If a client authenticates with a certificate using the TLS authentication, and the client requests the use of SASL in the second XML stream negotiation (over the secure channel), servers supporting certificate-based authentication should add the EXTERNAL mechanism to the list of supported authentication mechanisms. If the client then requests this mechanism, the server should automatically inform the user that authentication was successful. See <link url="http://www.ietf.org/rfc/rfc2222">RFC 2222</link> and <link url="http://www.jabber.org/jeps/jep-0034.html">JEP-0034</link> for more information.</p>
+  
+  <p>Servers implementing STARTTLS functionality are not required to implement certificate-based authentication.</p>
+</section1>
+
+</jep>
diff --git a/xep-0036.xml b/xep-0036.xml
new file mode 100644
index 00000000..f3efee44
--- /dev/null
+++ b/xep-0036.xml
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Pub-Sub Subscriptions</title>
+  <abstract>A proposal for the subscribe half of a publish-subscribe protocol within Jabber.</abstract> 
+  &LEGALNOTICE;
+  <number>0036</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <supersedes>None</supersedes>
+  <supersededby>JEP-0060</supersededby>
+  <shortname>None</shortname>
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Millard</surname>
+    <email>pgmillard@jabber.org</email>
+    <jid>pgmillard@jabber.org</jid>
+  </author>
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Saint-Andre</surname>
+    <email>stpeter@jabber.org</email>
+    <jid>stpeter@jabber.org</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2003-04-22</date>
+    <initials>psa</initials>
+    <remark>At the request of the authors, the status of this JEP has been changed to Retracted since it has been superseded by JEP-0060. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-07-12</date>
+    <initials>psa</initials>
+    <remark>Initial version based on discussions at JabberConf.</remark>
+  </revision>
+</header>
+<section1 topic='Introduction'>
+  <p>The Jabber community needs a cohesive standard for publish-subscribe functionality. Certainly there is interest in developing such a standard, as witness the number of JEPs written on this topic. <note><link url='http://www.jabber.org/jeps/jep-0021.html'>JEP-0021</link>, <link url='http://www.jabber.org/jeps/jep-0024.html'>JEP-0024</link>, <link url='http://www.jabber.org/jeps/jep-0028.html'>JEP-0028</link>.</note> Unfortunately, past discussion of this issue has been clouded by confusion over requirements and even terminology. This JEP seeks to clarify the situation somewhat and to provide a protocol for the subscribe half of publish-subscribe functionality within Jabber.</p>
+</section1>
+<section1 topic='Narrative'>
+  <p>Traditional pub-sub consists of event notification. This makes it possible for entities to publish data and for other interested entities to receive notification when the data is published. The following are some likely applications of pub-sub functionality within Jabber:</p>
+  <ul>
+    <li>Auction and trading systems</li>
+    <li>Online catalogs</li>
+    <li>Document workflow systems</li>
+    <li>Network management systems</li>
+    <li>NNTP over Jabber</li>
+    <li>Groupchat</li>
+  </ul>
+  <p>In such systems, a subscriber would request to receive notifications about data the subscriber is interested in. We define a "topic" as an object that defines the relationship between a publisher and its subscribers. Specifically, a topic contains three essential collections of information:</p>
+  <ol>
+    <li>A description of the information that will be provided</li>
+    <li>A list of subscribers to items that fit the description</li>
+    <li>One or more items that fit the description</li>
+  </ol>
+  <p>We define an "item" as an instance of data published by the publisher that fits the description associated with a topic. Each item MAY possess a unique identifier that enables the data to be tracked. (NOTE: This JEP does not address the durability of items, i.e., data storage.)</p>
+  <p>A topic is addressed by means of a unique "topic ID". A topic ID is simply a string with no required semantic meaning. While a topic ID may have semantic meaning (e.g., '/instruments/guitars/electric' or 'rec.music.dylan'), such meaning is not necessary and a topic ID may be any random string (e.g., 'a1gh83jfn342092'). The only requirement is that a topic ID be unique within the context of a specific pub-sub domain (e.g., pubsub.jabber.org).</p>
+</section1>
+<section1 topic='Protocol Details'>
+
+  <example caption="Protocol">
+&lt;iq type="set" from="pgm@jabber.org" to="pubsub.jabber.org" id="1"&gt;
+    &lt;query xmlns="jabber:iq:pubsub"&gt;
+        &lt;subscribe&gt;
+            &lt;topic id="12345"/&gt;
+            &lt;topic id="/presence/dizzyd@jabber.org"/&gt;
+        &lt;/subscribe&gt;
+    &lt;/query&gt;
+&lt;/iq&gt;
+
+&lt;iq type="set" from="pgm@jabber.org" to="pubsub.jabber.org" id="1"&gt;
+    &lt;query xmlns="jabber:iq:pubsub"&gt;
+        &lt;unsubscribe&gt;
+            &lt;topic id="12345"/&gt;
+        &lt;/unsubscribe&gt;
+    &lt;/query&gt;
+&lt;/iq&gt;
+
+&lt;iq type="set" to="pubsub.jabber.org" id="1"&gt;
+    &lt;query xmlns="jabber:iq:pubsub"&gt;
+        &lt;publish&gt;
+            &lt;topic id="12345"&gt;
+                &lt;item&gt;some kind of cdata goes here&lt;/item&gt;
+            &lt;/topic&gt;
+        &lt;/publish&gt;
+    &lt;/query&gt;
+&lt;/iq&gt;
+
+&lt;iq type="set" to="pubsub.jabber.org" id="1"&gt;
+    &lt;query xmlns="jabber:iq:pubsub"&gt;
+        &lt;createtopic&gt;
+            &lt;topic id="new_topic"&gt;
+                &lt;profile&gt;
+                    &lt;!-- is this even remotely close?? --&gt;
+                    &lt;publisher&gt;pgm@jabber.org&lt;/publisher&gt;
+                    &lt;publisher&gt;dizzyd@jabber.org&lt;/publisher&gt;
+                &lt;/profile&gt;
+            &lt;/topic&gt;
+            &lt;topic id="another_topic&gt;
+                &lt;profile&gt;
+                    &lt;publisher/&gt;
+                &lt;/profile&gt;
+            &lt;/topic&gt;
+        &lt;/createtopic&gt;
+    &lt;/query&gt;
+&lt;/iq&gt;
+
+&lt;iq type="set" to="pubsub.jabber.org" id="1"&gt;
+    &lt;query xmlns="jabber:iq:pubsub"&gt;
+        &lt;removetopic&gt;
+            &lt;topic id="12345"/&gt;
+        &lt;/removetopic&gt;
+    &lt;/query&gt;
+&lt;/iq&gt;
+  </example>
+
+</section1>
+
+</jep>
diff --git a/xep-0037.xml b/xep-0037.xml
new file mode 100644
index 00000000..feb8299f
--- /dev/null
+++ b/xep-0037.xml
@@ -0,0 +1,848 @@
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<jep>
+<header>
+  <title>DSPS - Data Stream Proxy Service</title>
+  <abstract>A proposal for proxy support in Jabber.</abstract>
+  <legal>This document has been placed in the public domain.</legal>
+  <number>0037</number>
+  <status>Rejected</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <author>
+    <firstname>David</firstname>
+    <surname>Sutton</surname>
+    <email></email>
+    <jid></jid>
+  </author>
+  <author>
+    <firstname>"Bac9"</firstname>
+    <surname></surname>
+    <email>bac9@bac9.yi.org</email>
+    <jid>bac9@jabber.org</jid>
+  </author>
+  <revision>
+    <version>Version 0.8</version>
+    <date>2002-09-18</date>
+    <initials>Bac9</initials>
+    <remark>Streamlined and enhanced handshake procedure, and cleaned up document.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.7</version>
+    <date>2002-08-20</date>
+    <initials>Bac9</initials>
+    <remark>Added public connections and reduced number of tags.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.6</version>
+    <date>2002-08-11</date>
+    <initials>Bac9</initials>
+    <remark>Added data tracking, inviting peer, auto-disconnect for slow peers, elaboration on protocol and suggested example of file transfer.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.5</version>
+    <date>2002-07-29</date>
+    <initials>Bac9</initials>
+    <remark>Elaborated on some functionality and cleaned up XML protocol.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.4</version>
+    <date>2002-07-11</date>
+    <initials>lw</initials>
+    <remark>Reformatted to JEP XML.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.3</version>
+    <date>2002-06-25</date>
+    <initials>Bac9</initials>
+    <remark>Added support for HTTP, SSL and throughput logging. Changed relay behaviour.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.2</version>
+    <date>2002-06-21</date>
+    <initials>Bac9</initials>
+    <remark>Revised, standardized and extended XML protocol structure.</remark>
+  </revision>
+  <revision>
+    <version>Version 0.1</version>
+    <date></date>
+    <initials>rn</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+
+  <p>Data Stream Proxy Service (DSPS) is designed to be a common stream protocol for multicast (unicast as special case) over P2S2P (P2P as special case) connections.</p>
+
+</section1>
+
+<section1 topic='Startup'>
+
+  <p>This document follows DSPS protocol version 0.5. Any XML data not explicitly defined or mentioned will be ignored without error. On startup, full fledged DSPS starts listening on port 5290 (and 80 if HTTP handshake implemented).</p>
+
+</section1>
+
+<section1 topic='General Operation'>
+
+  <section2 topic='Stream Creation/Relay {optional}'>
+
+    <p><em>(optional)</em> Creating or modifying stream is done like so:</p>
+
+<example>
+&lt;iq
+  id='dsps1'
+  type='get'
+  from='rob@nauseum.org/dspsclient' 
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a44'&gt;
+  &lt;query type='create' 
+    xmlns='jabber:iq:dsps'
+    minthroughput='1.5KB'
+    maxpublic='20'&gt;
+    &lt;peer port='5290'&gt;
+      dsps.myjabber.net/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
+    &lt;/peer&gt;
+    &lt;comment&gt;public comment&lt;/comment&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+    <ul>
+      <li><strong>&quot;to&quot;</strong> with resource implies reconnection to previous relay stream with previously supplied credentials and authentication as per section &quot;DSPS relay setup&quot;, otherwise implies creation of new stream where creator is granted &quot;master&quot; rights.</li>
+      <li><strong>&quot;minthroughput&quot;</strong> <em>(optional)</em> is minimum 16 second average throughput below which peers will be disconnected (but not dropped). Checked after every unit of outgoing transfer against the fourth value returned by &quot;who&quot; query for each peer. Legal only upon initial creation of stream. If omitted or negative, 0 is assumed.</li>
+      <li><strong>&quot;maxpublic&quot;</strong> <em>(optional)</em> is maximum number of peers that can join without invitation. If omitted or negative, 0 is assumed. If positive, DSPS generates globally unique id for public peers to acknowledge, reported within &quot;stats&quot; message. Said id remains constant for life of stream.</li>
+      <li><strong>&lt;peer/&gt;</strong> <em>(optional)</em> full JID of stream on another DSPS. Relay stream will be treated using &quot;slave&quot; rights. Legal only upon initial creation of stream. Multiple such blocks tried in series until successful connection. First successful (last if all failed) remembered by DSPS, all successive &lt;peer/&gt; ignored.. On connection, DSPS initiates handshake using peer's full JID and contents of block for destination's full JID to the relay destination as per section &quot;Connecting to DSPS via default method&quot;. Authentication is done as per section &quot;DSPS relay setup&quot;. Upon successful handshake, DSPS sends presence notification to peer as per section &quot;Acknowledge of DSPS connection&quot;.</li>
+      <li><strong>&quot;port&quot;</strong> <em>(optional)</em> for connecting to destination DSPS. If omitted, default is assumed.</li>
+      <li><strong>&lt;comment/&gt;</strong> <em>(optional)</em> all such blocks reported in &quot;stats&quot; message. Multiple such blocks allowed. Block may contain a full XML stack of elements. No order implied for &quot;stats&quot; message.</li>
+    </ul>
+
+    <p>Possible failure messages:</p>
+
+    <table>
+      <tr><th>Code</th><th>Message</th><th>Description</th></tr>
+      <tr><td>405</td><td>Method Not Allowed</td><td>Attempt at reconnect to relay without existing credentials, relay still connected, &lt;peer/&gt; block present in reconnect request, or feature not supported</td></tr>
+      <tr><td>504</td><td>Gateway Timeout</td><td>All destination DSPS are unreachable.</td></tr>
+    </table>
+
+  </section2>
+
+  <section2 topic='Connection waiting'>
+
+    <p>DSPS creates &quot;id&quot; (empty string is legal), used in &quot;who&quot; replies and notifies client of waiting connection like so:</p>
+
+<example>
+&lt;iq
+  id='dsps1' 
+  type='result'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' 
+  to='rob@nauseum.org/dspsclient'&gt;
+  &lt;query type='create' xmlns='jabber:iq:dsps'
+    wait='10'
+    host='dsps.jabber.org'
+    port='5290'
+    minthroughput='1.5KB'
+    protocol='0.5'&gt;
+    &lt;feature type='http' version='1.1'/&gt;
+    &lt;feature type='ssl' version='3.0'/&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+    <ul>
+      <li><strong>&quot;from&quot;</strong> full JID of DSPS, internally globally unique. Used in handshake and every subsequent communication with stream. May differ with the one specified in &quot;invite&quot; message.</li>
+      <li><strong>&quot;wait&quot;</strong> amount of time in <strong>milliseconds</strong> that DSPS will wait for client to initiate handshake. If timeout occurs, DSPS will totally forget prepared connection and act accordingly.</li>
+      <li><strong>&quot;host&quot;</strong> <em>(optional)</em> for handshake and data stream. If omitted default from the &quot;from&quot; is assumed. Intended for P2P connections to be able to report alternate hostname or IP for connection.</li>
+      <li><strong>&quot;port&quot;</strong> <em>(optional)</em> for handshake and data stream. If omitted default is assumed.</li>
+      <li><strong>&quot;minthroughput&quot;</strong> value from &quot;create&quot;.</li>
+      <li><strong>&quot;protocol&quot;</strong> version this DSPS supports.</li>
+      <li><strong>&lt;feature/&gt;</strong> <em>(optional)</em> supported by this DSPS. Type and version are properties and additional data stored in body. HTTP stream will not follow HTTP protocol. SSL handshake performed encrypted. Both HTTP and SSL connections are only between client and DSPS.</li>
+    </ul>
+
+  </section2>
+
+  <section2 topic='Establishing prepared connection'>
+
+    <p>Upon receipt of message as per section &quot;Connection waiting&quot;, client can either ignore it and connection will timeout, or connect to the DSPS directly via any supported connection method or via relay. There may be a maximum of 1 (one) established connection to DSPS from any Client_full_JID + DSPS_full_JID pair, deviations are handles as per section &quot;Connecting to DSPS via default method&quot;. DSPS will not discriminate method via which direct connection is made, even if prior to &quot;disconnect&quot; a different method was used. Any packet from an unauthorized connection is ignored without reporting an error.</p>
+
+    <section3 topic='DSPS relay setup {optional}'>
+
+      <p>Client may request another DSPS to relay this connection as per section &quot;Stream Creation/Relay&quot;, utilizing the &quot;create&quot; body. There is no limit on length of relay chain. Upon initiation of handshake with destination, DSPS reports key like so (message sequence unrelated to current DSPS handshake):</p>
+
+<example>
+&lt;iq
+  id='dsps1'
+  type='get'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='rob@nauseum.org/dspsclient'&gt;
+  &lt;query type='create' xmlns='jabber:iq:dsps'&gt;acDgH63I27Gb1&lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;get&quot;</strong> denotes request for auth key.</li>
+        <li><strong>&quot;create&quot;</strong> body contains key returned by destination.</li>
+      </ul>
+
+      <p>Client must send said key to destination as per section &quot;Connecting to DSPS via default method&quot; and send response to DSPS (which will be transmitted to destination) like so:</p>
+
+<example>
+&lt;iq
+  id='dsps1'
+  type='result'
+  from='rob@nauseum.org/dspsclient'
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  &lt;query type='create' xmlns='jabber:iq:dsps'&gt;acDgH63I27Gb1&lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;result&quot;</strong> denotes reply with auth key.</li>
+        <li><strong>&quot;create&quot;</strong> body contains key returned by destination.</li>
+      </ul>
+
+    </section3>
+
+    <section3 topic='Connecting to DSPS via HTTP method {optional}'>
+
+      <p>Client must connect to DSPS on port 80 and initiate handshake. This may be attempted after &quot;create&quot; result received or &quot;disconnect&quot; occurred, and prior to &quot;wait&quot; timeout expiring, then send HTTP request like so:</p>
+
+<example>
+GET /DSPS/STREAM/ HTTP/1.0&lt;CR&gt;
+Host: dsps.server&lt;CR&gt;
+&lt;CR&gt;
+</example>
+
+      <p>And will receive reply from DSPS before the start of data stream, like so:</p>
+
+<example>
+HTTP/1.0 200 OK&lt;CR&gt;
+Content-Type: application/octet-stream&lt;CR&gt;
+&lt;CR&gt;
+</example>
+
+      <p>Upon completion, Client must resume DSPS handshake as per either section &quot;Connecting to DSPS via default method&quot; or section &quot;Connecting to DSPS via SSL method&quot; (if applicable). Subsequent data will not follow HTTP protocol. On error connection closed immediately with optional error messages.</p>
+
+      <p>Possible failure messages:</p>
+
+      <table>
+        <tr><th>Code</th><th>Message</th><th>Description</th></tr>
+        <tr><td>401</td><td>Unauthorized</td><td><em>(optional)</em> Returned if any error in HTTP handshake.</td></tr>
+      </table>
+
+    </section3>
+
+    <section3 topic='Connecting to DSPS via SSL method {optional}'>
+
+      <p>Client must connect to DSPS on specified port and initiate handshake. This may be attempted after &quot;create&quot; result received or &quot;disconnect&quot; occurred, and prior to &quot;wait&quot; timeout expiring, then send following on stream:</p>
+      
+<example>starttls&lt;CR&gt;</example>
+
+      <p>Next, regular TLS handshake is initiated. Upon completion, Client must resume DSPS handshake as per section &quot;Connecting to DSPS via default method&quot;. On error connection closed immediately with optional error messages.</p>
+
+      <p>Possible failure messages:</p>
+
+      <table>
+        <tr><th>Code</th><th>Message</th><th>Description</th></tr>
+        <tr><td>401</td><td>Unauthorized</td><td><em>(optional)</em> Returned if any error in SSL handshake.</td></tr>
+      </table>
+
+    </section3>
+
+    <section3 topic='Connecting to DSPS via default method'>
+
+      <p>Client must connect to DSPS on specified port and initiate handshake. May be attempted after &quot;create&quot; result received or &quot;disconnect&quot; occurred, and prior to &quot;wait&quot; timeout expiring. Standard and SSL handshakes are identical in decrypted state and take the form of:</p>
+
+<example>Client_full_JID DSPS_full_JID&lt;CR&gt;</example>
+
+      <ul>
+        <li><strong>&quot;Client_full_JID&quot;</strong> client full JID as supplied in either the &quot;create&quot; or &quot;acknowledge&quot; message.</li>
+        <li><strong>&quot;DSPS_full_JID&quot;</strong> DSPS full JID as supplied in &quot;from&quot; field of &quot;create&quot; result message from section &quot;Connection waiting&quot;</li>
+        <li><strong>&lt;CR&gt;</strong> regular carriage return, commonly referred to as the newline character.</li>
+      </ul>
+
+      <p>For example, the appropriate string for the above request would be:</p>
+
+<example>rob@nauseum.org/dspsclient dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33</example>
+
+      <p>If Client_full_JID and DSPS_full_JID do not have an associated stream, are no longer valid, (e.g. timeout reached or client removed from stream), or connection from said Client_full_JID + DSPS_full_JID pair is in use (i.e. client is still connected to it), connection is closed immediately with possible optional error messages reported. Otherwise DSPS returns uniquely generated key followed by a &lt;CR&gt; like so:</p>
+
+<example>uGhhb74d21</example>
+
+      <p>Client must now send key to DSPS via XML stream like so:</p>
+
+<example>
+&lt;iq
+  id='dsps1'
+  type='get'
+  from='rob@nauseum.org/dspsclient'
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'&gt;
+  &lt;query type='auth' xmlns='jabber:iq:dsps'&gt;uGhhb74d21&lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;get&quot;</strong> denotes request for next auth key.</li>
+        <li><strong>&quot;auth&quot;</strong> body contains key returned by DSPS.</li>
+      </ul>
+
+      <p>DSPS will now check key, if not valid, close connection, report possible optional error message and resume waiting on original key. If valid, generate new key and send to client like so:</p>
+
+<example>
+&lt;iq
+  id='dsps1'
+  type='result'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='rob@nauseum.org/dspsclient'
+  &lt;query type='auth' xmlns='jabber:iq:dsps'&gt;qgqB42Ij784&lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;result&quot;</strong> denotes return of next auth key.</li>
+        <li><strong>&quot;auth&quot;</strong> body contains key returned by DSPS.</li>
+      </ul>
+
+      <p>Client must now send received key to DSPS via the stream followed by a &lt;CR&gt;. Once received, DSPS checks key, on mismatch connection is closed immediately with possible optional error messages reported, waiting on key is resumed. Upon successful handshake a message is sent to members of the stream in accordance with the following rules; If the client had type &quot;master&quot; connection, all members of the stream get notified. If the client had type &quot;slave&quot; connection, only other type &quot;master&quot; members get notified. The message takes the form of:</p>
+
+<example>
+  &lt;iq
+  id='dsps2'
+  type='set'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='foo@bar.com/resource'&gt;
+  &lt;query type='presence' xmlns='jabber:iq:dsps'&gt;
+  &lt;peer status='connect'&gt;JID&lt;/peer&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;presence&quot;</strong> denotes presence change. Body may contain multiple &lt;peer/&gt; blocks where same JID peers must be placed in chronological order relative to each other from start to end of message.</li>
+        <li><strong>&lt;peer/&gt;</strong> body is full JID of the joined peer unless peer of type &quot;relay&quot;, in which case the resource is not reported.</li>
+        <li><strong>&quot;status&quot;</strong> is new status of peer.</li>
+      </ul>
+                                                    
+      <p>Possible failure messages:</p>
+
+
+      <table>
+        <tr><th>Code</th><th>Message</th><th>Description</th></tr>
+        <tr><td>401</td><td>Unauthorized</td><td><em>(optional)</em> Returned if the DSPS is not aware of said Client_full_JID + DSPS_full_JID pair. Where &quot;from&quot; contains DSPS_full_JID that was used in the handshake and &quot;to&quot; contains Client_full_JID that was used in the handshake.</td></tr>
+        <tr><td>409</td><td>Conflict</td><td><em>(optional)</em> Returned if connection from said full client JID and full DSPS JID is in use (i.e. client is still connected to it). Where &quot;from&quot; contains DSPS_full_JID that was used in the handshake and &quot;to&quot; contains Client_full_JID that was used in the handshake.</td></tr>
+      </table>
+
+    </section3>
+    
+  </section2>
+
+  <section2 topic='Stream administration'>
+
+    <p>DSPS protocol allows multiple peers to use the same stream. Manipulation of the authorized peer list is done through admin functionality described in next several subsections. DSPS protocol allows for three types of peer connections: &quot;master&quot;, &quot;slave&quot;, and &quot;relay&quot;. &quot;master&quot; peers get full control of the stream, &quot;slave&quot; peers get limited control of the stream, and &quot;relay&quot; are treated similar to &quot;slave&quot; except in reporting of JIDs where the resource must be omitted.</p>
+
+    <p>&quot;master&quot; peers are allowed to invite any other user to the stream and drop any peer registered with the stream, including themselves. &quot;slave&quot; peers are only allowed to drop themselves from the stream. Any administrative changes coming from a &quot;slave&quot; peer that are not for the peer's own connection are ignored. Dropping one's own connection is the preferred way of permanently disconnecting from the stream.</p>
+
+    <p>Any data received from a &quot;master&quot; gets copied to every other peer on the stream. Any data received from a &quot;slave&quot; peer gets copied to all &quot;master&quot; peers on the stream only.</p>
+
+    <p>Stream administration request looks like so:</p>
+
+<example>
+&lt;iq
+  id='dsps3' 
+  type='set'
+  from='rob@nauseum.org/dspsclient' 
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'&gt;
+  &lt;query type='admin' xmlns='jabber:iq:dsps' expire='20' wait='10'&gt;
+    &lt;comment&gt;welcome to the stream&lt;/comment&gt;
+    &lt;peer type='master'&gt;someone@somewhere.net&lt;/peer&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+    <ul>
+      <li><strong>&quot;admin&quot;</strong> denotes administrative functions are to follow. Any properties within this block apply to this block alone. Multiple such blocks are allowed.</li>
+      <li><strong>&quot;expire&quot;</strong> time DSPS should wait for the &quot;acknowledge&quot; message from any invited peer within block. An &quot;expire&quot; of 0 denotes no time limit. Actual value sent to peer as &quot;expire&quot; is <em>minimum</em> of this value and default value preset for DSPS. If value unparseable or not present, default is used.</li>
+      <li><strong>&quot;wait&quot;</strong> time DSPS should wait for invited peer to connect to DSPS after &quot;acknowledge&quot; is received and message from section &quot;Connection waiting&quot;. is sent. A &quot;wait&quot; of 0 denotes no time limit. Actual value sent to peer as &quot;wait&quot; is <em>minimum</em> of this value and default value preset for DSPS. If the value unparseable or not present, default is used.</li>
+      <li><strong>&lt;comment/&gt;</strong> <em>(optional)</em> block sent to each of the peers. Multiple such blocks are allowed. Block may contain a full XML stack of elements. All such blocks are sent to each of the invited peers as is. No guarantee is made on their order in the &lt;invite/&gt; message.</li>
+      <li><strong>&lt;peer/&gt;</strong> JID to execute action upon. If invitation then body will not necessarily be same full JID as one that would respond. Multiple such blocks allowed.</li>
+      <li><strong>&quot;type&quot;</strong> type of action to do. &quot;master&quot; denotes invitation, granting master rights. &quot;slave&quot; denotes invitation, granting slave rights. &quot;drop&quot; denotes request to drop peer from stream. &quot;relay&quot; peers may not be invited but may be dropped using this method.</li>
+    </ul>
+
+    <p>Possible optional errors include the following:</p>
+
+<example>
+&lt;iq
+  id='dsps3'
+  type='result'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='user@server.org/resource'&gt;
+  &lt;query type='admin' xmlns='jabber:iq:dsps'&gt;
+    &lt;peer acknowledge='expire'&gt;abc@company.com/net&lt;/peer&gt;
+    &lt;peer acknowledge='reject'&gt;friend@someplace.com/home&lt;/peer&gt;
+    &lt;peer acknowledge='timeout'&gt;abd@company.com/net&lt;/peer&gt;
+    &lt;peer acknowledge='missing'&gt;who@knows.org/winjab&lt;/peer&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+    <ul>
+      <li><strong>&quot;admin&quot;</strong> denotes admin response, sent to sender of &quot;admin&quot; request for every peer in block. Peers may be combined from multiple &quot;admin&quot; requests or peers from single &quot;admin&quot; request may be split over multiple &quot;admin&quot; replies.</li>
+      <li><strong>&lt;peer/&gt;</strong> peer in question. For &quot;expire&quot; JID is one from invite request. For &quot;reject&quot; JID is one from which reject received. For &quot;timeout&quot; JID is one from invite request. For &quot;missing&quot; is one from drop request. After this DSPS will totally forget about this peer.</li>
+      <li><strong>&quot;acknowledge&quot;</strong> reason for failure. &quot;expire&quot; denotes &quot;expire&quot; timeout sent, has ended. &quot;reject&quot; denotes peer rejected invite. &quot;timeout&quot; denotes &quot;wait&quot; timeout sent, has ended. &quot;missing&quot; denotes peer marked for drop not found registered on tis stream.</li>
+    </ul>
+
+    <p>Possible failure messages:</p>
+
+    <table>
+      <tr><th>Code</th><th>Message</th><th>Description</th></tr>
+      <tr><td>403</td><td>Forbidden</td><td><em>(optional)</em> Returned if peer with &quot;slave&quot; rights attempts to use &quot;master&quot; admin privileges.</td></tr>
+    </table>
+                                
+    <section3 topic='Invitation to stream {optional}'>
+
+      <p>Upon invite DSPS will attempt to invite each of the peers like so:</p>
+
+<example>
+&lt;iq
+  id='dsps4' 
+  type='get'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' 
+  to='foo@bar.com/resource'&gt;
+  &lt;query type='acknowledge' 
+    xmlns='jabber:iq:dsps'
+    status='master'
+    expire='20'&gt;
+    &lt;peer&gt;rob@nauseum.org/dspsclient&lt;/peer&gt;
+    &lt;comment&gt;some long comment block or structure&lt;/comment&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;from&quot;</strong> is unique JID/resource pair generated for this JID, not necessarily same as JID/resource pair specified in section &quot;Connection waiting&quot;. It is used for identification of the &quot;acknowledge&quot; message.</li>
+        <li><strong>&quot;acknowledge&quot;</strong> denotes request for invitation acknowledge.</li>
+        <li><strong>&quot;status&quot;</strong> type of connection the client is granted. Same type as tag in invitation request.</li>
+        <li><strong>&quot;expire&quot;</strong> time DSPS will wait for the &quot;acknowledge&quot; message.</li>
+        <li><strong>&lt;peer/&gt;</strong> peer who initiated this invite. Multiple such blocks may exist if multiple distinct peers sent invitation that have not yet been received by the invitee.</li>
+        <li><strong>&lt;comment/&gt;</strong> is &lt;comment/&gt; structure(s) sent in admin request, present if admin request contained it.</li>
+      </ul>
+
+    </section3>
+
+    <section3 topic='Dropping from stream'>
+
+      <p>Upon drop DSPS will immediately closes the connection to the dropped peer. It then will totally forget this peer right after sending it a notification message like so:</p>
+
+<example>
+&lt;iq 
+  id='dsps5'
+  type='set' 
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='foo@bar.com/resource'&gt;
+  &lt;query type='acknowledge' xmlns='jabber:iq:dsps' status='drop'&gt;
+    &lt;comment&gt;some long comment block or structure&lt;/comment&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;from&quot;</strong> is the DSPS JID/resource pair which DSPS has associated with this connection.</li>
+        <li><strong>&quot;acknowledge&quot;</strong> denotes drop notification. Despite the block name, this message does not require a reply.</li>
+        <li><strong>&quot;status&quot;</strong> drop denotes a connection drop.</li>
+        <li><strong>&lt;comment/&gt;</strong> is &lt;comment/&gt; structure(s) sent in admin request, preset if admin request contained it.</li>
+      </ul>
+
+      <p>For every successfully dropped peer a message is sent to all other stream members, following the rules stated for the &quot;presence&quot; message, and takes the form of:</p>
+
+<example>
+&lt;iq
+  id='dsps6' 
+  type='set'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' 
+  to='foo@bar.com/resource'&gt;
+  &lt;query type='presence' xmlns='jabber:iq:dsps'&gt;
+    &lt;peer status='drop'&gt;JID&lt;/peer&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;from&quot;</strong> is the DSPS JID/resource pair which DSPS has associated with the connection of the recipient of the message.</li>
+        <li><strong>&quot;presence&quot;</strong> denotes presence change. Body may contain multiple &lt;peer/&gt; blocks where same JID peers must be placed in chronological order relative to each other from start to end of message.</li>
+        <li><strong>&lt;peer/&gt;</strong> body is full JID of the dropped peer registered on the stream, unless peer is of type &quot;relay&quot;, in which case the resource is not reported.</li>
+        <li><strong>&quot;status&quot;</strong> is new status of peer.</li>
+      </ul>
+
+    </section3>
+    
+  </section2>
+
+  <section2 topic='Invitation reply'>
+
+    <p>An invited peer has the option to accept or reject an invitation to a stream.</p>
+    
+    <section3 topic='Accepting an invite'>
+
+      <p>To accept an invitation to a stream, the peer must reply like so:</p>
+
+<example>
+&lt;iq
+  id='dsps4' 
+  type='result'
+  from='foo@bar.com/moredsps' 
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33&gt;
+  &lt;query type='acknowledge' xmlns='jabber:iq:dsps' status='connect'/&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;from&quot;</strong> is the JID/resource pair which will be associated with this connection, only it will be allowed to connect to this stream as this user. A peer may be registered to multiple streams from the same full JID, hence all DSPS full JIDs linked to a given peer must be unique.</li>
+        <li><strong>&quot;to&quot;</strong> contains the DSPS JID/resource pair which was the source in the original &quot;acknowledge&quot; message.</li>
+        <li><strong>&quot;acknowledge&quot;</strong> denotes acknowledgment to invitation.</li>
+        <li><strong>&quot;status&quot;</strong> connect denotes an acceptance of invitation.</li>
+      </ul>
+
+      <p>Upon receipt of this reply the DSPS creates a unique resource for this client JID/resource pair. It then prepares the &quot;create&quot; message as described in section &quot;Connection waiting&quot;.</p>
+
+    </section3>
+    
+    <section3 topic='Rejecting an invite'>
+
+     <p>Rejecting an invitation can be done in two ways. A peer can forget about the invitation and let the invitation &quot;expire&quot;, or preferably a message can be sent like so:</p>
+
+<example>
+&lt;iq
+  id='dsps4' 
+  type='result'
+  from='foo@bar.com/moredsps' 
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33&gt;
+  &lt;query type='acknowledge' xmlns='jabber:iq:dsps' status='drop'/&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;to&quot;</strong> contains the DSPS JID/resource pair which was the source in the original &quot;acknowledge&quot; message.</li>
+        <li><strong>&quot;acknowledge&quot;</strong> denotes acknowledgment to invitation.</li>
+        <li><strong>&quot;status&quot;</strong> drop denotes an rejection of invitation.</li>
+      </ul>
+
+      <p>Regardless of the way a rejection was achieved a notification message is sent to the inviting peer, as was described in section &quot;Stream administration&quot;. If unknown &quot;type&quot; is sent, it will be interpreted as a reject. A maximum of one &quot;acknowledge&quot; is allowed during the lifetime of an invitation. If multiple such tags are sent, the first tag takes precedence. Any rejection of a public connection will be ignored.</p> 
+
+    </section3>
+    
+  </section2>
+
+  <section2 topic='Disconnection handling'>
+
+    <p>If a peer ever disconnects without first dropping themselves, the following policy applies:</p>
+
+    <p>The peer may reconnect within the &quot;wait&quot; timeout provided in the &quot;create&quot; reply in section &quot;Connection waiting&quot;. The peer may choose any supported mode of reconnection supplied in &quot;create&quot; reply, regardless of mode previously used. The &quot;wait&quot; timeout is not cumulative over multiple disconnects. After reconnect, peer will not receive any data that exists on the stream while it was disconnected.</p>
+
+    <p>Upon such disconnection DSPS notifies all other members of the stream, following the rules stated for the &quot;presence&quot; message, and takes the form of:</p>
+
+<example>
+&lt;iq 
+  id='dsps7'
+  type='set' 
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='foo@bar.com/resource'&gt;
+  &lt;query type='presence' xmlns='jabber:iq:dsps'&gt;
+    &lt;peer status='waiting'&gt;JID&lt;/peer&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+    <ul>
+      <li><strong>&quot;from&quot;</strong> is the DSPS JID/resource pair which DSPS has associated with the connection of the recipient of the message.</li>
+      <li><strong>&quot;presence&quot;</strong> denotes presence change. Body may contain multiple &lt;peer/&gt; blocks where same JID peers must be placed in chronological order relative to each other from start to end of message.</li>
+      <li><strong>&lt;peer/&gt;</strong> body is full JID of the disconnected peer registered on the stream, unless peer is of type &quot;relay&quot;, in which case the resource is not reported.</li>
+      <li><strong>&quot;status&quot;</strong> is new status of peer.</li>
+    </ul>
+
+    <p>Upon reaching &quot;wait&quot; timeout the procedure is the same if the peer dropped its own connection.</p>
+
+  </section2>
+
+  <section2 topic='Ending a connection'>
+
+    <p>Permanent termination of connection can be done in two ways: peer may disconnect from the stream and let the &quot;wait&quot; timeout expire, or more preferably the peer will drop itself from the stream via an &quot;admin&quot; message. The &quot;admin&quot; is still allowed to contain multiple &quot;peer&quot; blocks.</p>
+
+  </section2>
+
+  <section2 topic='Stream use'>
+
+    <p>The use policy for the stream follows the standard rules described in this document. Type and structure of the data must be negotiated by the peers separately (presumably via the normal XML message stream or within &lt;comment/&gt; blocks). The DSPS stream operates at the speed of the slowest connection (or slower if it is so configured in its internal configuration).</p>
+
+    <p>Data read from peer in a unit of transfer (decided by DSPS) is sent to other peers in a format like so:</p>
+
+<example>0&lt;size&gt;&lt;CR&gt;&lt;id&gt;&lt;CR&gt;&lt;data&gt;</example>
+
+    <ul>
+      <li><strong>&quot;0&quot;</strong> at beginning for checking start of block.</li>
+      <li><strong>&lt;size&gt;</strong> length in bytes including id and its trailing CR in form of [1-9][0-9]*[0-9A-Z], where last character is base 36 numerical equivalent power of 1024.</li>
+      <li><strong>&lt;id&gt;</strong> id of the sender as per &quot;who&quot; query.</li>
+      <li><strong>&lt;data&gt;</strong> data sent.</li>
+      <li><strong>&lt;CR&gt;</strong> regular carriage return, commonly referred to as the newline character.</li>
+    </ul>
+
+    <p>For example, the appropriate string for the above block would be:</p>
+
+<example>
+0340&lt;CR&gt;
+010&lt;CR&gt;
+this is the data in ASCII form
+</example>
+
+    <p>First block received after connection will always be full block. If discrepancy occurs, receiving peer should disconnect and reconnect back to stream.</p>
+
+  </section2>
+
+  <section2 topic='Stream information'>
+
+    <p>Two mechanisms exists to gain information about the stream configuration and its members. They are described within next few subsections.</p>
+
+    <section3 topic='Stream peer listing'>
+
+      <p>To retrieve listing of all registered peers of this stream and their respective connection status any registered peer sends a message like so:</p>
+
+<example>
+&lt;iq
+  id='dsps8' 
+  type='get'
+  from='rob@nauseum.org/dspsclient' 
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'&gt;
+  &lt;query type='who' xmlns='jabber:iq:dsps'/&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;to&quot;</strong> has the usual meaning for this client when referring to this DSPS stream.</li>
+        <li><strong>&quot;who&quot;</strong> denotes that this is a listing request. It may not contain a body or attributes, otherwise it will be ignored without error.</li>
+      </ul>
+
+      <p>The query follows the standard rules: query originating from a &quot;master&quot; peer will return listing of all registered peers and their associated statuses, query originating from a &quot;slave&quot; peer will only return listing of all registered &quot;master&quot; peers and their associated statuses. Returned results do not have any strict order. If multiple &quot;who&quot; queries were requested by a peer that have not yet received a reply, only one reply need be sent.</p>
+
+      <p>The query reply is formatted like so:</p>
+
+<example>
+&lt;iq 
+  id='dsps8'
+  type='result' 
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='rob@nauseum.org/dspsclient'&gt;
+  &lt;query type='who' xmlns='jabber:iq:dsps'&gt;
+    &lt;peer 
+      type='master'
+      id='0'
+      status='connect'
+      throughput='1KB////4.8KB//3KB'&gt;
+      rob@nauseum.org/dspsclient
+    &lt;/peer&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;from&quot;</strong> is unique DSPS JID/resource pair for the peer receiving the result.</li>
+        <li><strong>&lt;peer/&gt;</strong> body is full JID of registered peer, unless peer is of type &quot;relay&quot;, in which case the resource is not reported. A separate block exists for every viewable peer.</li>
+        <li><strong>&quot;type&quot;</strong> the type of connection peer has. May contain value of &quot;master&quot;, &quot;slave&quot;, or &quot;relay&quot;.</li>
+        <li><strong>&quot;id&quot;</strong> id prepended to data coming from this peer.</li>
+        <li><strong>&quot;status&quot;</strong> current status of peer. &quot;connect&quot; denotes peer able to receive data. &quot;wait&quot; denotes peer registered but not connected. &quot;expire&quot; denotes peer was invited but no reply was received yet.</li>
+        <li><strong>&quot;throughput&quot;</strong> shows the average throughput to that peer per second in the units specified after the number (e.g. B, KB, MB, GB, TB, EB) in capital letters. Time is measured only during data transfer. Value contains multiple fields delimited by slash (/). Each field represents time span of power of two (2), relative to its position from start of the string. Each filled-in field contains the average throughput over that timespan. e.g. (1B per sec in last sec)/(1.1B per sec in last 2 sec)/(0.9B per sec in last 4 sec). Only fields representing power of zero (2^0 sec) and power of four (2^4 sec) are required. Last field must be filled-in.</li>
+      </ul>
+
+    </section3>
+
+    <section3 topic='Stream status listing'>
+
+      <p>To retrieve listing of all stream configuration/statistics values or public streams, any registered peer sends a message like so:</p>
+
+<example>
+&lt;iq 
+  id='dsps9'
+  type='get' 
+  from='rob@nauseum.org/dspsclient'
+  to='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'&gt;
+  &lt;query type='stats' xmlns='jabber:iq:dsps'/&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;to&quot;</strong> if contains a resource, will return statistics for specified stream. Otherwise will return listing of public streams, i.e. any stream with &quot;maxpublic&quot; greater then 0.</li>
+        <li><strong>&quot;stats&quot;</strong> denotes that this is a configuration/statistics request. It may not contain a body or attributes, otherwise it will be ignored without error.</li>
+      </ul>
+
+      <p>The query reply is formatted like so:</p>
+
+<example>
+&lt;iq
+  id='dsps9' 
+  type='result'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' 
+  to='rob@nauseum.org/dspsclient'&gt;
+  &lt;query type='stats' xmlns='jabber:iq:dsps'
+    init='00000000000000'
+    protocol='0.5'
+    port='5290'
+    minthroughput='1.5KB'
+    expiredefault='150'
+    waitdefault='100'
+    wait='10'
+    public='5'
+    maxpublic='25'
+    mastercount='20'
+    slavecount='40'
+    relaycount='0'&gt;
+    &lt;feature type='http' version='1.1'/&gt;
+    &lt;feature type='ssl' version='3.0'/&gt;
+    &lt;peer&gt;mydsps@jabber.org/8xd67f56df4f546fdgsfdg65f6g58f&lt;/peer&gt;
+    &lt;comment&gt;some server comment&lt;/comment&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+
+      <ul>
+        <li><strong>&quot;from&quot;</strong> the DSPS JID/resource pair for the peer receiving the result.</li>
+        <li><strong>&quot;init&quot;</strong> UNIX timestamp of the date this stream was initiated.</li>
+        <li><strong>&quot;protocol&quot;</strong> protocol version this DSPS supports.</li>
+        <li><strong>&quot;port&quot;</strong> default port this DSPS listens for connections on.</li>
+        <li><strong>&quot;minthroughput&quot;</strong> as defined in &quot;create&quot;.</li>
+        <li><strong>&quot;expiredefault&quot;</strong> default time this DSPS will wait for an &quot;acknowledge&quot; response.</li>
+        <li><strong>&quot;waitdefault&quot;</strong> default time this DSPS will wait for a connection to its default port after an invitation is accepted.</li>
+        <li><strong>&quot;wait&quot;</strong> time this DSPS will wait for this particular client to reconnect if it ever gets disconnected. This is the same value as one sent in the &quot;create&quot; response.</li>
+        <li><strong>&quot;public&quot;</strong> number of &quot;slave&quot; peers registered with stream without invitation.</li>
+        <li><strong>&quot;maxpublic&quot;</strong> maximum number of &quot;slave&quot;peers allowed without invitation.</li>
+        <li><strong>&quot;mastercount&quot;</strong> number of peers with a &quot;master&quot; connection registered on this stream.</li>
+        <li><strong>&quot;slavecount&quot;</strong> number of peers with a &quot;slave&quot; connection registered on this stream.</li>
+        <li><strong>&quot;relaycount&quot;</strong> number of peers with a &quot;relay&quot; connection registered on this stream.</li>
+        <li><strong>&lt;feature/&gt;</strong> <em>(optional)</em> denotes a supported feature. All supported features must be listed.</li>
+        <li><strong>&lt;peer/&gt;</strong> <em>(optional)</em> list of public stream connections where all reported statistics match. Present only if &quot;to&quot; in original request contained no resource. Multiple allowed where statistics match for all.</li>
+        <li><strong>&lt;comment/&gt;</strong> <em>(optional)</em> parameter(s) with a comments from &quot;create&quot;. This block may contain full XML stack of elements. Multiple such blocks are allowed.</li>
+      </ul>
+
+      <p>All &quot;status&quot; attributes are required. Any other undefined blocks with any multiplicity, are legal in this block as long as their tags are not identical to any tag within the protocol. Results returned do not have any strict order. If &quot;to&quot; in original request contained no resource, multiple &quot;stats&quot; blocks are allowed, where each contains at least one &lt;peer/&gt; block which has &quot;maxpublic&quot; greater than 0. To join a public stream a client must send message as per section &quot;Accepting an invite&quot;.</p>
+
+    </section3>
+    
+  </section2>
+
+  <section2 topic='Stream shutdown'>
+
+    <p>Stream exists from its &quot;create&quot;ion time to the time when there are no more &quot;master&quot; peers registered with the stream.</p> 
+
+    <p>When last &quot;master&quot; peer is dropped from the stream, DSPS will make sure that all the data sent by all the &quot;master&quot; peers was actually copied to all the &quot;slave&quot; peers still present. For every remaining &quot;slave&quot; peer DSPS will initiate a drop event. Once stream is void of any peers it will be totally forgotten by the DSPS and all associated data is released.</p>
+
+  </section2>
+
+  <section2 topic='Error message format'>
+
+    <p>Error messages look like so:</p>  
+
+<example>
+&lt;iq
+  id='dsps9'
+  type='error'
+  from='dsps.jabber.org/0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
+  to='rob@nauseum.org/dspsclient'&gt;
+  &lt;error code='405'&gt;Method Not Allowed&lt;/error&gt;
+&lt;/iq&gt;
+</example>
+
+    <ul>
+      <li><strong>&lt;error/&gt;</strong> denotes error block where body is text description.</li>
+      <li><strong>&quot;code&quot;</strong> denotes error code.</li>
+    </ul>
+
+  </section2>
+
+</section1>
+
+<section1 topic='Possible applications'>
+
+  <section2 topic='File transfer'>
+
+    <p>File transfer can be easily accomplished over DSPS. Where one user invites another user to a DSPS stream. File details can be transfered in the invitation comment as such: &lt;meta type='file' name='myfile.txt' size='500K' crc32='12345' sha1='23451' mime='application/octet-stream' timestamp='12345' date='20020412T00:00:00'/&gt;. Where the &quot;size&quot; would be in bytes. All properties should reflect their appropriate values for this instance. Once the second peer has accepted, it can simply put a CR on the stream stating that transfer can begin. then the first party simply dumps the contents of file on the stream, closes the stream and &quot;drop&quot;s itself from the stream. DSPS will make sure the second party gets everything that the first party sent before closing the connection. If multiple recipients of the file are required, the sending client can save a lot of bandwidth and transmit only one copy if the file to the DSPS which in term will transmit the data over to all the other connected clients.</p>
+
+  </section2>
+
+  <section2 topic='VoIP'>
+
+    <p>Same idea as the file transfer. However if more then two parties are involved, every party must have a &quot;master&quot; connection.</p>
+
+  </section2>
+
+  <section2 topic='Multicast'>
+
+    <p>A server has a JID which it registers with a stream. Any client wishing to join the multicast sends an XML message to the server, which then invites the client with a &quot;slave&quot; connection. Thus everything the server sends is received by every client on the stream. If there are multiple back-up servers, they can be invited with a &quot;master&quot; connection, thus if one of them goes down, the others can take over.</p>
+
+  </section2>
+
+  <section2 topic='File Storage'>
+
+    <p>It has long been discussed in many Jabber places that a file storage facility is desired. The communication with such a facility can be easily accommodated with DSPS, as such a facility would merely appear as a user to DSPS which can either be &quot;invite&quot;ed or &quot;invite&quot; other users onto personal streams to transfer files as described in 6.1.</p>
+
+  </section2>
+
+</section1>
+
+<section1 topic='Why DSPS instead of PASS'>
+
+  <p>PASS has the following design flaws that make it unsuitable for its stated purpose of providing raw data-streams to all classes of users, including those behind firewalls or NAT.</p>
+
+  <section2 topic='Ports'>
+
+    <p>PASS requires the use of a large number of individual ports, which on a heavily loaded server can lead to the number of spare ports dropping to zero, causing connections to be refused.</p>
+
+    <p>This is also problematic if PASS is situated behind a firewall. Firewall administrators are typically loathe to allow incoming connections to a large range of ports.</p>
+
+    <p>DSPS only uses one port, and so resolves the first problem, while making the second almost a non-issue.</p>
+
+  </section2>
+
+  <section2 topic='Knowledge of IP'>
+
+    <p>PASS requires the client to have some knowledge of IP, which immediately forces the assumption that the XML stream's underlying protocol is in fact, IP. While at the time of writing this is always the case, it may not always be this way.</p>
+
+    <p>DSPS uses the Jabber ID to do its routing, and so avoids these problems. And while DSPS does use the concept of a TCP connection and an IP port, this information is never actually used anywhere on the XML stream, making the actual connection to the DSPS implementation-defined.</p>
+
+  </section2>
+
+  <section2 topic='IP Addresses'>
+
+    <p>PASS makes the IP address of the remote client available to the local client.  While it is rare that this is an actual problem, many users and administrators prefer that IP address information is never actually revealed.</p>
+
+    <p>DSPS never transmits IP address information across the XML stream, and so does not have this problem.</p>
+
+  </section2>
+
+  <section2 topic='Intuitiveness'>
+
+    <p>PASS requires a client to initiate a connection by opening a (proxied) listening socket, and then soliciting connections. However, TCP works by having the client connect to a remote resource directly. This difference can make the operation of PASS difficult to understand. Also, it is left to the client to distribute the information about this listening socket, which places an additional burden on the client.</p>
+
+    <p>DSPS, while it uses listening sockets to do its work, does all the work of setting up the connection after a client initiates it. All the initiating client has to do is request a connection, connect to the DSPS, and wait - everything else is handled automatically.</p>
+
+  </section2>
+
+  <section2 topic='Scalability'>
+
+    <p>Due to the master/slave design, DSPS is already able to handle multicasts of streams or such, whilst PASS was only designed for simple p2p stream connections. This will becoming increasingly more important as more emphasis is made on streaming capabilities, for technologies such as audio and video conferencing.</p>
+
+    <p>Due to DSPS generality, the protocol can be easily used for either P2P or P2S2P needs. This eliminates the need for a separate protocol for each of the tasks.</p>
+
+  </section2>
+
+</section1>
+
+<section1 topic='DSPS with P2P'>
+
+    <p>It is not mandated for DSPS to reside beside a Jabber server. It is entirely possible for any client to implement a stripped down version of such a server. In such a case the only sections that are required are any error reporting, invitation acknowledgment and statistical responses. Any other area of the protocol becomes optional since the recipient peer will not have the ability to use it anyway.</p>
+
+    <p>Any client may, but is not required to utilize the striped down functionality. When utilizing such functionality the serving client sends an invitation to the recipient client to join the serving client's DSPS stream. Thus the &quot;create&quot; message would list the serving client as the DSPS and would utilize the &quot;host&quot; attribute to tell the recipient client where to connect to the DSPS.</p>
+
+    <p>This ability is advantageous since the recipient client only needs to know one protocol for data transmission over P2P or P2S2P connections, and would not see a difference between the two. The proposed method is for one side to fist try serving a connection to the other. If that fails the other side may attempt to serve the connection. If the second attempt fails the clients may utilize an external DSPS server. The negotiation of who will serve is done outside DSPS protocol. DSPS has no functionality to decide when a P2P connection is possible or desirable, nor does it have enough information to do so reliably.</p>
+
+</section1>
+
+</jep>
diff --git a/xep-0038.xml b/xep-0038.xml
new file mode 100644
index 00000000..791e5240
--- /dev/null
+++ b/xep-0038.xml
@@ -0,0 +1,365 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Icon Styles</title>
+  <abstract>A protocol for specifying exchangeable styles of emoticons and genicons within Jabber IM clients.</abstract>
+  &LEGALNOTICE;
+  <number>0038</number>
+  <status>Deferred</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>None</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>None</supersededby>
+  <shortname>None</shortname>
+  <schemaloc>Not yet assigned</schemaloc>
+  <author>
+    <firstname>Adam</firstname>
+    <surname>Theo</surname>
+    <email>theo@theoretic.com</email>
+    <jid>theo@theoretic.com</jid>
+  </author>
+  <revision>
+    <version>0.5</version>
+    <date>2003-06-02</date>
+    <initials>at</initials>
+    <remark>Bent to public will on using a common object element and enveloping all meta information into a meta element.</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2003-03-05</date>
+    <initials>at</initials>
+    <remark>Added "format" back in. Refused to simplify to use "object" for everything. Fixed some typos.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-11-05</date>
+    <initials>at</initials>
+    <remark>Simplified, even though it loses some flexibility. Should be the final version.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-07-24</date>
+    <initials>at</initials>
+    <remark>Added feedback, still needs serious Schema work</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-06-28</date>
+    <initials>at</initials>
+    <remark>Initial version</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p>This proposal standardizes the use of graphical emoticons and "genicons" in Jabber IM clients to prevent confusion and competing conventions that will soon arise, enabling client developers to spend their energy on more important parts of their projects.</p>
+  <p><link url="http://www.wikipedia.com/wiki/Emoticon">Emoticons</link> are the text string 'smiley' or 'frowny' faces such as <tt>:-)</tt> and <tt>:-(</tt> that people often use in email or instant messaging to represent emotions. Genicons are a term being coined here to mean non-emotive text pictures (often called '<link url="http://www.wikipedia.com/wiki/Ascii+Art">ASCII Art</link>') that serve to replace typing the full word or to simply be cute or creative in the conversation.</p>
+  <p>Many new Internet users demand graphical emoticon and genicon support in their IM clients. We should satisfy their needs if we ever wish to see them use Jabber instead of another IM system.</p>
+  <p>While traditionally emoticons and genicons have been typed and displayed as text, the recent trend of using graphics, and sometimes sounds, instead of text to represent these pictures will be assumed for purposes of this proposal. Also, the term "icon" will be used in place of "emoticon" and "genicon" for purposes of convenience.</p>
+</section1>
+
+<section1 topic='Requirements'>
+  <p>The following issues must be solved for in this specification.</p>
+  <ul>
+    <li><b>Here and Now</b>: The convention should not rely on technologies such as feature negotiation or generic pub/sub which do not exist yet in Jabber in order to work properly. The convention should be a "here and now" solution, relying only on the current Jabber protocol.</li>
+    <li><b>Meaningful</b>: The convention for creating the icons must be meaningful to users of clients without icon support, or even users on the other side of transports. Whatever method is used, it should not be cryptic or difficult to understand in text-only mode, in case the user does not have or want the capability to view the icons.</li>
+    <li><b>Component Friendly</b>: In order for gateways, bots, and other "semi-intelligent" components to be able to convert or otherwise use the specification (such as to and from the MSN icon style, or use icons in conversations with Artificially Intelligent bots), a specific list of icons must be possible. Since these bots do not have an intelligent human behind them deciding their every action, they cannot deal with unlimited possibilities.</li>
+    <li><b>Protect Privacy</b>: Sender-defined external data must not be required to properly display the icons because it can be used by the sender to track the user, circumventing their privacy. When the sender can define their own graphics or sounds to be used for the icons, they can use unique URLs and monitor when these unique URLs are accessed. External data may be allowed as long as it is not required for proper use of the icons, but it would be best to leave external data completely out of the system.</li>
+    <li><b>Conserve Bandwidth</b>: The amount of markup used within the messages to define the icons should be kept to a minimum, as well as keeping the media files used for the icons from being transferred over the wire with the messages themselves. These easily consume too much bandwidth, a precious resource to most of the Internet.</li>
+    <li><b>Be Passive</b>: The convention should not force transports or recipients to take any action to properly display the icons. Not only does it put extra strain on the components, but it would also unnecessarily break old clients. Transports and recieving clients may have the option of taking some actions, but they should not be forced to.</li>
+    <li><b>Internationalization</b>: The convention must be inherently international in order to ease adoption of Jabber throughout the world and prevent later growing pains. The use of English must be kept to a minimum, restricted to "meta information" about the icons themselves, and must dynamically allow for non-English language sets.</li>
+  </ul>
+  <p>Because icons in Jabber should be easy to use, extensible, and customizable, they will be created using style definition files which can be exchanged between users and supporting clients. The specification will not allow external data, in order to protect the privacy of users, and will not rely on file transfers or directory services in order to not break old clients or components.</p>
+</section1>
+
+<section1 topic='Discovery'>
+  <p>To find out if an entity supports Jabber Icon Styles, look for the feature category of <tt>http://jabber.org/protocol/icon-styles</tt> using <tt>jabber:iq:browse</tt> or <tt>http://jabber.org/protocol/disco</tt>. The same feature category can be used with feature negotiation.</p>
+</section1>
+
+<section1 topic='Specification'>
+  <p>Because icons in Jabber should be easy to use, extensible, and customizable, they will be created using style definition files which can be exchanged between users and supporting clients. The specification will not require external data, in order to protect the privacy of users, and will not rely on file transfers or directory services in order to not break old clients or components. How these icon styles are exchanged - as well as advertised - is out of the scope of this specification. The text strings representing the icons will be sent like any other text (this JEP doesn't require extra tags or attributes in the messages being sent).</p>
+  <p>All icons are created by defining each icon then grouping them together into "Icon Definition Files". These files, along with the object files associated with the icons, are called "icon styles". Icon styles may be traded and shared among users of all supporting clients like skins or themes, similar to WinAmp, XMMS, GNOME, and other customizable applications. This creates a platform-independent system, providing a great degree of customization for the user, and allowing client developers to focus on other features.</p>
+
+  <section2 topic="Definition File">
+    <p>Each icon in a style is defined and grouped together in an XML document, the "Icon Definition File". Each definition file for all styles is named "icondef.xml". There is only one such Icon Definition File per style. The W3C Schema for the Icon Definition File plus an example finished Icon Definition File can be found under Schema, below.</p>
+  </section2>
+
+  <section2 topic="Meta Elements">
+    <p>The meta elements contain information about the Icon Style itself, rather that the individual icons. They are contained within the <tt>&lt;meta&gt;</tt> element, which is directly under the root element. There is one and only one the <tt>&lt;meta&gt;</tt> element.</p>
+    <ul>
+      <li><b>Name</b>: This is an arbitrary text string (spaces allowed) which is the full name of the Icon Style. Only one name can be included.</li>
+      <li><b>Version</b>: This is an arbitrary text string (no spaces allowed) which is the version number of the Icon Style. Any version format is allowed, but the <tt>major.minor</tt> or <tt>major.minor.trivial</tt> formats are recommended. Only one version can be included.</li>
+      <li><b>Description</b>: This is the full description of the Icon Style. It summarizes the look and types of the icons, and can be used for keywords in searching. This is optional, but recommended.</li>
+      <li><b>Author</b>: This is the full name of the author. Multiple authors are allowed.</li>
+      <li><b>Creation</b>: This is the date of the creation of this version of the Icon Style. The date is in the <link url="http://www.w3.org/TR/NOTE-datetime">ISO 8601</link> standard format.</li>
+      <li><b>Home</b>: This is the full HTTP web address of the Icon Style's homepage. This is optional.</li>
+    </ul>
+  </section2>
+
+  <section2 topic="Text Strings">
+    <p>The <tt>&lt;text/&gt;</tt> element defines what text string(s) are recognized by the client as an icon. There may be multiple <tt>&lt;text/&gt;</tt> elements in an <tt>&lt;icon/&gt;</tt>, such as for different languages or simply for multiple text strings producing the same result (for example: <tt>:-)</tt> and <tt>:)</tt>)</p>
+
+    <section3 topic="Internationalization">
+      <p>Each may have an <tt>xml:lang</tt> attribute, as defined in Section 2.12 in the official <link url="http://www.w3.org/TR/REC-xml#sec-lang-tag">XML 1.0 reference document</link>. The <tt>xml:lang</tt> attribute allows for two-letter language codes, dialects, and custom "languages" to define foreign IM protocols, for example.</p>
+    </section3>
+
+    <section3 topic="Whitespace">
+      <p>In order to be more accurate in recognizing text strings intended to be icons from those that are just coincidences in normal conversation, the client should follow the "whitespace rule" of making sure there is some form of whitespace on at least one side of the text string. This is only a guideline; individual clients can implement different rules as needed. A newline and tabs count as whitespace in addition to spaces. This is to make sure that chunks of code and URIs are not accidentally converted into graphical pictures. Also, text strings cannot include newlines or tabs. All characters must be on the same line with only spaces within the string, and extra spaces should not be ignored. This is to make it much easier on text parsers looking for these text strings.</p>
+    </section3>
+
+    <section3 topic="Case Sensitivity">
+      <p>The text strings must be case sensitive. This is a rule that compliant clients must follow. "Cat" cannot be used in place of "cat" or "CAT". All three are separate text strings, and therefore must have separate <tt>&lt;text/&gt;</tt> elements, although they may of course use the same objects.</p>
+    </section3>
+  </section2>
+
+  <section2 topic="Objects">
+    <p>The <tt>&lt;object/&gt;</tt> element defines what multimedia objects are inserted into the displayed message, replacing the text string(s) defined in <tt>&lt;text/&gt;</tt>. An object may be a bitmap graphic, vector graphic, audio clip, rich text formatting rules, or any other media that can be stored in a separate file. The <tt>&lt;object/&gt;</tt> element is identical to <link url="http://www.w3.org/TR/2003/WD-xhtml2-20030131/mod-object.html#s_objectmodule">the OBJECT element used in XHTML 2.0</link>, and the specification used there should be used to govern the <tt>&lt;object/&gt;</tt> element here. Note that because the XHTML 2.0 OBJECT specification is quite complex (although very flexible and future-proof), client developers are encouraged to only implement compliant sub-sets of the OBJECT specification for their clients. There may be one or multiple <tt>&lt;object/&gt;</tt> elements in an <tt>&lt;icon/&gt;</tt>, such as for alternative file formats (such as <tt>
+ GIF</tt> vs. <tt>PNG</tt>), or multiple objects to use at the same time (such as graphic and sound files).</p>
+  </section2>
+
+  <section2 topic="X Tags">
+    <p>The <tt>&lt;x/&gt;</tt> element allows any type of extensions to the <tt>icondef.xml</tt> file, such as to specify how the user's nickname can be colored in multi-user chat windows or defining additional data about the style or authors. Each must have an <tt>xmlns</tt> attribute with a namespace that the extension operates under. Multiple <tt>&lt;x/&gt;</tt> elements may be in the <tt>&lt;icon/&gt;</tt> or <tt>&lt;icondef/&gt;</tt> elements. This functionality is optional for clients to support, and clients should ignore all extensions they do not understand.</p>
+  </section2>
+
+  <section2 topic="Hierarchy">
+    <p>The <tt>icondef.xml</tt> file must all be located in the root directory, which is named after the style and version (example: <tt>./happy_days-1.2</tt> or <tt>./gold_angelic-1.0.0</tt>). There is only one root directory per style. The object files may either be in the root directory as well, or be in sub-directories for categorization and easier maintenance reasons. If sub-directories are used, they must match the URIs used in the <tt>&lt;object/&gt;</tt> element in the <tt>icondef.xml</tt> file.</p>
+
+<example caption="Gold Angelic v1.0.0 Hierarchy Example">
+./gold_angelic-1.0.0
+./gold_angelic-1.0.0/icondef.xml
+./gold_angelic-1.0.0/alert.ogg
+./gold_angelic-1.0.0/red-exclamation-mark.svg
+./gold_angelic-1.0.0/shocked.svg
+./gold_angelic-1.0.0/woman.svg
+./gold_angelic-1.0.0/pngs/happy.png
+./gold_angelic-1.0.0/pngs/sad.png
+./gold_angelic-1.0.0/pngs/man.png
+./gold_angelic-1.0.0/pngs/woman.png
+./gold_angelic-1.0.0/wavs/boohoo.wav
+./gold_angelic-1.0.0/wavs/choir.wav
+./gold_angelic-1.0.0/wavs/alert.wav
+</example>
+  </section2>
+
+  <section2 topic="Packaging">
+    <p>The <tt>icondef.xml</tt> file and all object files must be packaged in the <tt>ZIP</tt> format following the above hierarchy (the directory must exist in the package, with all files in it). The package must have the file extension <tt>.jisp</tt> (Jabber Icon Style Package), and the MIME type <tt>application/vnd.jisp</tt> as defined in the official <link url="http://www.iana.org/assignments/media-types/application/vnd.jisp">IANA registration</link>. This allows Jabber clients to automatically install icon styles through web browsers. When the client installs the package, it should probably be kept in the archived format, instead of unzipped. This not only saves disk space, but also makes the packages easier to manage and exchange.</p>
+  </section2>
+</section1>
+
+<section1 topic='Implementation Notes'>
+  <p>Icons styles should be easy to create, distribute, and most importantly, use. The packaging and official MIME type helps with the first steps, but it is ultimately up to the client developers to fully support the specification and make sure it is easy for users to manage.</p>
+
+   <section2 topic='Procedure'>
+     <p>The procedure for using Jabber icons is simple and straightforward.</p>
+     <ol>
+       <li>The user installs and turns on ("activates") an icon style (using their client's GUI, most likely) they have received off the Internet or somewhere else.</li>
+       <li>The user selects the desired icon they wish to include in their message from their client's GUI (a drop-down list of installed icons, for example).</li>
+       <li>The client translates the selected icon into its main text string equivelent, which is found in the icon's <tt>&lt;text&gt;</tt> element. If there are multiple <tt>&lt;text&gt;</tt> elements, follow the procedure under "Text Strings", below.</li>
+       <li>The client sends the message with the text string to the intended recipient.</li>
+       <li>The recipient client receives the message with the text string.</li>
+       <li>If the recipient has an icon style activated that defines that text string, it is converted into the appropriate object. If there are multiple objects files for each icon, follow the procedure under "Object Files", below. If there are multiple icon styles installed which define that text string, follow the procedure under "Combining Styles", below. If the recipient does not have such an icon activated, then they simply see the text string without any changes.</li>
+     </ol>
+   </section2>
+
+  <section2 topic='Text Strings'>
+    <p>Because icons may have multiple text strings associated with them, clients need to be able to figure out which one to use when a user selects the desired icon from their GUI. This is ultimately completely up to the implementation, but here is a suggestion:</p>
+    <ol>
+      <li>First look for any text strings that are the same language as what the user is using (if the user is using english, then look for English text strings, ignoring languages like German or Simplified Chinese). Optionally, if the client is smart enough, it can instead look for text strings in the language that the intended recipient is using (using Browse/Disco or simply keeping track of languages used in an ongoing conversation). The language for text strings is found in the <tt>xml:lang</tt> attribute for <tt>&lt;text/&gt;</tt> elements.</li>
+      <li>If there are no text strings that match the user's language, then look for one that has no defined language.</li>
+      <li>If there are multiple options even after the above steps, select the one that comes first in the <tt>&lt;icon/&gt;</tt> element.</li>
+      <li>If there are no text strings that are in the user's language or no language defined at all, then it is probably best for the client to not even display the icon as a choice at all. But if the client still wants to allow it, then simply select the text string of any language that comes first in the <tt>&lt;icon/&gt;</tt> element.</li>
+    </ol>
+  </section2>
+
+  <section2 topic='Objects'>
+    <p>Like multiple text strings, icons can have multiple object data files associated with them, and therefore clients also need to be able to figure out which ones to use when a user selects the desired icon from their GUI. Here is a suggestion of how those files can be chosen among multiple options, although this is completely an implementation issue (as with multiple text strings).</p>
+    <ol>
+      <li>First look for any of these objects that are of MIME types the client can understand and use. For example, most clients could only use <tt>image/bmp</tt> and maybe <tt>audio/x-wav</tt>, but some newer clients may be able to support <tt>image/png</tt>, <tt>image/svg+xml</tt> and <tt>audio/x-ogg</tt>.</li>
+      <li>If there are still multiple object MIME types which the client can understand and use, then the client should rank the MIME types it can support, choosing its favorite.</li>
+      <li>If there are still multiple objects of the same MIME type, then the client should choose the first one in order in the <tt>&lt;icon/&gt;</tt> element.</li>
+      <li>If there are no files of any MIME type the client can understand, then it should ignore using any objects or even the entire icon.</li>
+    </ol>
+    <p>The <link url="http://www.w3.org/TR/2003/WD-xhtml2-20030131/mod-object.html#sec_14.1.3.">Rules for processing objects</link> in the XHTML 2.0 OBJECT specification may also be of help in coding the procedure of choosing an object to use, especially when it comes to nested and author-preferred objects.</p>
+    <p>The client should also take note of the file sizes. The client should set (possibly as a user-defined option) the maximum file size in kilobytes for object files. Anything above this amount implies the file will be too big to properly render, and the icon style developer is probably being abusive.</p>
+    <p>Also, if you are developing an icon style, please make sure the MIME types specified in your <tt>icondef.xml</tt> file are correct. And also make sure that the files you use are reasonable in any byte, pixel, and timelength size. And although any file format can be supported, try to use <tt>BMP</tt>, <tt>PNG</tt>, <tt>SVG</tt>, <tt>WAV</tt>, <tt>OGG</tt> formats because they are open, free, and becoming increasingly supported in developer tools and programming languages.</p>
+  </section2>
+
+  <section2 topic='Combining Styles'>
+    <p>A client may permit the user to activate multiple icon styles at one time. This would be useful for styles which make use of different text strings, and the user wants them all. The client should force the user to rank the multiple styles for purposes of conflict resolution between icons. The highest ranking style gets preference over lower ranking styles. This ranking doesn't have to be anything more than simply dragging the style names into top-to-bottom rows, with the styles on top being higher ranked than those below.</p>
+  </section2>
+
+  <section2 topic='Core Icons'>
+    <p>Although any text string can be turned into an icon by defining it in an <tt>icondef.xml</tt> file, it is highly reccomended they either follow traditional ASCII Art (smileys and frownys, for example) or full keywords in simple markup such as double-colons. If you want to design icons, always keep in mind that not every Jabber user uses graphics to "translate" this to something visual, as explained in the "Meaningful" requirement, above. Here is a short list of recommended "core" icons that should be in most definitions, as well as possibly be used by transports:</p>
+    <ul>
+      <li><b>:-)</b> and <b>:)</b> - A smiling face.</li>
+      <li><b>:-(</b> and <b>:(</b> - A frowing face.</li>
+      <li><b>;-)</b> and <b>;)</b> - A winking smiling face.</li>
+      <li><b>:'-(</b> and <b>:'(</b> - A crying face.</li>
+      <li><b>>:-(</b> and <b>>:(</b> - An angry face.</li>
+      <li><b>:yes:</b> - A thumbs-up or checkmark.</li>
+      <li><b>:no:</b> - A thumbs-down or a crossmark.</li>
+      <li><b>:wait:</b> - An open hand, palm outstretched.</li>
+      <li><b>@->--</b> and <b>:rose:</b> - A rose flower.</li>
+      <li><b>:telephone:</b> - A telephone.</li>
+      <li><b>:email:</b> - An electronic-looking envelope.</li>
+      <li><b>:jabber:</b> - Jabber's lightbulb logo.</li>
+      <li><b>:cake:</b> - A birthday cake.</li>
+      <li><b>:kiss:</b> - A pair of puckered lips.</li>
+      <li><b>:heart:</b> and <b>:love:</b> - A heart.</li>
+      <li><b>:brokenheart:</b> - A broken heart.</li>
+      <li><b>:music:</b> - A musical note or instrument.</li>
+      <li><b>:beer:</b> - A beer mug.</li>
+      <li><b>:coffee:</b> - A cup of coffee.</li>
+      <li><b>:money:</b> - A gold coin.</li>
+      <li><b>:moon:</b> - A moon.</li>
+      <li><b>:sun:</b> - A sun.</li>
+      <li><b>:star:</b> - A star.</li>
+    </ul>
+  </section2>
+</section1>
+
+<section1 topic='Security Considerations'>
+  <p>There are no security features or concerns related to this proposal.</p>
+</section1>
+
+<section1 topic='IANA Considerations'>
+  <p>The JSF shall register and maintain a MIME type and file extension for icon style packages with the IANA. Ones have already been registered by Sebastiaan Deckers (aka 'CBAS') as <tt>application/vnd.jisp</tt> and <tt>.jisp</tt>, respectively. The registration can be found at <link url="http://www.iana.org/assignments/media-types/application/vnd.jisp">http://www.iana.org/assignments/media-types/application/vnd.jisp</link>. Sebastiaan's registration shall be considered the official MIME type and file extension of this specification.</p>
+  <p>Also, this specification uses other MIME types that are maintained by IANA for the object and xml files that are included in the icon style packages.</p>
+</section1>
+
+<section1 topic='Jabber Registrar Considerations'>
+  <p>JANA shall register the namespace <tt>http://jabber.org/protocol/icon-styles</tt> as an official feature category.</p>
+  <p>Also, JANA may choose to define IM-specific <tt>xml:lang</tt> "language codes" for use within Jabber (in addition to those defined in the XML specification). Such language codes would allow Jabber developers to support icons from MSN, Yahoo, and popular web message programs.</p>
+</section1>
+
+<section1 topic='Formal Definition'>
+  <section2 topic='Schema'>
+    <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="icondef">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="name" type="xs:string"/>
+            <xs:element name="version" type="xs:string"/>
+            <xs:element name="description" type="xs:string"/>
+            <xs:element name="author" type="xs:string" maxOccurs="unbounded">
+              <xs:complexType>
+                <xs:attribute name="jid" type="xs:string" use="optional"/>
+              </xs:complexType>
+            </xs:element>
+            <xs:element name="creation" type="xs:date"/>
+          </xs:sequence>
+        </xs:complexType>
+        <xs:element name="icon" minOccurs="1" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="text" type="xs:string" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="xml:lang" type="xs:language" use="optional"/>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="object" type="xs:string" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="mime" type="xs:string" use="required"/>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="x" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="xmlns" type="xs:anyURI" use="required"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="x" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:attribute name="xmlns" type="xs:anyURI" use="required"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
+    ]]></code>
+  </section2>
+
+  <section2 topic="icondef.xml file example">
+    <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+  <meta>
+    <name>Gold Angelic</name>
+    <version>1.0.0</version>
+    <description>Angelic faces and themes with gold highlights.</description>
+    <author jid="theo@theoretic.com">Adam Theo</author>
+    <author jid="cbas@rhymbox.com">Sebastiaan Deckers</author>
+    <author jid="cobnet@jabber.org">Mattias Campe</author>
+    <creation>2002-10-31</creation>
+    <home>http://icon-styles.jabberstudio.org/Gold_Angelic</home>
+  </meta>
+  <icon>
+    <text>:-)</text>
+    <text>:)</text>
+    <object mime="image/png">happy.png</object>
+    <object mime="audio/x-wav">choir.wav</object>
+  </icon>
+  <icon>
+    <text>:-(</text>
+    <text>:(</text>
+    <object mime="image/png">sad.png</object>
+    <object mime="audio/x-wav">boohoo.wav</object>
+  </icon>
+  <icon>
+    <text>:-O</text>
+    <text>:O</text>
+    <object mime="image/svg+xml">shocked.svg</object>
+  </icon>
+  <icon>
+    <text xml:lang="en">::man::</text>
+    <text xml:lang="de">::mann::</text>
+    <text xml:lang="cs">::muz::</text>
+    <text xml:lang="x-msn">(z)</text>
+    <object mime="image/png">man.png</object>
+  </icon>
+  <icon>
+    <text xml:lang="en">::woman::</text>
+    <text xml:lang="x-msn">(x)</text>
+    <object mime="image/svg+xml">woman.svg</object>
+    <object mime="image/png">woman.png</object>
+  </icon>
+  <icon>
+    <text xml:lang="en">::alert::</text>
+    <object mime="image/svg+xml">red-exclamation-mark.svg</object>
+    <object mime="audio/x-ogg">alert.ogg</object>
+    <object mime="audio/x-wav">alert.wav</object>
+  </icon>
+</icondef>
+    ]]></code>
+  </section2>
+</section1>
+
+<section1 topic='Future Considerations'>
+  <ol>
+    <li>This proposes a standard, simple, plaintext-based icon convention. It does not attempt to create a powerful XML-based convention wherein XML tags are used to extensibly represent the icons. However, this proposal isn't exclusive, and does not prevent such an XML-based convention from being created at a later date. It may also be possible to build such an extensible XML-based convention on top of this plaintext one.</li>
+    <li>The Icon Styles that the sender used to create the message may be of use to the recipient. A separate specification can be developed for the transferring of the name and version of the Icon Styles used by the sender. The recipient's client may then be smart enough to automatically use the same icons as the sender intended, possibly even fetching and downloading the icon styles as needed. This would likely require directory services, so has not been included in this proposal.</li>
+    <li>The functionality of the <tt>icondef.xml</tt> files may be useful for variable text strings. Text strings that may change from session to session, such as the user's nickname in a multi-user chat. A set of variables could be defined that represent these variable datas, therefore allowing them to be manipulated in the same way set text strings are.</li>
+    <li>This convention may be adopted beyond the scope of Jabber into web browsers, email clients, and Wiki sites. There is great potential for a generalized, exchangeable convention for emoticons and genicons.</li>
+    <li>A "SVG Transport" may be created to enable clients to send <tt>SVG</tt> icons to it and get back icons in another format of their choice, such as <tt>PNG</tt> or <tt>JPG</tt>. This would speed up the adoption of <tt>SVG</tt> within Jabber greatly.</li>
+    <li>An online Web- (or even Jabber-) based editor to create icon style packages from the individual components would be a great tool for developers. This would be a great project for <link url="http://www.jabberstudio.org">JabberStudio</link> or even the <link url="http://www.theoretic.com/Ransom">Ransom model</link>.</li>
+  </ol>
+</section1>
+
+</jep>
+
+
+
+
diff --git a/xep-0039.xml b/xep-0039.xml
new file mode 100644
index 00000000..d1d40fda
--- /dev/null
+++ b/xep-0039.xml
@@ -0,0 +1,426 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+  <header>
+    <title>Statistics Gathering</title>
+    <abstract>A protocol to enable gathering statistics from Jabber servers and components.</abstract>
+    &LEGALNOTICE;
+    <number>0039</number>
+    <status>Deferred</status>
+    <type>Standards Track</type>
+    <jig>Standards</jig>
+    <author>
+      <firstname>Paul</firstname>
+      <surname>Curtis</surname>
+      <email>pcurtis@terrapin.com</email>
+      <jid>pcurtis@www.terrapin.com</jid>
+    </author>
+    <author>
+      <firstname>Russell</firstname>
+      <surname>Davis</surname>  
+      <email>ukscone@burninghorse.com</email>
+      <jid>ukscone@burninghorse.com</jid>
+    </author>
+    <author>
+      <firstname>Ryan</firstname>
+      <surname>Eatmon</surname>
+      <email>reatmon@jabber.org</email>
+      <jid>reatmon@jabber.org</jid>
+    </author>
+    <author>
+      <firstname>David</firstname>
+      <surname>Sutton</surname>
+      <email>dsutton@legend.co.uk</email>
+      <jid>peregrine@legend.net.uk</jid>
+    </author>
+    <revision>
+      <version>0.6.0</version>
+      <date>2002-11-05</date>
+      <initials>rkd</initials>
+      <remark>Corrected David Sutton's JID and email. It has been pointed out
+	to me by amoungst others Rob Norris that things such as lists of JIDs 
+	and lists in general are really the province of disco and browse and 
+	that at least one of the suggested 'core' statistics doesn't 
+	make sense for all components so removed these from the JEP. This namespace
+	was starting to become a generic data gathering namespace and we already 
+	have one of those, so i've reworked yet again hopefully for the 
+	final time it should now be simpler to implement and more consistent in
+	all cases.</remark>
+    </revision>    
+    <revision>
+      <version>0.5.0</version>
+      <date>2002-11-03</date>
+      <initials>rkd</initials>
+      <remark>Heavily modified JEP according to suggestions from Matt Miller (linuxwolf). rkd had some additional thoughts on the name attribute, this version reflects those. Reorganized the description section.</remark>
+    </revision>    
+    <revision>
+      <version>0.4.2</version>
+      <date>2002-10-25</date>
+      <initials>rkd</initials>
+      <remark>Changed rkd's email address and jid. Modified namespace to use http uri.</remark>
+    </revision>    
+    <revision>
+      <version>0.4.1</version>
+      <date>2002-08-20</date>
+      <initials>rkd</initials>
+      <remark>Corrected error codes</remark>
+    </revision>    
+    <revision>
+      <version>0.4</version>
+      <date>2002-08-18</date>
+      <initials>rkd</initials>
+      <remark>Fixed two silly typos that crept back in. Rewrote SNMP
+      to read better. Added the DTD</remark>
+    </revision>    
+    <revision>
+      <version>0.3</version>
+      <date>2002-08-16</date>
+      <initials>rkd</initials>
+      <remark>Added &lt;display/&gt; so a server or component may
+      optionally return data in a human readable format. It is nothing
+      more than a bit of visual fluff but it has potential to be quite
+      useful. Renumbered the revisions to allow room for stpeter's new 
+      JEP numbering scheme, sorry if it is now confusing but I hadn't 
+      left much room to grow with the previous revision numbering. A 
+      little more prettying and judicious use of punctuation has occurred.</remark>
+    </revision>
+    <revision>
+      <version>0.2.2</version>
+      <date>2002-08-15</date>
+      <initials>rkd</initials>
+      <remark>Fixed some typos and generally prettied up</remark>
+    </revision>
+    <revision>
+      <version>0.2.1</version>
+      <date>2002-08-14</date>
+      <initials>rkd</initials>
+      <remark>I seem to have misunderstood one of Ryan Eatmon's
+      suggestions and didn't make this generic enough. I have  
+      fixed that now. Clarified error codes and reworked how errors
+      are indicated to work with the new generic
+      namespace. Rearranged the order of the sections a bit make this
+      JEP a more linear read.</remark>
+    </revision>
+    <revision>
+      <version>0.2</version>
+      <date>2002-08-13</date>
+      <initials>rkd</initials>
+      <remark>Complete reworking to take into account suggestions made
+      by Ryan Eatmon and others. Ryan Eatmon added to list of authors to
+      reflect his significant contribution to the current form of this
+      JEP. I have also received a few comments that this document
+      previously read like an IETF document. Whether that was a good or
+      bad thing I was unable to ascertain but I've tried to lighten the
+      tone a little.</remark>
+    </revision>
+    <revision>
+      <version>0.1.5</version>
+      <date>2002-07-23</date>
+      <initials>rkd</initials>
+      <remark>Changed data returned by &lt;who/&gt; as per comments by
+      psa</remark>
+    </revision>
+    <revision>
+      <version>0.1.4</version>
+      <date>2002-07-23</date>
+      <initials>rkd</initials>
+      <remark>Converted to XML as per JEP spec in preparation for
+      submission as experimental JEP.</remark>
+    </revision>
+    <revision>
+      <version>0.1.3</version>
+      <date>2002-07-23</date>
+      <initials>rkd</initials>
+      <remark>A numeric values unit type is now returned using an attribute
+      "units" rather than specifying that it be returned in the smallest
+      sensible unit type to produce an unsigned integer.</remark>
+    </revision>
+    <revision>
+      <version>0.1.2</version>
+      <date>2002-07-23</date>
+      <initials>rkd</initials>
+      <remark>Justify inclusion of the 501 (Not Implemented) error code
+      as per comments by Zion</remark>
+    </revision>
+    <revision>
+      <version>0.1.1</version>
+      <date>2002-07-22</date>
+      <initials>rkd</initials>
+      <remark>Fixed some typos</remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2002-07-21</date>
+      <initials>rkd</initials>
+      <remark>Initial version.</remark>
+    </revision>
+    <dependencies>JEP-0053 (JANA)</dependencies>
+  </header>
+  <section1 topic='Introduction'>
+    <p>As things currently stand it is not possible to obtain statistics
+    from a jabber component or server without resorting to parsing the 
+    various log files. This makes it extremely difficult to obtain statistics 
+    that are of any use in real world situations. This JEP attempts to 
+    rectify this situation by defining a new namespace that would be used 
+    to obtain statistics from a component or server so that they may be 
+    manipulated and used in a useful manner. For the purposes of this namespace
+    a statistic is anything that maybe expressed in a numeric form, such as the
+    uptime of a server, the <strong>number</strong> of registered users and the
+    number of packets sent. Things such as a list of currently online users or
+    a list of registered users are beyond the scope of this namespace and
+    properly belong within browse or disco.</p>
+  </section1>
+  <section1 topic='Description'>
+    <section2 topic='Namespace'>
+      <p>This is a pretty simple namespace. It consists of a &lt;stat/&gt; tag with
+	three attributes. name, units and value.</p>
+      <code>
+      &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+        &lt;stat name='' units='' value=''/&gt;
+      &lt;/query&gt;
+      </code>
+      <p> There is one variation in the	case of an error invalidating one or 
+	more errors in a single returned query that does not actually
+	invalidate the whole query.</p>
+      <code>
+      &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+        &lt;stat name=''&gt;&lt;error code=''&gt;...&lt;/error&gt;&lt;/stat&gt;
+      &lt;/query&gt;
+      </code>
+    </section2>
+    <section2 topic='Name Attribute'>
+      <p>The name of the statistic. The format for this attribute is the
+	generic statistic type such as bandwidth, users, time etc. followed by
+	a '/' character and then then the name of the actual statistic. For 
+	example bandwidth/packets-in, time/uptime and users/online. This will 
+	be assigned and administered by JANA<note>See Name Registration</note>.</p>
+    </section2>
+    <section2 topic='Units Attribute'>
+      <p>This is the units type of the statistic. As with the name attribute it
+        will be assigned and administered by JANA<note>See Name
+        Registration</note>It is suggested that JANA use where appropriate
+        commonly accepted international standards when assigning unit types
+	i.e. seconds, grams, meters, bytes etc.</p>
+    </section2>
+    <section2 topic='Value Attribute'>
+      <p>This is the actual returned value of the queried statistic. The value returned is in
+	multiples of the unit described by the units attribute.</p>
+    </section2>
+    <section2 topic="Query">
+      <p>To query a component or server a client sends an iq packet of
+      the type 'get' to the component or server. The component or
+      server responds with the <em>list</em> of statistics that it supports.</p>
+
+      <example>
+      send:     &lt;iq type='get' to='component'&gt;
+	          &lt;query xmlns='http://jabber.org/protocol/stats'/&gt;
+                &lt;/iq&gt;
+      
+
+      recv:     &lt;iq type='result' from='component'&gt;
+                  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+	            &lt;stat name='time/uptime'/&gt;
+	            &lt;stat name='users/online'/&gt;
+	                  .
+	                  .
+	                  .
+	            &lt;stat name='bandwidth/packets-in'/&gt;
+	            &lt;stat name='bandwidth/packets-out'/&gt;
+	          &lt;/query&gt;
+                &lt;/iq&gt;
+      </example>
+      <p>Once a client knows which statistics a component or server
+      supports it may now request the actual statistics by sending an iq
+      packet of the type 'get' containing a request for the specific
+      statistics and sending that to the component or server.</p>
+
+      <example>
+      send:     &lt;iq type='get' to='component'&gt;
+                  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+	            &lt;stat name='time/uptime'/&gt;
+	            &lt;stat name='users/online'/&gt;
+	            &lt;stat name='bandwidth/packets-in'/&gt;
+	            &lt;stat name='bandwidth/packets-out'/&gt;
+	          &lt;/query&gt;
+                &lt;/iq&gt;
+
+
+      recv:     &lt;iq type='result' from='component'&gt;
+                  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+                    &lt;stat name='time/uptime' units='seconds'	value='3054635'/&gt;
+	            &lt;stat name='users/online' units='users' value='365'/&gt;
+	            &lt;stat name='bandwidth/packets-in' units='packets' value='23434'/&gt; 
+	            &lt;stat name='bandwidth/packets-out' units='packets' value='23422'/&gt;      
+                  &lt;/query&gt;
+                &lt;/iq&gt;
+      </example>
+
+    </section2>
+    <section2 topic='Errors'>
+      <p>If an error occurs with one or more of the requests for
+      statistics the component or server should return one of the 
+      following error codes.</p>
+      <table caption='Error Codes'>
+        <tr><th>Code</th><th>String</th><th>Reason</th></tr>
+        <tr><td>401</td><td>Unauthorized</td><td>Querying JID is not
+        authorized to perform that query</td></tr>
+	<tr><td>404</td><td>Not Found</td><td>The statistic was not
+	found for some reason</td></tr>
+        <tr><td>501</td><td>Not Implemented</td><td>Although statistic
+        is advertised as available it has not been implemented</td></tr>
+        <tr><td>503</td><td>Service Unavailable</td><td>Statistic is
+        temporarily unavailable</td></tr>
+      </table>
+
+   
+      <p>Because we wish to be able to collect groups of statistics
+      within a single returned packet errors must be handled in a two
+      tier way with authorization and core errors that would render 
+      <strong>all</strong> the statistics meaningless being indicated 
+      with a type='error' in the returned packet.</p>
+
+      <example>
+        &lt;iq type='error' from='component'&gt; 
+          &lt;query xmlns='http://jabber.org/protocol/stats'&gt;  
+            &lt;error code='401'&gt;Not Authorized&lt;/error&gt;
+          &lt;/query&gt;
+        &lt;/iq&gt;
+      </example>
+
+      <p>Errors in a query that only invalidate one or more of the
+      requested statistics are indicated with an &lt;/error&gt; tag
+      embedded inside the &lt;/stat&gt; tag.
+      </p>
+
+      <example>
+        &lt;iq type='result' from='component'&gt;
+          &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+            &lt;stat name='time/uptime units='seconds' value='4534'/&gt;
+	    &lt;stat name='bandwidth/packets-in'&gt;&lt;error code='503'&gt;Service Unavailable&lt;/error&gt;&lt;/stat&gt;
+            &lt;stat name='bandwidth/packets-out'&gt;&lt;error code='503'&gt;Service Unavailable&lt;/error&gt;&lt;/stat&gt;
+          &lt;/query&gt;
+        &lt;/iq&gt;
+      </example>
+    </section2>
+  </section1>
+  <section1 topic='Implementation'>
+    <section2 topic='Name Registration'>
+      <p>All statistic names, returned data units types and other
+	pertinent statistic information will be assigned and registered with
+	the Jabber Naming Authority in the category <em><strong>stat</strong></em>. 
+	Unfortunately at this time such a body does not exist so we will 
+	have to rely on component and server authors diligently
+	researching to ensure that their desired name is not already 
+	in use and that they adequately document the returned units
+	type and anything else that would normally be registered. 
+	Hopefully by the time this JEP is formally adopted
+	a central naming authority for the Jabber protocol will be in
+	place and functional and authors will be then able to register
+	their names.
+      </p>
+      <table caption='how to document your statistic'>
+        <tr>
+	  <th>Stat</th><th>Description</th><th>Returned Units</th>
+	</tr>
+	<tr>
+	  <td>registered name</td><td>description of
+	  statistic/reason</td><td>unit type returned by
+	  query</td>
+	</tr>
+      </table>
+    </section2>
+    <section2 topic='Core Statistics'>
+      <p>
+        Although components and servers are free to support whichever statistics they
+        feel are justified for their particular component or server it is
+	suggested that the following set of three core statistics are
+	implemented by all components and servers.</p>
+
+      <ul>
+	<li>&lt;stat name='time/uptime'/&gt;</li>
+	<li>&lt;stat name='bandwidth/packets-in'/&gt;</li>
+	<li>&lt;stat name='bandwidth/packets-out'/&gt;</li>
+      </ul>
+      <table caption='core statistic registration information'>
+        <tr>
+	  <th>Stat</th><th>Description</th><th>Returned Units</th>
+	</tr>
+	<tr>
+	  <td>time/uptime</td><td>uptime of component or
+	  server</td><td>Seconds</td>
+	</tr>
+	<tr>
+	  <td>bandwidth/packets-in</td><td>packets received by component or server</td><td>packets</td>
+	</tr>
+	<tr>
+	  <td>bandwidth/packets-out</td><td>packets transmitted by component or server</td><td>packets</td>
+	</tr>
+      </table>
+    </section2>
+    <section2 topic='Human readable labels'>
+      <p>For several reasons the
+	<strong>http://jabber.org/protocol/stats</strong> namespace does not
+	support human readable labels for the returned values. Generally the
+	application querying the statistic should already know what the
+	statistic is and in what units the value is returned. However if the
+	application really wants some form of human readable label for the
+	returned value although not an optimal solution or even recommended by
+	the authors of this JEP it should be safe for
+	it to convert the value of the units attribute into a string and use
+	that as a label for the returned statistic value.</p>
+    </section2>
+    <section2 topic='Namespace query authorization'>
+      <p>In most cases the <strong>http://jabber.org/protocol/stats</strong> would be tied to the component or
+      servers admin JID so that only that JID may query the statistics
+      however there are advantages to having a three tier system where
+      some statistics are available to all JIDs, some to an arbitrary
+      JID listed in the configuration file and all available to the
+      listed admin JID. As the first case can be emulated by the
+      second I propose that when implemented the <strong>http://jabber.org/protocol/stats</strong>
+      namespace is configured to use the three tier method of
+      authorizing queries.</p>
+    </section2>
+    <section2 topic='SNMP'>
+      <p>Supporting industry accepted standards and procedures
+      <note>For more details on <link url='http://www.snmplink.org'>SNMP</link>
+      and <link url='http://www.dmtf.org'>CIM</link></note> within 
+      the Jabber protocol is highly desirable as long as it does not 
+      restrict the flexibility or functionality of Jabber. So while 
+      the <strong>http://jabber.org/protocol/stats</strong> namespace seems to fall within the domain of 
+      the SNMP and CIM standards amongst others and large jabber 
+      installations would find direct support an appealing prospect 
+      when tying jabber into their existing network information and 
+      management systems the jabber:iq:namespace will not do this. 
+      Because Jabber is an XML based protocol, conversion of 
+      the returned data to other formats including those required 
+      for SNMP, CIM etc. should be relatively simple. Not supporting
+      industry standards is not without advantages. By leaving the
+      <strong>http://jabber.org/protocol/stats</strong> as a <em>pure</em> jabber namespace we allow
+      ourselves to obtain not only commonly used statistics but also
+      some unusual ones as well. For example imagine a jabber enabled
+      vending machine, by remaining free of the encumberence and
+      limitations of SNMP etc. we can directly (if allowed by the
+      controlling component) query the fluid ounces dispensed, most
+      popular beverage and the amount of money that has been collected.
+      Finally although it is unlikely to occur by staying true to our
+      roots and avoiding direct SNMP support we avoid any possibility
+      of conflict with other network management agents such as net(ucd)-snmp.
+      </p>
+    </section2>
+  </section1>
+  <section1 topic='Realworld Examples'>
+      TBD
+  </section1>
+  <section1 topic='DTD'>
+    <section2 topic='DTD in English'>
+      TBD
+    </section2>    
+    <section2 topic='DTD'>
+      TBD
+    </section2>
+  </section1>
+</jep>
diff --git a/xep-0040.xml b/xep-0040.xml
new file mode 100644
index 00000000..534e1c5a
--- /dev/null
+++ b/xep-0040.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type="text/xsl" href="../jep.xsl"?>
+<jep>
+   <header>
+      <title>Jabber Robust Publish-Subscribe</title>
+      <abstract>Note: This proposal has been superseded by JEP-0060; please refer to that document for the successor protocol.</abstract>
+      &LEGALNOTICE;
+      <number>0040</number>
+      <status>Retracted</status>
+      <type>Standards Track</type>
+      <jig>Standards</jig>
+      <dependencies>None</dependencies>
+      <supersedes>None</supersedes>
+      <supersededby>JEP-0060</supersededby>
+      <shortname>None</shortname>
+      <author>
+         <firstname>Tim</firstname>
+         <surname>Carpenter</surname>
+         <email>tim.carpenter@in8limited.co.uk</email>
+         <jid></jid>
+      </author>
+      <revision>
+        <version>0.2</version>
+        <date>2004-07-26</date>
+        <initials>psa</initials>
+        <remark>Formally retracted this proposal in favor of JEP-0060: Publish-Subscribe.</remark>
+      </revision>
+      <revision>
+         <version>0.1</version>
+         <date>2002-08-02</date>
+         <initials>tc</initials>
+         <remark>Initial Release For Comment</remark>
+      </revision>
+   </header>
+   <section1 topic="Introduction">
+      <p><em>Note: This JEP has been superseded by &jep0060;; please refer to that document for the successor protocol.</em></p>
+      <p>This document introduces and lays out a preliminary protocol for a robust form of publish-subscribe over the Jabber messaging environment -- Jabber Robust Publish Subscribe (JRPS).</p>
+      <p>Implementation issues in the environment are appended, covering Permissioning and Contributions. Both are likely to require separate JEPs, but need to be constructed sympathetically.</p>
+      <p>In creating this addition, I have an underlying philosophy to sustain a "fractal" world of publish-subscribe components, such that a subscriber to a pubsub component may well be a pubsub component in itself, representing its own community of subscribers. This will allow Jabber to support organic scalability found on other platforms.</p>
+      <section2 topic="Background">
+         <p>Publish-Subscribe and other messaging environments that exist are often classified as providing one or more of the following three levels of service.</p>
+         <ol>
+         <li>Best Try, where data may on rare occasions get lost. Small footprints and ultimate performance are the aim where the impact of occasional data loss in business, legal, confidential or other terms is not significant compared with the core priority of performance.</li>
+         <li>Robust, where non-delivery of data can be detected and recovered by recipients and that the sequence, integrity and completeness of data can be ascertained with a high level of confidence. Non-delivery of data would have a significant and lasting negative impact on the quality and integrity of the data.</li>
+         <li>Transactional, where there is an absolute, mission-critical need to ensure that all communication flow is guaranteed and if problems occur during a set of connected steps, then the situation can be rolled back (reversed) to the state before the operation commenced.</li>
+         </ol>
+         <p>This document concerns itself with level 2 Publish Subscribe -- "Robust".</p>
+      </section2>
+      <section2 topic="Positioning">
+        <p>JRPS is required in environments where there is a higher demand for guaranteed delivery in high throughput, low latency environments where data has value and can contain business intelligence, but does not demand a full transactional (e.g. 2-phase commit) strength environment.</p>
+        <p>Such environments often exercise business logic upon data received, so the notion of updates to all or part of data, the expression of the definitive, full compliment of a particular set of related data, the correction of data in full or in part and the notification that data is no longer valid needs to be supported. The existing type="set", though very suitable in a wide range of applications, does not provide suitable granularity in all environments.</p>
+        <p>Robust environments require that a receiver can tell when data has been lost and that a receiver also has the means to request the repair of any gaps efficiently. This must be done whilst keeping delay or disruption to ongoing data flow to a minimum. Jabber does not provide the means to detect or repair gaps, and traditional ACKing of each packet is slow and costly.</p>
+        <p>It would be advantageous to permit forms of permissioning and access control upon data that has value. Such permissioning and control should not be overly burdensome on the rapid transmission of data. It should allow a suitable level of abstraction to keep changes to a data item"s expression of permission coding/level to a minimum, to avoid the need for excessive changes to such codes. Abstraction will also permit permission coding to be kept compact, as it will, in effect, be tokenised.</p>
+        <p>JRPS then requires the ability to detect and repair gaps in the stream, to provide a means to convey richer information about the nature of the data in context to what has come before and to enable the publisher to have control over who sees what.</p>
+        <p>In addition, a pubsub component should be able to provide information and parameters about its implementation of JRPS to subscribers. Subscribers must inquire about such information from the pubsub component to gain the full benefit of a JRPS service.</p>
+       <ol>
+         <li>Identify the tasks that users can't complete because we are lacking this crucial piece of protocol. (Note: users are not just IM users, but any person, system, or application that could gain value from interacting with Jabber.)</li>
+         <li>Discuss other projects or protocols and how Jabber could interface with them because of your proposed protocol enhancement (e.g., XML-RPC, SOAP, DotGNU).</li>
+         <li>Compare Jabber to "the competition" (other IM systems or other messaging protocols) and point out holes in the Jabber protocol that need to be filled in order to offer similar functionality.</li>
+         <li>Review the relevant history of thinking within the Jabber community.</li>
+       </ol>
+       <p>JRPS is a layer on Jabber Publish-Subscribe (JEP0024, JEP0036) and should interoperate with them and support namespaces and topics. Included in this document is the capability for permission tokens. It is included as the author believes that such tokens should exist within the &lt;publish&gt; tag, being a means to identify data much as the namespace or topic does.</p>
+       <p>JRPS is different from other IM systems in that the publisher and pubsub components send out the data so that downstream entities can detect if problems occur. As a comparison, a sender in, say, MSN is told that the packet they sent cannot be delivered but in JRPS, the receiver knows that a packet or packets have not been delivered and can ask for retransmissions.  The sender need not normally know about such events as the intermediate components can usually cater for it. Thus JRPS has a future in areas such as Multicasting, large distributed and proxy-based environments where the end subscribers may be very remote from the publisher.</p>
+       <p>Existing commercial middlewares provide such facilities and it is especially necessary when data is pushed between applications and may not have an obvious "context" in the stream to data immediately before or after. Thus, JRPS may seem over-the-top for a chatroom world, but is a basic requirement for, say, distributing real-time process states, events or persistent, mutable data.</p>
+     </section2>
+   </section1>
+   <section1 topic="Gap Detection And Repair">
+      <p>This can be achieved by the use of packet sequence numbering and heartbeats whilst avoiding the necessity to positively ACK each packet.</p>
+      <section2 topic="Sequence Numbering">
+         <p>Multiple levels of sequence numbers are envisaged and will be used in different circumstances. Multiple levels allow a rapid repair of short "transient" breaks whilst catering for longer breaks, recoveries and resynchronisations without placing too great a burden on either subscriber or pubsub component. This discussion explains the use of a dual sequence number environment: link and source.</p>
+         <p>Sequence numbers will be sent in each publish thus:</p>
+         <example>
+&lt;iq type="set" 
+    to="myclient@server.net"
+    from="pubsub.localhost"&gt;
+  &lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;publish ns="data topics"
+        linkseq="57372"
+        sourceseq="7547392"
+        from="publisher.fromaplace"&gt;
+    &lt;/publish&gt;
+    &lt;publish ns="data topics"
+        linkseq="57373"
+        sourceseq="44211"
+        from="publisher.elsewhere"&gt;
+    &lt;/publish&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+         <p>The above shows sequence numbers placed in the &lt;publish/&gt; node or element. This is to abstract the publishing from any packet construction algorithms that may occur and thus allow a recovery to make use of network capacity as it sees fit and to interleave recovery and ongoing publishing data.</p>
+         <p>The subscriber stub is responsible for ordering information and detecting and repairing any gaps to provide sequential data for consumption by the application, which should not concern itself with such issues.</p>
+         <p>The operation of LINK and SOURCE sequence numbers are described below.</p>
+      </section2>
+      <section2 topic="Link Level Swquence Numbering">
+         <p>This will concern itself with data sent on each channel. A 
+channel can be, but is not limited to the following:</p>
+         <ul>
+           <li>Socket connection between Subscriber (and/or resource within same) and the Jabber pubsub component.</li>
+           <li>Multicast datastream sent from a pubsub component but shared amongst 0..n subscribers.</li>
+         </ul>
+         <p>Each publish received should contain an incremental sequence number to the previous or Zero. Zero is used to reset (or resynchronise) the sequence numbering. Zero should not be used in the situation of sequence number wrapping/rollover, wherein the value1 should be used. Sequence numbering bit resolution should be ascertained by querying the pubsub component in an &lt;iq/&gt; before subscription requests are levied.</p>
+         <p>E.g., in a 16-bit sequence number resolution channel, the sequence numbers would run as follows</p>
+         <p>1, 2, 3, 65533, 65534, 65535, 1, 2,</p>
+         <p>For information on sequence number bit resolution, see section 4, Source Queries.</p>
+      </section2>
+      <section2 topic="Source Level Sequence Numbering">
+         <p>This will indicate the sequence number of messages sent from the publisher to the pubsub component. Should a link be lost, timeout or other such eventuality where the context of link sequence number be lost (e.g. the pubsub component decides the subscriber has disappeared and discards context), the pubsub component is still in a position to re-filter and retransmit data cached locally or even refer back to its source to maintain integrity and temporal ordering of data to the subscriber.</p>
+         <p>To repair larger gaps, the pubsub component may provide the capability to request upwards to the source using the source sequence number, or the pubsub component may draw upon local or remote journaling services to repair the gap. The source sequence number seen by the subscriber may be the link level sequence number between publisher and pubsub component, may be the ultimate publisher sequence number or even an internal sequence number given to the incoming published data to the pubsub component on a per source basis.</p>
+         <p>The subscriber need not know how the source sequencing operates, only notify from when the link last gave a contiguous datastream.</p>
+         <p>One can now see that the pubsub component's conversation to the source is akin to that of a subscriber to a pubsub component.</p>
+      </section2>
+      <section2 topic="Gap Filling">
+         <p>When a subscriber detects a gap on its link, it can request for the data to be resent thus:</p>
+         <example>
+&lt;iq 
+    type="get" 
+    id="plugthegap1"
+    from="myclient@server.net"
+    to="pubsub.localhost"&gt;
+  &lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;gap linkfrom="56737" linkto="56739"&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+         <p>The values represent the missed link sequence numbers. For a gap of 1, the linkfrom and linkto are the same.</p>
+         <p>Should the pubsub have lost the link context and thus is unable to plug the gaps it will return an error &lt;iq/&gt; packet.</p>
+         <p>All is not lost. The subscriber has a last-ditch repair scenario by sending last-received source sequence numbers. </p>
+         <example>
+&lt;iq 
+    type="get" 
+    id="plugthegap1"
+    from="myclient@server.net"
+    to="pubsub.localhost"&gt;
+  &lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;gap ns="publisher.fromaplace" after="56737"&gt;
+    &lt;gap ns="publisher.elsewhere" after="211234"&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+         <p>Due to the non-contiguous nature of source sequence numbers from the subscriber point of view, the values sent must represent not the gap, but the last valid sequence number received. Each source may have a separate sequence number stream. This allows the pubsub component to manage and, if necessary, request gaps itself from the publisher to resynchronise the subscriber. The pubsub or publishing source should have the ability to refuse a rebuild/resynchronise.</p>
+         <p>It should be possible for the subscriber to send the link and source sequence numbers in the initial request. However, if link information has been discarded by the pubsub component (e.g. the connection was dropped and presence set offline) the link sequence numbers will be reset to zero (re-synchronised) thus:</p>
+         <example>
+&lt;iq 
+    type="set"
+    to="myclient@server.net"
+    from="pubsub.localhost"&gt;
+&lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;publish 
+        ns="data topics"
+        linkseq="0"
+        sourceseq="7547392"
+        from="publisher.fromaplace"&gt;
+    &lt;/publish&gt;
+    &lt;publish 
+        ns="data topics"
+        linkseq="1"
+        sourceseq="44211"
+        from="publisher.elsewhere"&gt;
+    &lt;/publish&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+      </section2>
+      <section2 topic="Heartbeats">
+         <p>During times of low traffic, an active circuit can be provided with regular heartbeat transmissions. Heartbeats will increment the link level sequence numbers. Subscribers missing or detecting overdue heartbeats will thus be able to detect gaps or delays even in low traffic scenarios. If the data is simply delayed, the subscriber stub is in a position to take action (and/or alert the application/user). If data is lost or heartbeats do not arrive in time, the subscriber can decide to request retransmission, disconnect or wait.</p>
+         <example>
+&lt;iq 
+    type="set"
+    to="myclient@server.net"
+    from="pubsub.localhost"&gt;
+  &lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;publish 
+        ns="link.heartbeat"
+        linkseq="57374"
+        from="pubsub.localhost"&gt;
+    &lt;/publish&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+         <p>No source sequence numbering exists here, as it is purely a link-level entity.</p>
+      </section2>
+   </section1>
+   <section1 topic="Publish Types">
+      <p>To be able to interpret published data in a more logical manner, more meaning needs to be given to data received.</p>
+      <p>When a publish packet arrives with a topic or data namespace, there is currently no way of knowing how to interpret the tags therein. Do they replace existing tag values seen? Should previously sent tags that are not  in the publish be kept or discarded? Are tag values being updated or was the previous value incorrect?</p>
+      <p>To resolve this a type field may be added to the &lt;publish/&gt; tag.</p>
+      <example>
+&lt;iq 
+    type="set"
+    to="myclient@server.net"
+    from="pubsub.localhost"&gt;
+&lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;publish 
+        ns="data topics"
+        linkseq="57372"
+        sourceseq="7547392"
+        from="publisher.fromaplace"
+        type="update"&gt;
+    &lt;/publish&gt;
+    &lt;publish 
+        ns="data topics"
+        linkseq="57373"
+        sourceseq="44211"
+        from="publisher.elsewhere"
+        type="correction"&gt;
+    &lt;/publish&gt;
+&lt;/query&gt;
+&lt;/iq&gt;
+</example>
+      <p>This option is preferable to extending the &lt;iq/&gt; type field as there will then be no need to split &lt;iq/&gt; packets if &lt;publish/&gt; elements have different types.</p>
+      <section2 topic="Publish Type Field Values">
+         <p>The following extensions would be used in environments where topic/namespaces define discrete sets of data items and/or data items changing over time, as opposed to only referring to a topic datastream consisting of atomic, unrelated data. Other types can be defined as the need arises.</p>
+         <p>'update' - partial update of data. Replaces the values of the fields of the topic/namespace it contains. Other fields held/cached downstream for this data item are still valid.</p>
+         <p>'correction' - previous data for contained fields was incorrect - e.g. paragraph in a news story, but, as per update, unsent items are still valid.</p>
+         <p>'image' - payload contains ALL the data for a data item/topic/namespace. All existing values should be dropped and replaced with the new data. Previously received fields not now contained within the image should be discarded. </p>
+         <p>'drop' - namespace/topic item is now dead and all data in it should be deleted and purged from cache.</p>
+         <p>'snapshot' - requested by subscriber and is a request for data (an image if empty of granular topics/namespaces) and no further updates, as distinct from a get, which is an on-going subscription in pubsub world.</p>
+         <p>'add' - new topic/data item on publisher's feed. Note that an "image" publish for an item can be interpreted in the same way. Previous systems have had the ADD mechanism, but use of "add" has been discontinued, with the role taken up by the "image". (thoughts?)</p>
+         <p>The above states (except "add") are very important for downstream caches and for applications that apply business logic to the datastreams.</p>
+      </section2>
+   </section1>
+   <section1 topic="Source Queries">
+      <p>As touched on above, subscribers should be able to enquire of the publisher regarding what capabilities it provides and what to expect. Some items of use for JRPS are as follows:</p>
+      <ul>
+        <li>Heartbeat. Integer milliseconds. Represents the interval between heartbeat messages. Useful for rapid detection of link level problems.</li>
+        <li>Link Sequence Resolution. Integer. Allows subscriber to predict link sequence number rollover. Zero would indicate that it is not supported.</li>
+        <li>Source Sequence Resolution. Integer. Allows a subscriber to predict source sequence number rollover. A zero would indicate that it is not supported.</li>
+        <li>Gap Support. Boolean. Used to indicate if the publisher supports gap filling.</li>
+        <li>Permissioning Scheme. There may be some standardisation of permissioning schemes so that common plugins or mechanisms can be adopted. The publisher should be able to define this.</li>
+        <li>Rebuild On Demand. If the pubsub can support a rebuild/refresh of the current values of all subscribed-to data on demand.</li>
+        <li>Refresh Cycle. It has been common practice to transmit a regular refresh cycle for all subscribed data. If a data item does not get an 'image' from the source for a period of time, the cache performs a logical 'drop'. Without this, intermediate caches would very soon balloon with stale data, or publishers would get every cache re-requesting or confirming if data is still alive. Zero would indicate that no refresh cycle exists for the source.</li>
+</ul>
+   </section1>
+   <section1 topic="Implementation Issues">
+      <section2 topic="Permissioning Requirements">
+         <p>Permissioning protocols should be open to permit a multitude of permissioning schemas. Data providers may wish to enforce their schemes in ways that suit their particular business models. The protocol should not bind or dictate such mechanisms.</p>
+         <p>The implementation of permissioning systems and regimes over time has repeatedly shown that it is especially dangerous to assume the behaviour of data and to disregard how information is used, protected, valued and owned or to force a scheme that is rigid and assumes a narrow problem domain. Thus the scheme should permit explicit and tokenised permissioning mechanisms.</p>
+         <p>Tokenised permissioning allows sets of data can be treated en masse. By permitting the concept of "grant" and "deny" permissions simultaneously (settings that define who CAN see something or defining who CANNOT) individual publishers can manage access both broadly and down to very fine granularity.</p>
+         <p>Permission tokens, if used, should be sent in-band with the data. This will allow data to change its coding online and thus immediately affect permissioning without a redistribution of the permissioning information.</p>
+         <example>
+&lt;iq 
+    type="set"
+    to="myclient@server.net"
+    from="pubsub.localhost"&gt;
+  &lt;query xmlns="jabber:iq:pubsub"&gt;
+    &lt;publish 
+        ns="data topics"
+        type="update"
+        permtoken="6747"
+        linkseq="57372"
+        sourceseq="7547392"
+        from="publisher.fromaplace"&gt;
+    &lt;/publish&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</example>
+         <p>This does not prevent namespace/topic permissioning systems from being applied, nor should the permtoken be compulsory1.</p>
+         <p>The pubsub systems should be able to &lt;iq/&gt; the publisher for the permissioning regime that applies.</p>
+         <p>The definition of the XML carrying permissioning tables/information should be regime specific.</p>
+         <p>Further information on why tokenised grant and deny permissioning is advantageous can be provided upon request.</p></section2>
+      <section2 topic="Contributions">
+         <p>Contributions in this context are when a subscriber publishes to one or more sources for redistribution so that it may reach the communities that subscribe to that source. By doing this, the subscriber reaches large communities, focus on specific communities and can abstract itself from delivery issues.  The publisher gains information and broadens its appeal. Delivery abstraction is valuable, as a subscriber can then connect once to the publisher to gain access to all systems, networks, technologies, subscribers and media that the publisher and contributor agree upon. As you may guess, there is a need for content, flow control/throttling and ongoing permissioning to be specified and handled over time.</p>
+         <p>Contributions requires a separate JEP, but the issues are important to the implementation of pubsub and of its permissions (Contributors have specific, complex and business-critical reasons to tightly control who sees data -- e.g. only customers, not competition!)</p>
+       </section2>
+   </section1>
+</jep>
diff --git a/xep-0041.xml b/xep-0041.xml
new file mode 100644
index 00000000..4aa78fca
--- /dev/null
+++ b/xep-0041.xml
@@ -0,0 +1,266 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Reliable Entity Link</title>
+  <abstract>Protocol for linking a bytestream between two Jabber entities.</abstract>
+  &LEGALNOTICE;
+  <number>0041</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>XMPP Core, JEP-0020, JEP-0030</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>JEP-0065</supersededby>
+  <shortname>rel</shortname>
+  <author>
+    <firstname>Justin</firstname>
+    <surname>Karneges</surname>
+    <email>justin@affinix.com</email>
+    <jid>justin@andbit.net</jid>
+  </author>
+  <revision>
+    <version>0.2</version>
+    <date>2003-09-30</date>
+    <initials>psa</initials>
+    <remark>At the request of the author, the status of this JEP has been changed to Retracted since it has been superseded by JEP-0065. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.8</version>
+    <date>2003-06-26</date>
+    <initials>jk</initials>
+    <remark>Refactored to old jidlink roots</remark>
+  </revision>
+  <revision>
+    <version>0.7</version>
+    <date>2003-04-29</date>
+    <initials>jk</initials>
+    <remark>Overhaul and rename</remark>
+  </revision>
+  <revision>
+    <version>0.6</version>
+    <date>2002-11-23</date>
+    <initials>jk</initials>
+    <remark>Reflect changes to DTCP</remark>
+  </revision>
+  <revision>
+    <version>0.5</version>
+    <date>2002-10-10</date>
+    <initials>jk</initials>
+    <remark>Table of stream transports</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2002-10-10</date>
+    <initials>jk</initials>
+    <remark>New name, cleaned up the text, added test mode.</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-09-12</date>
+    <initials>jk</initials>
+    <remark>Changed the implementation.</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-08-16</date>
+    <initials>jk</initials>
+    <remark>Fixed spelling errors, simplified the document.</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-08-15</date>
+    <initials>jk</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+<section1 topic='Overview'>
+<section2 topic='Introduction'>
+<p>Reliable Entity Link (or simply 'REL'), is a system for coordinating reliable bytestreams between two Jabber entities for the purpose of keeping applications (and application specifications) simple.  However, this proposal does not define any specific bytestream protocol.  It is expected that there will be multiple ways to obtain a bytestream between Jabber entities (thru-server and peer-to-peer are two methods that come to mind), but applications can refer to REL instead of some particular stream transport.</p>
+</section2>
+
+<section2 topic='Stream transport properties'>
+<p>A REL-compatible stream transport must have the following properties:</p>
+<ul>
+  <li>Provides a reliable bytestream between two Jabber entities, which means that the bytestream transport handles all data delivery issues, such that the application need not worry about them.</li>
+  <li>Has a the following link states:
+    <table caption='Link states'>
+      <tr>
+        <th>Code</th>
+        <th>Description</th>
+      </tr>
+      <tr>
+        <td><tt>INIT</tt></td>
+        <td>Initiation</td>
+      </tr>
+      <tr>
+        <td><tt>GOOD</tt></td>
+        <td>Successful initiation (connected)</td>
+      </tr>
+      <tr>
+        <td><tt>BAD</tt></td>
+        <td>Unsuccessful initiation (stream is closed, no further state)</td>
+      </tr>
+      <tr>
+        <td><tt>CLOS</tt></td>
+        <td>Successful closure after establishment (stream is closed, no further state)</td>
+      </tr>
+      <tr>
+        <td><tt>ERR</tt></td>
+        <td>Link failure after establishment (stream is closed, no further state)</td>
+      </tr>
+    </table>
+  </li>
+  <li>Defines a stream identifier, which MUST have a unique ASCII representation. The stream protocol MUST be able to use any ASCII identifier chosen during REL negotiation, as long as the sending party doesn't use the same identifier more than once.</li>
+</ul>
+<p>The following stream transports that meet these guidelines are:</p>
+<table caption='Supported streams'>
+  <tr>
+    <th>Short name</th>
+    <th>Protocol</th>
+  </tr>
+  <tr>
+    <td>ibb</td>
+    <td>&jep0047;</td>
+  </tr>
+  <tr>
+    <td>s5b</td>
+    <td>&jep0065;</td>
+  </tr>
+</table>
+
+</section2>
+</section1>
+
+<section1 topic='Usage'>
+<section2 topic='Service discovery'>
+<p>Before using REL, ensure it is a supported service of the remote entity by using &jep0030;:</p>
+
+<example caption='Requesting disco information'><![CDATA[
+<iq type="get" to="joe@blow.com/Home" id="sd_1">
+  <query xmlns="http://jabber.org/protocol/disco#info"/>
+</iq>
+]]></example>
+
+The remote entity will advertise the "http://jabber.org/protocol/rel" namespace as a feature to represent they implement this JEP.
+
+<example caption='Response'><![CDATA[
+<iq type="result" from="joe@blow.com/Home" id="sd_1">
+  <query xmlns="http://jabber.org/protocol/disco#info">
+    <feature var="http://jabber.org/protocol/rel"/>
+  </query>
+</iq>
+]]></example>
+
+</section2>
+
+<section2 topic='Obtaining a REL context'>
+<p>To use REL, the entities must obtain a REL Context ID (or <em>cid</em>) through some action.  A <em>cid</em> is simply an opaque alphanumeric string.  For example, perhaps the link is needed for a file transfer:</p>
+
+<example caption='Possible File Transfer'><![CDATA[
+<iq type="set" id="ft_1" to="joe@blow.com/Home">
+  <query xmlns="filexfer" filename="coolfile.txt"/>
+</iq>
+]]></example>
+
+<example caption='Possible response'><![CDATA[
+<iq type="result" id="ft_1" from="joe@blow.com/Home">
+  <query xmlns="filexfer">
+    <cid xmlns="http://jabber.org/protocol/rel" value="myCID"/>
+  </query>
+</iq>
+]]></example>
+
+<p>All high-level protocols that use Reliable Entity Link MUST have a way of providing such a cid.  The cid must be unique among all other REL cids between the two entities.</p>
+</section2>
+
+<section2 topic='Selecting a Stream'>
+<p>The next step is to ask the remote entity which stream method it would like to use.  We will use &jep0020; for this.  The streams are listed using the short names from the table of supported streams.</p>
+
+<example caption='Selecting a stream'><![CDATA[
+<iq type="get" id="rel_1" to="joe@blow.com/Home">
+  <query xmlns="http://jabber.org/protocol/rel" cid="myCID" keepAlive='true'>
+    <feature xmlns="http://jabber.org/protocol/feature-neg">
+      <x xmlns="jabber:x:data">
+        <field var="method" type="list-single">
+          <option><value>s5b</value></option>
+          <option><value>ibb</value></option>
+        </field>
+      </x>
+    </feature>
+  </query>
+</iq>
+]]></example>
+
+<p>The keepAlive attribute indicates that the initiator is planning on trying another method if the one selected here is to fail.  An entity SHOULD use keepAlive for all attempts but the last for a given application.  If keepAlive is omitted, then it is considered false.</p>
+
+<p>The remote entity will then agree on a method:</p>
+<example caption='Possible response'><![CDATA[
+<iq type="result" id="rel_1" from="joe@blow.com/Home">
+  <query xmlns="http://jabber.org/protocol/rel" cid="myCID">
+    <feature xmlns="http://jabber.org/protocol/feature-neg">
+      <x xmlns="jabber:x:data" type="submit">
+        <field var="method">
+          <value>s5b</value>
+        </field>
+      </x>
+    </feature>
+  </query>
+</iq>
+]]></example>
+
+<p>Or maybe an error:</p>
+<example caption='Error'><![CDATA[
+<iq type="error" id="rel_1" from="joe@blow.com/Home">
+  <error code="501">No supported protocols.</error>
+</iq>
+]]></example>
+
+<p>If the entity returns error, then the REL cid is invalidated and the application fails.  If a stream method has been chosen successfully, then now it must be initiated using the REL cid as the stream's identifier (the stream goes into <strong><tt>INIT</tt></strong> state).</p>
+
+<p>On <strong><tt>GOOD</tt></strong>: This indicates the stream is ready for use within the original context, and data exchanged over the stream is to be left up to the application.</p>
+
+<p>On <strong><tt>BAD</tt></strong>: If the keepAlive="true" attribute was specified, then the initiator MUST repeat this section over again to attempt with a different method.  If keepAlive was not specified, then the REL cid is invalidated and the application fails.</p>
+
+<p>On <strong><tt>CLOS</tt></strong> or <strong><tt>ERR</tt></strong>, the REL cid is invalidated.</p>
+</section2>
+</section1>
+
+<section1 topic='Security Considerations'>
+  <p>There are no security considerations.</p>
+</section1>
+
+<section1 topic='IANA Considerations'>
+  <p>This JEP requires no interaction with &IANA;.</p>
+</section1>
+
+<section1 topic='Jabber Registrar Considerations'>
+  <p>The &REGISTRAR; shall register the 'http://jabber.org/protocol/rel' namespace as a result of this JEP.</p>
+</section1>
+
+<section1 topic='XML Schema'>
+  <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='http://jabber.org/protocol/rel'
+    xmlns='http://jabber.org/protocol/rel'
+    elementFormDefault='qualified'>
+
+   <xs:element name='query'>
+     <xs:complexType>
+      <xs:attribute name='cid' type='xs:string' use='required'/>
+      <xs:attribute name='keepAlive' type='xs:boolean' use='optional'/>
+     </xs:complexType>
+   </xs:element>
+
+</xs:schema>
+  ]]></code>
+</section1>
+
+</jep>
diff --git a/xep-0042.xml b/xep-0042.xml
new file mode 100644
index 00000000..3cdb02ce
--- /dev/null
+++ b/xep-0042.xml
@@ -0,0 +1,1075 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Jabber OOB Broadcast Service (JOBS)</title>
+  <abstract>A protocol for enabling uni-directional multicast data transfers out of band.</abstract> 
+  &LEGALNOTICE;
+  <number>0042</number>
+  <status>Retracted</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <dependencies>JEP-0004 (OPTIONAL), JEP-0011 (RECOMMENDED) JEP-0029 (REQUIRED)</dependencies>
+  <supersedes>None</supersedes>
+  <supersededby>JEP-0065</supersededby>
+  <shortname>JOBS</shortname>
+  <author>
+    <firstname>Matthew</firstname>
+    <surname>Miller</surname>
+    <email>linuxwolf@outer-planes.net</email>
+    <jid>linuxwolf@outer-planes.net</jid>
+  </author>
+  <revision>
+    <version>0.5</version>
+    <date>2003-04-11</date>
+    <initials>psa</initials>
+    <remark>At the request of the JEP author, changed status to Retracted. This JEP will not be considered further by the Jabber Software Foundation and should not be used as a basis for implementations.</remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2002-10-22</date>
+    <initials>lw</initials>
+    <remark>More restrictive on usage of "action" attributes; Reduced session information returned in most use-cases; Added action for retrieving session information; Added action for service ("proxy") invites</remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-10-20</date>
+    <initials>lw</initials>
+    <remark>Complete overhaul (redesign to allow for peer-to-peer operation; reduced element-set; removed "session types"; reorganized into use-cases)</remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-08-20</date>
+    <initials>lw</initials>
+    <remark>Added "detailed" description of OOB headers</remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-08-14</date>
+    <initials>lw</initials>
+    <remark>Initial Release</remark>
+  </revision>
+</header>
+<section1 topic='Overview'>
+  <section2 topic='Introduction'>
+    <p>Distributing data out-of-band (OOB) to one or more end-points is a requirement for many Jabber clients. The Jabber OOB Broadcast Service (JOBS) is a mechanism to allow end-points to open uni-directional data streams between each other, on top of which any number of applications can be built <note>Possible applications include file transfer, audio/video streaming, and some gaming implementations.</note>.</p>
+
+    <p>The aim of this JEP is to define a process of connecting a sender to one or more receivers through a secondary TCP port.</p>
+  </section2>
+  <section2 topic='Design Concepts'>
+    <p>As the name implies, JOBS is designed to enable multicast, uni-directional OOB connections. These connections are usually between a "sender" client, a JOBS "service", and one or more "receiver" clients. Each such set of connections is collectively called a session. JOBS is designed to allow a single service to handle multiple sessions over a single host/port combination.</p>
+
+    <p>To address a large number of typical uses efficiently, JOBS can multicast the data from a sender to multiple receivers. In order to keep the protcol as simple as possible, it only allows data to flow in one direction.</p>
+
+    <p>JOBS utilizes a "two-band" authentication mechanism. This allows the end-points to know practically nothing about each other, yet still be assured that the OOB connection is really to/from the Jabber entity its intended to be. The authentication system is then backed-up with explicit authorization requests.</p>
+
+    <p>For the OOB portion, clients connect to the host/address and port of the JOBS service for a given session. Once connected, a client-initiated handshake process occurs, and (if successful), then data is routed from the sender's connection to each receiver's connection. The only point at which any error information may be conveyed over the OOB connection is during the handshake process.</p>
+    
+    <table caption='Terms in Use'>
+      <tr>
+        <th>Term</th>
+        <th>Description</th>
+      </tr>
+      <tr>
+        <td>OOB</td>
+        <td>Out-Of-Band. Any network connection that exists outside of the normal Jabber protocol traffic.</td>
+      </tr>
+      <tr>
+        <td>session</td>
+        <td>A session registered with a "server" for clients to connect to.</td>
+      </tr>
+      <tr>
+        <td>client</td>
+        <td>An end-point on a JOBS session.</td>
+      </tr>
+      <tr>
+        <td>service</td>
+        <td>The JOBS Jabber component/server.</td>
+      </tr>
+      <tr>
+        <td>server</td>
+        <td>A particular host/port of the JOBS service.</td>
+      </tr>
+      <tr>
+        <td>sender</td>
+        <td>The client sending data.</td>
+      </tr>
+      <tr>
+        <td>receiver</td>
+        <td>A client receiving data.</td>
+      </tr>
+    </table>
+  </section2>
+</section1>
+<section1 topic='Use Cases'>
+  <section2 topic='Discovering the Service'>
+    <p>Discovering support for JOBS involves either "jabber:iq:browse"<note>jabber:iq:browse -- <link url='http://www.jabber.org/jeps/jep-0011.html'>http://www.jabber.org/jeps/jep-0011.html</link></note> or "disco"<note>http://jabber.org/protocol/disco -- <link url='http://www.jabber.org/jeps/jep-0030.html'>http://www.jabber.org/jeps/jep-0030.html</link></note>. This determines if the end-point understands the JOBS protocol.</p>
+    <section3 topic='"jabber:iq:browse"'>
+      <p>To determine support for JOBS via jabber:iq:browse, look for an item with a nested &lt;ns/&gt; with a value of "http://jabber.org/protocol/jobs":</p>
+      <example caption='Browse request'><![CDATA[
+<iq type='get' to='domain'>
+  <query xmlns='jabber:iq:browse'/>
+</iq>
+      ]]></example>
+      <example caption='Browse result'><![CDATA[
+<iq type='get' to='sender@domain/res' from='domain'>
+  ...
+  <item xmlns='jabber:iq:browse'
+      category='service'
+      type='x-jobs'
+      jid='jobs.domain'
+      version='0.4'>
+    <ns>http://jabber.org/protocol/jobs</ns>
+  </item>
+  ...
+</iq>
+      ]]></example>
+    </section3>
+  </section2>
+  <section2 topic='Creating a Session'>
+    <p>The JOBS protocol supports various scenarios to create sessions. Most of these scenarios allow an entity to determine the possible parameters to create a session with. To actually create a session, the (would-be) sender sends an "iq-set" with a &lt;session action="create"/&gt;. This returns the details of the newly created session, including the ID and OOB host/port.</p>
+    
+    <p>This use-case can be completely ignored for true "peer-to-peer" systems.</p>
+    
+    <section3 topic='Simple'>
+      <p>The simplest create request is:</p>
+    
+      <example caption='Creation request'><![CDATA[
+<iq type='set' from='sender@domain/res' to='jobs.domain' id='JOBS1'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='create'/>
+</iq>
+      ]]></example>
+      <example caption='Creation result'><![CDATA[
+<iq 
+    type='result' to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      status='pending'
+      host='jobs.domain' 
+      id='01234567'
+      port='12676' 
+      sender='sender@domain/res'
+      buffer='0'
+      expires='30' 
+      receivers='1'/>
+</iq>
+      ]]></example>
+    
+      <p>This creates a session between sender@domain/resource and any one receiver. At this point, the JOBS service is ready to accept connections for this session. The &lt;session/&gt; element describes the details for the session. The value returned in the "id" attribute is the JOBS session ID <note>The exact value of the ID is left to JOBS implementations.</note>.</p>
+    </section3>
+    <section3 topic='With Parameters'>
+      <p>When creating a session, parameters to &lt;session/&gt; can be supplied, explicitly requesting that certain parameters be met (such as buffer size, time to expire, and receiver limit). Since these parameters have lower- and upper-bounds specific to the JOBS service, a sender may need to determine these limits.</p>
+      
+      <p>To determine the limits, the sender sends an "iq-get" with a &lt;session action="create"/&gt;:</p>
+      
+      <example caption='Parameter statistics request'><![CDATA[
+<iq id='JOBS0' type='get' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs' action='create'/>
+</iq>
+      ]]></example>
+      <example caption='Parameter statistics result'><![CDATA[
+<iq id='JOBS0' type='result' to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      host='jobs.domain'
+      port='12676'
+      sender='sender@domain/res'
+      buffer='0'
+      expires='30'
+      receivers='1'>
+    <connect host='jobs.domain' port='12676'/>
+    <limit  type='buffer'
+        default='0'
+        max='1024'
+        min='0'/>
+    <limit  type='expires'
+        default='30'
+        max='3600'
+        min='5'/>
+    <limit  type='receivers'
+        default='1'
+        max='15'
+        min='1'/>
+  </session>
+</iq>
+      ]]></example>
+
+      <p>The returned &lt;session/&gt; is also prefilled with default values for all known parameters.</p>
+      
+      <p>To create a session with specific parameters, the sender sends an "iq-set" as in the "simple" use-case, but then specifying the parameter values desired:</p>
+      <example caption='Creation request, with parameters'><![CDATA[
+<iq id='JOBS1' type='set' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs' action='create'
+      expires='-1'/>
+</iq>
+      ]]></example>
+      <example caption='Creation result, with parameters'><![CDATA[
+<iq type='result' to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      status='pending'
+      host='jobs.domain' 
+      id='01234567'
+      port='12676' 
+      sender='sender@domain/res'
+      buffer='0'
+      expires='-1' 
+      receivers='1'/>
+</iq>
+      ]]></example>
+    
+      <p>The above example creates a session that does not timeout. A JOBS service uses values from the default information set for any parameters that are missing.</p>
+      
+      <p>Any parameters that exceed the minimums/maximums causes an error.</p>
+    </section3>
+    <section3 topic='Form-based'>
+      <p>In some cases, the session creation process requires an interface more suitable for human consumption. In such cases the JOBS protocol helps by allowing for contained elements governed by other namespaces. For form-based creation, a "jabber:x:data" form<note>jabber:x:data -- <link url='http://www.jabber.org/jeps/jep-0004.html'>http://www.jabber.org/jeps/jep-0004.html</link></note> can be embedded in the &lt;session/&gt;.</p>
+      
+      <p>To create a session using forms, send a &lt;session action="create"/&gt; with an embedded &lt;x xmlns="jabber:x:data"/&gt;:</p>
+      
+      <example caption='Creation form request'><![CDATA[
+<iq type='get' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs' action='create'>
+    <x xmlns='jabber:x:data'/>
+  </session>
+</iq>
+      ]]></example>
+      <example caption='Creation form result'><![CDATA[
+<iq type='result' from='jobs.domain' to='sender@domain/res'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      host='jobs.domain' 
+      port='12676' 
+      buffer='0'
+      expires='-1' 
+      receivers='1'>
+    <x xmlns='jabber:x:data' type='form'>
+      <instructions>Please specify values for the given fields.</instructions>
+      <field var='hostport' type='select-single' label='JOBS host/port'>
+        <option>jobs.domain:12676</option>
+      </field>
+      <field var='buffer' type='text' label='Buffer Size (in bytes)'><value>0</value></field>
+      <field var='expires' type='text' label='Timeout (in seconds)'><value>30</value></field>
+      <field var='receivers' type='text' label='Number of Recipients'><value>1</value></field>
+    </x>
+  </session>
+</iq>
+      ]]></example>
+      
+      <p>The exact fields present in the form are dependent upon the JOBS implementation. The form SHOULD allow a user to at least specify the &lt;session/&gt; attributes.</p>
+      <p>Using the form-based approach, the session is then created by sending a &lt;session action='create'/&gt; with a form submission (as defined for "jabber:x:data"):</p>
+      
+      <example caption='Creation request (form-based)'><![CDATA[
+<iq type='set' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs' action='create'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='hostport'><value>jobs.domain:12676</value></field>
+      <field var='buffer'><value>0</value></field>
+      <field var='expires'><value>300</value></field>
+      <field var='receivers'><value>1</value></field>
+    </x>
+  </session>
+</iq>
+      ]]></example>
+      <example caption='Creation result (form-based)'><![CDATA[
+<iq type='result' from='jobs.domain' to='sender@domain/res'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      status='pending'
+      host='jobs.domain' 
+      id='01234567'
+      port='12676' 
+      sender='sender@domain/res'
+      buffer='0'
+      expires='300' 
+      receivers='1'/>
+</iq>
+      ]]></example>
+    </section3>
+  </section2>
+  <section2 topic='Inviting Receivers'>
+    <p>Once the session is created, the sender invites receivers to connect. The sender can invite receivers either directly, or via the JOBS service. Most invitations are distributed via &lt;message/&gt;.</p>
+    
+    <section3 topic='Inviting Directly'>
+      <p>The sender can invite receivers directly. This is done using a &lt;message/&gt;:</p>
+      <example caption='Invitation message (direct)'><![CDATA[
+<message from='sender@domain/res' to='receiver@domain/res'>
+  <body>Let's connect!</body>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      host='jobs.domain'
+      id='01234567'
+      port='12676'
+      sender='sender@domain/res'
+      buffer='0'
+      expires='30'
+      receivers='1'/>
+</message>
+      ]]></example>
+      
+      <p>When inviting directly, the &lt;session/&gt; MUST contain enough information for a receiver to connect OOB. The required information is:</p>
+      <ul>
+        <li>host</li>
+        <li>id</li>
+        <li>port</li>
+      </ul>
+    </section3>
+    <section3 topic='Inviting via JOBS'>
+      <p>Alternatively, a sender can invite receivers via the JOBS service. This is also done using a &lt;message/&gt;, with a &lt;session action="notify"/&gt; containing one or more &lt;item action="invite" type="connection"/&gt;:</p>
+      <example caption='Invitation message (to JOBS service)'><![CDATA[
+<message from='sender@domain/res' to='jobs.domain'>
+  <body>Let's connect!</body>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      id='01234567'>
+    <item type='connection' action='invite'>receiver@domain</item>
+</message>
+      ]]></example>
+      <p>This results in the JOBS service sending the &lt;message/&gt; to each &lt;item/&gt;. Any additional elements (such as a &lt;body/&gt;) are passed onto those invited:</p>
+      <example caption='Invitation message (from JOBS service)'><![CDATA[
+<message from='jobs.domain' to='receiver@domain'>
+  <body>Let's connect!</body>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      status='pending'
+      host='jobs.domain'
+      id='01234567'
+      port='12676'
+      sender='sender@domain/res'
+      buffer='0'
+      expires='30'
+      receivers='1'>
+    <item type='connection' action='invite'/>
+</message>
+      ]]></example>
+    </section3>
+  </section2>
+  <section2 topic='Retrieving Session Information'>
+    <p>At any time, a client can request information about sessions for a JOBS service. The request can be directed for "all" sessions, or a specific session<note>Who is allowed to perform this action is left up to the JOBS service implementation.</note>.</p>
+
+    <section3 topic='Service-wide'>
+      <p>A client can request all the sessions for a JOBS service by sending an "iq-get" containing a &lt;session action="info"/&gt; with no ID:</p>
+      <example caption='Information request (all sessions)'><![CDATA[
+<iq type='get' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='info'/>
+</iq>
+      ]]></example>
+      <p>The JOBS service responds with all the sessions within the "iq-result". This is the only case where a result can have more than one &lt;session/&gt;.</p>
+      <example caption='Information result (all sessions)'><![CDATA[
+<iq type='result' from='jobs.domain' to='sender@domain/res'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='info'
+      status='active'
+      host='jobs.domain'
+      id='01234567'
+      port='12676'
+      buffer='0'
+      expires='30'
+      receivers='1'>
+    <item type='connection' action='accept'>sender@domain/res</item>
+  </session>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='info'
+      status='pending'
+      host='jobs.domain'
+      id='87654321'
+      port='12676'
+      buffer='0'
+      expires='30'
+      receivers='1'/>
+</iq>
+      ]]></example>
+    </section3>
+    <section3 topic='Session-specific'>
+      <p>Alternatively, a client can request the information for a specific session by sending an "iq-get" containing a &lt;session action="info"/&gt; with the ID:</p>
+      <example caption='Information request (session-specific)'><![CDATA[
+<iq type='get' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='info'
+      id='01234567'/>
+</iq>
+      ]]></example>
+      <p>The service responds with an "iq-result" of just the requested session.</p>
+      <example caption='Information result (session-specific)'><![CDATA[
+<iq type='result' from='jobs.domain' sender='sender@domain/res'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='info'
+      status='active'
+      host='jobs.domain'
+      id='01234567'
+      port='12676'
+      buffer='0'
+      expires='30'
+      receivers='1'>
+    <item type='connection' action='accept'>sender@domain/res</item>
+  </session>
+</iq>
+      ]]></example>
+    </section3>
+  </section2>
+  <section2 topic='Connecting OOB'>
+    <section3 topic='Initiating and Authenticating'>
+      <p>When a client connects (sender or receivers), a client-initiated handshake takes place. The purpose of this handshake is to authenticate the OOB connection, in relation to the client's JID. This authentication utilizes both in-band and OOB packets.</p>
+    
+      <p>To start the handshake, the client sends an "init" packet on its established connection:</p>
+      
+      <example caption='Client INIT'><![CDATA[
+jobs/0.4 init
+session-id: 01234567
+client-jid: sender@domain/res
+
+      ]]></example>
+      
+      <p>If the session exists, and the client's JID is not automatically rejected, the JOBS service responds with an auth-challenge packet, containing an unique, arbitrary token:</p>
+      
+      <example caption='Server AUTH-CHALLENGE'><![CDATA[
+jobs/0.4 auth-challenge
+confirm: SID00001234
+
+      ]]></example>
+      
+      <p>Once received, the client then sends an "iq-set" containing a &lt;session action="authenticate"/&gt;, which itself contains an &lt;item type='auth' action='confirm'/&gt; with this confirm key:</p>
+      
+      <example caption='Authentication request (from Client)'><![CDATA[
+  <iq type='set' to='jobs.domain'>
+    <session xmlns='http://jabber.org/protocol/jobs'
+        action='authenticate'
+        id='01234567'>
+      <item type='auth' action='confirm'>SID00001234</item>
+    </session>
+  </iq>hehe
+      ]]></example>
+    
+      <p>The service then compares this confirm key to that sent with the "auth-challenge" OOB packet. If this matches correctly, and the service determines this connection is authorized, the session will respond with a &lt;session action="authenticate"/&gt; containing a &lt;item type="auth" action="accept"/&gt; with the accept key:</p>
+    
+      <example caption='Authentication result (from Server)'><![CDATA[
+  <iq type='result' from='jobs.domain' to='sender@domain/res'>
+    <session xmlns='http://jabber.org/protocol/jobs'
+        action='authenticate'
+        status='pending'
+        id='01234567'>
+      <item type='auth' action='accept'>SID88884321</accept>
+    </session>
+  </iq>
+    ]]></example>
+    
+      <p>At this point, the client responds on the OOB data stream with an "auth-response" packet:</p>
+    
+      <example caption='Client AUTH-RESPONSE'><![CDATA[
+  jobs/0.4 auth-response
+  accept: SID88884321
+  
+    ]]></example>
+    
+      <p>If the connection is accepted, the JOBS service sends a "connected" packet:</p>
+    
+      <example caption='Server CONNECTED'><![CDATA[
+  jobs/0.4 connected
+
+      ]]></example>
+      <p>and after this, the data transfer occurs. If this connection is the sender, they may start sending data now (regardless if receivers are connected). If this connection is a receiver, the sender's data immediately follows the terminating "newline".</p>
+    </section3>
+    <section3 topic='Authorizing'>
+      <p>Authenticating ensures the OOB connection matches a particular JID. Authorizing ensures to the service that receiver is allowed to be connected to the session. To determine if the session connection should be accepted or rejected, the JOBS service first checks if the JID matches the sender. This matches against the "full" JID, including node, domain, and resource. If this connection is the sender, it is allowed. Otherwise, the service confirms the connection with the sender.</p>
+      
+      <p>If a confirmation is required, the service sends an "iq-get" to the sender, with a &lt;session action="authorize"/&gt; containing an &lt;item type"connection" action="confirm"/&gt; with the full JID of the receiver:</p>
+      
+      <example caption='Confirmation request'><![CDATA[
+<iq type='get' to='sender@domain/res' id='JOBS5' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='authorize'
+      status='active'
+      id='01234567'>
+    <item type='connection' action='confirm'>receiver@domain/res</item>
+  </session>
+</iq>
+      ]]></example>
+
+      <p>One or more &lt;item type="connection" action="confirm/&gt; elements, each specifying a JID to accept/reject. To accept (or reject) a connection, the sender responds with an "iq-result", wrapping each JID in either an &lt;item type="connection" action="accept"/&gt; or &lt;item type="connection" action="reject"/&gt;.</p>
+
+      <example caption='Confirmation result (accept)'><![CDATA[
+<iq id='JOBS5' type='result' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='authorize'
+      id='01234567'>
+    <item type='connection' action='accept'>receiver@domain/res</item>
+  </session>
+</iq>
+      ]]></example>
+      <example caption='Confirmation result (reject)'><![CDATA[
+<iq id='JOBS5' type='result' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='authorize'
+      id='01234567'>
+    <item type='connection' action='reject'>receiver@domain/res</item>
+  </session>
+</iq>
+      ]]></example>
+      
+      <p>If the connection is rejected, the service drops the connection, and notifies the sender and receiver of the dropped connection.</p>
+    </section3>
+    <section3 topic='Dropping'>
+      <p>The sender may drop a connection at any time. To drop a connection, the sender sends an "iq-set" with the &lt;session/&gt; containing the "connection" to drop:</p>
+      
+      <example caption='Drop request'><![CDATA[
+<iq type='set' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      id='01234567'>
+    <item type='connection' action='drop'>receiver@domain/res</item>
+  </session>
+</iq>
+      ]]></example>
+      
+      <p>If the connection is successfully dropped, the service returns an "iq-result":</p>
+      
+      <example caption='Drop result'><![CDATA[
+<iq type='result' from='jobs.domain' to='sender@domain/res'>
+  <session  xmlns='http://jabber.org/protocol/jobs'
+      status='active'
+      id='01234567'/>
+</iq>
+      ]]></example>
+      
+      <p>The service also sends notification messages to the sender and the JID of the dropped connection (detailed in the "Being Notified about Events" section).</p>
+    </section3>
+  </section2>
+  <section2 topic='Deleting a Session'>
+    <p>Sessions are deleted either by timeout or explicitly. Sessions are deleted by timeout automatically under certain conditions. Sessions can also be deleted explicity by their senders, at any time. Regardless of the method of deletion, a notice is sent to all connected.</p>
+    
+    <p>This use-case can be completely ignored for true "peer-to-peer" systems.</p>
+    <section3 topic='Expiring'>
+      <p>The exact conditions that expire a session are mostly up to the implementation. At a minimum, a session SHOULD be expired when there are less than two connections, and the "expires" time is reached.</p>
+    </section3>
+    <section3 topic='Deleting Explicitly'>
+      <p>To explictly delete a session, the sender sends an "iq-set" containing a &lt;session action="delete"/&gt;:</p>
+  
+      <example caption='Delete request'><![CDATA[
+<iq id='JOBS50' type='set' to='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='delete'/>
+</iq>
+      ]]></example>
+      <example caption='Delete result'><![CDATA[
+<iq id='JOBS50' type='result' to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      status='closed'
+      id='01234567'/>
+</iq>
+      ]]></example>
+    </section3>
+  </section2>
+  <section2 topic='Being Notified about Events'>
+    <section3 topic='Connection Accepted'>
+      <p>When a connection is accepted, the service sends a "notify" message to the sender and (if appropriate) the accepted receiver, with a &lt;item type='connection' action='accept'/&gt;:</p>
+      
+      <example caption='"Connection Accepted" message'><![CDATA[
+<message to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      status='pending'
+      id='01234567'>
+    <item type='connection' action='accept'/>
+  </session>
+</message>
+      ]]></example>
+      
+      <p>If the notification is not about the recipient of the message, then the &lt;item/&gt; contains the JID this notification pertains to.</p>
+    </section3>
+    <section3 topic='Connection Rejected'>
+      <p>When a connection is rejected, the service sends a "notify" message to the sender and (if appropriate) the accepted receiver, with a &lt;item type='connection' action='reject'/&gt;:</p>
+      
+      <example caption='"Connection Rejected" message'><![CDATA[
+<message to='receiver@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      status='pending'
+      id='01234567'>
+    <item type='connection' action='reject'/>
+  </session>
+</message>
+      ]]></example>
+      
+      <p>If the notification is not about the recipient of the message, then the &lt;item/&gt; contains the JID this notification pertains to.</p>
+    </section3>
+    <section3 topic='Connection Dropped'>
+      <p>When a connection is dropped, the service sends a "notify" message to the sender and (if appropriate) the accepted receiver, with a &lt;item type='connection' action='drop'/&gt;:</p>
+      
+      <example caption='"Connection Dropped" message'><![CDATA[
+<message to='receiver@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      status='pending'
+      id='01234567'>
+    <item type='connection' action='drop'/>
+  </session>
+</message>
+      ]]></example>
+      
+      <p>If the notification is not about the recipient of the message, then the &lt;item/&gt; contains the JID this notification pertains to.</p>
+    </section3>
+    <section3 topic='Session Deleted'>
+      <p>When a session is deleted, any clients connected to the session are immediately disconnected. The "notify" message is sent to the sender and any receivers still connected, with the &lt;session action="notify"/&gt; containing an &lt;item type="status"/&gt;:</p>
+      
+      <example caption='"Session Deleted (explicitly)" message'><![CDATA[
+<message to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      status='closed'
+      id='01234567'>
+    <item type='status' action='delete'/>
+  </session>
+</message>
+      ]]></example>
+
+      <example caption='"Session Deleted (timed out)" message'><![CDATA[
+<message to='sender@domain/res' from='jobs.domain'>
+  <session xmlns='http://jabber.org/protocol/jobs'
+      action='notify'
+      status='closed'
+      id='01234567'>
+    <item type='status' action='expire'/>
+  </session>
+</message>
+      ]]></example>
+      
+      <p>The reason the session is deleted is specified by the action attribute. A value of "delete" means it was explicitly deleted. A value of "expire" means it timed out.</p>
+    </section3>
+  </section2>
+</section1>
+<section1 topic='Formal Description'>
+  <section2 topic='In-Band Protocol'>
+    <section3 topic='DTD'>
+      <code><![CDATA[
+<!ELEMENT session ( ( item | ( connect? , limit+ ) )* | #PCDATA* ) >
+<!ATTLIST session
+    action  ( 'authenticate' | 'authorize' | 'create' | 'delete' | 'info' | 'notify' )  #OPTIONAL
+    status  ( 'active' | 'closed' | 'in-use' | 'pending' )                              #OPTIONAL
+    host      CDATA #OPTIONAL
+    id        CDATA #OPTIONAL
+    port      CDATA #OPTIONAL
+    sender    CDATA #OPTIONAL
+    buffer    CDATA #OPTIONAL
+    expires   CDATA #OPTIONAL
+    receivers CDATA #OPTIONAL
+>
+
+<!ELEMENT item ( #PCDATA )* >
+<!ATTLIST item
+    action  ( 'accept' | 'confirm' | 'delete' | 'drop' | 'expire' | 'invite' | 'reject')  #OPTIONAL
+    type    ( 'auth' | 'connection' | 'status' )                                          #OPTIONAL
+>
+
+<!ELEMENT connect () >
+<!ATTLIST connect
+    host  CDATA #REQUIRED
+    port  CDATA #REQUIRED
+>
+
+<!ELEMENT limit () >
+<!ATTLIST limit
+    default CDATA #REQUIRED
+    max     CDATA #REQUIRED
+    min     CDATA #REQUIRED
+>
+      ]]></code>
+    </section3>
+    <section3 topic='&lt;session/&gt; Element'>
+      <p>The &lt;session/&gt; element is the core element to the protocol. This element provides both information about a session and the action applied to it. It has a large number of attributes, and contains zero or more &lt;item/&gt; elements, zero or more &lt;connect/&gt; elements, and zero or three &lt;limit/&gt; elements. It may also contain elements governed by other namespaces.</p>
+      <p>The "action" attribute specifies the action to apply or being applied to the session. From clients, this attribute MUST be specified. From the service this attribute MAY be specified (to prevent ambiguity). The value of "action" MUST be one of the following:</p>
+      <table caption='Possible "action" values'>
+        <tr>
+          <th>Value</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>authenticate</td>
+          <td>Authenticating one or more connections.</td>
+        </tr>
+        <tr>
+          <td>authorize</td>
+          <td>Authorizing one or more connections.</td>
+        </tr>
+        <tr>
+          <td>create</td>
+          <td>Create a new session.</td>
+        </tr>
+        <tr>
+          <td>delete</td>
+          <td>Delete an existing session.</td>
+        </tr>
+        <tr>
+          <td>notify</td>
+          <td>Notification about the session.</td>
+        </tr>
+      </table>
+      <p>The "status" attribute specifies the current status of the session. This attribute MUST NOT be present if the session does not have an identifier (i.e. does not yet exist). Only the service can provide this attribute. The value of "status" MUST be one of the following:</p>
+      <table caption='Possible "status" values'>
+        <tr>
+          <th>Value</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>active</td>
+          <td>The session is active, but not yet in use.</td>
+        </tr>
+        <tr>
+          <td>closed</td>
+          <td>The session has closed.</td>
+        </tr>
+        <tr>
+          <td>in-use</td>
+          <td>The session is in use (e.g. data is being transferred).</td>
+        </tr>
+        <tr>
+          <td>pending</td>
+          <td>The session is ready, but not yet active (e.g. not enough connections).</td>
+        </tr>
+      </table>
+      <p>The "host" attribute specifies the OOB hostname for the session. This attribute SHOULD be specified when possible. The value of this attribute can either be the "raw" dotted-decimal address or a fully-qualified domain name.</p>
+      <p>The "id" attribute identifies the session. This attribute is required for all uses of &lt;session/&gt; except the request to create a session. This value is any string that the service and clients can use to uniquely identify it.</p>
+      <p>The "port" attribute specifies the OOB port number for the session. This attribute SHOULD be specified when possible.</p>
+      <p>The "sender" attribute specifies the JID of the sender. This attribute SHOULD be specified when possible. The value of this attribute MUST be the full JID of the sender, including node and resource (if possible).</p>
+      <p>The "buffer" attribute specifies the size of a temporary transfer buffer. This attribute MAY be present at any time, and SHOULD be presented by the service wherever possible. The value of this attribute MUST be a non-negative number. A value of 0 means there is no buffer. This value has limits defined by the "jobs:buffer" parameter statistic.</p>
+      <p>The "expires" attribute specifies the number of seconds before this session times out. This attribute MAY be present at any time, and SHOULD be presented by the service wherever possible. The value of this attribute MUST be either a positive number or -1. A value of -1 means this session does not expire. This value has limits defined by the "jobs:expires" parameter statistic.</p>
+      <p>The "receivers" attribute specifies the maximum number of receivers this session can have. this attribute MAY be present at any time, and SHOULD be presented by the service wherever possible. The value of this attribute MUST be either a positive number of -1. A value of -1 means this session can (theoretically) have any number of receivers. This value has limits defined by the "jobs:receivers" parameter statistic.</p>
+    </section3>
+    <section3 topic='&lt;item/&gt; Element'>
+      <p>The &lt;item/&gt; element is used for detailed information about specific items of a session. It is used to contain authentication keys, to define connections, and provide more detailed status for a session. It has attributes for the type of item and the action associated with this item. This element contains only character data.</p>
+      <p>The "action" attribute specifies the action to apply or being applied to this item. From clients, this attribute SHOULD be specified. From the service, this attribute MUST be specified (to prevent ambiguity). The value of "action" MUST be one of the following:</p>
+      <table caption='Possible "action" values'>
+        <tr>
+          <th>Value</th>
+          <th>Description</th>
+          <th>Notes</th>
+        </tr>
+        <tr>
+          <td>accept</td>
+          <td>The item is accepted.</td>
+          <td>This value MUST only be used when the type is "auth" or "connection".</td>
+        </tr>
+        <tr>
+          <td>confirm</td>
+          <td>The item needs confirmation.</td>
+          <td>This value MUST only be used when the type is "auth" or "connection".</td>
+        </tr>
+        <tr>
+          <td>delete</td>
+          <td>The item is deleted.</td>
+          <td>This value MUST only be used when the type is "status".</td>
+        </tr>
+        <tr>
+          <td>drop</td>
+          <td>The item is dropped.</td>
+          <td>This value MUST only be used when the type is "connection".</td>
+        </tr>
+        <tr>
+          <td>expire</td>
+          <td>The item has expired.</td>
+          <td>This value MUST only be used when the type is "status".</td>
+        </tr>
+        <tr>
+          <td>invite</td>
+          <td>The item is invited to the session.</td>
+          <td>This value MUST only be used when the type is "connection".</td>
+        </tr>
+        <tr>
+          <td>reject</td>
+          <td>The item is rejected.</td>
+          <td>This value MUST only be used when the type is "auth" or "connection".</td>
+        </tr>
+      </table>
+      <p>The "type" attribute specifies the type of item. This attribute MUST be present. The value of "type" MUST be one of the following:</p>
+      <table caption='Possible "action" values'>
+        <tr>
+          <th>Value</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>auth</td>
+          <td>The item pertains to authentication keys.</td>
+        </tr>
+        <tr>
+          <td>connection</td>
+          <td>The item details a session connection. The CDATA is the JID that is connected.</td>
+        </tr>
+        <tr>
+          <td>status</td>
+          <td>The item details a session status event.</td>
+        </tr>
+      </table>
+    </section3>
+    <section3 topic='&lt;connect/&gt; Element'>
+      <p>The &lt;connect/&gt; element specifies a valid host/port combination for a session. An instance of this element MUST be present for each host/port combination possible. This element SHOULD only be present when information on creating sessions is requested. It has attributes to define the OOB hostname and port number. This element is empty.</p>
+      <p>The "host" attribute specifies the OOB hostname. This attribute MUST be present. The value is either the "raw" dotted-decimal IP address, or the fully-qualified domain name.</p>
+      <p>The "port" attribute specifies the OOB port number. This attribute MUST be present. The value MUST be a positive integer in the range (0 &lt; port &lt;= 1024).</p>
+    </section3>
+    <section3 topic='&lt;limit/&gt; Element'>
+      <p>The &lt;limit/&gt; element specifies a valid host/port combination for a session. An instance of this element MUST be present for each "type". This element SHOULD only be present when information on creating sessions is requested. It has attributes to define the type of limit, the default value, the minimum value, and the maximum value. This element is empty.</p>
+      <p>The "type" attribute specifies the type of limit. This attribute MUST be present. Each type corresponds to an attribute of &lt;session/&gt;. The value of "type" MUST be one of the following:</p>
+      <table caption='Possible "type" values'>
+        <tr>
+          <th>Value</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>buffer</td>
+          <td>The buffer size limits. The units for "default", "max", and "min" are bytes.</td>
+        </tr>
+        <tr>
+          <td>expires</td>
+          <td>The expires time limits. The units for "default", "max", and "min" are seconds.</td>
+        </tr>
+        <tr>
+          <td>receivers</td>
+          <td>The receiver count limits. The units for "default", "max", and "min" are number of connections.</td>
+        </tr>
+      </table>
+      <p>The "default" attribute specifies the default value for this limit. This attribute MUST be present. The value of "default" MUST be a number.</p>
+      <p>The "max" attribute specifies the maximum value for this limit. This attribute MUST be present. The value of "max" MUST be a number. A value of -1 means there is no maximum value.</p>
+      <p>The "min" attribute specifies the minimum value for this limit. This attribute MUST be present. The value of "min" MUST be a number. A value of -1 means there is no minimum value.</p>
+    </section3>
+    <section3 topic='Possible Errors'>
+      <table caption='&lt;session action="authenticate"/&gt; errors'>
+        <tr>
+          <th>Code</th>
+          <th>Message</th>
+          <th>Cause</th>
+        </tr>
+        <tr>
+          <td>400</td>
+          <td>Bad Request</td>
+          <td>The JOBS service did not understand the request.</td>
+        </tr>
+        <tr>
+          <td>403</td>
+          <td>Forbidden</td>
+          <td>The JOBS service cannot accept the authentication request from the requesting JID.</td>
+        </tr>
+        <tr>
+          <td>404</td>
+          <td>Not Found</td>
+          <td>The JOBS service could not find the given session.</td>
+        </tr>
+        <tr>
+          <td>406</td>
+          <td>Not Acceptable</td>
+          <td>The authentication is not valid.</td>
+        </tr>
+      </table>
+
+      <table caption='&lt;session action="authorize"/&gt; errors'>
+        <tr>
+          <th>Code</th>
+          <th>Message</th>
+          <th>Cause</th>
+        </tr>
+        <tr>
+          <td>400</td>
+          <td>Bad Request</td>
+          <td>The JOBS service did not understand the request.</td>
+        </tr>
+        <tr>
+          <td>403</td>
+          <td>Forbidden</td>
+          <td>The JOBS service cannot accept the authorization request from the requesting JID.</td>
+        </tr>
+        <tr>
+          <td>404</td>
+          <td>Not Found</td>
+          <td>The JOBS service could not find the given session.</td>
+        </tr>
+        <tr>
+          <td>406</td>
+          <td>Not Acceptable</td>
+          <td>The authorization is not valid.</td>
+        </tr>
+      </table>
+
+      <table caption='&lt;session action="create"/&gt; errors'>
+        <tr>
+          <th>Code</th>
+          <th>Message</th>
+          <th>Cause</th>
+        </tr>
+        <tr>
+          <td>400</td>
+          <td>Bad Request</td>
+          <td>The JOBS service did not understand the request.</td>
+        </tr>
+        <tr>
+          <td>403</td>
+          <td>Forbidden</td>
+          <td>The JOBS service cannot accept any creation requests from this JID.</td>
+        </tr>
+        <tr>
+          <td>406</td>
+          <td>Server Not Acceptable</td>
+          <td>The JOBS service cannot accept any creation requests using the requested &lt;server/&gt; parameters.</td>
+        </tr>
+        <tr>
+          <td>406</td>
+          <td>Restrictions Not Acceptable</td>
+          <td>The JOBS service cannot accept any creation requests using the requested &lt;accept/&gt;, &lt;confirm/&gt;, and/or &lt;reject/&gt; parameters.</td>
+        </tr>
+        <tr>
+          <td>503</td>
+          <td>Service Unavailable</td>
+          <td>The JOBS service cannot accept any additional sessions at this time. Future requests may be accepted.</td>
+        </tr>
+      </table>
+  
+      <table caption='&lt;session action="delete"/&gt; errors'>
+        <tr>
+          <th>Code</th>
+          <th>Message</th>
+          <th>Cause</th>
+        </tr>
+        <tr>
+          <td>400</td>
+          <td>Bad Request</td>
+          <td>The JOBS service did not understand the request.</td>
+        </tr>
+        <tr>
+          <td>403</td>
+          <td>Forbidden</td>
+          <td>The JOBS service cannot accept deletion requests from the requesting JID.</td>
+        </tr>
+        <tr>
+          <td>404</td>
+          <td>Not Found</td>
+          <td>The JOBS service could not find a given session.</td>
+        </tr>
+      </table>
+
+      <table caption='&lt;session action="notify"/&gt; errors'>
+        <tr>
+          <th>Code</th>
+          <th>Message</th>
+          <th>Cause</th>
+        </tr>
+        <tr>
+          <td>400</td>
+          <td>Bad Request</td>
+          <td>The JOBS service did not understand the request.</td>
+        </tr>
+        <tr>
+          <td>403</td>
+          <td>Forbidden</td>
+          <td>The JOBS service denied the connection for any reason.</td>
+        </tr>
+        <tr>
+          <td>404</td>
+          <td>Not Found</td>
+          <td>The JOBS service could not find a given connection and/or JID.</td>
+        </tr>
+        <tr>
+          <td>406</td>
+          <td>Not Acceptable</td>
+          <td>The JOBS service denied the notify for some reason.</td>
+        </tr>
+        <tr>
+          <td>504</td>
+          <td>Remote Server Timeout</td>
+          <td>The JOBS connection timed out.</td>
+        </tr>
+      </table>
+    </section3>
+  </section2>
+  <section2 topic='OOB Protocol'>
+    <p>The OOB protocol consists of a series of hanshaking headers, then the normal data transfer process. The syntax of the hanshake packets is similar to HTTP and SIP, in that it includes a "version and method" line, followed by zero or more "headers". The end of a packet is marked by two adjacent carriage returns (i.e. a single "empty" line). The primary difference is with the first line ("version and method"), where the protocol name and version precede the method.</p>
+    <section3 topic='Header EBNF'><code><![CDATA[
+jobs-oob :=         header CRLF ?(BINDATA)
+header :=           command-line CRLF *( header-field CRLF )
+
+command-line :=     jobs-version-tag SP method
+
+jobs-version-tag := "jobs" "/" *DIGIT 1*( "." *DIGIT )
+method :=           "init" | "auth-challenge" | "auth-response" | "connected" | "error"
+
+header-field :=     header-name ":" *1(SP header-value)
+header-name :=      NMCHAR *1( ( "." | "-" | NMCHAR ) NMCHAR)
+header-value :=     TEXT
+
+name-char :=        UALPHA | LALPHA | DIGIT
+
+CRLF :=             CR LF
+
+TEXT :=             <any OCTECT except CTLs>
+OCTET :=            <any 8-bit sequence of data>
+CTL :=              <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+UALPHA :=           <any US-ASCII uppercase letter "A".."Z">
+LALPHA :=           <any US-ASCII lowercase letter "a".."z">
+DIGIT :=            <any US-ASCII digit "0".."9">
+SP :=               <US-ASCII SP, space (32)>
+CR :=               <US-ASCII CR, carriage return (13)>
+LF :=               <US-ASCII LF, linefeed (10)>
+BINDATA :=          <Arbitrary Binary Data>
+      ]]></code></section3>
+    <section3 topic='State Details'>
+      <table caption='"init" details'>
+        <tr>
+          <th>Comand-line (example)</th>
+          <td><code>jobs/0.4 init</code></td>
+        </tr>
+        <tr>
+          <th>Expected header-fields</th>
+          <td><ul>
+            <li>"session-id" - The JOBS session ID</li>
+            <li>"client-jid" - The (full) client JID</li>
+          </ul></td>
+        </tr>
+      </table>
+      <table caption='"auth-challenge" details'>
+        <tr>
+          <th>Comand-line (example)</th>
+          <td><code>jobs/0.4 auth-challenge</code></td>
+        </tr>
+        <tr>
+          <th>Expected header-fields</th>
+          <td><ul>
+            <li>confirm - A unique &lt;item type="auth" action="confirm"/&gt; token</li>
+          </ul></td>
+        </tr>
+      </table>
+      <table caption='"auth-response" details'>
+        <tr>
+          <th>Comand-line (example)</th>
+          <td><code>jobs/0.4 auth-response</code></td>
+        </tr>
+        <tr>
+          <th>Expected header-fields</th>
+          <td><ul>
+            <li>accept - A unique &lt;item type="auth" action="accept"/&gt; token</li>
+          </ul></td>
+        </tr>
+      </table>
+      <table caption='"connected" details'>
+        <tr>
+          <th>Comand-line (example)</th>
+          <td><code>jobs/0.4 connected</code></td>
+        </tr>
+        <tr>
+          <th>Expected header-fields</th>
+          <td>NONE</td>
+        </tr>
+      </table>
+      <table caption='"error" details'>
+        <tr>
+          <th>Comand-line (example)</th>
+          <td><code>jobs/0.4 error</code></td>
+        </tr>
+        <tr>
+          <th>Expected header-fields</th>
+          <td><ul>
+            <li>error-code - The HTTP-like error code</li>
+            <li>error-msg - Detailed error message</li>
+          </ul></td>
+        </tr>
+      </table>
+    </section3>
+    <section3 topic='Possible Errors'>
+    </section3>
+  </section2>
+</section1>
+</jep>
diff --git a/xep-0043.xml b/xep-0043.xml
new file mode 100644
index 00000000..9491d6e6
--- /dev/null
+++ b/xep-0043.xml
@@ -0,0 +1,793 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+  <header>
+    <title>Jabber Database Access</title>
+    <abstract>Expose RDBM systems directly to the jabber network</abstract>
+    &LEGALNOTICE;
+    <number>0043</number>
+    <status>Retracted</status>
+    <type>Standards Track</type>
+    <jig>Standards</jig>
+    <author>
+      <firstname>Justin</firstname>
+      <surname>Kirby</surname>
+      <email>justin@openaether.org</email>
+      <jid>zion@openaether.org</jid>
+    </author>
+    <revision>
+      <version>0.2</version>
+      <date>2003-10-20</date>
+      <initials>psa</initials>
+      <remark>At the request of the author, changed status to Retracted; interested parties should refer to &lt;<link url="http://www.openaether.org/projects/jabber_database.html">http://www.openaether.org/projects/jabber_database.html</link>&gt; for further information.</remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2002-08-21</date>
+      <initials>jk</initials>
+      <remark>Initial public release</remark>
+    </revision>
+  </header>
+  <section1 topic='Introduction'>
+    <p>Accessing a RDBMS in a generic fashion is a complex and difficult
+    task. Consequently, this will not be an attempt to XMLize a generic
+    Database API or query language. Instead, it will providing a
+    simple mechanism for a JID to read/write data that it has access to 
+    and specifying a model for those schemas to use in xml.</p>
+  
+    <p>This JEP has two aims.</p>
+
+    <ol>
+      <li>Be able to request the available schemas</li>
+      <li>Perform near SQL-like data manipulation</li>
+    </ol>
+  
+    <p>Although designed for use with an RDBMS this JEP is not
+    restricted to such uses. It may be used with any data storage 
+    system that can be broken down to a simple table, column/row 
+    format. for example comma delimited files.</p>
+  </section1>
+  <section1 topic='Prerequisites'>
+    <p>To understand the following sections of this JEP the reader
+    must be aware of the following.</p>
+
+    <section2 topic='Namespace'>
+      <p>The current namespace of <link>http://openaether.org/projects/jabber_database.html</link> 
+      will be used until this becomes a jep. Once officially accepted as
+      a jep and approved as final by the council, it will become 
+      <link>http://www.jabber.org/jeps/jep-0043.html</link>.</p>
+    </section2>
+    <section2 topic='Elements'>
+      <ul>
+        <li>version - specify the version of the protocol that the client/server supports</li>
+        <li>database - specify the database/catalog has the following attributes:</li>
+        <ul>
+          <li>name - name of the database/catalog</li>
+          <li>sql - embed native SQL queries directly</li>
+        </ul>
+        <ul>
+          <li>table - the element scopes the children into the table. has the following attributes:</li>
+      <ul>
+        <li>name - name of the table</li>
+        <li>permission - what the user can do with the data</li>
+        <li>col - describes the column. has the following attributes</li>
+        <ul>
+          <li>name - name of the column</li>
+          <li>type - SQL99 datatype of the column</li>
+          <li>size - size of the datatype if required</li>
+          <li>op - comparison operator, used only if child of where element</li>
+        </ul>
+        <li>where - scopes col elements into a 'sql-like' where clause</li>
+        <ul>
+          <li>col - see above</li>
+        </ul>
+      </ul>
+      <li>proc - element scopes the children into a procedure has the following attributes:</li>
+      <ul>
+        <li>name - name of the sproc</li>
+        <li>permission - what the user can do with the data</li>
+        <li>col - see above</li>
+        <li>result - indicated return value by running the procedure (restricted to integer)</li>
+      </ul>
+        </ul>
+      </ul>
+    </section2>
+    <section2 topic='Data Types'>
+      <p>There are a limited subset of data types available:</p>
+      <ul>
+        <li>bit - a single 'bit', usually used to represent boolean values</li>
+        <li>tinyint - signed 8bit integer, has a range from   -128  to +127</li>
+        <li>integer - signed 32bit integer, has a range from -2147483648 to +2147483647</li>
+        <li>utinyint - unsigned 8bit integer, has a range from 0 to +255</li>
+        <li>uinteger - usigned 32bit integer, has a range from   0 to +4294967296</li>
+        <li>float - allowed values are -3.402823466E+38 to
+        -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38 (can NOT be  unsigned)</li>
+        <li>numeric - unlimited size (some databases constrain this though)</li>
+        <li>date - resolution is one day. acceptable ranges vary (TODO: constrain minimal range to something)</li>
+        <li>datetime - a date and time combination (often has range dependencies)</li>
+        <li>timestamp - a datetime used most often to record events</li>
+        <li>time - a time in the format HH:MM:SS (TODO: specify valid range)</li>
+        <li>char - an unsigned byte representing a single character (ASCII)</li>
+        <li>vchar - a variable width char</li>
+        <li>text - an extremely large chunk of text</li>
+        <li>blob - an extremely large chunk of binary data (encode in MIME)</li>
+      </ul>
+    </section2>
+    <section2 topic='Assumed Database Setup'>
+      <p>All SQL/RDBMS units will be scoped in the xml hierarchy:</p>
+
+      <code>
+&lt;database&gt;
+  &lt;table&gt;
+    &lt;col/&gt;
+  &lt;/table&gt;
+&lt;/database&gt;
+      </code>
+
+      <p>All examples will assume the existence of the following rdbms setup. A 
+      database named 'testdb' with tables created with following SQL
+      script:</p>
+  
+      <code>
+        create table tbl_one 
+        ( 
+          a_int int, 
+          a_float float, 
+          a_char  char(10)  
+        )
+        create table tbl_two 
+        ( 
+          a_date datetime, 
+      a_numeric numeric(9,3) 
+        )
+      </code>
+    </section2>
+</section1>      
+<section1 topic='Usage'>
+  <section2 topic='Requesting Schemas'>
+      <example caption='A simple schema request'>
+&lt;iq id="001" to="db.host" type="get"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+&lt;/iq&gt;
+      </example>
+  
+      <p>This is a simple request to discover what tables/procedures
+      exist on the database testdb. And what permissions are available 
+      to the user. All schema requests will respond within the scope that 
+      was asked for. This is to prevent unnecessary data from flooding
+      the network. So the response for the above request would look
+      something like:</p>                                     
+  
+      <example caption='Response to a schema request'>
+&lt;iq id="001" type="result" from="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one" permission="both"/&gt;
+      &lt;table  name="tbl_two" permission="read"/&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+      </example>
+  
+      <p>The response is scoped to only the 'children' of the request. 
+      Since the request was for the testdb database, only the tables 
+      within that database were returned in the result. The reason for 
+      the limitation is to prevent excessively large packets from filling 
+      the network from large schemas.</p>
+   
+      <p>The response indicates that the user has both read and write
+      permissions on the table 'tbl_one' and only read permissions on 
+      the table 'tbl_two'. Consequently, the user may only perform get 
+      requests on 'tbl_two'.</p>
+   
+      <example caption='Request detailed table schema'>
+&lt;iq id="002" type="get" to="db.host"&gt; 
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"/&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+      </example>
+   
+      <p>The response would look like:</p>
+
+      <example caption='Response to detailed request'>
+&lt;iq id="002" type="result" from="db.host"&gt;             
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"    permission="both"&gt; 
+     &lt;col name="a_int" type="int"/&gt;
+      &lt;col name="a_float" type="float"/&gt;
+      &lt;col name="a_char" type="char" size="10"/&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt; 
+      </example>
+   
+      <p>The schema response for tbl_one is quite intuitive. Three
+      columns exist, one called a_int of type int (integer), another 
+      a_float of type float and  a third called a_char of type char 
+      with a size of ten characters.</p>
+    
+
+    </section2>
+
+    <section2 topic='Manipulating Data'>
+  
+      <p>Manipulation of data (select, insert, update, delete) will
+      definitely not be elegant or easy. SQL allows for some fairly 
+      complex queries on any fully  functional RDBMS. Consequently, 
+      the data manipulation will be  relatively limited since it is 
+      not a goal to translate SQL into xml.</p>
+    
+      <section3 topic='Selects'>
+        <p>To indicate a select like query, specify an &lt;iq&gt; of
+        type get. The table that the query is to be performed against 
+        must be specified. The columns   that are to be returned in 
+        the result set must be scoped within  the relative   table. 
+        Any attribute on the &lt;col&gt; element besides name will be 
+        ignored.  e.g. it is not required nor recommended to specify 
+        the data types  or the  sizes while performing a get.</p>
+      
+        <example caption='Basic select'>
+&lt;iq id="003" type="get" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_int"/&gt;
+      &lt;col name="a_float"/&gt;
+      &lt;col name="a_char"/&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+
+      SQL Syntax:
+        select a_int, a_float, a_char
+        from tbl_one
+        </example>
+      
+       <p>It is also possible to specify a limit on the number of rows 
+       returned in the result set by specifying a value for the limit 
+       attribute.</p>
+     
+       <example caption='Basic select with limit'>
+&lt;iq id="003" type="get" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_one"  limit="2"&gt;
+      &lt;col name="a_int"/&gt;
+      &lt;col name="a_float"/&gt;
+      &lt;col name="a_char"/&gt;
+      &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+       </example>
+
+       <p>In this case a limit of two rows will be returned in the result set.</p>
+    
+       <p> The result set which is returned will contain all the rows
+       that met the criteria of the select. There is no schema
+       information beyond the column names included in the result set. 
+       Each 'row' in the result set is scoped within the corresponding 
+       &lt;table&gt; element. This allows for queries on multiple
+       tables to be used in one &lt;iq&gt; packet.</p>
+
+       <example caption='Response to basic select'>
+&lt;iq id="003" type="result" from="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_int"&gt;1234&lt;/col&gt;
+      &lt;col name="a_float"&gt;123.45&lt;/col&gt;
+      &lt;col name="a_char"&gt;onetwothre&lt;/col&gt;
+    &lt;/table&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_int"&gt;2345&lt;/col&gt;
+      &lt;col name="a_float"&gt;234.56&lt;/col&gt;
+      &lt;col name="a_char"&gt;twothreefo&lt;/col&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+       </example>
+     </section3>
+
+     <section3 topic='Constraining Result Sets'>
+       <p>It would be impractical to request the entire contents of the 
+       table every time you needed one row or a subset of the data. You 
+       can constrain the result set by specifying a where clause.</p>
+
+       <example caption='Select with constraints'>
+&lt;iq id="004" type="get" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_int"/&gt;
+      &lt;col name="a_float"/&gt;
+      &lt;col name="a_char"/&gt;
+      &lt;where&gt;
+        &lt;col name="a_int" op="eq"&gt;1234&lt;/col&gt;
+        &lt;col name="a_float" op="lt" conj="and"&gt;200.00&lt;/col&gt;
+      &lt;/where&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+
+         SQL Syntax:
+         select a_int, a_float, a_char from tbl_one
+         where   a_int = 1234 and a_float &lt; 200.00
+       </example>
+      
+       <p>Attributes only used in the &lt;col&gt; element within a 
+       &lt;where&gt; element are the op (for operator) and conj for 
+       (conjunction). The op is used for comparison operators such 
+       as &lt;, &gt;, =, &lt;&gt;, &lt;=, &gt;=
+
+       <ul>
+     <li>eq - equivalent =</li>
+     <li>neq - not-equivalent &lt;&gt;</li>
+     <li>lt - less than &lt;</li>
+     <li>gt - greater than &gt;</li>
+     <li>let - less than or equivalent &lt;=</li>
+     <li>get - greater than or equivalent &gt;=</li>
+     <li>null - IS NULL (the column is null in  the   database  sense of the word)</li>
+       </ul>
+      </p>
+
+      <p>The conjuction attribute is used to combined constraints in the where clause
+
+      <ul>
+        <li>not - to negate a result</li>
+    <li>or - logical OR ||</li>
+    <li>and - logical AND &amp;&amp;</li>
+      </ul>      
+      </p>
+
+      <p><strong>Result</strong></p>
+
+      <example caption='Response to select with constraints'>
+&lt;iq id="003" type="result" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_int"&gt;1234&lt;/col&gt;
+      &lt;col name="a_float"&gt;123.45&lt;/col&gt;
+      &lt;col name="a_char"&gt;onetwothre&lt;/col&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+      </example>
+    </section3>
+
+    <section3 topic='Inserts'>
+      <p>Inserting or altering the stored data in anyway requires
+      setting the type attribute to a value of set. This indicates 
+      that the user wants to perform a 'insert/update'. The
+      differentiating factor between an insert and an update operation 
+      is whether a &lt;where&gt; element is used. If there is no
+&lt;where&gt; element then it must be interpreted as an insert. 
+      If a &lt;where&gt; element does exist, then it must be
+      interpreted as an update.</p>
+
+      <example caption='Inserting data'>
+&lt;iq id="004" type="set" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_int"&gt;3456&lt;/col&gt;
+      &lt;col name="a_float"&gt;345.67&lt;/col&gt;
+      &lt;col name="a_char"&gt;threefour&lt;/col&gt;
+    &lt;/table&gt;
+    &lt;table  name="tbl_two"&gt;
+      &lt;col name="a_date"&gt;02/16/2002&lt;/col&gt;
+      &lt;col name="a_numeric"&gt;123456789123.123&lt;/col&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+
+SQL syntax:
+insert tbl_one (a_int, a_float,a_char)VALUES(3456,   345.67, 'threefour')
+insert tbl_two (a_date, a_numeric) VALUES('02/16/2002', 123456789123.123)
+      </example>
+
+      <p><strong>Result</strong></p>
+
+      <p> If there is no result set for the query, as in an update,
+      insert, delete, then the response must indicate success or 
+      failure within the &lt;table&gt; element scope. An empty
+&lt;table&gt; element indicates success, and a &lt;table&gt; 
+      element containing an &lt;error&gt; element indicates a failure.</p>
+
+      <example caption='Response to data insert'>
+&lt;iq id="004" type="result" from="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_one"/&gt;
+    &lt;table name="tbl_two"&gt;
+      &lt;error code="380"&gt;permission denied on table&lt;/error&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+      </example>
+      
+      <p> The insert into tbl_one succeeded since the response has an 
+      empty &lt;table&gt; element. However, the insert into tbl_two 
+      failed with a permission denied error. Which is indicated with a 
+      non-empty &lt;table&gt; element.</p>
+    </section3>
+
+    <section3 topic='Updates'>
+
+      <p> As stated previously, if the type attribute has a value of
+      set and a &lt;where&gt; element exists, then it must be interpreted as an update.</p>
+
+      <example caption='Updating'>
+&lt;iq id="005" type="set" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table  name="tbl_one"&gt;
+      &lt;col name="a_char"&gt;aaaaaaaaaa&lt;/col&gt;
+      &lt;where&gt;
+        &lt;col name=c"a_int"&gt;1234&lt;/col&gt;
+      &lt;/where&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+
+        SQL Syntax:
+    update tbl_one 
+    set a_char = 'aaaaaaaaaa'
+    where a_int = 1234
+      </example>
+
+      <p><strong>Result</strong></p>
+
+      <p> Again, if there is no result set returned by the query, then
+      success or failure must be indicated.</p>
+
+      <example caption='Response to update'>
+&lt;iq id="005" type="result" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_one"/&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+      </example>
+    </section3>
+
+    <section3 topic='Deletes'>
+
+    <p> If the type attribute has a value of set and there are no
+    &lt;col&gt; elements scoped within the &lt;table&gt; element, 
+    then the query must be interpreted as a delete.</p>
+
+    <example caption='Simple delete'>
+&lt;iq id="006" type="set"  to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_one"&gt;
+      &lt;where&gt;
+        &lt;col name="a_int" op="eq"&gt;1234&lt;/col&gt;
+      &lt;/where&gt;
+    &lt;/table&gt;
+    &lt;/database&gt;
+&lt;/iq&gt;
+
+      SQL Syntax:
+      delete from tbl_one where a_int = 1234
+    </example>
+
+    <p><strong>Result</strong></p>
+    
+    <p>Again, if a result set is not generated by a query, then
+    success or failure must be indicated by the &lt;table&gt; element</p>
+
+    <example caption='Response to delete'>
+&lt;iq id="006" type="result"    to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_one"/&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+    </example>
+    </section3>
+  </section2>
+  <section2 topic='Procedures'>
+
+  <p> Procedures, or stored procedures <note>Apparently procedures 
+  are not as common in RDBMS as I thought. Postgres and MySQL have 
+  functions, but not procedures. So until I, or someone else, 
+  researches this issue this feature is on hold.</note>  
+, are often handy to make frequently used sql queries execute faster. 
+  These are simply queries stored in a precompiled form and given a 
+  name with a list of parameters. Each RDBMS handles procedures 
+  differently, but the common characteristics are that they are 
+  stored server side and have in/out parameters.</p>
+
+  <p> The &lt;proc&gt; element will be used to indicate a procedure. 
+  It has similar characteristics to the &lt;table&gt; element. The 
+  core differences are that the &lt;col&gt; elements have permissions 
+  and a &lt;result&gt; element can be used to indicate the value 
+  returned by the procedure.</p>
+
+  <p> The permission attribute on a &lt;col&gt; element is used to 
+  indicate whether the parameter is in (read), out (write) or in/out (both). </p>
+  
+  <p> The only result set acceptable from a procedure is that of the 
+  parameters or &lt;col&gt; element. If the procedure produces a
+  result set outside of the parameters this should be ignored.</p>
+
+  </section2>
+  <section2 topic='Errors'>
+
+  <p> The server must be able to let the client know when an error 
+  occurs, instead of just being silent.</p>
+  
+  <table caption='Error Codes'>
+    <tr>
+      <th>Code</th>
+      <th>Message</th>
+      <th>Description</th>
+    </tr>
+    <tr>
+      <td>399</td>
+      <td>Invalid Database Name</td>
+      <td>Returned when the client has requested information from a
+      database which does not exist according to the component.</td>
+    </tr>
+    <tr>
+      <td>398</td>
+      <td>Invalid Table Name</td>
+      <td>Returned when the client has requested information from a 
+      table/procedure which does not exist according to the component.</td>
+    </tr>
+    <tr>
+      <td>397</td>
+      <td>Invalid Column Name</td>
+      <td>Returned when the client has requested information from a 
+      column which does not exist according to the component.</td>
+    </tr>
+    <tr>
+      <td>380</td>
+      <td>Permission Denied on Table</td>
+      <td>Returned when the requested action is not allowed for the 
+      user on the table</td>
+    </tr>
+    <tr>
+      <td>401</td>
+      <td>Access Denied</td>
+      <td>Returned when the user does not have permission to use the 
+      component.</td>
+    </tr>
+  </table>
+
+  <p>If the user requests an action on a table which they do not have 
+  permission to do the following should be returned</p>
+  
+  <example caption='Permission denied error'>
+&lt;iq id="004" type="error" from="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_two"&gt;
+      &lt;error code="380"&gt;permission denied on table&lt;/error&gt;
+    &lt;/table&gt;
+&lt;/database&gt;
+    &lt;/iq&gt;  
+  </example>
+
+  <p>If the user is not allowed to access the component the following should be returned</p>
+
+  <example caption='General access denied'>
+&lt;iq id="004" type="error" from="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;error code="401"&gt;Access Denied&lt;/error&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+  </example>
+
+  </section2>
+  <section2 topic='Optional Features'>
+  <p> There are requirements which can be provided by other jabber 
+  components/namespaces, namely the jabber:iq:browse namespace 
+  in-place of Version Negotiation. Due to the inherent limitations 
+  of the above data retrieval mechanisms more sophisticated querying 
+  techniques might be desired. The &lt;query&gt; element will extend 
+  the functionality </p>
+
+  <section3 topic='Embedded SQL'>
+    <p> The abilities described in the Basics section are just that, 
+    basic. To provide more flexibility and allow for the full power 
+    of SQL without xmlifying everything, a &lt;sql&gt; element may 
+    be implemented to provide this feature.</p>
+    
+    <p> The &lt;sql&gt; element must be scoped within the &lt;database&gt; element.</p>
+
+    <example caption='Embedded sql query'>
+&lt;iq id="007" type="get" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;sql&gt; select a_int, a_float from tbl_one &lt;/sql&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p><strong>Result</strong></p>
+
+    <example caption='Response to embedded query'>
+&lt;iq id="007" type="result" to="db.host"&gt;
+  &lt;database 
+      name="testdb"
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+    &lt;table name="tbl_one" permission="both"&gt;
+      &lt;col name="a_int" type="integer"/&gt;
+      &lt;col name="a_float" type="float"/&gt;
+    &lt;/table&gt;
+    &lt;table name="tbl_one"&gt;
+      &lt;col name="a_int"&gt;1234&lt;/col&gt;
+      &lt;col name="a_float"&gt;123.45&lt;/col&gt;
+    &lt;/table&gt;
+    &lt;table name="tbl_one"&gt;
+      &lt;col name="a_int"&gt;2345&lt;/col&gt;
+      &lt;col name="a_float"&gt;234.56&lt;/col&gt;
+    &lt;/table&gt;
+  &lt;/database&gt;
+&lt;/iq&gt;
+    </example>
+
+    <p> Since SQL is so flexible, the result set schema is not known 
+    until it is returned as a result of the query. Consequently, it 
+    must be sent as the first 'row' of the returned result. Each 
+    following row will be the actual data queried for.</p>
+
+    <p> If multiple tables are used within one SQL statement, then 
+    then name attribute within the &lt;table&gt; element can not be 
+    accurately denoted with a single table name. The best way to deal 
+    with this situation is to simply use a unique identifier within 
+    the scope of the &lt;database&gt; element. This will allow for 
+    multiple &lt;sql&gt; results to be scoped within the same result.</p>
+
+    </section3>  
+    <section3 topic='Version Negotiation'>
+
+    <p>It is expected that this protocol will grow and be extended 
+    to meet various demands. Therefore, version
+    negotiation<note>Version Negotiation is being killed since browsing, feature 
+    negotiation, or disco will be able to perform this function, 
+    however it might be useful as an optional feature for clients 
+    that don't implement these yet, especially considering none 
+    of these have been standardized.</note> will be 
+    incorporated up front.</p>
+    
+    <p>When the connection initiator, client end-user or
+    server/transport, starts a session, it must first send 
+    the version number it expects to use, otherwise, behavior 
+    is undefined.</p>
+
+    <code>
+&lt;iq id="000" type="get" to="db.host"&gt;
+  &lt;database 
+      xmlns="http://openaether.org/projects/jabber_database.html"&gt;
+      &lt;version&gt;0.1&lt;/version&gt;
+    &lt;/database&gt;
+&lt;/iq&gt;
+    </code>
+
+    <p>Three responses are possible from the server.</p>
+    <ol>    
+      <li>It supports that version number and responds with:
+      <p><code>
+&lt;iq id="000" type="result" from="db.host"&gt;
+  &lt;database 
+      xmlns="http://openaether.org/projects/jabber_database.html"&gt;
+    &lt;version&gt;0.1&lt;/version&gt;
+    &lt;/database&gt;
+&lt;/iq&gt;
+      </code>
+      The type of 'result' indicates that the version request was
+      successful and if the client is satisfied with the version number, 
+      may continue with schema requests or whatever.</p></li>
+    
+      <li>It does not support that version number and responds with:
+      <p><code>
+&lt;iq id="000" type="error" from="db.host"&gt;
+  &lt;database 
+      xmlns="http://openaether.org/projects/jabber_database.html"/&gt;
+&lt;/iq&gt;
+      </code>
+      The type of 'error' indicates a failure in conforming to the
+      desired version number. The server may optionally send an
+      alternative option.
+      <code>
+&lt;iq id="000" type="error" from="db.host"&gt;
+  &lt;database 
+      xmlns="http://openaether.org/projects/jabber_database.html"&gt;
+      &lt;version&gt;0.2&lt;/version&gt;
+    &lt;/database&gt;
+&lt;/iq&gt;
+      </code></p></li>
+      <li>If the server has no idea what the client is talking
+      about it should send the appropriate Jabber error code.</li>
+    </ol>
+    </section3>
+  </section2>
+</section1>
+
+<section1 topic='Limitations'>
+  <ol>
+    <li>No joins, roll ups, cubes</li>
+    <li>Views are not differentiated from tables</li>
+    <li>provides basic sql-like functionality only</li>
+    <li>Utilizes <em>lowest common denominator</em> approach</li>
+  </ol>
+</section1>
+
+<section1 topic='Todos'>
+  <ul>
+    <li>define procedures; what they are and how they work</li>
+    <li>determine value of adding administration features</li>
+  </ul>
+</section1>
+
+<section1 topic='Thanks'>
+  <p>Thanks to Russell Davis (ukscone) for fine tuning the layout and wording of this jep. It would probably have been unreadable if it wasn't for him.</p>
+</section1>
+
+<section1 topic='DTD and Schema'>
+  <section2 topic='DTD'>
+    <code>
+&lt;!ELEMENT version (#PCDATA)&gt;
+&lt;!ELEMENT error (#PCDATA)&gt;
+&lt;!ELEMENT sql(#PCDATA)&gt;
+&lt;!ELEMENT database (table | sproc | sql | error)*&gt;
+&lt;!ELEMENT table (col | where | error)*&gt;
+&lt;!ELEMENT where (col+)&gt;
+&lt;!ELEMENT col (#PCDATA)&gt;
+&lt;!ELEMENT proc(col | result | error)*&gt;
+&lt;!ELEMENT result (#PCDATA)&gt;
+&lt;!ATTLIST error code CDATA #IMPLIED&gt;
+&lt;!ATTLIST database name CDATA #IMPLIED&gt;
+&lt;!ATTLIST table 
+name CDATA #IMPLIED 
+    permission (read | write | both) #IMPLIED 
+    limit CDATA #IMPLIED
+&gt;
+&lt;!ATTLIST proc name CDATA #IMPLIED&gt;
+&lt;!ATTLIST col 
+    name CDATA #IMPLIED 
+    size CDATA #IMPLIED 
+    op (eq | neq | lt | gt | let | get | null) #IMPLIED 
+    conj (not | or | and ) #IMPLIED 
+    permission (read | write | both) #IMPLIED 
+    type (bit | tinyint | integer | utinyint | uinteger | 
+          float | numeric | date | datetime | timestamp | 
+          time | char | vchar | text | blob) #IMPLIED 
+&gt;
+    </code>
+  </section2>
+  <section2 topic='Schema'>
+    <p><strong>Anyone care to do this?</strong></p>
+  </section2>
+</section1>
+</jep>
diff --git a/xep-0044.xml b/xep-0044.xml
new file mode 100644
index 00000000..46b97299
--- /dev/null
+++ b/xep-0044.xml
@@ -0,0 +1,172 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM "../jep.ent">
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+
+<jep>
+
+<header>
+  <title>Full Namespace Support for XML Streams</title>
+  <abstract>A description of the use of namespaces within Jabber.</abstract>
+  &LEGALNOTICE;
+  <number>0044</number>
+  <status>Deferred</status>
+  <type>Standards Track</type>
+  <jig>Standards</jig>
+  <author>
+    <firstname>Robert</firstname>
+    <surname>Norris</surname>
+    <email>rob@cataclysm.cx</email>
+    <jid>rob@cataclysm.cx</jid>
+  </author>
+  <revision>
+    <version>0.1</version>
+    <date>2002-08-26</date>
+    <initials>rn</initials>
+    <remark>Initial version.</remark>
+  </revision>
+</header>
+
+<section1 topic='Introduction'>
+  <p>Jabber has traditionally supported a subset of the XML Namespaces specification <note><link url="http://www.w3.org/TR/REC-xml-names">http://www.w3.org/TR/REC-xml-names</link></note>. The protocol has been restricted to using specific namespace prefixes.</p>
+
+  <p>This is convenient for client and server implementors, since they only need to check the element name to determine both the name and the context of the element. However, these restrictions mean that developers are unable to take advantage of some of the features that namespaces provide.</p>
+
+  <p>Many developers have expressed an interest in having Jabber fully support namespaces - a desire which is likely to increase as time goes on. This support consists of allowing any namespace prefix to be used with any namespace, and also to allow namespace prefixes to be pre-declared on the stream root.</p>
+
+  <p>This document outlines the semantics required for servers and clients to support namespaces fully, and also discusses implementation techniques and methods for providing compatibility with older "fixed-prefix" implementations.</p>
+</section1>
+
+<section1 topic='Requirements and Protocol'>
+
+  <p>A typical XML stream is a pair of XML documents, one for each direction of communication between the two peers. An simple example of these might look like this:</p>
+  
+  <example caption="A typical XML stream"><![CDATA[
+SEND: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     to='jabber.org'>
+RECV: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     id='12345678'>
+SEND: <iq type='get' to='jabber.org'>
+        <query xmlns='jabber:iq:version'/>
+      </iq>
+RECV: <iq type='result' from='jabber.org'>
+        <query xmlns='jabber:iq:version'>
+          <name>jsm</name>
+          <version>1.4.2</version>
+          <os>Linux 2.4.19</os>
+        </query>
+      </iq>]]>
+   </example>
+
+  <p>Note that there may also be additional namespaces specified in the stream header, to select or inform of various server features:</p>
+
+  <example caption="A typical XML stream with stream options"><![CDATA[
+SEND: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     xmlns:sasl='http://www.iana.org/assignments/sasl-mechanisms'
+                     to='jabber.org'>
+RECV: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     xmlns:sasl='http://www.iana.org/assignments/sasl-mechanisms'
+                     id='12345678'>
+      <sasl:mechanisms>
+        <sasl:mechanism>PLAIN</sasl:mechanism>
+        <sasl:mechanism>DIGEST-MD5</sasl:mechanism>
+        <sasl:mechanism>EXTERNAL</sasl:mechanism>
+      </sasl:mechanisms>
+SEND: <iq type='get' to='jabber.org'>
+        <query xmlns='jabber:iq:version'/>
+      </iq>
+RECV: <iq type='result' from='jabber.org'>
+        <query xmlns='jabber:iq:version'>
+          <name>jsm</name>
+          <version>1.4.2</version>
+          <os>Linux 2.4.19</os>
+        </query>
+      </iq>]]>
+  </example>
+
+  <p>Currently, the prefix for each namespace is fixed; it cannot vary at all, since implementations use it for matching. The desire is to be able to use arbitrary prefixes:</p>
+ 
+  <example caption="XML stream with arbitrary namespace prefixes (1)"><![CDATA[
+SEND: <stream xmlns:app='jabber:client'
+              xmlns='http://etherx.jabber.org/streams'
+              to='jabber.org'>
+RECV: <stream xmlns:app='jabber:client'
+              xmlns='http://etherx.jabber.org/streams'
+              id='12345678'>
+SEND: <app:iq type='get' to='jabber.org'>
+        <query xmlns='jabber:iq:version'/>
+      </app:iq>
+RECV: <app:iq type='result' from='jabber.org'>
+        <query xmlns='jabber:iq:version'>
+          <name>jsm</name>
+          <version>1.4.2</version>
+          <os>Linux 2.4.19</os>
+        </query>
+      </app:iq>]]>
+  </example>
+
+  <p>Also, since there exist streams in both directions, it should be possible for prefixes to differ between the two streams:</p>
+
+  <example caption="XML stream with arbitrary namespace prefixes"><![CDATA[
+SEND: <stream xmlns:app='jabber:client'
+              xmlns='http://etherx.jabber.org/streams'
+              to='jabber.org'>
+RECV: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     id='12345678'>
+SEND: <app:iq type='get' to='jabber.org'>
+        <query xmlns='jabber:iq:version'/>
+      </app:iq>
+RECV: <iq type='result' from='jabber.org'>
+        <ver:query xmlns:ver='jabber:iq:version'>
+          <ver:name>jsm</ver:name>
+          <ver:version>1.4.2</ver:version>
+          <ver:os>Linux 2.4.19</ver:os>
+        </ver:query>
+      </iq>]]>
+  </example>
+
+  <p>Additionally, it should be possible to declare namespaces on the stream header so that they don't need to be declared later:</p>
+
+  <example caption="XML stream with namespaces declared in the stream header"><![CDATA[
+SEND: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     xmlns:ver='jabber:iq:version'
+                     to='jabber.org'>
+RECV: <stream:stream xmlns='jabber:client'
+                     xmlns:stream='http://etherx.jabber.org/streams'
+                     xmlns:ver='jabber:iq:version'
+                     id='12345678'>
+SEND: <iq type='get' to='jabber.org'>
+        <ver:query/>
+      </iq>
+RECV: <iq type='result' from='jabber.org'>
+        <ver:query>
+          <ver:name>jsm</ver:name>
+          <ver:version>1.4.2</ver:version>
+          <ver:os>Linux 2.4.19</ver:os>
+        </ver:query>
+      </iq>]]>
+  </example>
+
+  <p>And of course, any combinations of these should be valid, as long as they conform to the XML Namespaces specification.</p>
+
+</section1>
+
+<section1 topic='Implementation Notes'>
+
+  <p>In order to implement namespaces correctly, implementations will need to check both the namespace of an element (or attribute), and its namespace, in order to match it. An implementation will need to maintain some sort of mapping between prefixes and namespaces, though some parsers, such as recent versions of Expat, can do this for the implementor.</p>
+
+  <p>Implementations should, wherever possible, adhere to the IETF maxim "be liberal in what you accept, and conservative in what you send". This means accepting any valid namespace prefix, but using only the traditional prefixes (i.e. "stream" for "http://etherx.jabber.org/streams", "sasl" for "http://www.iana.org/assignments/sasl-mechanisms", and no prefix for the application namespace). For servers, this has the added benefit of getting compatibility with non-namespace-aware clients for free.</p>
+
+  <p>In server components that may have to forward packets received from one stream to another stream, it may be necessary for the application namespace to be rewritten before the packet is forwarded. Examples of this are client-to-server and server-to-server components, which must convert "jabber:client" and "jabber:server" components, respectively, into "jabber:component:accept" packets before they are forwarded to the router.</p>
+
+</section1>
+
+</jep>
diff --git a/xep-0045.xml b/xep-0045.xml
new file mode 100644
index 00000000..4b5b1649
--- /dev/null
+++ b/xep-0045.xml
@@ -0,0 +1,5206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE jep SYSTEM '../jep.dtd' [
+  <!ENTITY % ents SYSTEM '../jep.ent'>
+%ents;
+<!ENTITY ROOM "&lt;room@service&gt;">
+<!ENTITY ROOMJID "&lt;room@service/nick&gt;">
+]>
+<?xml-stylesheet type='text/xsl' href='../jep.xsl'?>
+<jep>
+<header>
+  <title>Multi-User Chat</title>
+  <abstract>This document defines an XMPP protocol extension for multi-user text conferencing.</abstract>
+  &LEGALNOTICE;
+  <number>0045</number>
+  <status>Draft</status>
+  <type>Standards Track</type>
+  <jig>Standards JIG</jig>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XMPP IM</spec>
+    <spec>JEP-0004</spec>
+    <spec>JEP-0030</spec>
+    <spec>JEP-0068</spec>
+    <spec>JEP-0082</spec>
+    <spec>JEP-0128</spec>
+  </dependencies>
+  <supersedes/>
+  <supersededby/>
+  <shortname>muc</shortname>
+  <schemaloc>
+    <ns>muc</ns>
+    <url>http://jabber.org/protocol/muc/muc.xsd</url>
+  </schemaloc>
+  <schemaloc>
+    <ns>muc#admin</ns>
+    <url>http://jabber.org/protocol/muc/admin.xsd</url>
+  </schemaloc>
+  <schemaloc>
+    <ns>muc#owner</ns>
+    <url>http://jabber.org/protocol/muc/owner.xsd</url>
+  </schemaloc>
+  <schemaloc>
+    <ns>muc#unique</ns>
+    <url>http://jabber.org/protocol/muc/unique.xsd</url>
+  </schemaloc>
+  <schemaloc>
+    <ns>muc#user</ns>
+    <url>http://jabber.org/protocol/muc/user.xsd</url>
+  </schemaloc>
+  <registry/>
+  &stpeter;
+  <revision>
+    <version>1.21</version>
+    <date>2006-09-13</date>
+    <initials>psa</initials>
+    <remark>
+      <ul>
+        <li>Clarified that inclusion of MUC extension in room join/create request triggers Data Forms flow but that absence of MUC extension leads to automatic room creation for backwards compatibility with older groupchat 1.0 protocol.</li>
+        <li>Specified use of &lt;not-acceptable/&gt; error on nickname change if nicks are locked down.</li>
+        <li>Required clients to discover room configuration prior to entering room and specified related security considerations, including use of privacy-related status codes 170, 171, 172, 173, and 174.</li>
+        <li>Specified use of &lt;not-acceptable/&gt; error if room configuration options cannot be processed or violate service policies.</li>
+        <li>Made explicit that roomnicks must not consist only of spaces.</li>
+        <li>Moved all service discovery use cases into dedicated section.</li>
+        <li>Changed jabber:x:delay support from SHOULD to MUST.</li>
+        <li>Clarified that _whois room configuration option specifies room type.</li>
+        <li>Defined JEP-0128 room information fields for discussion logs, associated pubsub node, and contact JID.</li>
+        <li>Specified that changing role to moderator upon affiliation change to admin or owner is recommended, not required.</li>
+        <li>Added internationalization consideration about localization of field labels for various data forms.</li>
+        <li>Specified that implementations may persist roles across visits and should do so for moderated rooms.</li>
+        <li>Added protocol and service discovery feature for requesting a unique room name prior to room creation.</li>
+        <li>Further clarified nature of reserved room nicknames and nickname lockdown.</li>
+        <li>Defined data forms for requesting voice and approving voice requests.</li>
+        <li>Added multiple invitee example for XMPP URI.</li>
+        <li>Clarified order of presence, discussion history, etc.</li>
+        <li>Added status codes for occupant's own roomnick, service-modified roomnick, and warning that room discussion is publicly logged.</li>
+        <li>Clarified privacy and anonymity considerations regarding room logging and non-anonymous rooms.</li>
+      </ul>
+    </remark>
+  </revision>
+  <revision>
+    <version>1.20</version>
+    <date>2005-09-08</date>
+    <initials>psa</initials>
+    <remark><p>Harmonized ability to kick and ban users, and clarified that a user cannot be kicked or banned by a moderator or admin with a lower affiliation.</p></remark>
+  </revision>
+  <revision>
+    <version>1.19</version>
+    <date>2005-04-21</date>
+    <initials>psa</initials>
+    <remark><p>Specified how to send multiple invitations simultaneously; corrected some errors regarding consistency of affiliation state changes; changed message events prohibition from MUST NOT to SHOULD NOT; corrected error handling related to the #traffic disco node; allowed &lt;password/&gt; as a child of &lt;destroy/&gt;; changed max users error from &notallowed; to &unavailable;; specified that the maxchars attribute counts characters in complete XML stanzas; added disco features for FORM_TYPEs; defined registry for status codes; split Create Instant Room into separate use case for protocol compliance purposes; adjusted XML schemas to reflect the foregoing changes; re-wrote the introduction; clarified small textual matters throughout.</p></remark>
+  </revision>
+  <revision>
+    <version>1.18</version>
+    <date>2004-11-02</date>
+    <initials>psa</initials>
+    <remark><p>Corrected several errors in the affiliation state chart and in the examples (wrong FORM_TYPE values); mentioned /me command.</p></remark>
+  </revision>
+  <revision>
+    <version>1.17</version>
+    <date>2004-10-04</date>
+    <initials>psa</initials>
+    <remark><p>Added text about allowable extension namespaces and related service discovery mechanisms; specified well-known service discovery nodes; added conformance terms to clarify some descriptions; modified affiliation state chart to allow more flexible state changes; per list dicussion, added ability to convert a one-to-one chat into a conference, including sending of history; specified error to use when max users limit is reached; specified form for admin approval of user registration requests and modified FORM_TYPE from http://jabber.org/protocol/muc#user to http://jabber.org/protocol/muc#register; modified FORM_TYPE for room configuration from http://jabber.org/protocol/muc#owner to http://jabber.org/protocol/muc#roomconfig.</p></remark>
+  </revision>
+  <revision>
+    <version>1.16</version>
+    <date>2004-06-30</date>
+    <initials>psa</initials>
+    <remark><p>Added example and registry submission for service discovery extension.</p></remark>
+  </revision>
+  <revision>
+    <version>1.15</version>
+    <date>2004-06-24</date>
+    <initials>psa</initials>
+    <remark><p>Removed jabber:iq:browse references; clarified order of presence stanzas sent to new occupant on entering room; specified format of in-room messages (type='groupchat', from='room@service'); clarified allowable attributes in various list-related operations; made admin/owner revocation text and examples consistent with state chart; clarified ownership revocation conflict scenarios; changed the 'muc#roomconfig_inviteonly' field to 'muc#roomconfig_membersonly'; changed attribute order in examples to match XML canonicalization rules; corrected several errors in the schemas.</p></remark>
+  </revision>
+  <revision>
+    <version>1.14</version>
+    <date>2004-05-03</date>
+    <initials>psa</initials>
+    <remark><p>Corrected discovery of registered roomnicks; added note about error to return if nicks are locked down.</p></remark>
+  </revision>
+  <revision>
+    <version>1.13</version>
+    <date>2004-03-31</date>
+    <initials>psa</initials>
+    <remark><p>Fixed an error in the muc#user schema.</p></remark>
+  </revision>
+  <revision>
+    <version>1.12</version>
+    <date>2004-03-01</date>
+    <initials>psa</initials>
+    <remark><p>Corrected a few errors in the examples; added IQ results in order to clarify workflows.</p></remark>
+  </revision>
+  <revision>
+    <version>1.11</version>
+    <date>2004-02-05</date>
+    <initials>psa</initials>
+    <remark><p>Clarified JID matching rules (same as for privacy lists in XMPP IM).</p></remark>
+  </revision>
+  <revision>
+    <version>1.10</version>
+    <date>2004-01-07</date>
+    <initials>psa</initials>
+    <remark><p>Added XMPP error handling; fully specified all conformance terms.</p></remark>
+  </revision>
+  <revision>
+    <version>1.9</version>
+    <date>2003-12-14</date>
+    <initials>psa</initials>
+    <remark><p>Removed protocol for requesting voice in a moderated room (should be performed using Ad-Hoc Commands).</p></remark>
+  </revision>
+  <revision>
+    <version>1.8</version>
+    <date>2003-12-04</date>
+    <initials>psa</initials>
+    <remark><p>Added protocol for requesting voice in a moderated room; added (informational) mapping of IRC commands to MUC protocols.</p></remark>
+  </revision>
+  <revision>
+    <version>1.7</version>
+    <date>2003-10-21</date>
+    <initials>psa</initials>
+    <remark><p>Added room configuration option for restricting presence broadcast to certain roles.</p></remark>
+  </revision>
+  <revision>
+    <version>1.6</version>
+    <date>2003-10-03</date>
+    <initials>psa</initials>
+    <remark><p>Added history management protocol on entering a room.</p></remark>
+  </revision>
+  <revision>
+    <version>1.5</version>
+    <date>2003-09-11</date>
+    <initials>psa</initials>
+    <remark><p>Specified that ban occurs by JID, not roomnick; allowed privileged users to send messages to the room even if not present in the room; added note that service should remove occupant if a delivery-related stanza error occurs; enabled user to disco the room in order to discover registered roomnick; specified that "banning" by domain or regex is a service-level configuration matter and therefore out of scope for MUC; specified that role should be decremented as appropriate if affiliation is lowered; added some clarifying text to room creation workflow; added implementation note about sending an out-of-band message if a user's affiliation changes while the user is not in the room; fixed stringprep references (room nicks use Resourceprep); clarified relationship between Room ID (i.e., node identifier of Room JID, which may be opaque) and natural-language Room Name; specified Field Standardization profile per JEP-0068; defined Jabber Registrar submissions; added schema locations.</p></remark>
+  </revision>
+  <revision>
+    <version>1.4</version>
+    <date>2003-02-16</date>
+    <initials>psa</initials>
+    <remark><p>Added XML schemas.</p></remark>
+  </revision>
+  <revision>
+    <version>1.3</version>
+    <date>2003-02-11</date>
+    <initials>psa</initials>
+    <remark><p>Added reference to nodeprep Internet-Draft.</p></remark>
+  </revision>
+  <revision>
+    <version>1.2</version>
+    <date>2003-01-30</date>
+    <initials>psa</initials>
+    <remark><p>Commented out revision history prior to version 1.0 (too long); clarified business rules regarding when nicks, full JIDs, and bare JIDs are used in reference to roles and affiliations; consistently specified that extended presence information in the muc#user namespace must include the full JID as the value of the 'jid' attribute in all cases; cleaned up text and examples throughout; added open issue regarding syntax of room nicknames.</p></remark>
+  </revision>
+  <revision>
+    <version>1.1</version>
+    <date>2002-12-16</date>
+    <initials>psa</initials>
+    <remark><p>Added protocol for declining an invitation; replaced &lt;created/&gt; element with status code 201; modified the destroy room protocol so that &lt;destroy/&gt; is a child of &lt;query/&gt;; clarified usage of 'nick' attribute when adding members; prohibited use of message events.</p></remark>
+  </revision>
+  <revision>
+    <version>1.0</version>
+    <date>2002-11-21</date>
+    <initials>psa</initials>
+    <remark><p>Per a vote of the Jabber Council, revision 0.23 was advanced to Draft on 2002-11-21. (For earlier revision history, refer to XML source.)</p></remark>
+  </revision>
+  <revision>
+    <version>0.23</version>
+    <date>2002-11-06</date>
+    <initials>psa</initials>
+    <remark><p>Added examples for disco#items queries sent to a room; prohibited 'type' attribute on invite messages sent from client to room; added dependencies for JEPs 11 and 30; changed 'room user' to 'occupant'; fixed many small errors throughout.</p></remark>
+  </revision>
+  <revision>
+    <version>0.22</version>
+    <date>2002-11-04</date>
+    <initials>psa</initials>
+    <remark><p>Added example for disco#items; added support for cancellation of room configuration using type='cancel' from JEP-0004; noted 403 error for invites sent by non-admins in members-only room.</p></remark>
+  </revision>
+  <revision>
+    <version>0.21</version>
+    <date>2002-11-01</date>
+    <initials>psa</initials>
+    <remark><p>Clarified several small ambiguities; made &lt;body/&gt; optional on invites sent from the service to the invitee; added error scenarios for changing nickname and for destroying the room; specified that the service must return the full member list for a members-only room (not only the members in the room); updated the disco examples to track protocol changes.</p></remark>
+  </revision>
+  <revision>
+    <version>0.20</version>
+    <date>2002-10-29</date>
+    <initials>psa</initials>
+    <remark><p>Specified that messages sent to change the room subject must be of type "groupchat"; updated the legal notice to conform to the JSF IPR policy.</p></remark>
+  </revision>
+  <revision>
+    <version>0.19</version>
+    <date>2002-10-28</date>
+    <initials>psa</initials>
+    <remark><p>Added ability to create an instant room within MUC (not by using gc-1.0 protocol); cleaned up disco examples.</p></remark>
+  </revision>
+  <revision>
+    <version>0.18</version>
+    <date>2002-10-27</date>
+    <initials>psa</initials>
+    <remark><p>Added experimental support for disco; added sections for security, IANA, and JANA considerations; corrected typographical errors; cleaned up some DocBook formatting.</p></remark>
+  </revision>
+  <revision>
+    <version>0.17</version>
+    <date>2002-10-23</date>
+    <initials>psa</initials>
+    <remark><p>Added the optional &lt;actor/&gt; element (with 'jid' attribute) to &lt;item/&gt; elements inside presence stanzas of type "unavailable" that are sent to users who are kicked or banned, as well as within IQs for tracking purposes; reverted all list editing use cases (ban, voice, member, moderator, admin, owner) to use of MUC format rather than 'jabber:x:data' namespace; added several guidelines regarding generation and handling of XML stanzas; cleaned up the change room subject use case; changed several ambiguous uses of 'would', 'can', and 'will' to 'should', 'may', or 'must'; fixed several small errors in the text, examples, and DTDs.</p></remark>
+  </revision>
+  <revision>
+    <version>0.16</version>
+    <date>2002-10-20</date>
+    <initials>psa</initials>
+    <remark><p>Added the &lt;item/&gt; element to presence stanzas of type "unavailable" in order to improve the tracking of user states in the room; consolidated &lt;invitee/&gt; and &lt;invitor/&gt; elements into an &lt;invite/&gt; element with 'from' and 'to' attributes; made &lt;reason/&gt; element always a child of &lt;item/&gt; or &lt;invite/&gt; in the muc#user namespace; moved the alternate room location in room destruction to a 'jid' attribute of the &lt;alt/&gt; element; further specified several error messages; disallowed simultaneous modifications of both affiliations and roles by a moderator or admin; added several more rules regarding handling of XML stanzas; added use cases for granting and revoking administrative privileges; adjusted DTD to track all changes.</p></remark>
+  </revision>
+  <revision>
+    <version>0.15</version>
+    <date>2002-10-18</date>
+    <initials>psa</initials>
+    <remark><p>Fully incorporated the change to affiliations + roles; moved a number of admin use cases to a new section for moderator use cases; added participant use case for requesting membership; added admin use cases for adding members, removing members, granting and revoking moderator privileges, and modifying the moderator list; organized the sections in a more logical manner.</p></remark>
+  </revision>
+  <revision>
+    <version>0.14</version>
+    <date>2002-10-17</date>
+    <initials>psa</initials>
+    <remark><p>Significantly modified the privileges model by distinguishing between in-room "roles" and long-lived "affiliations"; specified the privileges of the various roles and affiliations; included state transition charts for both roles and affiliations; removed use of MUC protocol for editing ban, voice, and admin lists (but not for the actions of banning users and granting/revoking voice); added delivery rule regarding IQ stanzas; changed kick so that the action is based on changing the role to "none".</p></remark>
+  </revision>
+  <revision>
+    <version>0.13</version>
+    <date>2002-10-16</date>
+    <initials>psa</initials>
+    <remark><p>Corrected the change nickname examples (newnick sent on unavailable, no nick sent on available).</p></remark>
+  </revision>
+  <revision>
+    <version>0.12</version>
+    <date>2002-10-16</date>
+    <initials>psa</initials>
+    <remark><p>Removed SHA1 passwords; specified that room shall add passwords on invitations to password-protected rooms (not supplied by invitor).</p></remark>
+  </revision>
+  <revision>
+    <version>0.11</version>
+    <date>2002-10-16</date>
+    <initials>psa</initials>
+    <remark><p>Changed 'participant' to 'room user' and 'discussant' to 'participant'; clarified presence rule about client generation of extended presence information; added role of 'none'.</p></remark>
+  </revision>
+  <revision>
+    <version>0.10</version>
+    <date>2002-10-15</date>
+    <initials>psa</initials>
+    <remark><p>Fixed extended presence on entering or creating a room (plain '...muc' with no fragment); harmonized #user with #admin regarding the use of the &lt;item/&gt; element and associated attributes (jid, nick, etc.), and added 'role' attribute; modified management of voice, ban, admin, and member lists to use &lt;query/&gt; wrapper and new &lt;item/&gt; structure; changed the 'member' role to 'discussant', added 'outcast' role for banned users, and added new 'member' role to enable management of member lists; changed invitation-only rooms to members-only rooms and made appropriate adjustments to apply member lists to both members-only rooms and open rooms; modified nickname change protocol slightly to send the old nickname in the unavailable presence and the new nickname in the available presence; removed prohibition on members-only rooms that are password-protected; removed the &lt;query/&gt; wrapper for the &lt;destroy/&gt; element; updated the DTDs.</p></remark>
+  </revision>
+  <revision>
+    <version>0.9</version>
+    <date>2002-10-13</date>
+    <initials>psa</initials>
+    <remark><p>Added extended presence ('...#user') on entering a room for MUC clients; changed namespace on room creation request to '...#owner'; added a service discovery example using jabber:iq:browse; added information about discussion history; made small fixes to several examples; further defined the presence rules; transferred all implementation notes to a dedicated section; added a Terminology section.</p></remark>
+  </revision>
+  <revision>
+    <version>0.8</version>
+    <date>2002-10-10</date>
+    <initials>psa</initials>
+    <remark><p>Made further changes to the room creation workflow (finally correct); removed feature discovery use case (this needs to be addressed by a real service discovery protocol!); added ability for room owners to edit the admin list; removed &lt;body/&gt; from invitations generated by the service; removed messages sent to kicked and banned users (handled by unavailable presence with status code); added a number of implementation notes; converted all examples to Shakespeare style.</p></remark>
+  </revision>
+  <revision>
+    <version>0.7.6</version>
+    <date>2002-10-09</date>
+    <initials>psa</initials>
+    <remark><p>Fixed the room creation workflow; changed some terminology ("join" to "enter" and "leave" to "exit").</p></remark>
+  </revision>
+  <revision>
+    <version>0.7.5</version>
+    <date>2002-10-08</date>
+    <initials>psa</initials>
+    <remark><p>Specified and improved the handling of invitation-only rooms. In particular, added the ability for room admins to edit the invitation list and added a configuration option that limits the ability to send invitations to room admins only.</p></remark>
+  </revision>
+  <revision>
+    <version>0.7.4</version>
+    <date>2002-10-07</date>
+    <initials>psa</initials>
+    <remark><p>Changed namespaces from http://jabber.org/protocol/muc/owner etc. to http://jabber.org/protocol/muc#owner etc. per Jabber Council discussion.</p></remark>
+  </revision>
+  <revision>
+    <version>0.7.3</version>
+    <date>2002-10-07</date>
+    <initials>psa</initials>
+    <remark><p>Changed namespaces to HTTP URIs; left role handling up to the implementation; further clarified presence rules.</p></remark>
+  </revision>
+  <revision>
+    <version>0.7.2</version>
+    <date>2002-10-06</date>
+    <initials>psa</initials>
+    <remark><p>Disallowed kicking, banning, and revoking voice with respect to room admins and room owners; replaced &lt;x/&gt; with &lt;query/&gt; in the Discovering Room Features and Destroying a Room use cases; corrected some small errors and made many clarifications throughout.</p></remark>
+  </revision>
+  <revision>
+    <version>0.7.1</version>
+    <date>2002-10-04</date>
+    <initials>psa</initials>
+    <remark><p>Removed &lt;whois/&gt; command (unnecessary since participants with appropriate privileges receive the full JID of all participants in presence stanzas); completed many small fixes throughout.</p></remark>
+  </revision>
+  <revision>
+    <version>0.7</version>
+    <date>2002-10-03</date>
+    <initials>psa</initials>
+    <remark><p>More clearly delineated participant roles and defined the hierarchy thereof (owner, admin, member, visitor); replaced &lt;voice/&gt; element in extended presence with &lt;item role='member'/&gt;; changed initial room configuration to use IQ rather than message; adjusted presence rules (especially regarding extended presence information); cleaned up examples throughout; updated DTD to track changes.</p></remark>
+  </revision>
+  <revision>
+    <version>0.6</version>
+    <date>2002-09-21</date>
+    <initials>psa</initials>
+    <remark><p>More clearly defined the scope; removed fully anonymous rooms; changed meaning of semi-anonymous rooms and of non-anonymous rooms; added mechanism for notification of full JIDs in non-anonymous rooms; replaced the &lt;admin/&gt; element in extended presence with a &lt;role/&gt; element (more extensible); changed room passwords to cleartext; added status codes for various messages received from the service; added lists of valid error and status codes associated with the 'http://jabber.org/protocol/muc#user' namespace; added a &lt;reason/&gt; element for invitations; made kick and ban reasons child elements rather than attributes; replaced stopgap feature discovery mechanism with jabber:iq:negotiate; added extended presence element to room creation request and clarified the room creation process; specified presence reflection rules; added method for destroying a room; adjusted DTDs to track all changes.</p></remark>
+  </revision>
+  <revision>
+    <version>0.5.1</version>
+    <date>2002-09-20</date>
+    <initials>psa</initials>
+    <remark><p>Added DTDs; changed feature discovery to use &lt;x/&gt; element rather than query and made service response come in IQ result; fixed reference to JEP 29; changed 'grant' to 'add' and 'revoke' to 'remove' for consistency in the item attributes; made several other small changes.</p></remark>
+  </revision>
+  <revision>
+    <version>0.5</version>
+    <date>2002-09-19</date>
+    <initials>psa</initials>
+    <remark><p>Changed the kick, ban, and voice protocols; added a few more configuration options; specified the restrictions for roomnicks; and added a stopgap service discovery protocol.</p></remark>
+  </revision>
+  <revision>
+    <version>0.4</version>
+    <date>2002-09-18</date>
+    <initials>psa</initials>
+    <remark><p>Changed all non-GC-1.0 use cases to jabber:gc:* namespaces or jabber:x:data; added use cases for ban list management and room moderation; added protocol for sending notice of admin and voice privileges in presence; cleaned up text and many examples.</p></remark>
+  </revision>
+  <revision>
+    <version>0.3</version>
+    <date>2002-09-17</date>
+    <initials>psa</initials>
+    <remark><p>Changed admin use cases; cleaned up participant and owner use cases.</p></remark>
+  </revision>
+  <revision>
+    <version>0.2</version>
+    <date>2002-09-12</date>
+    <initials>psa</initials>
+    <remark><p>Broke content out into three actors (participant, owner, and admin) and added more detail to owner and admin use cases.</p></remark>
+  </revision>
+  <revision>
+    <version>0.1</version>
+    <date>2002-09-09</date>
+    <initials>psa</initials>
+    <remark><p>Initial version.</p></remark>
+  </revision>
+</header>
+<section1 topic='Introduction' anchor='intro'>
+  <p>Traditionally, instant messaging is thought to consist of one-to-one chat rather than many-to-many chat, which is called variously "groupchat" or "text conferencing". Groupchat functionality is familiar from systems such as Internet Relay Chat (IRC) and the chatroom functionality offered by popular consumer IM services. The Jabber community developed and implemented a basic groupchat protocol as long ago as 1999. This "groupchat 1.0" protocol provided a minimal feature set for chat rooms but was rather limited in scope. This specification builds on the older "groupchat 1.0" protocol in a backwards-compatible manner but provides advanced features such as invitations, room moderation and administration, and specialized room types. These extensions are implemented using protocol elements qualified by the 'http://jabber.org/protocol/muc' namespace (and the #owner, #admin, and #user fragments on the main namespace URI).</p>
+</section1>
+<section1 topic='Scope' anchor='scope'>
+  <p>This document addresses common requirements related to configuration of, participation in, and administration of individual text-based conference rooms. All of the requirements addressed herein apply at the level of the individual room and are "common" in the sense that they have been widely discussed within the Jabber community or are familiar from existing text-based conference environments outside of Jabber (e.g., Internet Relay Chat as defined in &rfc1459; and its successors).</p>
+  <p>This document explicitly does <em>not</em> address the following:</p>
+  <ul>
+    <li>Relationships between rooms (e.g., hierarchies of rooms)</li>
+    <li>Management of multi-user chat services (e.g., managing permissions across an entire service or registering a global room nickname)</li>
+    <li>Moderation of individual messages</li>
+    <li>Security and encryption at the level of a room or service</li>
+    <li>Advanced features such as attaching files to a room, integrating whiteboards, and interfacing with audio chat services</li>
+    <li>Interaction between MUC deployments and foreign chat systems (e.g., gateways to IRC or to legacy IM systems)</li>
+  </ul>
+  <p>This limited scope is not meant to disparage such topics, which are of inherent interest; however, it is meant to focus the discussion in this document and to present a comprehensible protocol that can be implemented by Jabber client and component developers alike. Future specifications may of course address the topics mentioned above.</p>
+</section1>
+<section1 topic='Requirements' anchor='reqs'>
+  <p>This document addresses the minimal functionality provided by existing multi-user chat services in Jabber. For the sake of backwards-compatibility, this document uses the original "groupchat 1.0" protocol for this baseline functionality, with the result that:</p>
+  <ul>
+    <li>Each room is identified as &ROOM; (e.g., &lt;jdev@conference.jabber.org&gt;), where "room" is the name of the room and "service" is the hostname at which the multi-user chat service is running.</li>
+    <li>Each occupant in a room is identified as &ROOMJID;, where "nick" is the room nickname of the occupant as specified on entering the room or subsequently changed during the occupant's visit.</li>
+    <li>A user enters a room (i.e., becomes an occupant) by sending presence to &ROOMJID;.</li>
+    <li>Messages sent within multi-user chat rooms are of a special type "groupchat" and are addressed to the room itself (room@service), then reflected to all occupants.</li>
+    <li>An occupant can change his or her room nickname and availability status within the room by sending presence information to &lt;room@service/newnick&gt;.</li>
+    <li>An occupant exits a room by sending presence of type "unavailable" to its current &ROOMJID;.</li>
+  </ul>
+  <p>The additional features and functionality addressed in this document include the following:</p>
+  <ol start='1'>
+    <li>native conversation logging (no in-room bot required)</li>
+    <li>enabling users to request membership in a room</li>
+    <li>enabling occupants to view an occupant's full JID in a non-anonymous room</li>
+    <li>enabling moderators to view an occupant's full JID in a semi-anonymous room</li>
+    <li>allowing only moderators to change the room subject</li>
+    <li>enabling moderators to kick participants and visitors from the room</li>
+    <li>enabling moderators to grant and revoke voice (i.e., the privilege to speak) in a moderated room, and to manage the voice list</li>
+    <li>enabling admins to grant and revoke moderator privileges, and to manage the moderator list</li>
+    <li>enabling admins to ban users from the room, and to manage the ban list</li>
+    <li>enabling admins to grant and revoke membership privileges, and to manage the member list for a members-only room</li>
+    <li>enabling owners to limit the number of occupants</li>
+    <li>enabling owners to specify other owners</li>
+    <li>enabling owners to grant and revoke administrative privileges, and to manage the admin list</li>
+    <li>enabling owners to destroy the room</li>
+  </ol>
+  <p>In addition, this document provides protocol elements for supporting the following room types:</p>
+  <ol start='1'>
+    <li>public or hidden</li>
+    <li>persistent or temporary</li>
+    <li>password-protected or unsecured</li>
+    <li>members-only or open</li>
+    <li>moderated or unmoderated</li>
+    <li>non-anonymous or semi-anonymous</li>
+  </ol>
+</section1>
+<section1 topic='Terminology' anchor='terms'>
+  <section2 topic='General Terms' anchor='terms-general'>
+    <p>Affiliation -- a long-lived association or connection with a room; the possible affiliations are "owner", "admin", "member", and "outcast" (naturally it is also possible to have no affiliation); affiliation is distinct from role. An affiliation lasts across a user's visits to a room.</p>
+    <p>Ban -- to remove a user from a room such that the user is not allowed to re-enter the room (until and unless the ban has been removed). A banned user has an affiliation of "outcast".</p>
+    <p>Bare JID -- the &lt;user@host&gt; by which a user is identified outside the context of any existing session or resource; contrast with Full JID and Room JID.</p>
+    <p>Full JID -- the &lt;user@host/resource&gt; by which an online user is identified outside the context of a room; contrast with Bare JID and Room JID.</p>
+    <p>GC -- the minimal "groupchat 1.0" protocol <note><link url='http://www.jabber.org/protocol/groupchat.html'>http://www.jabber.org/protocol/groupchat.html</link></note> developed within the Jabber community in 1999; MUC is backwards-compatible with GC.</p>
+    <p>History -- a limited number of message stanzas sent to a new occupant to provide the context of current discussion.</p>
+    <p>Invitation -- a special message sent from one user to another asking the recipient to join a room.</p>
+    <p>IRC -- Internet Relay Chat.</p>
+    <p>Kick -- to temporarily remove a participant or visitor from a room; the user is allowed to re-enter the room at any time. A kicked user has a role of "none".</p>
+    <p>Logging -- storage of discussions that occur within a room for public retrieval outside the context of the room.</p>
+    <p>Member -- a user who is on the "whitelist" for a members-only room or who is registered with an open room. A member has an affiliation of "member".</p>
+    <p>Moderator -- a room role that is usually associated with room admins but that may be granted to non-admins; is allowed to kick users, grant and revoke voice, etc. A moderator has an role of "moderator".</p>
+    <p>MUC -- the multi-user chat protocol for text-based conferencing specified in this document.</p>
+    <p>Occupant -- any Jabber user who is in a room (this is an "abstract class" and does not correspond to any specific role).</p>
+    <p>Outcast -- a user who has been banned from a room. An outcast has an affiliation of "outcast".</p>
+    <p>Participant -- an occupant who does not have administrative privileges; in a moderated room, a participant is further defined as having voice (in contrast to a visitor). A participant has a role of "participant".</p>
+    <p>Private Message -- a message sent from one occupant directly to another's room JID (not to the room itself for broadcasting to all occupants).</p>
+    <p>Role -- a temporary position or privilege level within a room, distinct from a user's long-lived affiliation with the room; the possible roles are "moderator", "participant", and "visitor" (it is also possible to have no defined role). A role lasts only for the duration of an occupant's visit to a room.</p>
+    <p>Room -- a virtual space that Jabber users figuratively enter in order to participate in real-time, text-based conferencing with other users.</p>
+    <p>Room Administrator -- a user empowered by the room owner to perform administrative functions such as banning users; however, is not allowed to change defining room features. An admin has an affiliation of "admin".</p>
+    <p>Room ID -- the node identifier portion of a Room JID, which may be opaque and thus lack meaning for human users (see Business Rules for syntax); contrast with Room Name.</p>
+    <p>Room JID -- the &ROOMJID; by which an occupant is identified within the context of a room; contrast with Bare JID and Full JID.</p>
+    <p>Room Name -- a user-friendly, natural-language name for a room, configured by the room owner and presented in Service Discovery queries; contrast with Room ID.</p>
+    <p>Room Nickname -- the resource identifier portion of a Room JID (see Business Rules for syntax); this is the "friendly name" by which an occupant is known in the room.</p>
+    <p>Room Owner -- the Jabber user who created the room or a Jabber user who has been designated by the room creator or owner as someone with owner privileges (if allowed); is allowed to change defining room features as well as perform all administrative functions. An owner has an affiliation of "owner".</p>
+    <p>Room Roster -- a Jabber client's representation of the occupants in a room.</p>
+    <p>Server -- a Jabber server that may or may not have associated with it a text-based conferencing service.</p>
+    <p>Service -- a host that offers text-based conferencing capabilities; often but not necessarily a sub-domain of a Jabber server (e.g., conference.jabber.org).</p>
+    <p>Subject -- a temporary discussion topic within a room.</p>
+    <p>Visit -- a user's "session" in a room, beginning when the user enters the room (i.e., becomes an occupant) and ending when the user exits the room.</p>
+    <p>Visitor -- in a moderated room, an occupant who does not have voice (in contrast to a participant). A visitor has a role of "visitor".</p>
+    <p>Voice -- in a moderated room, the privilege to send messages to all occupants.</p>
+  </section2>
+  <section2 topic='Room Types' anchor='terms-rooms'>
+    <p>Fully-Anonymous Room -- a room in which the full JIDs or bare JIDs of occupants cannot be discovered by anyone, including room admins and room owners; such rooms are NOT RECOMMENDED or explicitly supported by MUC, but are possible using this protocol if a service implementation offers the appropriate configuration options; contrast with Non-Anonymous Room and Semi-Anonymous Room.</p>
+    <p>Hidden Room -- a room that cannot be found by any user through normal means such as searching and service discovery; antonym: Public Room.</p>
+    <p>Members-Only Room -- a room that a user cannot enter without being on the member list; antonym: Open Room.</p>
+    <p>Moderated Room -- a room in which only those with "voice" may send messages to all occupants; antonym: Unmoderated Room.</p>
+    <p>Non-Anonymous Room -- a room in which an occupant's full JID is exposed to all other occupants, although the occupant may choose any desired room nickname; contrast with Semi-Anonymous Room and Fully-Anonymous Room.</p>
+    <p>Open Room -- a room that anyone may enter without being on the member list; antonym: Members-Only Room.</p>
+    <p>Password-Protected Room -- a room that a user cannot enter without first providing the correct password; antonym: Unsecured Room.</p>
+    <p>Persistent Room -- a room that is not destroyed if the last occupant exits; antonym: Temporary Room.</p>
+    <p>Public Room -- a room that can be found by any user through normal means such as searching and service discovery; antonym: Hidden Room.</p>
+    <p>Semi-Anonymous Room -- a room in which an occupant's full JID can be discovered by room admins only; contrast with Fully-Anonymous Room and Non-Anonymous Room.</p>
+    <p>Temporary Room -- a room that is destroyed if the last occupant exits; antonym: Persistent Room.</p>
+    <p>Unmoderated Room -- a room in which any occupant is allowed to send messages to all occupants; antonym: Moderated Room.</p>
+    <p>Unsecured Room -- a room that anyone is allowed to enter without first providing the correct password; antonym: Password-Protected Room.</p>
+  </section2>
+  <section2 topic='Dramatis Personae' anchor='terms-personae'>
+    <p>Most of the examples in this document use the scenario of the witches' meeting held in a dark cave at the beginning of Act IV, Scene I of Shakespeare's <cite>Macbeth</cite>, represented here as the "darkcave@macbeth.shakespeare.lit" chatroom. The characters are as follows:</p>
+    <table caption='Dramatis Personae'>
+      <tr>
+        <th>Room Nickname</th>
+        <th>Full JID</th>
+        <th>Affiliation</th>
+      </tr>
+      <tr>
+        <td>firstwitch</td>
+        <td>crone1@shakespeare.lit/desktop</td>
+        <td>Owner</td>
+      </tr>
+      <tr>
+        <td>secondwitch</td>
+        <td>wiccarocks@shakespeare.lit/laptop</td>
+        <td>Admin</td>
+      </tr>
+      <tr>
+        <td>thirdwitch</td>
+        <td>hag66@shakespeare.lit/pda</td>
+        <td>None</td>
+      </tr>
+    </table>
+  </section2>
+</section1>
+<section1 topic='Roles and Affiliations' anchor='connections'>
+  <p>There are two dimensions along which we can measure a user's connection with or position in a room. One is the user's long-lived affiliation with a room -- e.g., a user's status as an owner or an outcast. The other is a user's role while an occupant of a room -- e.g., an occupant's position as a moderator with the ability to kick visitors and participants. These two dimensions are distinct from each other, since an affiliation lasts across visits, while a role lasts only for the duration of a visit. In addition, there is no one-to-one correspondence between roles and affiliations; for example, someone who is not affiliated with a room may be a (temporary) moderator, and a member may be a participant or a visitor in a moderated room. These concepts are explained more fully below.</p>
+  <section2 topic='Roles' anchor='roles'>
+    <p>There are four defined roles that an occupant may have:</p>
+    <ol start='1'>
+      <li>Moderator</li>
+      <li>Participant</li>
+      <li>Visitor</li>
+      <li>None (the absence of a role)</li>
+    </ol>
+    <p>Roles are temporary in that they do not necessarily persist across a user's visits to the room and MAY change during the course of an occupant's visit to the room. An implementation MAY persist roles across visits and SHOULD do so for moderated rooms (since the distinction between visitor and participant is critical to the functioning of a moderated room).</p>
+    <p>There is no one-to-one mapping between roles and affiliations (e.g., a member could be a participant or a visitor).</p>
+    <p>A moderator is the most powerful occupant within the context of the room, and can to some extent manage other occupants' roles in the room. A participant has fewer privileges than a moderator, although he or she always has the right to speak. A visitor is a more restricted role within the context of a moderated room, since visitors are not allowed to send messages to all occupants.</p>
+    <p>Roles are granted, revoked, and maintained based on the occupant's room nickname or full JID rather than bare JID. The privileges associated with these roles, as well as the actions that trigger changes in roles, are defined below.</p>
+    <p>Information about roles MUST be sent in all presence stanzas generated or reflected by the room and thus sent to occupants.</p>
+    <section3 topic='Privileges' anchor='roles-priv'>
+      <p>For the most part, roles exist in a hierarchy. For instance, a participant can do anything a visitor can do, and a moderator can do anything a participant can do. Each role has privileges not possessed by the next-lowest role; these privileges are specified in the following table as defaults (an implementation MAY provide configuration options that override these defaults).</p>
+      <table caption='Privileges Associated With Roles'>
+        <tr>
+          <th>Privilege</th>
+          <th>None</th>
+          <th>Visitor</th>
+          <th>Participant</th>
+          <th>Moderator</th>
+        </tr>
+        <tr>
+          <td>Present in Room</td>
+          <td>No</td>
+          <td>Yes</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Receive Messages</td>
+          <td>No</td>
+          <td>Yes</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Change Availability Status</td>
+          <td>No</td>
+          <td>Yes</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Change Room Nickname</td>
+          <td>No</td>
+          <td>Yes*</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Send Private Messages</td>
+          <td>No</td>
+          <td>Yes*</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Invite Other Users</td>
+          <td>No</td>
+          <td>Yes*</td>
+          <td>Yes*</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Send Messages to All</td>
+          <td>No</td>
+          <td>No**</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Modify Subject</td>
+          <td>No</td>
+          <td>No*</td>
+          <td>Yes*</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Kick Participants and Visitors</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Grant Voice</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Revoke Voice</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes***</td>
+        </tr>
+      </table>
+      <p>* Default; configuration settings MAY modify this privilege.</p>
+      <p>** An implementation MAY grant voice by default to visitors in unmoderated rooms.</p>
+      <p>*** A moderator MUST NOT be able to revoke voice privileges from an admin or owner.</p>
+    </section3>
+    <section3 topic='Changing Roles' anchor='roles-change'>
+      <p>The ways in which an occupant's role changes are well-defined. Sometimes the change results from the occupant's own action (e.g., entering or exiting the room), whereas sometimes the change results from an action taken by a moderator, admin, or owner. If an occupant's role changes, a MUC service implementation MUST change the occupant's role to reflect the change and communicate the change to all occupants. Role changes and their triggering actions are specified in the following table.</p>
+      <table caption='Role State Chart'>
+        <tr>
+          <th>&gt;</th>
+          <th>None</th>
+          <th>Visitor</th>
+          <th>Participant</th>
+          <th>Moderator</th>
+        </tr>
+        <tr>
+          <td>None</td>
+          <td>--</td>
+          <td>Enter moderated room</td>
+          <td>Enter unmoderated room</td>
+          <td>Admin or owner enters room</td>
+        </tr>
+        <tr>
+          <td>Visitor</td>
+          <td>Exit room or be kicked by a moderator</td>
+          <td>--</td>
+          <td>Moderator grants voice</td>
+          <td>Admin or owner grants moderator privileges</td>
+        </tr>
+        <tr>
+          <td>Participant</td>
+          <td>Exit room or be kicked by a moderator</td>
+          <td>Moderator revokes voice</td>
+          <td>--</td>
+          <td>Admin or owner grants moderator privileges</td>
+        </tr>
+        <tr>
+          <td>Moderator</td>
+          <td>Exit room</td>
+          <td>Admin or owner changes role to visitor *</td>
+          <td>Admin or owner changes role to participant or revokes moderator privileges *</td>
+          <td>--</td>
+        </tr>
+      </table>
+      <p>* A moderator MUST NOT be able to revoke moderator privileges from an occupant who is equal to or above the moderator in the hierarchy of affiliations.</p>
+      <p>Note: Certain roles are typically implicit in certain privileges. For example, an admin or owner is automatically a moderator, so if an occupant is granted admin status then the occupant will by that fact be granted moderator privileges; similarly, when an occupant is made a member in a moderated room, the occupant automatically has a role of participant. However, the loss of admin status does not necessarily mean that the occupant is no longer a moderator (since a "mere" participant can be a moderator). Therefore, the roles that are gained when an occupant is granted a certain affiliation are stable, whereas the roles that are lost when an occupant loses a certain affilitation are no hardcoded and are left up to the implementation. Since a client cannot predict what the role will be after revoking a certain affiliation, if it wants to remove both admin/owner privileges and the moderator role at the same time then it must specifically request the role change in addition to the affiliation change.</p>
+    </section3>
+  </section2>
+  <section2 topic='Affiliations' anchor='affil'>
+    <p>There are five defined affiliations that a user may have in relation to a room:</p>
+    <ol start='1'>
+      <li>Owner</li>
+      <li>Admin</li>
+      <li>Member</li>
+      <li>Outcast</li>
+      <li>None (the absence of an affiliation)</li>
+    </ol>
+    <p>These affiliations are long-lived in that they persist across a user's visits to the room and are not affected by happenings in the room. In addition, there is no one-to-one mapping between these affiliations and an occupant's role within the room. Affiliations are granted, revoked, and maintained based on the user's bare JID.</p>
+    <p>If a user without a defined affiliation enters a room, the user's affiliation is defined as "none"; however, this affiliation does not persist across visits (i.e., a service does not maintain a "none list" across visits).</p>
+    <p>The member affiliation provides a way for a room owner or admin to specify a "whitelist" of users who are allowed to enter a members-only room. When a member enters a members-only room, his or her affiliation does not change, no matter what his or her role is. The member affiliation also provides a way for users to effectively register with an open room and thus be lastingly associated with that room in some way (one result may be that the user's nickname is reserved in the room).</p>
+    <p>An outcast is a user who has been banned from a room and who is not allowed to enter the room.</p>
+    <p>Information about affiliations MUST be sent in all presence stanzas generated or reflected by the room and sent to occupants.</p>
+    <section3 topic='Privileges' anchor='affil-priv'>
+      <p>For the most part, affiliations exist in a hierarchy. For instance, an owner can do anything an admin can do, and an admin can do anything a member can do. Each affiliation has privileges not possessed by the next-lowest affiliation; these privileges are specified in the following table.</p>
+      <table caption='Privileges Associated With Affiliations'>
+        <tr>
+          <th>Privilege</th>
+          <th>Outcast</th>
+          <th>None</th>
+          <th>Member</th>
+          <th>Admin</th>
+          <th>Owner</th>
+        </tr>
+        <tr>
+          <td>Enter Open Room</td>
+          <td>No</td>
+          <td>Yes*</td>
+          <td>Yes</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Register with an Open Room</td>
+          <td>No</td>
+          <td>Yes</td>
+          <td>N/A</td>
+          <td>N/A</td>
+          <td>N/A</td>
+        </tr>
+        <tr>
+          <td>Enter Members-Only Room</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes*</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Ban Members and Unaffiliated Users</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Edit Member List</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Edit Moderator List</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes**</td>
+          <td>Yes**</td>
+        </tr>
+        <tr>
+          <td>Edit Admin List</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Edit Owner List</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Change Room Definition</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Destroy Room</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>No</td>
+          <td>Yes</td>
+        </tr>
+      </table>
+      <p>* As a default, an unaffiliated user enters a moderated room as a visitor, and enters an open room as a participant. A member enters a room as a participant. An admin or owner enters a room as a moderator.</p>
+      <p>** An admin or owner MUST NOT be able to revoke moderation privileges from another admin or owner.</p>
+    </section3>
+    <section3 topic='Changing Affiliations' anchor='affil-change'>
+      <p>The ways in which a user's affiliation changes are well-defined. Sometimes the change results from the user's own action (e.g., registering as a member of the room), whereas sometimes the change results from an action taken by an admin or owner. If a user's affiliation changes, a MUC service implementation MUST change the user's affiliation to reflect the change and communicate that to all occupants. Affiliation changes and their triggering actions are specified in the following table.</p>
+      <table caption='Affiliation State Chart'>
+        <tr>
+          <th>&gt;</th>
+          <th>Outcast</th>
+          <th>None</th>
+          <th>Member</th>
+          <th>Admin</th>
+          <th>Owner</th>
+        </tr>
+        <tr>
+          <td>Outcast</td>
+          <td>--</td>
+          <td>Admin or owner removes ban</td>
+          <td>Admin or owner adds user to member list</td>
+          <td>Owner adds user to admin list</td>
+          <td>Owner adds user to owner list</td>
+        </tr>
+        <tr>
+          <td>None</td>
+          <td>Admin or owner applies ban</td>
+          <td>--</td>
+          <td>Admin or owner adds user to member list, or user registers as member (if allowed)</td>
+          <td>Owner adds user to admin list</td>
+          <td>Owner adds user to owner list</td>
+        </tr>
+        <tr>
+          <td>Member</td>
+          <td>Admin or owner applies ban</td>
+          <td>Admin or owner changes affiliation to "none"</td>
+          <td>--</td>
+          <td>Owner adds user to admin list</td>
+          <td>Owner adds user to owner list</td>
+        </tr>
+        <tr>
+          <td>Admin</td>
+          <td>Owner applies ban</td>
+          <td>Owner changes affiliation to "none"</td>
+          <td>Owner changes affiliation to "member"</td>
+          <td>--</td>
+          <td>Owner adds user to owner list</td>
+        </tr>
+        <tr>
+          <td>Owner</td>
+          <td>Owner applies ban</td>
+          <td>Owner changes affiliation to "none"</td>
+          <td>Owner changes affiliation to "member"</td>
+          <td>Owner changes affiliation to "admin"</td>
+          <td>--</td>
+        </tr>
+      </table>
+    </section3>
+  </section2>
+</section1>
+<section1 topic='Entity Use Cases' anchor='entity'>
+  <p>A MUC implementation MUST support &jep0030;.</p>
+  <section2 topic='Discovering Component Support for MUC' anchor='disco-component'>
+    <p>A Jabber entity may wish to discover if a service implements the Multi-User Chat protocol; in order to do so, it sends a service discovery information ("disco#info") query to the component's JID:</p>
+    <example caption='User Queries Chat Service for MUC Support via Disco'><![CDATA[
+<iq from='hag66@shakespeare.lit/pda'
+    id='disco1'
+    to='macbeth.shakespeare.lit'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+    ]]></example>
+    <p>The service MUST return its identity and the features it supports:</p>
+    <example caption='Service Returns Disco Info Results'><![CDATA[
+<iq from='macbeth.shakespeare.lit'
+    id='disco1'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='conference'
+        name='Macbeth Chat Service'
+        type='text'/>
+    <feature var='http://jabber.org/protocol/muc'/>
+  </query>
+</iq>
+    ]]></example>
+    <p>Note: Because MUC is a superset of the old "groupchat 1.0" protocol, a MUC service SHOULD NOT return a &lt;feature var='gc-1.0'/&gt; entry in a disco#info result.</p>
+  </section2>
+  <section2 topic='Discovering Rooms' anchor='disco-rooms'>
+    <p>The service discovery items ("disco#items") protocol enables a user to query a service for a list of associated items, which in the case of a chat service would consist of the specific chat rooms hosted by the service.</p>
+    <example caption='User Queries Chat Service for Rooms'><![CDATA[
+<iq from='hag66@shakespeare.lit/pda'
+    id='disco2'
+    to='macbeth.shakespeare.lit'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+    ]]></example>
+    <p>The service SHOULD return a full list of the rooms it hosts.</p>
+    <example caption='Service Returns Disco Item Results'><![CDATA[
+<iq from='macbeth.shakespeare.lit'
+    id='disco2'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#items'>
+    <item jid='heath@macbeth.shakespeare.lit'
+          name='A Lonely Heath'/>
+    <item jid='darkcave@macbeth.shakespeare.lit'
+          name='A Dark Cave'/>
+    <item jid='forres@macbeth.shakespeare.lit'
+          name='The Palace'/>
+    <item jid='inverness@macbeth.shakespeare.lit'
+          name='Macbeth&apos;s Castle'/>
+  </query>
+</iq>
+    ]]></example>
+    <p>If the full list of rooms is large (see <cite>JEP-0030</cite> for details), the service MAY return only a partial list of rooms.</p>
+  </section2>
+  <section2 topic='Querying for Room Information' anchor='disco-roominfo'>
+    <p>Using the disco#info protocol, a user may also query a specific chat room for more detailed information about the room. A user SHOULD do so before entering a room in order to determine the privacy and security profile of the room configuration (see the <link url='#secrity'>Security Considerations</link> for details).</p>
+    <example caption='User Queries for Information about a Specific Chat Room'><![CDATA[
+<iq from='hag66@shakespeare.lit/pda'
+    id='disco3'
+    to='darkcave@macbeth.shakespeare.lit'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+    ]]></example>
+    <p>The room MUST return its identity and SHOULD return the features it supports:</p>
+    <example caption='Room Returns Disco Info Results'><![CDATA[
+<iq from='darkcave@macbeth.shakespeare.lit'
+    id='disco3'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='conference'
+        name='A Dark Cave'
+        type='text'/>
+    <feature var='http://jabber.org/protocol/muc'/>
+    <feature var='muc_passwordprotected'/>
+    <feature var='muc_hidden'/>
+    <feature var='muc_temporary'/>
+    <feature var='muc_open'/>
+    <feature var='muc_unmoderated'/>
+    <feature var='muc_nonanonymous'/>
+  </query>
+</iq>
+    ]]></example>
+    <p>Note: Because MUC is a superset of the old "groupchat 1.0" protocol, a MUC room SHOULD NOT return a &lt;feature var='gc-1.0'/&gt; entry in a disco#info result. The room SHOULD return the materially-relevant features it supports, such as password protection and room moderation (these are listed fully in the feature registry maintained by the Jabber Registrar; see also the <link url='#registrar'>Jabber Registrar</link> section of this document).</p>
+    <p>A chatroom MAY return more detailed information in its disco#info response using &jep0128;, identified by inclusion of a hidden FORM_TYPE field whose value is "http://jabber.org/protocol/muc#roominfo". Such information might include a more verbose description of the room, the current room subject, and the current number of occupants in the room:</p>
+    <example caption='Room Returns Extended Disco Info Results'><![CDATA[
+<iq from='darkcave@macbeth.shakespeare.lit'
+    id='disco3a'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='conference'
+        name='A Dark Cave'
+        type='text'/>
+    <feature var='http://jabber.org/protocol/muc'/>
+    <feature var='muc_passwordprotected'/>
+    <feature var='muc_hidden'/>
+    <feature var='muc_temporary'/>
+    <feature var='muc_open'/>
+    <feature var='muc_unmoderated'/>
+    <feature var='muc_nonanonymous'/>
+    <x xmlns='jabber:x:data' type='result'>
+      <field var='FORM_TYPE' type='hidden'>
+        <value>http://jabber.org/protocol/muc#roominfo</value>
+      </field>
+      <field var='muc#roominfo_description' label='Description'>
+        <value>The place for all good witches!</value>
+      </field>
+      <field var='muc#roominfo_changesubject' label='Whether Occupants May Change the Subject'>
+        <value>true</value>
+      </field>
+      <field var='muc#roominfo_contactjid' label='Contact Addresses'>
+        <value>crone1@shakespeare.lit</value>
+      </field>
+      <field var='muc#roominfo_subject' label='Subject'>
+        <value>Spells</value>
+      </field>
+      <field var='muc#roominfo_occupants' label='Number of occupants'>
+        <value>3</value>
+      </field>
+      <field var='muc#roominfo_lang' label='Language of discussion'>
+        <value>en</value>
+      </field>
+      <field var='muc#roominfo_logs' label='URL for discussion logs'>
+        <value>http://www.shakespeare.lit/chatlogs/darkcave/</value>
+      </field>
+      <field var='muc#roominfo_pubsub' label='Associated pubsub node'>
+        <value>xmpp:pubsub.shakespeare.lit?node=chatrooms/darkcave</value>
+      </field>
+    </x>
+  </query>
+</iq>
+    ]]></example>
+    <p>Some extended room information may be dynamically generated (e.g., the URL for discussion logs, which may be based on service-wide configuration) whereas other information may be based on the room configuration.</p>
+    <p>Note: The foregoing extended service discovery fields for the 'http://jabber.org/protocol/muc#roominfo' FORM_TYPE may be supplemented in the future via the mechanisms described in the <link url="#registrar-formtype">Field Standardization</link> section of this document.</p>
+  </section2>
+  <section2 topic='Querying for Room Items' anchor='disco-roomitems'>
+    <p>A user MAY also query a specific chat room for its associated items:</p>
+    <example caption='User Queries for Items Associated with a Specific Chat Room'><![CDATA[
+<iq from='hag66@shakespeare.lit/pda'
+    id='disco4'
+    to='darkcave@macbeth.shakespeare.lit'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+    ]]></example>
+    <p>An implementation MAY return a list of existing occupants if that information is publicly available, or return no list at all if this information is kept private.</p>
+    <example caption='Room Returns Disco Item Results (Items are Public)'><![CDATA[
+<iq from='darkcave@macbeth.shakespeare.lit'
+    id='disco4'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#items'>
+    <item jid='darkcave@macbeth.shakespeare.lit/firstwitch'/>
+    <item jid='darkcave@macbeth.shakespeare.lit/secondwitch'/>
+  </query>
+</iq>
+    ]]></example>
+    <p>Note: These &lt;item/&gt; elements are qualified by the disco#items namespace, not the muc namespace; this means that they cannot possess 'affiliation' or 'role' attributes, for example.</p>
+    <example caption='Room Returns Empty Disco Item Results (Items are Private)'><![CDATA[
+<iq from='darkcave@macbeth.shakespeare.lit'
+    id='disco4'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#items'/>
+</iq>
+    ]]></example>
+  </section2>
+  <section2 topic='Querying a Room Occupant' anchor='disco-occupant'>
+    <p>If a non-occupant attempts to send a disco request to an address of the form &ROOMJID;, a MUC service SHOULD return the request to the entity and specify a &badrequest; error condition. If an occupant sends such a request, the service MAY pass it through the intended recipient; see the <link url='#impl'>Implementation Guidelines</link> section of this document for details.</p>
+  </section2>
+  <section2 topic='Discovering Client Support for MUC' anchor='disco-client'>
+    <p>A Jabber user may want to discover if one of the user's contacts supports the Multi-User Chat protocol. This is done using Service Discovery.</p>
+    <example caption='User Queries Contact Regarding MUC Support'><![CDATA[
+<iq from='hag66@shakespeare.lit/pda'
+    id='disco5'
+    to='wiccarocks@shakespeare.lit/laptop'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#info'/>
+</iq>
+    ]]></example>
+    <p>The client SHOULD return its identity and the features it supports:</p>
+    <example caption='Contact Returns Disco Info Results'><![CDATA[
+<iq from='wiccarocks@shakespeare.lit/laptop'
+    id='disco5'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#info'>
+    <identity
+        category='client'
+        type='pc'/>
+    ...
+    <feature var='http://jabber.org/protocol/muc'/>
+    ...
+  </query>
+</iq>
+    ]]></example>
+    <p>A user may also query a contact regarding which rooms the contact is in. This is done by querying the contact's full JID (&lt;user@host/resource&gt;) while specifying the well-known Service Discovery node 'http://jabber.org/protocol/muc#rooms':</p>
+    <example caption='User Queries Contact for Current Rooms'><![CDATA[
+<iq from='hag66@shakespeare.lit/pda'
+    id='rooms1'
+    to='wiccarocks@shakespeare.lit/laptop'
+    type='get'>
+  <query xmlns='http://jabber.org/protocol/disco#items'
+         node='http://jabber.org/protocol/muc#rooms'/>
+</iq>
+    ]]></example>
+    <example caption='Contact Returns Room Query Results'><![CDATA[
+<iq from='wiccarocks@shakespeare.lit/laptop'
+    id='rooms1'
+    to='hag66@shakespeare.lit/pda'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/disco#items'
+         node='http://jabber.org/protocol/muc#rooms'/>
+    <item jid='darkcave@macbeth.shakespeare.lit'/>
+    <item jid='characters@conference.shakespeare.lit'/>
+  </query>
+</iq>
+    ]]></example>
+    <p>Optionally, the contact MAY include its roomnick as the value of the 'name' attribute:</p>
+    <code><![CDATA[
+    ...
+    <item jid='darkcave@macbeth.shakespeare.lit'
+          name='secondwitch'/>
+    ...
+    ]]></code>
+  </section2>
+</section1>
+<section1 topic='Occupant Use Cases' anchor='user'>
+  <p>The main actor in a multi-user chat environment is the occupant, who can be said to be located "in" a multi-user chat room and to participate in the discussions held in that room (for the purposes of this specification, participants and visitors are considered to be "mere" occupants, since they possess no administrative privileges). As will become clear, the protocol elements proposed in this document to fulfill the occupant use cases fall into three categories:</p>
+  <ol start='1'>
+    <li><p>existing "groupchat 1.0" protocol for minimal functionality</p></li>
+    <li><p>straightforward applications of the "groupchat 1.0" protocol, for example to handle some of the errors related to new room types</p></li>
+    <li><p>additional protocol elements to handle functionality not covered by "groupchat 1.0" (room invites, room passwords, extended presence related to room roles and affiliations); these are qualified by the 'http://jabber.org/protocol/muc#user' namespace</p></li>
+  </ol>
+  <p>Note: All client-generated examples herein are presented from the perspective of the service, with the result that all stanzas received by a service contain a 'from' attribute corresponding to the sender's full JID as added by a normal Jabber router or session manager. In addition, normal IQ result stanzas sent upon successful completion of a request (as required by &rfc3920;) are not shown.</p>
+  <section2 topic='Entering a Room' anchor='enter'>
+    <section3 topic='Groupchat 1.0 Protocol' anchor='enter-gc'>
+      <p>In order to participate in the discussions held in a multi-user chat room, a Jabber user MUST first become an occupant by entering the room. In the old "groupchat 1.0" protocol, this was done by sending presence to &ROOMJID;, where "room" is the room ID, "service" is the hostname of the chat service, and "nick" is the user's desired nickname within the room:</p>
+      <example caption='Jabber User Seeks to Enter a Room (Groupchat 1.0)'><![CDATA[
+<presence
+    from='hag66@shakespeare.lit/pda'
+    to='darkcave@macbeth.shakespeare.lit/thirdwitch'/>
+      ]]></example>
+      <p>In this example, a user with a full JID of "hag66@shakespeare.lit/pda" has requested to enter the room "darkcave" on the "macbeth.shakespeare.lit" chat service with a room nickname of "thirdwitch".</p>
+      <p>If the user does not specify a room nickname, the service SHOULD return a &badjid; error:</p>
+      <example caption='Jabber User Seeks to Enter a Room (Groupchat 1.0)'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='400' type='modify'>
+    <jid-malformed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</presence>
+      ]]></example>
+    </section3>
+    <section3 topic='Basic MUC Protocol' anchor='enter-muc'>
+      <p>Compliant multi-user chat services MUST accept the foregoing as a request to enter a room from any Jabber client that knows either the "groupchat 1.0" (GC) protocol or the multi-user chat (MUC) protocol; however, MUC clients SHOULD signal their ability to speak the MUC protocol by including in the initial presence stanza an empty &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc' namespace (note the absence of the '#user' fragment):</p>
+      <example caption='Jabber User Seeks to Enter a Room (Multi-User Chat)'><![CDATA[
+<presence
+    from='hag66@shakespeare.lit/pda'
+    to='darkcave@macbeth.shakespeare.lit/thirdwitch'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
+</presence>
+      ]]></example>
+      <p>Before attempting to enter the room, a MUC-compliant client SHOULD first discover its reserved room nickname (if any) by following the protocol defined in the <link url='#reservednick'>Discovering Reserved Room Nickname</link> section of this document.</p>
+    </section3>
+    <section3 topic='Presence Broadcast' anchor='enter-pres'>
+      <p>If the service is able to add the user to the room, it MUST send presence from all the existing occupants' room JIDs to the new occupant's full JID, including extended presence information about roles in an &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc#user' namespace and containing an &lt;item/&gt; child with the 'role' attribute set to a value of "moderator", "participant", or "visitor", and with the 'affiliation' attribute set to a value of "owner", "admin", "member", or "none" as appropriate:</p>
+      <example caption='Service Sends Presence from Existing Occupants to New Occupant'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit/firstwitch'
+    to='hag66@shakespeare.lit/pda'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='owner' role='moderator'/>
+  </x>
+</presence>
+
+<presence
+    from='darkcave@macbeth.shakespeare.lit/secondwitch'
+    to='hag66@shakespeare.lit/pda'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='admin' role='moderator'/>
+  </x>
+</presence>
+      ]]></example>
+      <p>In this example, the user from the previous example has entered the room, by which time two other people had already entered the room: a user with a room nickname of "firstwitch" (who is a room owner) and a user with a room nickname of "secondwitch" (who is a room admin).</p>
+      <p>The service MUST also send presence from the new occupant's room JID to the full JIDs of all the occupants (including the new occupant):</p>
+      <example caption="Service Sends New Occupant's Presence to All Occupants"><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit/thirdwitch'
+    to='crone1@shakespeare.lit/desktop'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='member' role='participant'/>
+  </x>
+</presence>
+
+<presence
+    from='darkcave@macbeth.shakespeare.lit/thirdwitch'
+    to='wiccarocks@shakespeare.lit/laptop'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='member' role='participant'/>
+  </x>
+</presence>
+
+<presence
+    from='darkcave@macbeth.shakespeare.lit/thirdwitch'
+    to='hag66@shakespeare.lit/pda'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='member' role='participant'/>
+    <status code='110'/>
+  </x>
+</presence>
+      ]]></example>
+      <p>In this example, initial room presence is being sent from the new occupant (thirdwitch) to all occupants, including the new occupant. As shown in the last stanza, the presence sent by the room to a user from itself as an occupant SHOULD include a status code of 110 so that the user knows this presence refers to itself as an occupant.</p>
+      <p>The service MAY rewrite the new occupant's roomnick (e.g., if roomnicks are locked down). If the service does not accept the new occupant's requested roomnick but instead assigns a new roomnick, it MUST include a status code of "210" in the presence broadcast that it sends to the new occupant.</p>
+      <example caption="Service Sends New Occupant's Presence to New Occupant"><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit/thirdwitch'
+    to='hag66@shakespeare.lit/pda'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='member' role='participant'/>
+    <status code='110'/>
+    <status code='210'/>
+  </x>
+</presence>
+      ]]></example>
+      <p>Note: The order of the presence stanzas sent to the new occupant is important. The service MUST first send the complete list of the existing occupants to the new occupant and only then send the new occupant's own presence to the new occupant. This helps the client know when it has received the complete "room roster".</p>
+      <p>After sending the presence broadcast (and only after doing so), the service may then send discussion history, live messages, presence updates, and other in-room traffic.</p>
+    </section3>
+    <section3 topic='Default Roles' anchor='enter-roles'>
+      <p>The following table summarizes the initial default roles that a service should set based on the user's affiliation (there is no role associated with the "outcast" affiliation, since such users are not allowed to enter the room).</p>
+      <table caption='Initial Role Based on Affiliation'>
+        <tr>
+          <th>Room Type</th>
+          <th>None</th>
+          <th>Member</th>
+          <th>Admin</th>
+          <th>Owner</th>
+        </tr>
+        <tr>
+          <td>Moderated</td>
+          <td>Visitor</td>
+          <td>Participant</td>
+          <td>Moderator</td>
+          <td>Moderator</td>
+        </tr>
+        <tr>
+          <td>Unmoderated</td>
+          <td>Participant</td>
+          <td>Participant</td>
+          <td>Moderator</td>
+          <td>Moderator</td>
+        </tr>
+        <tr>
+          <td>Members-Only</td>
+          <td>N/A *</td>
+          <td>Participant</td>
+          <td>Moderator</td>
+          <td>Moderator</td>
+        </tr>
+        <tr>
+          <td>Open</td>
+          <td>Participant</td>
+          <td>Participant</td>
+          <td>Moderator</td>
+          <td>Moderator</td>
+        </tr>
+      </table>
+      <p>* Entry is not permitted.</p>
+    </section3>
+    <section3 topic='Non-Anonymous Rooms' anchor='enter-nonanon'>
+      <p>If the room is non-anonymous, the service MUST send the new occupant's full JID to all occupants using extended presence information in an &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc#user' namespace and containing an &lt;item/&gt; child with a 'jid' attribute specifying the occupant's full JID:</p>
+      <example caption="Service Sends Full JID to All Occupants"><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit/thirdwitch'
+    to='crone1@shakespeare.lit/desktop'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='none'
+          jid='hag66@shakespeare.lit/pda'
+          role='participant'/>
+  </x>
+</presence>
+.
+.
+.
+      ]]></example>
+      <p>If the user is entering a room that is non-anonymous (i.e., which informs all occupants of each occupant's full JID as shown above), the service SHOULD allow the user to enter the room but MUST also warn the user that the room is not anonymous. This SHOULD be done by including a status code of "100" in the initial presence that the room sends to the new occupant:</p>
+      <example caption="Service Sends New Occupant's Presence to New Occupant"><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit/thirdwitch'
+    to='hag66@shakespeare.lit/pda'>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <item affiliation='member' role='participant'/>
+    <status code='100'/>
+    <status code='110'/>
+    <status code='210'/>
+  </x>
+</presence>
+      ]]></example>
+      <p>However, it MAY done by sending a message of type "groupchat" to the new occupant containing an &lt;x/&gt; child with a &lt;status/&gt; element that has the 'code' attribute set to a value of "100":</p>
+      <example caption='Service Warns New Occupant About Lack of Anonymity'><![CDATA[
+<message
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='groupchat'>
+  <body>This room is not anonymous.</body>
+  <x xmlns='http://jabber.org/protocol/muc#user'>
+    <status code='100'/>
+  </x>
+</message>
+      ]]></example>
+      <p>The inclusion of the status code assists clients in presenting their own notification messages (e.g., information appropriate to the user's locality).</p>
+    </section3>
+    <section3 topic='Semi-Anonymous Rooms' anchor='enter-semianon'>
+      <p>If the room is semi-anonymous, the service MUST send the new occupant's full JID in the format shown above only to those occupants with a role of "moderator".</p>
+      <p>(Note: All subsequent examples include the 'jid' attribute for each &lt;item/&gt; element, even though this information is not sent to non-moderators in semi-anonymous rooms.)</p>
+    </section3>
+    <section3 topic='Password-Protected Rooms' anchor='enter-pw'>
+      <p>If the room requires a password and the user did not supply one (or the password provided is incorrect), the service MUST deny access to the room and inform the user that they are unauthorized; this is done by returning a presence stanza of type "error" specifying a &notauthorized; error:</p>
+      <example caption='Service Denies Access Because No Password Provided'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='401' type='auth'>
+    <not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</presence>
+      ]]></example>
+      <p>Passwords SHOULD be supplied with the presence stanza sent when entering the room, contained within an &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc' namespace and containing a &lt;password/&gt; child. Passwords are to be sent as cleartext; no other authentication methods are supported at this time, and any such authentication or authorization methods shall be defined in a separate specification (see the <link url='#security'>Security Considerations</link> section of this document).</p>
+      <example caption='User Provides Password On Entering a Room'><![CDATA[
+<presence
+    from='hag66@shakespeare.lit/pda'
+    to='darkcave@macbeth.shakespeare.lit/thirdwitch'>
+  <x xmlns='http://jabber.org/protocol/muc'>
+    <password>cauldronburn</password>
+  </x>
+</presence>
+      ]]></example>
+    </section3>
+    <section3 topic='Members-Only Rooms' anchor='enter-members'>
+      <p>If the room is members-only but the user is not on the member list, the service MUST deny access to the room and inform the user that they are not allowed to enter the room; this is done by returning a presence stanza of type "error" specifying a &registration; error condition:</p>
+      <example caption='Service Denies Access Because User Is Not on Member List'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='407' type='auth'>
+    <registration-required xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</presence>
+      ]]></example>
+    </section3>
+    <section3 topic='Banned Users' anchor='enter-banned'>
+      <p>If the user has been banned from the room (i.e., has an affiliation of "outcast"), the service MUST deny access to the room and inform the user of the fact that he or she is banned; this is done by returning a presence stanza of type "error" specifying a &forbidden; error condition:</p>
+      <example caption='Service Denies Access Because User is Banned'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='403' type='auth'>
+    <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</presence>
+      ]]></example>
+    </section3>
+    <section3 topic='Nickname Conflict' anchor='enter-conflict'>
+      <p>If the room already contains another user with the nickname desired by the user seeking to enter the room (or if the nickname is reserved by another user on the member list), the service MUST deny access to the room and inform the user of the conflict; this is done by returning a presence stanza of type "error" specifying a &conflict; error condition:</p>
+      <example caption='Service Denies Access Because of Nick Conflict'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='409' type='cancel'>
+    <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</presence>
+      ]]></example>
+      <p>However, if the bare JID (&BAREJID;) of the present occupant matches the bare JID of the user seeking to enter the room, then the service SHOULD allow entry to the user, so that the user has two (or more) in-room "sessions" with the same roomnick, one for each resource. If a service allows more than one occupant with the same bare JID and the same room nickname, it SHOULD route in-room messages to all of the user's resources and allow all of the user's resources to send messages to the room; it is up to the implementation to determine how to appropriately handle presence from the user's resources and how to route private messages to all or only one resource (based on presence priority or some other algorithm).</p>
+    </section3>
+    <section3 topic='Max Users' anchor='enter-maxusers'>
+      <p>If the room has reached its maximum number of users, the service SHOULD deny access to the room and inform the user of the restriction; this is done by returning a presence stanza of type "error" specifying a &unavailable; error condition:</p>
+      <example caption='Service Informs User that Room Occupant Limit Has Been Reached'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='503' type='wait'>
+    <service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+  </error>
+</presence>
+      ]]></example>
+      <p>Alternatively, the room could kick an "idle user" in order to free up space. Also, a room MUST always allow entry by a room admin or owner.</p>
+    </section3>
+    <section3 topic='Locked Room' anchor='enter-locked'>
+      <p>If a user attempts to enter a room while it is "locked" (i.e., before the room creator provides an initial configuration and therefore before the room officially exists), the service MUST refuse entry and return an &notfound; error to the user:</p>
+      <example caption='Service Denies Access Because Room Does Not Exist'><![CDATA[
+<presence
+    from='darkcave@macbeth.shakespeare.lit'
+    to='hag66@shakespeare.lit/pda'
+    type='error'>
+  <error code='404' type='cancel'>
+    <item-not-found xm