diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/dokuwiki.php | 2 | ||||
| -rw-r--r-- | conf/smileys.conf | 55 |
2 files changed, 28 insertions, 29 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index e3d19fb71..90750ed40 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -45,7 +45,7 @@ $conf['deaccent'] = 1; //deaccented chars in pagenames (1) or $conf['useheading'] = 0; //use the first heading in a page as its name $conf['refcheck'] = 1; //check for references before deleting media files $conf['refshow'] = 0; //how many references should be shown, 5 is a good value -$conf['showuseras'] = 'loginname'; // 'loginname' users login name +$conf['showuseras'] = 'loginname'; // 'loginname' users login name // 'username' users full name // 'email' e-mail address (will be obfuscated as per mailguard) // 'email_link' e-mail address as a mailto: link (obfuscated) diff --git a/conf/smileys.conf b/conf/smileys.conf index 42a9c2f89..47e4537e2 100644 --- a/conf/smileys.conf +++ b/conf/smileys.conf @@ -1,28 +1,27 @@ -# Smileys configured here will be replaced by the
-# configured images in the smiley directory
-
-8-) icon_cool.gif
-8-O icon_eek.gif
-8-o icon_eek.gif
-:-( icon_sad.gif
-:-) icon_smile.gif
-=) icon_smile2.gif
-:-/ icon_doubt.gif
-:-\ icon_doubt2.gif
-:-? icon_confused.gif
-:-D icon_biggrin.gif
-:-P icon_razz.gif
-:-o icon_surprised.gif
-:-O icon_surprised.gif
-:-x icon_silenced.gif
-:-X icon_silenced.gif
-:-| icon_neutral.gif
-;-) icon_wink.gif
-^_^ icon_fun.gif
-:?: icon_question.gif
-:!: icon_exclaim.gif
-LOL icon_lol.gif
-FIXME fixme.gif
-DELETEME delete.gif
-
-#;<P icon_kaddi.gif
+# Smileys configured here will be replaced by the +# configured images in the smiley directory + +8-) icon_cool.gif +8-O icon_eek.gif +8-o icon_eek.gif +:-( icon_sad.gif +:-) icon_smile.gif +=) icon_smile2.gif +:-/ icon_doubt.gif +:-\ icon_doubt2.gif +:-? icon_confused.gif +:-D icon_biggrin.gif +:-P icon_razz.gif +:-o icon_surprised.gif +:-O icon_surprised.gif +:-x icon_silenced.gif +:-X icon_silenced.gif +:-| icon_neutral.gif +;-) icon_wink.gif +^_^ icon_fun.gif +:?: icon_question.gif +:!: icon_exclaim.gif +LOL icon_lol.gif +FIXME fixme.gif +DELETEME delete.gif + |