diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-18 14:41:25 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-18 14:41:25 +0000 |
| commit | 788b7715b691883a265d862e57592e9ba0b330ad (patch) | |
| tree | d5efe9c42a977e4364d11a5cbb9cd1158ca1cc49 /basewiki | |
| parent | e3e32c1ff1cee74f879ae1416890030eee299a4c (diff) | |
| download | ikiwiki-788b7715b691883a265d862e57592e9ba0b330ad.tar ikiwiki-788b7715b691883a265d862e57592e9ba0b330ad.tar.gz | |
merge change from doc to basewiki while removing an introduced duplicate
smiley
Diffstat (limited to 'basewiki')
| -rw-r--r-- | basewiki/smileys.mdwn | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn index 2b23d2ba2..73826c457 100644 --- 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. |