Various documentation updates, and added names.txt :)

diff --git a/TODO b/TODO
index f35f9b0de562f6edf04411eb8affcfe1ff567a55..c127996933cb18cc049c311b0e228c08f30676bb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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 --git a/doc/names.txt b/doc/names.txt
new file mode 100644 (file)
index 0000000..ced293b
--- /dev/null
+++ b/doc/names.txt
@@ -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 --git a/doc/stanza_routing.txt b/doc/stanza_routing.txt
index a149455347746a3d3a9536b6625f40edb564f6cb..4befeb0e752ec6914d4c08094dfdf174af80d9a3 100644 (file)
--- a/doc/stanza_routing.txt
+++ b/doc/stanza_routing.txt
@@ -27,3 +27,4 @@ To local contact:
 To remote contact:
        Initiate s2s connection if necessary
        Send stanza across
+