Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / smileys.mdwn

diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
index cdd59fc797b934e7fb5e110d4760d767dddd74fc..54ac53979b27324180f04d62ece427faf690f916 100644 (file)
--- a/doc/smileys.mdwn
+++ b/doc/smileys.mdwn
@@ -4,40 +4,52 @@ Just write the text of a smiley to display it.
 * \:)  [[smileys/smile.png]]
 * \:-) [[smileys/smile.png]]
 * \:D  [[smileys/biggrin.png]]
 * \:)  [[smileys/smile.png]]
 * \:-) [[smileys/smile.png]]
 * \:D  [[smileys/biggrin.png]]

+* \:-D [[smileys/biggrin.png]]

 * \B)  [[smileys/smile2.png]]
 * \B)  [[smileys/smile2.png]]

+* \B-) [[smileys/smile2.png]]

 * \:)) [[smileys/smile3.png]]
 * \:-))        [[smileys/smile3.png]]
 * \;)  [[smileys/smile4.png]]
 * \;-) [[smileys/smile4.png]]
 * \:\  [[smileys/ohwell.png]]
 * \:)) [[smileys/smile3.png]]
 * \:-))        [[smileys/smile3.png]]
 * \;)  [[smileys/smile4.png]]
 * \;-) [[smileys/smile4.png]]
 * \:\  [[smileys/ohwell.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]]
 * \>:> [[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]]
 * \: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/checkmark.png]]
 * \(!) [[smileys/idea.png]]
 * \[!] [[smileys/attention.png]]
 * \/!\ [[smileys/alert.png]]

+* \(?) [[smileys/question.png]]

 * \{*} [[smileys/star_on.png]]
 * \{o} [[smileys/star_off.png]]
 * \{*} [[smileys/star_on.png]]
 * \{o} [[smileys/star_off.png]]

+* \{1}  [[smileys/prio1.png]]
+* \{2}  [[smileys/prio2.png]]
+* \{3}  [[smileys/prio3.png]]

 
 

-For example: {*} :-) {*}
+For example: {*} B) {*}

 
 ----
 
 To change the supported smileys, just edit the lists on this page.
 Note that the format is important; each list item should start with the
 text that is turned into the smiley, escaped so that users can see what
 
 ----
 
 To change the supported smileys, just edit the lists on this page.
 Note that the format is important; each list item should start with the
 text that is turned into the smiley, escaped so that users can see what

-produces it, followed by a [[WikiLink]] to the image to display.
+produces it, followed by a [[ikiwiki/WikiLink]] to the image to display.

 
 

-/!\ Bear in mind that the link to the imge needs to be written in a way that
+/!\ Bear in mind that the link to the image needs to be written in a way that

 will work if it's copied to other pages on the wiki. So be sure to include the
 smileys directory in the path to the file.
 will work if it's copied to other pages on the wiki. So be sure to include the
 smileys directory in the path to the file.