aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lxmppd_core_stanz_dispatch.txt1
-rw-r--r--doc/names.txt42
-rwxr-xr-xpull_from_master.sh4
3 files changed, 39 insertions, 8 deletions
diff --git a/doc/lxmppd_core_stanz_dispatch.txt b/doc/lxmppd_core_stanz_dispatch.txt
index c76844e9..15bb730b 100644
--- a/doc/lxmppd_core_stanz_dispatch.txt
+++ b/doc/lxmppd_core_stanz_dispatch.txt
@@ -24,3 +24,4 @@ function init_stanza_dispatcher(session)
function (stanza)
Validates the stanza and calls the required handler
+
diff --git a/doc/names.txt b/doc/names.txt
index ced293bb..7a6ab1e9 100644
--- a/doc/names.txt
+++ b/doc/names.txt
@@ -1,9 +1,35 @@
-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'.
+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
-polylogue- Many conversations
+Thorns thought of:
+ poe - Derived from "poetry"
+ poezie - Romanian for "poesy" and "poem"
+ Elain - Just a cool name
+ Elane - A variation
+ Eclaire - Idem (French)
+ Adel - Random
+ Younha - Read as "yuna"
+ Quezacotl - Mayan gods -> google for correct form and pronounciation
+ Carbuncle - FF8 Guardian Force ^^
+ Protos - Mars satellite
+ mins - Derived from minstrel
+ diapoe - gr. dia + poesy/poetry
+ xinshi - I like it for a name just like that
+ loom - The first application I run on the first day of using a computer
+ Lory - Another name I happen to like
+ Loki - Nordic god of mischief, IIRC
+ Luna - Probably taken but I think worth mentioning
+ Coreo - Random thought
+ Miria - Also random
+ Lora - Idem
+ Kraken - :P
+ Nebula - .
+
+
+
diff --git a/pull_from_master.sh b/pull_from_master.sh
new file mode 100755
index 00000000..8ac568a4
--- /dev/null
+++ b/pull_from_master.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Pulling from http://getjabber.ath.cx:4000/"
+echo "You must have Mercurial (the hg command)"
+hg pull http://getjabber.ath.cx:4000/