aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-09-17 21:33:05 +0100
committerMatthew Wild <mwild1@gmail.com>2008-09-17 21:33:05 +0100
commit037b327e005211c72f210dacb64e8f55ae56768b (patch)
treed8fedebee8b85ea00c66f79255cf1193758455b0 /doc
parentde79b8d83f5497ea2dd0f3b237b263c68f4e4e27 (diff)
parentc2c027e14c01cd9c24add477b2e153374bcc7198 (diff)
downloadprosody-im-server-037b327e005211c72f210dacb64e8f55ae56768b.tar
prosody-im-server-037b327e005211c72f210dacb64e8f55ae56768b.zip
Merged Paul's branch
Diffstat (limited to 'doc')
-rw-r--r--doc/names.txt9
-rw-r--r--doc/stanza_routing.txt1
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/names.txt b/doc/names.txt
new file mode 100644
index 00000000..ced293bb
--- /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 a1494553..4befeb0e 100644
--- 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
+