diff --git a/dibi/dibi.php b/dibi/dibi.php
index 5e1336c9..487f28c1 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -8,24 +8,23 @@
  *
  * for PHP 5.0.3 and newer
  *
- * This source file is subject to the NEW BSD license that is bundled
+ * This source file is subject to the new BSD license that is bundled
  * with this package in the file license.txt.
  *
- * @link      http://dibi.texy.info/
- * @license   NEW BSD LICENSE
- * @package   dibi
- * @category  Database
- * @version   0.8d (Revision: $WCREV$, Date: $WCDATE$)
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2004-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    0.8d (Revision: $WCREV$, Date: $WCDATE$)
+ * @category   Database
+ * @package    Dibi
+ * @link       http://dibi.texy.info/
  */
 
 
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @version    $Revision$ $Date$
  */
 
 
@@ -154,7 +153,7 @@ class dibi
      * @param  array|string connection parameters
      * @param  string       connection name
      * @return DibiDriver
-     * @throw  DibiException
+     * @throws DibiException
      */
     static public function connect($config, $name=0)
     {
@@ -202,7 +201,7 @@ class dibi
      *
      * @param  string   connection registy name
      * @return object   DibiDriver object.
-     * @throw  DibiException
+     * @throws DibiException
      */
     static public function getConnection($name=NULL)
     {
@@ -226,7 +225,7 @@ class dibi
      *
      * @param  string   connection registy name
      * @return void
-     * @throw  DibiException
+     * @throws DibiException
      */
     static public function activate($name)
     {
@@ -240,7 +239,7 @@ class dibi
      *
      * @param  array|mixed    one or more arguments
      * @return int|DibiResult
-     * @throw  DibiException
+     * @throws DibiException
      */
     static public function query($args)
     {
diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 290bb82f..35b02e32 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -34,7 +36,7 @@ class DibiMSSqlDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index 02e150b9..fee5fe4d 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -35,7 +37,7 @@ class DibiMySqlDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 6f4c4bea..04e43c7a 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -36,7 +38,7 @@ class DibiMySqliDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 02e1587b..f4737ca5 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -35,7 +37,7 @@ class DibiOdbcDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index 86406d03..18082246 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -34,7 +36,7 @@ class DibiPdoDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index e4a3087e..327a3da1 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -35,7 +37,7 @@ class DibiPostgreDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 860e0525..7329397b 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -36,7 +38,7 @@ class DibiSqliteDriver extends DibiDriver
 
     /**
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
diff --git a/dibi/libs/driver.php b/dibi/libs/driver.php
index 9fd2cce8..affae7ec 100644
--- a/dibi/libs/driver.php
+++ b/dibi/libs/driver.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -49,7 +51,7 @@ abstract class DibiDriver
     /**
      * Creates object and (optionally) connects to a database
      * @param array  connect configuration
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function __construct($config)
     {
@@ -61,7 +63,7 @@ abstract class DibiDriver
 
     /**
      * Connects to a database
-     * @throw  DibiException
+     * @throws DibiException
      * @return resource
      */
     abstract protected function connect();
@@ -98,7 +100,7 @@ abstract class DibiDriver
      *
      * @param  array|mixed    one or more arguments
      * @return int|DibiResult
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function query($args)
     {
diff --git a/dibi/libs/exception.php b/dibi/libs/exception.php
index 358d434d..30c43d07 100644
--- a/dibi/libs/exception.php
+++ b/dibi/libs/exception.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
diff --git a/dibi/libs/resultset.php b/dibi/libs/resultset.php
index 522b8d2b..cd889058 100644
--- a/dibi/libs/resultset.php
+++ b/dibi/libs/resultset.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
diff --git a/dibi/libs/translator.php b/dibi/libs/translator.php
index 79f05dec..7f2cca27 100644
--- a/dibi/libs/translator.php
+++ b/dibi/libs/translator.php
@@ -3,10 +3,12 @@
 /**
  * This file is part of the "dibi" project (http://dibi.texy.info/)
  *
- * Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
- *
- * @version  $Revision$ $Date$
- * @package  dibi
+ * @author     David Grudl
+ * @copyright  Copyright (c) 2005-2007 David Grudl aka -dgx- (http://www.dgx.cz)
+ * @license    New BSD License
+ * @version    $Revision$ $Date$
+ * @category   Database
+ * @package    Dibi
  */
 
 
@@ -43,7 +45,7 @@ class DibiTranslator
      *
      * @param  array
      * @return string|FALSE
-     * @throw  DibiException
+     * @throws DibiException
      */
     public function translate($args)
     {