merge change from doc to basewiki while removing an introduced duplicate

smiley
master
joey 2007-01-18 14:41:25 +00:00
parent e3e32c1ff1
commit 788b7715b6
2 changed files with 7 additions and 50 deletions

View File

@ -4,13 +4,16 @@ Just write the text of a smiley to display it.
* \:) [[smileys/smile.png]] * \:) [[smileys/smile.png]]
* \:-) [[smileys/smile.png]] * \:-) [[smileys/smile.png]]
* \:D [[smileys/biggrin.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/smile3.png]] * \:-)) [[smileys/smile3.png]]
* \;) [[smileys/smile4.png]] * \;) [[smileys/smile4.png]]
* \;-) [[smileys/smile4.png]] * \;-) [[smileys/smile4.png]]
* \:\ [[smileys/ohwell.png]] * \:\ [[smileys/ohwell.png]]
* \:/ [[smileys/ohwell.png]] * \:/ [[smileys/ohwell.png]]
* \:-/ [[smileys/ohwell.png]]
* \>:> [[smileys/devil.png]] * \>:> [[smileys/devil.png]]
* \X-( [[smileys/angry.png]] * \X-( [[smileys/angry.png]]
* \<:( [[smileys/frown.png]] * \<:( [[smileys/frown.png]]
@ -29,7 +32,7 @@ Just write the text of a smiley to display it.
* \{*} [[smileys/star_on.png]] * \{*} [[smileys/star_on.png]]
* \{o} [[smileys/star_off.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 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 [[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. 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.

View File

@ -1,47 +0,0 @@
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]]
* \:-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/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]]
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.
/!\ 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.