web commit by http://jeremie.koenig.myopenid.com/

[ikiwiki.git] / doc / smileys.mdwn

diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
index 5c42ccd5843c3bbcfef079c8eaedafbb7683e4d6..dfe30430bb99e7ca9be11d0825dea3009da67443 100644 (file)
--- 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.
 
@@ -15,23 +19,31 @@ Just write the text of a smiley to display it.
 * \:-\ [[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]]
 * \{OK}        [[smileys/thumbs-up.png]]
 * \{X} [[smileys/icon-error.png]]
+* \{i} [[smileys/icon-info.png]]
 * \(./)        [[smileys/checkmark.png]]
 * \(!) [[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]]
 
 For example: {*} B) {*}