X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/88e8f08c8ffe61fbb3aa8d0fbf78a86c30c65543..a98766ee75c236cb6508e6988c484de86eea2a3c:/doc/smileys.mdwn?ds=inline

diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
index e5377ced2..dfe30430b 100644
--- a/doc/smileys.mdwn
+++ b/doc/smileys.mdwn
@@ -1,3 +1,7 @@
+[[if test="enabled(smiley)"
+     then="This wiki has smileys **enabled**."
+     else="This wiki has smileys **disabled**."]]
+
 This page is used to control what smileys are supported by the wiki.
 Just write the text of a smiley to display it.
 
@@ -12,14 +16,18 @@ Just write the text of a smiley to display it.
 * \;)	[[smileys/smile4.png]]
 * \;-)	[[smileys/smile4.png]]
 * \:\	[[smileys/ohwell.png]]
+* \:-\	[[smileys/ohwell.png]]
 * \:/	[[smileys/ohwell.png]]
 * \:-/	[[smileys/ohwell.png]]
+* \:|	[[smileys/neutral.png]]
+* \:-|	[[smileys/neutral.png]]
 * \>:>	[[smileys/devil.png]]
 * \X-(	[[smileys/angry.png]]
 * \<:(	[[smileys/frown.png]]
 * \:(	[[smileys/sad.png]]
 * \:-(	[[smileys/sad.png]]
 * \:-?	[[smileys/tongue.png]]
+* \:-P	[[smileys/tongue.png]]
 * \:o	[[smileys/redface.png]]
 * \|)	[[smileys/tired.png]]
 * \|-)	[[smileys/tired.png]]
@@ -30,11 +38,12 @@ Just write the text of a smiley to display it.
 * \(!)	[[smileys/idea.png]]
 * \[!]	[[smileys/attention.png]]
 * \/!\	[[smileys/alert.png]]
+* \(?)	[[smileys/question.png]]
 * \{*}	[[smileys/star_on.png]]
 * \{o}	[[smileys/star_off.png]]
-* \{1} [[smileys/prio1.png]]
-* \{2} [[smileys/prio2.png]]
-* \{3} [[smileys/prio3.png]]
+* \{1}  [[smileys/prio1.png]]
+* \{2}  [[smileys/prio2.png]]
+* \{3}  [[smileys/prio3.png]]
 
 For example: {*} B) {*}