Merge almost everything. a lot to test.

config_default.php

@@ -13,6 +13,8 @@
      * The directory containing calibre's metadata.db file, with sub-directories
      * containing all the formats.
      * BEWARE : it has to end with a /
+     * You can enable multiple database with this notation instead of a simple string :
+     * $config['calibre_directory'] = array ("My database name" => "/home/directory/calibre1/", "My other database name" => "/home/directory/calibre2/");
      */
     $config['calibre_directory'] = './feedbook/';
     
@@ -93,7 +95,7 @@
     
     /*
      * use URL rewriting for downloading of ebook in HTML catalog
-     * See README for more information
+     * See Github wiki for more information
      *  1 : enable
      *  0 : disable
      */
@@ -164,4 +166,5 @@
      * 0 : No
      */
     $config['cops_provide_kepub'] = "0";
+
 ?>