merge change from doc to basewiki while removing an introduced duplicate

[ikiwiki.git] / basewiki / smileys.mdwn

diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn
index 2b23d2ba2d9f7d1e078275bfb40ab3fa0017780b..73826c457740bd251d2cb62b88e8c3646a2e3552 100644 (file)
--- a/basewiki/smileys.mdwn
+++ b/basewiki/smileys.mdwn
@@ -4,13 +4,16 @@ Just write the text of a smiley to display it.
 * \:)  [[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/devil.png]]
 * \X-( [[smileys/angry.png]]
 * \<:( [[smileys/frown.png]]
@@ -29,7 +32,7 @@ Just write the text of a smiley to display it.
 * \{*} [[smileys/star_on.png]]
 * \{o} [[smileys/star_off.png]]
 
-For example: {*} :-) {*}
+For example: {*} B) {*}
 
 ----
 
@@ -38,5 +41,6 @@ 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.
 
-/!\ Bear in mind that the link to the imge needs to be written in a way that
-will work if it's copied to other pages on the wiki.
+/!\ 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.