textile to gh-markdown (pandoc conversion)

[xonotic/xonotic.wiki.git] / Announcement_vote_results.md

diff --git a/Announcement_vote_results.md b/Announcement_vote_results.md
index 26176f707368ee0eadf2b9c63acae3aea60636a6..ed4db7e4d125570e4f912d05137bc7b911c724ea 100644 (file)
--- a/Announcement_vote_results.md
+++ b/Announcement_vote_results.md
@@ -1,89 +1,94 @@
-h1. Announcement vote results
+Announcement vote results
+=========================
 
-h2. Comments and other votes have been ignored
+Comments and other votes have been ignored
+------------------------------------------
 
 1st place is awarded 3 points
 2nd place is awarded 2 points
 3rd place is awarded 1 points
 
-h2. The results
+The results
+-----------
 
 The winner with 29 points is Announcement v7
 
-v1 by -z-: (0 * 3 + 0 * 2 + 0 * 1) = 0 points
-v2 by Spaceman: (0 * 3 + 0 * 2 + 0 * 1) = 0 points
-v3 by a_grue and -z-: 1st, 1st, 1st, 3rd, 3rd (3 * 3 + 0 * 2 + 2 * 1) = 11 points
-v4 by merlijn: 2nd, 1st, 2nd, 2nd, 1st, 1st (3 * 3 + 3 * 2 + 0 * 1) = 15 points
-v5 by Dokujisan: 2nd, 1st, 2nd (1 * 3 + 2 * 2 + 0 * 1) = 7 points
-v6 by Xeno: 1st, 1st, 2nd, 1st, 2nd (3 * 3 + 2 * 2 + 0 * 1) = 13 points
-*v7 (mix of 5 and 6): 1st, 1st, 1st, 3rd, 1st, 2nd, 3rd, 2nd, 1st, 2nd, 1st, 1st (8 * 3 + 3 * 2 + 2 * 1) = 32 points*
+v1 by ~~z~~: (0 \* 3 + 0 \* 2 + 0 \* 1) = 0 points
+v2 by Spaceman: (0 \* 3 + 0 \* 2 + 0 \* 1) = 0 points
+v3 by a\_grue and ~~z~~: 1st, 1st, 1st, 3rd, 3rd (3 \* 3 + 0 \* 2 + 2 \* 1) = 11 points
+v4 by merlijn: 2nd, 1st, 2nd, 2nd, 1st, 1st (3 \* 3 + 3 \* 2 + 0 \* 1) = 15 points
+v5 by Dokujisan: 2nd, 1st, 2nd (1 \* 3 + 2 \* 2 + 0 \* 1) = 7 points
+v6 by Xeno: 1st, 1st, 2nd, 1st, 2nd (3 \* 3 + 2 \* 2 + 0 \* 1) = 13 points
+**v7 (mix of 5 and 6): 1st, 1st, 1st, 3rd, 1st, 2nd, 3rd, 2nd, 1st, 2nd, 1st, 1st (8** 3 + 3 \* 2 + 2 \* 1) = 32 points\*
 
-h2. The cleaned and tidied votes
+The cleaned and tidied votes
+----------------------------
 
-*mand1nga*
+**mand1nga**
 1. v7
 
-*Dokujisan*
+**Dokujisan**
 1. v7
-*
-DiaboliK*
+\*
+DiaboliK\*
 1. v7
 
-*MirceaKitsune*
+**MirceaKitsune**
 1. v3
 2. v4
 3. v7
 
-*lda17h*
+**lda17h**
 1. V6
 2. V5
 
-*tZork*
+**tZork**
 1. v4
 
-*Ronan*
+**Ronan**
 1. v3
 2. v4
 
-*C.Brutail*
+**C.Brutail**
 1. v6
 
-*Psychcf*
+**Psychcf**
 1. v7
 
-*Morphed*
+**Morphed**
 1. v3
 2. v4
 
-*a grue*
+**a grue**
 1. v5
 2. v7
 3. v3
 
-*Blub*
+**Blub**
 1. v4
 2. v6
 3. v7
 
-*Oblivion*
+**Oblivion**
 1. v6
 2. v7
 
-*divVerent*
+**divVerent**
 1. v7
 2. v5
 
-*RoKenn*
+**RoKenn**
 1. v4
 2. v7
 
-*Xeno*
+**Xeno**
 1. v7
 2. v6
 3. v3
 
-*BennyDacks*
-1. v7 
+**BennyDacks**
+1. v7
+
+**FruitieX**
+1. v7
 
-*FruitieX*
-1. v7