Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
index 6a09c1bdbe8011d3fe64f08ca2aef31998b5fde4..4c19b05852ff7ded993110151aafc8d8763b4f45 100644 (file)
--- a/doc/smileys.mdwn
+++ b/doc/smileys.mdwn
@@ -1,43 +1,56 @@
 This page is used to control what smileys are supported by the wiki.
 Just write the text of a smiley to display it.
 
 This page is used to control what smileys are supported by the wiki.
 Just write the text of a smiley to display it.
 

-* \:)  [[smileys/smile.png]]
-* \:-) [[smileys/smile.png]]
-* \:D  [[smileys/biggrin.png]]
-* \B)  [[smileys/smile2.png]]
-* \:)) [[smileys/smile3.png]]
-* \:-))        [[smileys/smile3.png]]
-* \;)  [[smileys/smile4.png]]
-* \;-) [[smileys/smile4.png]]
-* \:\  [[smileys/ohwell.png]]
-* \:/  [[smileys/ohwell.png]]
-* \>:> [[smileys/devil.png]]
-* \X-( [[smileys/angry.png]]
-* \<:( [[smileys/frown.png]]
-* \:(  [[smileys/sad.png]]
-* \:-( [[smileys/sad.png]]
-* \:-? [[smileys/tongue.png]]
-* \:o  [[smileys/redface.png]]
-* \|)  [[smileys/tired.png]]
-* \|-) [[smileys/tired.png]]
-* \{OK}        [[smileys/thumbs-up.png]]
-* \{X} [[smileys/icon-error.png]]
-* \(./)        [[smileys/checkmark.png]]
-* \(!) [[smileys/idea.png]]
-* \[!] [[smileys/attention.png]]
-* \/!\ [[smileys/alert.png]]
-* \{*} [[smileys/star_on.png]]
-* \{o} [[smileys/star_off.png]]
+* \\:) [[smileys/smile.png]]
+* \\:-)        [[smileys/smile.png]]
+* \\:D [[smileys/biggrin.png]]
+* \\:-D        [[smileys/biggrin.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/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]]
+* \\{x}        [[smileys/star_on.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) {*}
+For example: {x} B) {x}

 
 ----
 
 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.