From e6e7babe222d3dbe7ddacc0352a5b788c5de0b6d Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 14 Sep 2010 18:40:41 +0200
Subject: [PATCH] simplified phpDoc comments

---
 dibi/Nette/DateTime53.php         | 13 ++++++-------
 dibi/dibi.php                     | 16 ++++------------
 dibi/drivers/firebird.php         | 11 +++++------
 dibi/drivers/mssql.php            | 12 ++++++------
 dibi/drivers/mssql2005.php        | 12 ++++++------
 dibi/drivers/mysql.php            | 12 ++++++------
 dibi/drivers/mysql.reflector.php  | 12 ++++++------
 dibi/drivers/mysqli.php           | 12 ++++++------
 dibi/drivers/odbc.php             | 12 ++++++------
 dibi/drivers/oracle.php           | 12 ++++++------
 dibi/drivers/pdo.php              | 12 ++++++------
 dibi/drivers/postgre.php          | 12 ++++++------
 dibi/drivers/sqlite.php           | 12 ++++++------
 dibi/drivers/sqlite.reflector.php | 12 ++++++------
 dibi/drivers/sqlite3.php          | 12 ++++++------
 dibi/libs/DibiConnection.php      | 13 ++++++-------
 dibi/libs/DibiDataSource.php      | 13 ++++++-------
 dibi/libs/DibiDatabaseInfo.php    | 28 +++++++++++-----------------
 dibi/libs/DibiException.php       | 16 +++++++---------
 dibi/libs/DibiFluent.php          | 13 ++++++-------
 dibi/libs/DibiLazyStorage.php     | 13 ++++++-------
 dibi/libs/DibiObject.php          | 13 ++++++-------
 dibi/libs/DibiProfiler.php        | 13 ++++++-------
 dibi/libs/DibiResult.php          | 13 ++++++-------
 dibi/libs/DibiResultIterator.php  | 13 ++++++-------
 dibi/libs/DibiRow.php             | 13 ++++++-------
 dibi/libs/DibiTranslator.php      | 13 ++++++-------
 dibi/libs/interfaces.php          | 19 ++++++++-----------
 examples/Nette/Debug.php          | 14 +++-----------
 29 files changed, 176 insertions(+), 215 deletions(-)

diff --git a/dibi/Nette/DateTime53.php b/dibi/Nette/DateTime53.php
index eb06621a..7a8333fe 100644
--- a/dibi/Nette/DateTime53.php
+++ b/dibi/Nette/DateTime53.php
@@ -1,13 +1,12 @@
 <?php
 
 /**
- * Nette Framework
+ * This file is part of the Nette Framework.
  *
- * @copyright  Copyright (c) 2004, 2010 David Grudl
- * @license    http://nette.org/license  Nette license
- * @link       http://nette.org
- * @category   Nette
- * @package    Nette
+ * Copyright (c) 2004, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "Nette license", and/or
+ * GPL license. For more information please see http://nette.org
  */
 
 // no namespace
@@ -17,7 +16,7 @@
 /**
  * DateTime with serialization and timestamp support for PHP 5.2.
  *
- * @copyright  Copyright (c) 2004, 2010 David Grudl
+ * @author     David Grudl
  * @package    Nette
  */
 class DateTime53 extends DateTime
diff --git a/dibi/dibi.php b/dibi/dibi.php
index 07cb1d96..54668efb 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -1,19 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * dibi - smart database abstraction layer.
  *
  * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "dibi license" that is bundled
- * with this package in the file license.txt, and/or GPL license.
- *
- * For more information please see http://dibiphp.com
- *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -110,8 +103,7 @@ require_once dirname(__FILE__) . '/libs/DibiProfiler.php';
  * This class is static container class for creating DB objects and
  * store connections info.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 class dibi
 {
diff --git a/dibi/drivers/firebird.php b/dibi/drivers/firebird.php
index eed0f340..ee1780b8 100644
--- a/dibi/drivers/firebird.php
+++ b/dibi/drivers/firebird.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -24,7 +24,6 @@
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
  * @author     Tomáš Kraina, Roman Sklenář
- * @copyright  Copyright (c) 2010
  * @package    dibi\drivers
  */
 class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultDriver, IDibiReflector
diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 88dc51f7..1f096d0a 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -23,7 +23,7 @@
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/drivers/mssql2005.php b/dibi/drivers/mssql2005.php
index 625b5ff7..2f1fe81b 100644
--- a/dibi/drivers/mssql2005.php
+++ b/dibi/drivers/mssql2005.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -24,7 +24,7 @@
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index 71d683dd..38f3d034 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -32,7 +32,7 @@ require_once dirname(__FILE__) . '/mysql.reflector.php';
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/drivers/mysql.reflector.php b/dibi/drivers/mysql.reflector.php
index be02ba79..d38f1c27 100644
--- a/dibi/drivers/mysql.reflector.php
+++ b/dibi/drivers/mysql.reflector.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -14,7 +14,7 @@
 /**
  * The dibi reflector for MySQL databases.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  * @internal
  */
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 8a2001f8..b2f407d5 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -33,7 +33,7 @@ require_once dirname(__FILE__) . '/mysql.reflector.php';
  *   - resource (mysqli) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 4d8ff8c4..30e2c197 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -22,7 +22,7 @@
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDriver, IDibiReflector
diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php
index 298261e0..d2e05f66 100644
--- a/dibi/drivers/oracle.php
+++ b/dibi/drivers/oracle.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -24,7 +24,7 @@
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDriver, IDibiReflector
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index 719984f7..996e62e8 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -22,7 +22,7 @@
  *   - resource (PDO) => existing connection
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index d867ce0e..a28d1626 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -23,7 +23,7 @@
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDriver, IDibiReflector
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 391ff9e3..61a6302e 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -28,7 +28,7 @@ require_once dirname(__FILE__) . '/sqlite.reflector.php';
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/drivers/sqlite.reflector.php b/dibi/drivers/sqlite.reflector.php
index 0aa14cac..27b61574 100644
--- a/dibi/drivers/sqlite.reflector.php
+++ b/dibi/drivers/sqlite.reflector.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -14,7 +14,7 @@
 /**
  * The dibi reflector for SQLite database.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  * @internal
  */
diff --git a/dibi/drivers/sqlite3.php b/dibi/drivers/sqlite3.php
index 6d7194f6..d93c1af5 100644
--- a/dibi/drivers/sqlite3.php
+++ b/dibi/drivers/sqlite3.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi\drivers
  */
 
@@ -26,7 +26,7 @@ require_once dirname(__FILE__) . '/sqlite.reflector.php';
  *   - resource (SQLite3) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see DibiConnection options
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
+ * @author     David Grudl
  * @package    dibi\drivers
  */
 class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDriver
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index c484bcc6..167eb800 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * dibi connection.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read bool $connected
  * @property-read mixed $config
diff --git a/dibi/libs/DibiDataSource.php b/dibi/libs/DibiDataSource.php
index b56e33ec..47b355e6 100644
--- a/dibi/libs/DibiDataSource.php
+++ b/dibi/libs/DibiDataSource.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * Default implementation of IDataSource for dibi.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read DibiConnection $connection
  * @property-read DibiResult $result
diff --git a/dibi/libs/DibiDatabaseInfo.php b/dibi/libs/DibiDatabaseInfo.php
index 7e5628ac..dae623b6 100644
--- a/dibi/libs/DibiDatabaseInfo.php
+++ b/dibi/libs/DibiDatabaseInfo.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * Reflection metadata class for a database.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read string $name
  * @property-read array $tables
@@ -132,8 +131,7 @@ class DibiDatabaseInfo extends DibiObject
 /**
  * Reflection metadata class for a database table.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read string $name
  * @property-read bool $view
@@ -341,8 +339,7 @@ class DibiTableInfo extends DibiObject
 /**
  * Reflection metadata class for a result set.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read array $columns
  * @property-read array $columnNames
@@ -448,8 +445,7 @@ class DibiResultInfo extends DibiObject
 /**
  * Reflection metadata class for a table or result set column.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read string $name
  * @property-read string $fullName
@@ -655,8 +651,7 @@ class DibiColumnInfo extends DibiObject
 /**
  * Reflection metadata class for a foreign key.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  * @todo
  *
  * @property-read string $name
@@ -706,8 +701,7 @@ class DibiForeignKeyInfo extends DibiObject
 /**
  * Reflection metadata class for a index or primary key.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read string $name
  * @property-read array $columns
diff --git a/dibi/libs/DibiException.php b/dibi/libs/DibiException.php
index 93dcbbfc..88f35ebe 100644
--- a/dibi/libs/DibiException.php
+++ b/dibi/libs/DibiException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * dibi common exception.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 class DibiException extends Exception implements IDebugPanel
 {
@@ -102,8 +101,7 @@ class DibiException extends Exception implements IDebugPanel
 /**
  * database server exception.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 class DibiDriverException extends DibiException
 {
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
index 841fc52f..cd3d638c 100644
--- a/dibi/libs/DibiFluent.php
+++ b/dibi/libs/DibiFluent.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * dibi SQL builder via fluent interfaces. EXPERIMENTAL!
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read string $command
  * @property-read DibiConnection $connection
diff --git a/dibi/libs/DibiLazyStorage.php b/dibi/libs/DibiLazyStorage.php
index 274d8ead..516adbb1 100644
--- a/dibi/libs/DibiLazyStorage.php
+++ b/dibi/libs/DibiLazyStorage.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**#@+
  * Lazy cached storage.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  * @internal
  */
 abstract class DibiLazyStorageBase
diff --git a/dibi/libs/DibiObject.php b/dibi/libs/DibiObject.php
index 6b023ddd..9d49b675 100644
--- a/dibi/libs/DibiObject.php
+++ b/dibi/libs/DibiObject.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -50,8 +50,7 @@
  * $obj->newMethod($x);
  * </code>
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 abstract class DibiObject
 {
diff --git a/dibi/libs/DibiProfiler.php b/dibi/libs/DibiProfiler.php
index 4287e8c9..f25e37ac 100644
--- a/dibi/libs/DibiProfiler.php
+++ b/dibi/libs/DibiProfiler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -19,8 +19,7 @@
  *   - 'explain' - explain SELECT queries?
  *   - 'filter' - which queries to log?
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 class DibiProfiler extends DibiObject implements IDibiProfiler, IDebugPanel
 {
diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index 16837528..b0756130 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -28,8 +28,7 @@
  * unset($result);
  * </code>
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  *
  * @property-read mixed $resource
  * @property-read IDibiResultDriver $driver
diff --git a/dibi/libs/DibiResultIterator.php b/dibi/libs/DibiResultIterator.php
index c5584543..567eb666 100644
--- a/dibi/libs/DibiResultIterator.php
+++ b/dibi/libs/DibiResultIterator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -24,8 +24,7 @@
  * unset($result);
  * </code>
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 class DibiResultIterator implements Iterator, Countable
 {
diff --git a/dibi/libs/DibiRow.php b/dibi/libs/DibiRow.php
index 9fa48dc0..4630be4c 100644
--- a/dibi/libs/DibiRow.php
+++ b/dibi/libs/DibiRow.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * Result set single row.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 class DibiRow implements ArrayAccess, IteratorAggregate, Countable
 {
diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php
index eafbc0c4..0dfac67c 100644
--- a/dibi/libs/DibiTranslator.php
+++ b/dibi/libs/DibiTranslator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -15,8 +15,7 @@
 /**
  * dibi SQL translator.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 final class DibiTranslator extends DibiObject
 {
diff --git a/dibi/libs/interfaces.php b/dibi/libs/interfaces.php
index 5a7c051d..3e46a60e 100644
--- a/dibi/libs/interfaces.php
+++ b/dibi/libs/interfaces.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * dibi - tiny'n'smart database abstraction layer
- * ----------------------------------------------
+ * This file is part of the "dibi" - smart database abstraction layer.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @license    http://dibiphp.com/license  dibi license
- * @link       http://dibiphp.com
+ * Copyright (c) 2005, 2010 David Grudl (http://davidgrudl.com)
+ *
+ * This source file is subject to the "dibi license", and/or
+ * GPL license. For more information please see http://dibiphp.com
  * @package    dibi
  */
 
@@ -80,8 +80,7 @@ interface IDibiProfiler
 /**
  * dibi driver interface.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 interface IDibiDriver
 {
@@ -192,8 +191,7 @@ interface IDibiDriver
 /**
  * dibi result set driver interface.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 interface IDibiResultDriver
 {
@@ -257,8 +255,7 @@ interface IDibiResultDriver
 /**
  * dibi driver reflection.
  *
- * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @author     David Grudl
  */
 interface IDibiReflector
 {
diff --git a/examples/Nette/Debug.php b/examples/Nette/Debug.php
index 8ee3b081..a137459a 100644
--- a/examples/Nette/Debug.php
+++ b/examples/Nette/Debug.php
@@ -1,19 +1,11 @@
 <?php
 /**
- * Nette Framework
+ * This file is part of the Nette Framework.
  *
  * Copyright (c) 2004, 2010 David Grudl (http://davidgrudl.com)
  *
- * This source file is subject to the "Nette license" that is bundled
- * with this package in the file license.txt, and/or GPL license.
- *
- * For more information please see http://nette.org
- *
- * @copyright  Copyright (c) 2004, 2010 David Grudl
- * @license    http://nette.org/license  Nette license
- * @link       http://nette.org
- * @category   Nette
- * @package    Nette
+ * This source file is subject to the "Nette license", and/or
+ * GPL license. For more information please see http://nette.org
  */
 
 final