Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 18 insertions, 11 deletions

diff --git a/system/config/database.php b/system/config/database.php
index 36e4614c..dd6bf469 100644
--- a/system/config/database.php
+++ b/system/config/database.php
@@ -1,27 +1,34 @@
 <?php defined('SYSPATH') OR die('No direct access allowed.');
 /**
- * @package  Database
- *
  * Database connection settings, defined as arrays, or "groups". If no group
  * name is used when loading the database library, the group named "default"
  * will be used.
  *
  * Each group can be connected to independently, and multiple groups can be
- * connected at once.
+ * connected at once. For more information about connecting to a database group
+ * see the [Database] library.
  *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+/**
  * Group Options:
- *  benchmark     - Enable or disable database benchmarking
- *  persistent    - Enable or disable a persistent connection
- *  connection    - Array of connection specific parameters; alternatively,
+ *
+ *  - benchmark     - Enable or disable database benchmarking
+ *  - persistent    - Enable or disable a persistent connection
+ *  - connection    - Array of connection specific parameters; alternatively,
  *                  you can use a DSN though it is not as fast and certain
  *                  characters could create problems (like an '@' character
  *                  in a password):
  *                  'connection'    => 'mysql://dbuser:secret@localhost/kohana'
- *  character_set - Database character set
- *  table_prefix  - Database table prefix
- *  object        - Enable or disable object results
- *  cache         - Enable or disable query caching
- *	escape        - Enable automatic query builder escaping
+ *  - character_set - Database character set
+ *  - table_prefix  - Database table prefix
+ *  - object        - Enable or disable object results
+ *  - cache         - Enable or disable query caching
+ *  - escape        - Enable automatic query builder escaping
  */
 $config['default'] = array
 (