# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1221683585 -3600
# Node ID 23cab333d014a1992f5b1fb3d4ee85c2e81badc5
# Parent  2856dfc1f5ccf352030835e01513b0d8d54dbfce# Parent  ceca8faf23b105203e40e5ca941d8ac04ba7c0df
Merged Paul's branch

diff -r ceca8faf23b1 -r 23cab333d014 TODO
--- a/TODO	Wed Sep 17 23:30:48 2008 +0300
+++ b/TODO	Wed Sep 17 21:33:05 2008 +0100
@@ -2,8 +2,10 @@
 - Roster manipulation support
 - On-the-fly code updates
 - S2S \o/
+- Control/statistics interface
 
 Further down the line:
+- Ad-hoc commands
 - Clustering
 - Pubsub/PEP
 - Plugins!
diff -r ceca8faf23b1 -r 23cab333d014 doc/names.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/names.txt	Wed Sep 17 21:33:05 2008 +0100
@@ -0,0 +1,9 @@
+lxmppd	 -	...
+dia	 -	Greek, 'through', pronounced "dee-ah", root of "dialogue"
+metaphor -  	An imaginative comparison between two actions/objects etc which is not literally applicable.
+minstrel -  	Itinerant medieval musician/singer/story teller/poet. 
+parody	 -	Imitation of a poem or another poet's style for comic/satiric effect.
+poesy	 -	Archaic word for poetry.
+Xinshi   -	Chinese poetic term which literally means 'new poetry'.
+
+polylogue-	Many conversations
diff -r ceca8faf23b1 -r 23cab333d014 doc/stanza_routing.txt
--- a/doc/stanza_routing.txt	Wed Sep 17 23:30:48 2008 +0300
+++ b/doc/stanza_routing.txt	Wed Sep 17 21:33:05 2008 +0100
@@ -27,3 +27,4 @@
 To remote contact:
 	Initiate s2s connection if necessary
 	Send stanza across
+