Update changelog and cleanup

CHANGELOG

@@ -12,8 +12,9 @@ CHANGELOG Roundcube Webmail
 - Archive: Fix bug where next email was not displayed after Archive button use (#6965)
 - Archive: Fix missing Archive icon in folder selector popup in Elastic
 - Fix bug where cache keys were not case-sensitive on MySQL/MSSQL (#6942)
-- Fix so an error is loogged when encryption fails (#6948)
+- Fix so an error is logged when encryption fails (#6948)
 - Fix bug where inline images could have been ignored if Content-Id header contained redundant spaces (#6980)
+- Fix and document skin_logo setup (#6981)
 
 RELEASE 1.4-rc2
 ---------------

config/defaults.inc.php

@@ -390,23 +390,22 @@ $config['advanced_prefs'] = array();
 // PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
 $config['support_url'] = '';
 
-// replace Roundcube logo with this image
+// Logo image replacement. Specifies location of the image as:
-// specify an URL relative to the document root of this Roundcube installation
+// - URL relative to the document root of this Roundcube installation
-// an array can be used to specify different logos for specific template files
+// - full URL with http:// or https:// prefix
-// the array key specifies the template(s) the logo should be applied to while the
+// - URL relative to the current skin folder (when starts with a '/')
-// value should be the relative URL of the image.
 //
-// the array key is made up of (up to) 3 parts:
+// An array can be used to specify different logos for specific template files
-// the skin name (optional)
+// The array key specifies the place(s) the logo should be applied to and
-// the template name (or * for all templates)
+// is made up of (up to) 3 parts:
-// the logo type (optional) the type attribute is used for logos used on multiple templates
+// - skin name prefix (always with colon, can be replaced with *)
+// - template name (or * for all templates)
+// - logo type - it is used for logos used on multiple templates
 //   the available types include '[favicon]' for favicon, '[print]' for logo on all print
 //   templates (e.g. messageprint, contactprint) and '[small]' for small screen logo in supported skins
 //
-// config applied in order: <skin>:<template>, <skin>:<template>, <skin>:*, <template>, *
+// Example config for skin_logo
 /*
- * example config for skin_logo
- *
    array(
      // show the image /images/logo_login_small.png for the Login screen in the Elastic skin on small screens
      "elastic:login[small]" => "/images/logo_login_small.png",