merge change from doc to basewiki while removing an introduced duplicate

smiley

2 files changed, 7 insertions, 50 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.
diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
deleted file mode 100644
index 5c42ccd58..000000000
--- a/doc/smileys.mdwn
+++ /dev/null
@@ -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.