# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1223166763 -3600
# Node ID 9ec0d447cc9edb37a35a9fff32b31f791cc0fb2e
# Parent  7afc23a8114e9b397b1092c48e7792c08d25037b# Parent  44800be871f590f4b48758a12cd7a234e7065554
Merged mod_InBandRegistration from waqas

diff -r 44800be871f5 -r 9ec0d447cc9e doc/session.txt
--- a/doc/session.txt	Sun Oct 05 04:55:45 2008 +0500
+++ b/doc/session.txt	Sun Oct 05 01:32:43 2008 +0100
@@ -6,14 +6,16 @@
 	-- properties --
 	conn -- the tcp connection
 	notopen -- true if stream has not been initiated, removed after receiving <stream:steam>
-	priority -- the resource priority, default: 0
 	type -- the connection type. Valid values include:
 			-- "c2s_unauthed" - connection has not been authenticated yet
 			-- "c2s" - from a local client to the server
 	username -- the node part of the client's jid (not defined before auth)
 	host -- the host part of the client's jid (not defined before stream initiation)
 	resource -- the resource part of the client's full jid (not defined before resource binding)
+	full_jid -- convenience for the above 3 as string in username@host/resource form (not defined before resource binding)
+	priority -- the resource priority, default: 0 (not defined before initial presence)
 	
 	-- methods --
 	send(x) -- converts x to a string, and writes it to the connection
-}
\ No newline at end of file
+	disconnect(x) -- Disconnect the user and clean up the session, best call sessionmanager.destroy_session() instead of this in most cases
+}
diff -r 44800be871f5 -r 9ec0d447cc9e util/stanza.lua
--- a/util/stanza.lua	Sun Oct 05 04:55:45 2008 +0500
+++ b/util/stanza.lua	Sun Oct 05 01:32:43 2008 +0100
@@ -17,15 +17,6 @@
 	return setmetatable(stanza, stanza_mt);
 end
 
-function stanza_mt:iq(attrs)
-	return self + stanza("iq", attrs)
-end
-function stanza_mt:message(attrs)
-	return self + stanza("message", attrs)
-end
-function stanza_mt:presence(attrs)
-	return self + stanza("presence", attrs)
-end
 function stanza_mt:query(xmlns)
 	return self:tag("query", { xmlns = xmlns });
 end