X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf827b51073e07dc9a4cccb7c31b42183182f465..f7f1cb80503a775f3b20ea1df67f0c72575b53c4:/doc/smileys.mdwn

diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
index 42f234ab4..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,8 +16,11 @@ 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]]
@@ -31,6 +38,7 @@ 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]]