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 42f234ab46c1688bd41b89840cdf98b6082c5b3d..54ac53979b27324180f04d62ece427faf690f916 100644 (file)
--- a/doc/smileys.mdwn
+++ b/doc/smileys.mdwn
@@ -12,8 +12,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 +34,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]]
@@ -44,7 +48,7 @@ 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
-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 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