diff options
author | Matthew Wild <mwild1@gmail.com> | 2008-09-03 02:24:28 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2008-09-03 02:24:28 +0100 |
commit | 5e38a584202a8a91313921d4a3009406e61408d2 (patch) | |
tree | acd526dda51570a96f041669350a692541e8cbf1 /doc | |
parent | 8af81638a0d17d3cec2d8f73e156546679af5a4c (diff) | |
download | prosody-5e38a584202a8a91313921d4a3009406e61408d2.tar.gz prosody-5e38a584202a8a91313921d4a3009406e61408d2.zip |
Various documentation updates, and added names.txt :)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/names.txt | 9 | ||||
-rw-r--r-- | doc/stanza_routing.txt | 1 |
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 + |