diff --git a/app/config/database.php.default b/app/config/database.php.default index 2a605e498..f85b56922 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -35,12 +35,7 @@ * sqlite - SQLite (PHP5 only), * postgres - PostgreSQL 7 and higher, * mssql - Microsoft SQL Server 2000 and higher, - * db2 - IBM DB2, Cloudscape, and Apache Derby (http://php.net/ibm-db2) * oracle - Oracle 8 and higher - * firebird - Firebird/Interbase - * sybase - Sybase ASE - * adodb-[drivername] - ADOdb interface wrapper (see below), - * odbc - ODBC DBO driver * * You can add custom database drivers (or override existing drivers) by adding the * appropriate file to app/models/datasources/dbo. Drivers should be named 'dbo_x.php', @@ -49,12 +44,6 @@ * persistent => true / false * Determines whether or not the database should use a persistent connection * - * connect => - * ADOdb set the connect to one of these - * (http://phplens.com/adodb/supported.databases.html) and - * append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent) - * For all other databases, this setting is deprecated. - * * host => * the host you connect to the database. To add a socket or port number, use 'port' => # * @@ -63,11 +52,11 @@ * on a per-table basis with the Model::$tablePrefix property. * * schema => - * For Postgres and DB2, specifies which schema you would like to use the tables in. Postgres defaults to + * For Postgresspecifies which schema you would like to use the tables in. Postgres defaults to * 'public', DB2 defaults to empty. * * encoding => - * For MySQL, MySQLi, Postgres and DB2, specifies the character encoding to use when connecting to the + * For MySQL, MySQLi, Postgres specifies the character encoding to use when connecting to the * database. Uses database default. * */ diff --git a/cake/console/templates/skel/config/database.php.default b/cake/console/templates/skel/config/database.php.default index 2a605e498..f85b56922 100644 --- a/cake/console/templates/skel/config/database.php.default +++ b/cake/console/templates/skel/config/database.php.default @@ -35,12 +35,7 @@ * sqlite - SQLite (PHP5 only), * postgres - PostgreSQL 7 and higher, * mssql - Microsoft SQL Server 2000 and higher, - * db2 - IBM DB2, Cloudscape, and Apache Derby (http://php.net/ibm-db2) * oracle - Oracle 8 and higher - * firebird - Firebird/Interbase - * sybase - Sybase ASE - * adodb-[drivername] - ADOdb interface wrapper (see below), - * odbc - ODBC DBO driver * * You can add custom database drivers (or override existing drivers) by adding the * appropriate file to app/models/datasources/dbo. Drivers should be named 'dbo_x.php', @@ -49,12 +44,6 @@ * persistent => true / false * Determines whether or not the database should use a persistent connection * - * connect => - * ADOdb set the connect to one of these - * (http://phplens.com/adodb/supported.databases.html) and - * append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent) - * For all other databases, this setting is deprecated. - * * host => * the host you connect to the database. To add a socket or port number, use 'port' => # * @@ -63,11 +52,11 @@ * on a per-table basis with the Model::$tablePrefix property. * * schema => - * For Postgres and DB2, specifies which schema you would like to use the tables in. Postgres defaults to + * For Postgresspecifies which schema you would like to use the tables in. Postgres defaults to * 'public', DB2 defaults to empty. * * encoding => - * For MySQL, MySQLi, Postgres and DB2, specifies the character encoding to use when connecting to the + * For MySQL, MySQLi, Postgres specifies the character encoding to use when connecting to the * database. Uses database default. * */